Menu
▾
▴
mp-plugins-svn — SVN Update mailing list
You can subscribe to this list here.
| 2007 |
Jan
(36) |
Feb
(79) |
Mar
(123) |
Apr
(95) |
May
(119) |
Jun
(172) |
Jul
(124) |
Aug
(100) |
Sep
(83) |
Oct
(52) |
Nov
(97) |
Dec
(87) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(131) |
Feb
(80) |
Mar
(163) |
Apr
(178) |
May
(73) |
Jun
(54) |
Jul
(106) |
Aug
(118) |
Sep
(50) |
Oct
(125) |
Nov
(100) |
Dec
(99) |
| 2009 |
Jan
(104) |
Feb
(99) |
Mar
(68) |
Apr
(81) |
May
(52) |
Jun
(87) |
Jul
(67) |
Aug
(33) |
Sep
(27) |
Oct
(37) |
Nov
(60) |
Dec
(116) |
| 2010 |
Jan
(82) |
Feb
(79) |
Mar
(38) |
Apr
(50) |
May
(45) |
Jun
(53) |
Jul
(23) |
Aug
(86) |
Sep
(22) |
Oct
(96) |
Nov
(97) |
Dec
(73) |
| 2011 |
Jan
(24) |
Feb
(45) |
Mar
(28) |
Apr
(31) |
May
(42) |
Jun
(25) |
Jul
|
Aug
(12) |
Sep
(28) |
Oct
(13) |
Nov
(43) |
Dec
(13) |
| 2012 |
Jan
(62) |
Feb
(28) |
Mar
(6) |
Apr
(16) |
May
(7) |
Jun
|
Jul
(16) |
Aug
(2) |
Sep
(1) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2013 |
Jan
(5) |
Feb
|
Mar
(34) |
Apr
(9) |
May
(6) |
Jun
(10) |
Jul
(32) |
Aug
(8) |
Sep
(11) |
Oct
(35) |
Nov
(24) |
Dec
(22) |
| 2014 |
Jan
(44) |
Feb
(9) |
Mar
(9) |
Apr
(15) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(11) |
Sep
(7) |
Oct
(6) |
Nov
(1) |
Dec
(12) |
| 2015 |
Jan
(33) |
Feb
(19) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
|
From: <sa...@us...> - 2007-04-01 16:15:29
|
Revision: 272
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=272&view=rev
Author: saamand
Date: 2007-04-01 09:15:16 -0700 (Sun, 01 Apr 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.resx
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_SearchTitleDialog.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_SearchTitleDialog.cs
trunk/plugins/MyLyrics/MyLyrics.suo
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-04-01 08:44:30 UTC (rev 271)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-04-01 16:15:16 UTC (rev 272)
@@ -8,6 +8,7 @@
using System.IO;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
+using System.Text;
using LyricsEngine;
using LyricsEngineConfig;
@@ -96,13 +97,15 @@
#region Fields releated to the editor mode
internal const int TAG_IN_ROUND = 5;
- internal int currentLineToTag = 1;
+ internal int currentLineToTagIndex = 1;
+ internal int currentLineToTag_Total = 0;
internal int tagRoundFinished = 0;
internal int min = 0;
internal int sec = 0;
internal int msec = 0;
string[] lines;
+ ArrayList times;
enum EditorGUI_Controls : int
{
@@ -250,24 +253,59 @@
{
if (iControl == (int)EditorGUI_Controls.CONTROL_TAGBUTTON)
{
- string time = min.ToString() + ":" + sec.ToString() + "." + stopwatch.ElapsedMilliseconds;
- GUIControl.SetControlLabel(GetID, (int)EditorGUI_Controls.CONTROL_TIME + currentLineToTag, time);
- GUIControl.HideControl(GetID, (int)EditorGUI_Controls.CONTROL_LINE + currentLineToTag);
+ string time = "[" + min.ToString() + ":" + (sec.ToString().Length == 2 ? sec.ToString() : "0" + sec.ToString()) + "." + (stopwatch.ElapsedMilliseconds.ToString().Length == 3 ? stopwatch.ElapsedMilliseconds.ToString() : stopwatch.ElapsedMilliseconds.ToString() + "0") + "]";
+ lines[currentLineToTag_Total] = time + lines[currentLineToTag_Total];
+ GUIControl.SetControlLabel(GetID, (int)EditorGUI_Controls.CONTROL_TIME + currentLineToTagIndex, time);
+ GUIControl.HideControl(GetID, (int)EditorGUI_Controls.CONTROL_LINE + currentLineToTagIndex);
- // If a new round has to start
- if (++currentLineToTag == TAG_IN_ROUND + 1)
+ if (++currentLineToTag_Total < lines.Length)
{
- currentLineToTag = 1;
- ++tagRoundFinished;
- for (int i = 1; i <= TAG_IN_ROUND; i++)
+ // If a new round has to start
+ if (++currentLineToTagIndex == TAG_IN_ROUND + 1)
{
- GUIControl.ShowControl(GetID, (int)EditorGUI_Controls.CONTROL_LINE + i);
- GUIControl.SetControlLabel(GetID, (int)EditorGUI_Controls.CONTROL_TIME + i, "");
- GUIControl.SetControlLabel(GetID, (int)EditorGUI_Controls.CONTROL_LINE + i, lines[tagRoundFinished * TAG_IN_ROUND + i]);
- GUIControl.SetControlLabel(GetID, (int)EditorGUI_Controls.CONTROL_LINE_DONE + i, lines[tagRoundFinished * TAG_IN_ROUND + i]);
+ currentLineToTagIndex = 1;
+ ++tagRoundFinished;
+
+ for (int i = 1; i <= TAG_IN_ROUND && currentLineToTag_Total + i < lines.Length ; i++)
+ {
+ GUIControl.ShowControl(GetID, (int)EditorGUI_Controls.CONTROL_LINE + i);
+ GUIControl.SetControlLabel(GetID, (int)EditorGUI_Controls.CONTROL_TIME + i, "");
+ GUIControl.SetControlLabel(GetID, (int)EditorGUI_Controls.CONTROL_LINE + i, lines[tagRoundFinished * TAG_IN_ROUND + i]);
+ GUIControl.SetControlLabel(GetID, (int)EditorGUI_Controls.CONTROL_LINE_DONE + i, lines[tagRoundFinished * TAG_IN_ROUND + i]);
+ }
}
}
+ else
+ {
+ MessageBox.Show("The lyric has now completely been converted into a lrc!");
+ StringBuilder lyric = new StringBuilder();
+ for (int i = 0; i < lines.Length; i++)
+ {
+ lyric.Append(lines[i] + "\n");
+ }
+ lyric.Replace("\r", "");
+
+ string artist = LyricUtil.capatalizeString(m_artist);
+ string title = LyricUtil.capatalizeString(m_title);
+ string lyricAsString = lyric.ToString();
+
+ int lastLineShift = lyricAsString.LastIndexOf("\n");
+ lyricAsString = lyricAsString.Substring(0, lastLineShift);
+
+ LyricsItem item = new LyricsItem(artist, title, lyricAsString, "MP LRC-editor");
+ LyricsDB[DatabaseUtil.CorrectKeyFormat(artist, title)] = item;
+
+ string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsDBName);
+ using (FileStream fs = new FileStream(path, FileMode.Open))
+ {
+ BinaryFormatter bf = new BinaryFormatter();
+ LyricsDB.SetLastModified();
+ bf.Serialize(fs, LyricsDB);
+ fs.Close();
+ }
+ }
+
}
}
return true;
@@ -463,6 +501,8 @@
GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_Lyric, m_LyricText);
GUIPropertyManager.OnPropertyChanged += new GUIPropertyManager.OnPropertyChangedHandler(trackChangeHandler);
+
+ times = new ArrayList();
}
else if(selectedScreen == (int)MyLyricsSettings.Screen.LRC_EDITOR)
{
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-04-01 08:44:30 UTC (rev 271)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-04-01 16:15:16 UTC (rev 272)
@@ -5,7 +5,7 @@
<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>
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs 2007-04-01 08:44:30 UTC (rev 271)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs 2007-04-01 16:15:16 UTC (rev 272)
@@ -96,6 +96,10 @@
this.btSave = new MediaPortal.UserInterface.Controls.MPButton();
this.btClose = new MediaPortal.UserInterface.Controls.MPButton();
this.bgWorkerSearch = new System.ComponentModel.BackgroundWorker();
+ this.mpGroupBox3 = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.cbAutoFetch = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.cbMoveSongFrom = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.cbAutomaticUpdate = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.tabControl.SuspendLayout();
this.tabPageSetup.SuspendLayout();
this.mpGroupBox2.SuspendLayout();
@@ -109,13 +113,14 @@
this.gbMessages.SuspendLayout();
this.gbProgress.SuspendLayout();
this.gbMusicDBSearchStats.SuspendLayout();
+ this.mpGroupBox3.SuspendLayout();
this.SuspendLayout();
//
// tabControl
//
this.tabControl.Controls.Add(this.tabPageLyricsDatabase);
+ this.tabControl.Controls.Add(this.tabPageDatabase);
this.tabControl.Controls.Add(this.tabPageSetup);
- this.tabControl.Controls.Add(this.tabPageDatabase);
this.tabControl.Location = new System.Drawing.Point(7, 12);
this.tabControl.Name = "tabControl";
this.tabControl.SelectedIndex = 0;
@@ -135,6 +140,7 @@
//
// tabPageSetup
//
+ this.tabPageSetup.Controls.Add(this.mpGroupBox3);
this.tabPageSetup.Controls.Add(this.mpGroupBox2);
this.tabPageSetup.Controls.Add(this.gbLyricSites);
this.tabPageSetup.Location = new System.Drawing.Point(4, 22);
@@ -166,10 +172,10 @@
this.comboLyricsPage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboLyricsPage.FormattingEnabled = true;
this.comboLyricsPage.Items.AddRange(new object[] {
- "Lyrics page (basic)",
- "Lyrics page (wide)",
- "LRC page (basic)",
- "LRC page (editor)"});
+ "Lyrics screen (basic)",
+ "Lyrics screen (wide)",
+ "LRC screen (basic)",
+ "LRC screen (editor)"});
this.comboLyricsPage.Location = new System.Drawing.Point(96, 58);
this.comboLyricsPage.Name = "comboLyricsPage";
this.comboLyricsPage.Size = new System.Drawing.Size(144, 21);
@@ -180,9 +186,9 @@
this.lbLyricsPage.AutoSize = true;
this.lbLyricsPage.Location = new System.Drawing.Point(13, 61);
this.lbLyricsPage.Name = "lbLyricsPage";
- this.lbLyricsPage.Size = new System.Drawing.Size(64, 13);
+ this.lbLyricsPage.Size = new System.Drawing.Size(72, 13);
this.lbLyricsPage.TabIndex = 15;
- this.lbLyricsPage.Text = "Lyrics page:";
+ this.lbLyricsPage.Text = "Lyrics screen:";
//
// tbPluginName
//
@@ -211,7 +217,7 @@
this.gbLyricSites.Controls.Add(this.rbUserDefined);
this.gbLyricSites.Controls.Add(this.tbNote);
this.gbLyricSites.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.gbLyricSites.Location = new System.Drawing.Point(5, 109);
+ this.gbLyricSites.Location = new System.Drawing.Point(5, 207);
this.gbLyricSites.Name = "gbLyricSites";
this.gbLyricSites.Size = new System.Drawing.Size(538, 202);
this.gbLyricSites.TabIndex = 28;
@@ -845,6 +851,56 @@
this.bgWorkerSearch.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.bgWorkerSearch_RunWorkerCompleted);
this.bgWorkerSearch.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.bgWorkerSearch_ProgressChanged);
//
+ // mpGroupBox3
+ //
+ this.mpGroupBox3.Controls.Add(this.cbAutomaticUpdate);
+ this.mpGroupBox3.Controls.Add(this.cbMoveSongFrom);
+ this.mpGroupBox3.Controls.Add(this.cbAutoFetch);
+ this.mpGroupBox3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.mpGroupBox3.Location = new System.Drawing.Point(5, 109);
+ this.mpGroupBox3.Name = "mpGroupBox3";
+ this.mpGroupBox3.Size = new System.Drawing.Size(538, 92);
+ this.mpGroupBox3.TabIndex = 30;
+ this.mpGroupBox3.TabStop = false;
+ this.mpGroupBox3.Text = "Fetch lyric dialog settings";
+ //
+ // cbAutoFetch
+ //
+ this.cbAutoFetch.AutoSize = true;
+ this.cbAutoFetch.Checked = true;
+ this.cbAutoFetch.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cbAutoFetch.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cbAutoFetch.Location = new System.Drawing.Point(16, 23);
+ this.cbAutoFetch.Name = "cbAutoFetch";
+ this.cbAutoFetch.Size = new System.Drawing.Size(119, 17);
+ this.cbAutoFetch.TabIndex = 6;
+ this.cbAutoFetch.Text = "Automatic fetch lyric";
+ this.cbAutoFetch.UseVisualStyleBackColor = true;
+ //
+ // cbMoveSongFrom
+ //
+ this.cbMoveSongFrom.AutoSize = true;
+ this.cbMoveSongFrom.Checked = true;
+ this.cbMoveSongFrom.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cbMoveSongFrom.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cbMoveSongFrom.Location = new System.Drawing.Point(16, 68);
+ this.cbMoveSongFrom.Name = "cbMoveSongFrom";
+ this.cbMoveSongFrom.Size = new System.Drawing.Size(341, 17);
+ this.cbMoveSongFrom.TabIndex = 7;
+ this.cbMoveSongFrom.Text = "Move lyrics from marked database to lyrics database when updated";
+ this.cbMoveSongFrom.UseVisualStyleBackColor = true;
+ //
+ // cbAutomaticUpdate
+ //
+ this.cbAutomaticUpdate.AutoSize = true;
+ this.cbAutomaticUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cbAutomaticUpdate.Location = new System.Drawing.Point(16, 45);
+ this.cbAutomaticUpdate.Name = "cbAutomaticUpdate";
+ this.cbAutomaticUpdate.Size = new System.Drawing.Size(206, 17);
+ this.cbAutomaticUpdate.TabIndex = 8;
+ this.cbAutomaticUpdate.Text = "Automatic update when first lyric found";
+ this.cbAutomaticUpdate.UseVisualStyleBackColor = true;
+ //
// MyLyricsSetup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -883,6 +939,8 @@
this.gbMessages.ResumeLayout(false);
this.gbProgress.ResumeLayout(false);
this.gbMusicDBSearchStats.ResumeLayout(false);
+ this.mpGroupBox3.ResumeLayout(false);
+ this.mpGroupBox3.PerformLayout();
this.ResumeLayout(false);
}
@@ -957,5 +1015,9 @@
private MediaPortal.UserInterface.Controls.MPCheckBox cbDisconsiderTitlesWithLyrics;
private MediaPortal.UserInterface.Controls.MPLabel lbLyricsPage;
private MediaPortal.UserInterface.Controls.MPComboBox comboLyricsPage;
+ private MediaPortal.UserInterface.Controls.MPGroupBox mpGroupBox3;
+ internal MediaPortal.UserInterface.Controls.MPCheckBox cbAutoFetch;
+ internal MediaPortal.UserInterface.Controls.MPCheckBox cbMoveSongFrom;
+ internal MediaPortal.UserInterface.Controls.MPCheckBox cbAutomaticUpdate;
}
}
\ No newline at end of file
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-04-01 08:44:30 UTC (rev 271)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-04-01 16:15:16 UTC (rev 272)
@@ -133,6 +133,10 @@
tbLimit.Text = xmlreader.GetValueAsString("myLyrics", "limit", m_TotalTitles.ToString());
tbPluginName.Text = xmlreader.GetValueAsString("myLyrics", "pluginsName", "My Lyrics");
+ cbAutoFetch.Checked = xmlreader.GetValueAsBool("myLyrics", "automaticFetch", true);
+ cbAutomaticUpdate.Checked = xmlreader.GetValueAsBool("myLyrics", "automaticUpdateWhenFirstFound", false);
+ cbMoveSongFrom.Checked = xmlreader.GetValueAsBool("myLyrics", "moveLyricFromMarkedDatabase", true);
+
int xmlScreen = xmlreader.GetValueAsInt("myLyrics", "myLyricsScreen", (int)MyLyricsSettings.Screen.LYRICS_BASIC);
comboLyricsPage.SelectedIndex = xmlScreen;
@@ -319,6 +323,9 @@
xmlwriter.SetValue("myLyrics", "useLyricsOnDemand", cbLyricsOnDemand.Checked.ToString());
xmlwriter.SetValue("myLyrics", "useSeekLyrics", cbSeekLyrics.Checked.ToString());
xmlwriter.SetValue("myLyrics", "useHotLyrics", cbHotLyrics.Checked.ToString());
+ xmlwriter.SetValueAsBool("myLyrics", "automaticFetch", cbAutoFetch.Checked);
+ xmlwriter.SetValueAsBool("myLyrics", "automaticUpdateWhenFirstFound", cbAutomaticUpdate.Checked);
+ xmlwriter.SetValueAsBool("myLyrics", "moveLyricFromMarkedDatabase", cbMoveSongFrom.Checked);
int xmlScreen = comboLyricsPage.SelectedIndex;
xmlwriter.SetValue("myLyrics", "myLyricsScreen", xmlScreen);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.resx
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.resx 2007-04-01 08:44:30 UTC (rev 271)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.resx 2007-04-01 16:15:16 UTC (rev 272)
@@ -118,9 +118,9 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bgWorkerSearch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>94, 17</value>
+ <value>6, 4</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>51</value>
+ <value>27</value>
</metadata>
</root>
\ No newline at end of file
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.Designer.cs 2007-04-01 08:44:30 UTC (rev 271)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.Designer.cs 2007-04-01 16:15:16 UTC (rev 272)
@@ -135,7 +135,7 @@
// lbSource
//
this.lbSource.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbSource.Location = new System.Drawing.Point(386, 297);
+ this.lbSource.Location = new System.Drawing.Point(400, 297);
this.lbSource.Name = "lbSource";
this.lbSource.Size = new System.Drawing.Size(113, 15);
this.lbSource.TabIndex = 28;
@@ -167,7 +167,7 @@
//
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(440, 313);
+ this.lbLRCTest.Location = new System.Drawing.Point(453, 313);
this.lbLRCTest.MaximumSize = new System.Drawing.Size(60, 13);
this.lbLRCTest.MinimumSize = new System.Drawing.Size(60, 13);
this.lbLRCTest.Name = "lbLRCTest";
@@ -235,7 +235,7 @@
// lbTitle
//
this.lbTitle.AutoSize = true;
- this.lbTitle.Location = new System.Drawing.Point(221, 53);
+ this.lbTitle.Location = new System.Drawing.Point(238, 53);
this.lbTitle.MaximumSize = new System.Drawing.Size(290, 26);
this.lbTitle.MinimumSize = new System.Drawing.Size(290, 26);
this.lbTitle.Name = "lbTitle";
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs 2007-04-01 08:44:30 UTC (rev 271)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs 2007-04-01 16:15:16 UTC (rev 272)
@@ -167,7 +167,7 @@
treeView.Update();
}
- private void RemoveSong(string artist, string title)
+ public void RemoveSong(string artist, string title)
{
int artistIndex = treeView.Nodes.IndexOfKey(artist);
int titleIndex = treeView.Nodes[artistIndex].Nodes.IndexOfKey(title);
@@ -238,17 +238,20 @@
m_CurrentArtist = LyricUtil.capatalizeString(artist);
m_CurrentTitle = LyricUtil.capatalizeString(title);
- LyricsItem item = CurrentDB[DatabaseUtil.CorrectKeyFormat(m_CurrentArtist, m_CurrentTitle)];
- string lyricsText = item.Lyrics;
+ if (DatabaseUtil.IsTrackInLyricsDatabase(CurrentDB, m_CurrentArtist, m_CurrentTitle).Equals(DatabaseUtil.LYRIC_FOUND))
+ {
+ LyricsItem item = CurrentDB[DatabaseUtil.CorrectKeyFormat(m_CurrentArtist, m_CurrentTitle)];
+ string lyricsText = item.Lyrics;
- lyricsText = LyricsEngine.LyricUtil.ReturnEnvironmentNewLine(lyricsText);
+ lyricsText = LyricsEngine.LyricUtil.ReturnEnvironmentNewLine(lyricsText);
- m_OriginalLyric = lyricsText;
- tbLyrics.Text = m_OriginalLyric;
- tbLyrics.Enabled = true;
+ m_OriginalLyric = lyricsText;
+ tbLyrics.Text = m_OriginalLyric;
+ tbLyrics.Enabled = true;
- lbTitle.Text = "\"" + m_CurrentArtist + " - " + m_CurrentTitle + "\"";
- lbSource.Text = "(" + item.Source + ")";
+ lbTitle.Text = "\"" + m_CurrentArtist + " - " + m_CurrentTitle + "\"";
+ lbSource.Text = "(" + item.Source + ")";
+ }
}
}
// Selected an artist
@@ -662,7 +665,8 @@
}
}
- MyLyricsSetup_SearchTitleDialog std = new MyLyricsSetup_SearchTitleDialog(this, artist, title);
+
+ MyLyricsSetup_SearchTitleDialog std = new MyLyricsSetup_SearchTitleDialog(this, artist, title, CurrentDB.Equals(MyLyricsSettings.LyricsMarkedDB));
}
private void btSwitch_Click(object sender, EventArgs e)
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_SearchTitleDialog.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_SearchTitleDialog.Designer.cs 2007-04-01 08:44:30 UTC (rev 271)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_SearchTitleDialog.Designer.cs 2007-04-01 16:15:16 UTC (rev 272)
@@ -50,6 +50,7 @@
this.cbLyricWiki = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.btClose = new System.Windows.Forms.Button();
this.btUpdate = new System.Windows.Forms.Button();
+ this.btCancel = new System.Windows.Forms.Button();
this.gbSearchInfo.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
@@ -74,7 +75,7 @@
this.tbTitle.Location = new System.Drawing.Point(73, 53);
this.tbTitle.Name = "tbTitle";
this.tbTitle.Size = new System.Drawing.Size(344, 20);
- this.tbTitle.TabIndex = 3;
+ this.tbTitle.TabIndex = 2;
//
// lbTitle
//
@@ -103,10 +104,10 @@
//
// btFind
//
- this.btFind.Location = new System.Drawing.Point(342, 69);
+ this.btFind.Location = new System.Drawing.Point(281, 67);
this.btFind.Name = "btFind";
- this.btFind.Size = new System.Drawing.Size(75, 23);
- this.btFind.TabIndex = 4;
+ this.btFind.Size = new System.Drawing.Size(65, 23);
+ this.btFind.TabIndex = 3;
this.btFind.Text = "&Fetch";
this.btFind.UseVisualStyleBackColor = true;
this.btFind.Click += new System.EventHandler(this.btFind_Click);
@@ -174,6 +175,7 @@
//
// gbLyricSites
//
+ this.gbLyricSites.Controls.Add(this.btCancel);
this.gbLyricSites.Controls.Add(this.btFind);
this.gbLyricSites.Controls.Add(this.cbHotLyrics);
this.gbLyricSites.Controls.Add(this.cbSeekLyrics);
@@ -195,10 +197,10 @@
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(148, 21);
+ this.cbHotLyrics.Location = new System.Drawing.Point(146, 21);
this.cbHotLyrics.Name = "cbHotLyrics";
this.cbHotLyrics.Size = new System.Drawing.Size(71, 17);
- this.cbHotLyrics.TabIndex = 7;
+ this.cbHotLyrics.TabIndex = 14;
this.cbHotLyrics.Text = "Hot Lyrics";
this.cbHotLyrics.UseVisualStyleBackColor = true;
//
@@ -208,10 +210,10 @@
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(148, 43);
+ this.cbSeekLyrics.Location = new System.Drawing.Point(146, 43);
this.cbSeekLyrics.Name = "cbSeekLyrics";
this.cbSeekLyrics.Size = new System.Drawing.Size(79, 17);
- this.cbSeekLyrics.TabIndex = 6;
+ this.cbSeekLyrics.TabIndex = 15;
this.cbSeekLyrics.Text = "Seek Lyrics";
this.cbSeekLyrics.UseVisualStyleBackColor = true;
//
@@ -224,7 +226,7 @@
this.cbLyricsOnDemand.Location = new System.Drawing.Point(16, 43);
this.cbLyricsOnDemand.Name = "cbLyricsOnDemand";
this.cbLyricsOnDemand.Size = new System.Drawing.Size(108, 17);
- this.cbLyricsOnDemand.TabIndex = 5;
+ this.cbLyricsOnDemand.TabIndex = 12;
this.cbLyricsOnDemand.Text = "Lyrics OnDemand";
this.cbLyricsOnDemand.UseVisualStyleBackColor = true;
//
@@ -237,7 +239,7 @@
this.cbLyrics007.Location = new System.Drawing.Point(16, 66);
this.cbLyrics007.Name = "cbLyrics007";
this.cbLyrics007.Size = new System.Drawing.Size(72, 17);
- this.cbLyrics007.TabIndex = 4;
+ this.cbLyrics007.TabIndex = 13;
this.cbLyrics007.Text = "Lyrics 007";
this.cbLyrics007.UseVisualStyleBackColor = true;
//
@@ -247,10 +249,10 @@
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(148, 66);
+ this.cbEvilLabs.Location = new System.Drawing.Point(146, 66);
this.cbEvilLabs.Name = "cbEvilLabs";
this.cbEvilLabs.Size = new System.Drawing.Size(67, 17);
- this.cbEvilLabs.TabIndex = 3;
+ this.cbEvilLabs.TabIndex = 16;
this.cbEvilLabs.Text = "Evil Labs";
this.cbEvilLabs.UseVisualStyleBackColor = true;
//
@@ -263,7 +265,7 @@
this.cbLyricWiki.Location = new System.Drawing.Point(16, 21);
this.cbLyricWiki.Name = "cbLyricWiki";
this.cbLyricWiki.Size = new System.Drawing.Size(67, 17);
- this.cbLyricWiki.TabIndex = 2;
+ this.cbLyricWiki.TabIndex = 11;
this.cbLyricWiki.Text = "LyricWiki";
this.cbLyricWiki.UseVisualStyleBackColor = true;
//
@@ -288,6 +290,16 @@
this.btUpdate.UseVisualStyleBackColor = true;
this.btUpdate.Click += new System.EventHandler(this.btUpdate_Click);
//
+ // btCancel
+ //
+ this.btCancel.Location = new System.Drawing.Point(352, 67);
+ this.btCancel.Name = "btCancel";
+ this.btCancel.Size = new System.Drawing.Size(65, 23);
+ this.btCancel.TabIndex = 4;
+ this.btCancel.Text = "&Cancel";
+ this.btCancel.UseVisualStyleBackColor = true;
+ this.btCancel.Click += new System.EventHandler(this.btCancel_Click);
+ //
// MyLyricsSetup_SearchTitleDialog
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -340,5 +352,6 @@
private System.Windows.Forms.ColumnHeader chLyric;
private System.Windows.Forms.Button btClose;
private System.Windows.Forms.Button btUpdate;
+ private System.Windows.Forms.Button btCancel;
}
}
\ No newline at end of file
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_SearchTitleDialog.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_SearchTitleDialog.cs 2007-04-01 08:44:30 UTC (rev 271)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_SearchTitleDialog.cs 2007-04-01 16:15:16 UTC (rev 272)
@@ -36,16 +36,21 @@
string originalArtist;
string originalTitle;
int counter;
+ bool automaticFetch = true;
+ bool automaticUpdate = true;
+ bool moveLyricFromMarkedDatabase = true;
+ bool markedDatabase;
List<string> sitesToSearch;
MyLyricsSetup_LyricsLibrary parent = null;
- public MyLyricsSetup_SearchTitleDialog(MyLyricsSetup_LyricsLibrary form, string artist, string title)
+ public MyLyricsSetup_SearchTitleDialog(MyLyricsSetup_LyricsLibrary form, string artist, string title, bool markedDatabase)
{
InitializeComponent();
this.parent = form;
+ this.markedDatabase = markedDatabase;
// initialize delegates
m_DelegateStringUpdate = new DelegateStringUpdate(this.updateStringMethod);
@@ -64,12 +69,32 @@
originalArtist = artist;
originalTitle = title;
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
+ {
+ 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;
+ 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;
+ automaticFetch = xmlreader.GetValueAsBool("myLyrics", "automaticFetch", true);
+ automaticUpdate = xmlreader.GetValueAsBool("myLyrics", "automaticUpdateWhenFirstFound", false);
+ moveLyricFromMarkedDatabase = xmlreader.GetValueAsBool("myLyrics", "moveLyricFromMarkedDatabase", true);
+ }
+
this.Show();
if (!artist.Equals("") && !title.Equals(""))
{
- fetchLyric(originalArtist, originalTitle);
- lvSearchResults.Focus();
+ if (automaticFetch)
+ {
+ fetchLyric(originalArtist, originalTitle);
+ lvSearchResults.Focus();
+ }
+ else
+ {
+ btFind.Focus();
+ }
}
else if (!artist.Equals(""))
{
@@ -84,11 +109,13 @@
private void lockGUI()
{
btFind.Enabled = false;
+ btCancel.Enabled = true;
}
private void openGUI()
{
btFind.Enabled = true;
+ btCancel.Enabled = false;
}
private void fetchLyric(string artist, string title)
@@ -126,7 +153,6 @@
sitesToSearch.Add("SeekLyrics");
}
-
lc = new LyricsController(this, m_EventStopThread, (string[])sitesToSearch.ToArray(), true);
ThreadStart job = delegate
@@ -143,19 +169,27 @@
private void stopSearch()
{
- if (lc != null)
+ Monitor.Enter(this);
+ try
{
- lc.finishThread(originalArtist, originalTitle, "", "");
- lc.Dispose();
- lc = null;
+ if (lc != null)
+ {
+ lc.finishThread(originalArtist, originalTitle, "", "");
+ lc.Dispose();
+ lc = null;
+ }
+ else
+ {
+ m_EventStopThread.Set();
+ ThreadFinishedMethod(originalArtist, originalTitle, "", "");
+ }
+
+ m_LyricControllerThread = null;
}
- else
+ finally
{
- m_EventStopThread.Set();
- ThreadFinishedMethod(originalArtist, originalTitle, "", "");
+ Monitor.Exit(this);
}
-
- m_LyricControllerThread = null;
}
private void btFind_Click(object sender, EventArgs e)
@@ -200,14 +234,17 @@
item.SubItems.Add("yes");
item.SubItems.Add(lyricStrings);
lvSearchResults.Items.Add(item);
+ lvSearchResults.Items[lvSearchResults.Items.Count - 1].Selected = true;
- if (++counter == sitesToSearch.Count)
+ if (automaticUpdate)
{
+ btUpdate_Click(null, null);
+ }
+ else if (++counter == sitesToSearch.Count)
+ {
stopSearch();
openGUI();
}
-
- lvSearchResults.Items[lvSearchResults.Items.Count - 1].Selected = true;
}
private void lyricNotFoundMethod(String artist, String title, String message, String site)
@@ -249,7 +286,7 @@
{
set
{
- this.Invoke(m_DelegateStatusUpdate, value);
+ //this.Invoke(m_DelegateStatusUpdate, value);
}
}
public Object[] LyricFound
@@ -317,11 +354,30 @@
ListViewItem item = lvSearchResults.Items[0];
string site = lvSearchResults.SelectedItems[0].Text;
string lyric = tbLyrics.Text;
- DatabaseUtil.ReplaceInLyricsDatabase(MyLyricsSetup_LyricsLibrary.CurrentDB, originalArtist, originalTitle, lyric, site);
- DatabaseUtil.SerializeDBs();
- parent.updateInfo();
+
+ if (markedDatabase && moveLyricFromMarkedDatabase)
+ {
+ parent.RemoveSong(originalArtist, originalTitle);
+ string key = DatabaseUtil.CorrectKeyFormat(originalArtist, originalTitle);
+ MyLyricsSettings.LyricsDB[key] = new LyricsItem(originalArtist, originalTitle, lyric, site);
+ DatabaseUtil.SerializeLyricDB();
+ parent.updateInfo();
+ }
+ else if (markedDatabase)
+ {
+ DatabaseUtil.ReplaceInLyricsDatabase(MyLyricsSettings.LyricsMarkedDB, originalArtist, originalTitle, lyric, site);
+ DatabaseUtil.SerializeDBs();
+ parent.updateInfo();
+ parent.highlightSong(originalArtist, originalTitle, false);
+ }
+ else
+ {
+ DatabaseUtil.ReplaceInLyricsDatabase(MyLyricsSettings.LyricsDB, originalArtist, originalTitle, lyric, site);
+ DatabaseUtil.SerializeDBs();
+ parent.updateInfo();
+ parent.highlightSong(originalArtist, originalTitle, false);
+ }
this.Close();
- parent.highlightSong(originalArtist, originalTitle, false);
}
}
@@ -329,5 +385,11 @@
{
btUpdate.PerformClick();
}
+
+ private void btCancel_Click(object sender, EventArgs e)
+ {
+ stopSearch();
+ openGUI();
+ }
}
}
\ No newline at end of file
Modified: trunk/plugins/MyLyrics/MyLyrics.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-04-01 08:44:34
|
Revision: 271
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=271&view=rev
Author: zebons
Date: 2007-04-01 01:44:30 -0700 (Sun, 01 Apr 2007)
Log Message:
-----------
Correct substring information for skin objects when using Upper/Lowercase in string name path.
Add a default view and clear filename of all openFiledialog (reset the previous information)
Modified Paths:
--------------
trunk/plugins/mpinstaler/MPInstaler/Form1.cs
Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.cs
===================================================================
--- trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-03-31 15:46:19 UTC (rev 270)
+++ trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-04-01 08:44:30 UTC (rev 271)
@@ -44,6 +44,7 @@
return;
}
saveFileDialog1.Filter = "Proiect files (*.xmp)|*.xmp|All files |*.*";
+ saveFileDialog1.DefaultExt = "*.xmp";
if (Path.GetFileName(proiect_file_name) == "Untitled"||String.IsNullOrEmpty(proiect_file_name.Trim()))
{
_struct.AddFileList(bossview);
@@ -71,7 +72,9 @@
5 - external player
*/
string fil;
- openFileDialog1.Filter = "Dll files|*.dll|All files|*.*";
+ openFileDialog1.Filter = "Dll files|*.dll|*.exe|All files|*.*";
+ openFileDialog1.FileName = "";
+ openFileDialog1.DefaultExt = "*.dll";
if (openFileDialog1.ShowDialog(this) == DialogResult.OK)
{
fil = openFileDialog1.FileName;
@@ -100,6 +103,8 @@
private void addtext()
{
openFileDialog1.Filter = "txt files|*.txt|All files|*.*";
+ openFileDialog1.FileName = "";
+ openFileDialog1.DefaultExt = "*.txt";
openFileDialog1.Multiselect = true;
if (openFileDialog1.ShowDialog(this) == DialogResult.OK)
{
@@ -113,24 +118,27 @@
{
// string fil;
string subtype;
+ openFileDialog1.FileName = "";
openFileDialog1.Multiselect = true;
switch (type)
{
case 1: openFileDialog1.Filter = "xml files|*.xml|png files|*.png|bmp files|*.bmp|All files|*.*";
-
+ openFileDialog1.DefaultExt = "*.xml";
break;
case 2: openFileDialog1.Filter = "png files|*.png|bmp files|*.bmp|xml files|*.xml|All files|*.*";
+ openFileDialog1.DefaultExt = "*.png";
break;
}
if (openFileDialog1.ShowDialog(this) == DialogResult.OK)
{
foreach (string fil in openFileDialog1.FileNames)
{
- if (Path.GetFullPath(fil).IndexOf("Skin\\") == 0)
+ if (Path.GetFullPath(fil).ToLower().IndexOf("skin\\") == 0)
subtype = "BlueTwo";
else
{
- subtype =Path.GetFullPath(fil).Substring(Path.GetFullPath(fil).IndexOf("Skin\\") +5);
+
+ subtype =Path.GetFullPath(fil).Substring(Path.GetFullPath(fil).ToLower().IndexOf("skin\\") +5);
subtype =subtype.Substring(0,subtype.IndexOf("\\"));
}
switch (type)
@@ -150,6 +158,8 @@
{
// string fil;
openFileDialog1.Filter = "All files|*.*|xml files|*.xml|png files|*.png|bmp files|*.bmp|jpeg files|*.jpg";
+ openFileDialog1.FileName = "";
+ openFileDialog1.DefaultExt = "*.*";
openFileDialog1.Multiselect = true;
if (openFileDialog1.ShowDialog(this) == DialogResult.OK)
{
@@ -215,6 +225,8 @@
{
string fil;
openFileDialog1.Filter = "Proiect files (*.xmp)|*.xmp|All files |*.*";
+ openFileDialog1.FileName = "";
+ openFileDialog1.DefaultExt = "*.xmp";
if (openFileDialog1.ShowDialog(this) == DialogResult.OK)
{
bossview.Items.Clear();
@@ -307,6 +319,7 @@
return;
}
saveFileDialog1.Filter = "Proiect files (*.xmp)|*.xmp|All files |*.*";
+ saveFileDialog1.DefaultExt = "*.xmp";
if (saveFileDialog1.ShowDialog(this) == DialogResult.OK)
{
proiect_file_name = saveFileDialog1.FileName;
@@ -475,6 +488,8 @@
private void button_browse_Click(object sender, EventArgs e)
{
openFileDialog1.Filter = "All files|*.*|png files|*.png|bmp files|*.bmp|jpeg files|*.jpg";
+ openFileDialog1.FileName = "";
+ openFileDialog1.DefaultExt = "*.*";
openFileDialog1.Multiselect = false;
if (openFileDialog1.ShowDialog(this) == DialogResult.OK)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-03-31 15:46:21
|
Revision: 270
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=270&view=rev
Author: zebons
Date: 2007-03-31 08:46:19 -0700 (Sat, 31 Mar 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilmsSetup.cs
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-03-31 13:43:25 UTC (rev 269)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-03-31 15:46:19 UTC (rev 270)
@@ -313,7 +313,7 @@
else
{
Load_Config(CurrentConfig, true);
- Fin_Charge_Init(true);
+ Fin_Charge_Init(false);
}
}
}
@@ -353,7 +353,6 @@
//---------------------------------------------------------------------------------------
// Hide Informations about List Item
//---------------------------------------------------------------------------------------
-// if ((dControl == (int)Controls.CTRL_List) && (!boolselect))
if ((dControl == (int)Controls.CTRL_List) && !(boolselect || (lsCtlFilm.SelectedListItemIndex > -1 && lsCtlFilm.SelectedListItem.IsFolder))) //xxxx
{
if (lsCtlFilm.SelectedListItemIndex > -1)
@@ -764,9 +763,6 @@
}
}
}
-
-
-
//----------------------------------------------------------------------------------------
// Hide Detailed Info (Image, Description, Year, Category)
//----------------------------------------------------------------------------------------
@@ -1274,12 +1270,16 @@
}
else
{
+ MessageBox.Show(StrViewDfltItem);
if (StrViewDfltText.Length == 0)
{
if (StrViewDfltItem == StrViewItem1)
Change_view("View1");
else
- Change_view("View2");
+ if (StrViewDfltItem == StrViewItem2)
+ Change_view("View2");
+ else
+ Change_view(StrViewDfltItem);
}
else
// View List as selected
Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-03-31 13:43:25 UTC (rev 269)
+++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-03-31 15:46:19 UTC (rev 270)
@@ -31,7 +31,7 @@
private void MesFilmsSetup_Load(object sender, EventArgs e)
{
- Refresh_Items(false);
+ Refresh_Items(true);
textBox1.Text = MyFilms_xmlreader.GetValueAsString("MyFilms", "PluginName", "Films");
MesFilms_nb_config = MyFilms_xmlreader.GetValueAsInt("MyFilms", "NbConfig", -1);
for (int i = 0; i < (int)MesFilms_nb_config; i++)
@@ -409,6 +409,11 @@
StrDfltSelect = "";
mydivx.Clear();
Config_Dflt.Checked = false;
+ View_Dflt_Item.Items.Clear();
+ View_Dflt_Item.Items.Add("(none)");
+ View_Dflt_Item.Items.Add("Year");
+ View_Dflt_Item.Items.Add("Category");
+ View_Dflt_Item.Items.Add("Country");
if (!all)
return;
MesFilmsCat.ResetText();
@@ -446,13 +451,6 @@
TitleDelim.ResetText();
View_Dflt_Item.ResetText();
View_Dflt_Text.ResetText();
- View_Dflt_Item.Items.Clear();
- View_Dflt_Item.Items.Add("(none)");
- View_Dflt_Item.Items.Add("Year");
- View_Dflt_Item.Items.Add("Category");
- View_Dflt_Item.Items.Add("Country");
- StrDfltSelect = "";
- mydivx.Clear();
}
private void AntViewItem1_SelectedIndexChanged(object sender, EventArgs e)
@@ -528,7 +526,7 @@
}
private void MesFilmsSetup_Quit(object sender, FormClosedEventArgs e)
{
- MyFilms_xmlwriter.SetValue("MyFilms", "Current_Config", "");
+// MyFilms_xmlwriter.SetValue("MyFilms", "Current_Config", "");
if (Config_Name.Items.Count == 0)
{
DialogResult dialogResult = MessageBox.Show("No Configuration defined; the plugin'll not work !", "Information", MessageBoxButtons.OKCancel,
@@ -546,8 +544,8 @@
for (int i = 0; i < (int)Config_Name.Items.Count; i++)
{
MyFilms_xmlwriter.SetValue("MyFilms", "ConfigName" + i, Config_Name.Items[i]);
- MyFilms_xmlwriter.SetValue("ConfigName" + i, "IndexItem", -1);
- MyFilms_xmlwriter.SetValue("ConfigName" + i, "LastID", "");
+ //MyFilms_xmlwriter.SetValue("ConfigName" + i, "IndexItem", -1);
+ //MyFilms_xmlwriter.SetValue("ConfigName" + i, "LastID", "");
if (Config_Name.Items.Count == 1)
MyFilms_xmlwriter.SetValue("MyFilms", "Default_Config", Config_Name.Items[i]);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hap...@us...> - 2007-03-31 13:43:29
|
Revision: 269
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=269&view=rev
Author: happytalk
Date: 2007-03-31 06:43:25 -0700 (Sat, 31 Mar 2007)
Log Message:
-----------
quit Fin_Charge_Init if file no exist
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilms.cs
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-03-31 12:31:05 UTC (rev 268)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-03-31 13:43:25 UTC (rev 269)
@@ -308,7 +308,6 @@
if (CurrentConfig == "") //continuing here with CurrentConfig = "" will cause exception in GuiWindowManager.cs so exit plugin
{
- base.OnMessage(messageType);
GUIWindowManager.ShowPreviousWindow();
}
else
@@ -1220,7 +1219,10 @@
if (LoadDfltSlct)
boolselect = false;
if (!ControlFichierDonn\xE9es())
+ {
base.OnPreviousWindow();
+ return; // need to return here as xml file doesn't exist so no point trying to load it
+ }
try
{
mydivx.ReadXml(StrFileXml);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hap...@us...> - 2007-03-31 12:31:20
|
Revision: 268
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=268&view=rev
Author: happytalk
Date: 2007-03-31 05:31:05 -0700 (Sat, 31 Mar 2007)
Log Message:
-----------
put AntPicture code back
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilms.cs
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-03-31 12:18:16 UTC (rev 267)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-03-31 12:31:05 UTC (rev 268)
@@ -1133,6 +1133,7 @@
StrViewText2 = xmlreader.GetValueAsString(CurrentConfig, "AntViewText2", "");
StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalog", "");
StrFileType = xmlreader.GetValueAsString(CurrentConfig, "CatalogType", "0");
+ StrPathImg = xmlreader.GetValueAsString(CurrentConfig, "AntPicture", "");
switch (StrFileType)
{
case "0":
@@ -1140,21 +1141,25 @@
case "1":
if (create_temp)
{
- string destFile = StrFileXml.Substring(0, StrFileXml.Length - 4) + "_tmp.xml";
+ string WStrPathImg;
+ if (StrPathImg.Substring(StrPathImg.Length - 1) == "\\")
+ WStrPathImg = StrPathImg.Substring(0, StrPathImg.LastIndexOf(@"\"));
+ else
+ WStrPathImg = StrPathImg;
+ string destFile = WStrPathImg + "\\" + StrFileXml.Substring(StrFileXml.LastIndexOf(@"\") + 1, StrFileXml.Length - StrFileXml.LastIndexOf(@"\") - 5) + "_tmp.xml";
if ((System.IO.File.Exists(destFile) && (System.IO.File.GetLastWriteTime(destFile) > System.IO.File.GetLastWriteTime(StrFileXml))))
{
StrFileXml = destFile;
break;
}
CatalogConverter cv = new CatalogConverter();
- StrFileXml = cv.ConvertProfiler(StrFileXml);
+ StrFileXml = cv.ConvertProfiler(StrFileXml, StrPathImg);
}
else
StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalogTemp", "");
break;
}
- StrPathImg = xmlreader.GetValueAsString(CurrentConfig, "AntPicture", "");
StrSelect = xmlreader.GetValueAsString(CurrentConfig, "StrSelect", "");
StrActors = xmlreader.GetValueAsString(CurrentConfig, "StrActors", "");
StrDfltSelect = xmlreader.GetValueAsString(CurrentConfig, "StrDfltSelect", "");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hap...@us...> - 2007-03-31 12:18:18
|
Revision: 267
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=267&view=rev
Author: happytalk
Date: 2007-03-31 05:18:16 -0700 (Sat, 31 Mar 2007)
Log Message:
-----------
fixed "{"There is no row at position -1."} exception
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilms.cs
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-03-31 11:14:14 UTC (rev 266)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-03-31 12:18:16 UTC (rev 267)
@@ -134,7 +134,6 @@
public string WStrSortSens = null;
public bool boolreturn = false;
public bool boolstorage = false;
- public bool choice_menu = false;
string StrDfltSelect = null;
string CurrentSortMethod = null;
decimal w_rating = 0;
@@ -257,15 +256,6 @@
{
if (GetPrevFilmList() || (actionType.wID != Action.ActionType.ACTION_PREVIOUS_MENU)) return;
}
- //if (actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU)
- //{
- // if (choice_menu)
- // base.OnPreviousWindow();
- //// using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings("MyFilms.xml"))
- //// {
- //// xmlwriter.SetValue("MyFilms", "Current_Config", "");
- //// }
- //}
base.OnAction(actionType);
}
//---------------------------------------------------------------------------------------
@@ -312,16 +302,27 @@
if (CurrentConfig == "")
CurrentConfig = xmlreader.GetValueAsString("MyFilms", "Current_Config", "");
if (CurrentConfig == "")
- CurrentConfig = Choice_Config();
- Load_Config(CurrentConfig,true);
- Fin_Charge_Init(true);
+ {
+ CurrentConfig = Choice_Config(); // "" => user esc's dialog on plugin startup so exit plugin unchanged
+ }
+
+ if (CurrentConfig == "") //continuing here with CurrentConfig = "" will cause exception in GuiWindowManager.cs so exit plugin
+ {
+ base.OnMessage(messageType);
+ GUIWindowManager.ShowPreviousWindow();
+ }
+ else
+ {
+ Load_Config(CurrentConfig, true);
+ Fin_Charge_Init(true);
+ }
}
}
}
return true;
case GUIMessage.MessageType.GUI_MSG_WINDOW_DEINIT: //called when exiting plugin either by prev menu or pressing home button
- save_config_values();
+ if (CurrentConfig != "") save_config_values();
mydivx.Clear();
mydivx.Dispose();
return true; // fall through to call base class?
@@ -912,8 +913,6 @@
//-----------------------------------------------------------------------------------------
private bool ControlFichierDonn\xE9es()
{
- if (StrFileXml == "")
- return false;
if (File.Exists(StrFileXml))
return true;
else
@@ -1111,6 +1110,7 @@
}
}
}
+
private void Load_Config(string CurrentConfig,bool create_temp)
{
//-----------------------------------------------------------------------------------------------
@@ -1133,7 +1133,6 @@
StrViewText2 = xmlreader.GetValueAsString(CurrentConfig, "AntViewText2", "");
StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalog", "");
StrFileType = xmlreader.GetValueAsString(CurrentConfig, "CatalogType", "0");
- StrPathImg = xmlreader.GetValueAsString(CurrentConfig, "AntPicture", "");
switch (StrFileType)
{
case "0":
@@ -1141,25 +1140,21 @@
case "1":
if (create_temp)
{
- string WStrPathImg;
- if (StrPathImg.Substring(StrPathImg.Length - 1) == "\\")
- WStrPathImg = StrPathImg.Substring(0, StrPathImg.LastIndexOf(@"\"));
- else
- WStrPathImg = StrPathImg;
- string destFile = WStrPathImg + "\\" + StrFileXml.Substring(StrFileXml.LastIndexOf(@"\") + 1, StrFileXml.Length - StrFileXml.LastIndexOf(@"\") - 5) + "_tmp.xml";
+ string destFile = StrFileXml.Substring(0, StrFileXml.Length - 4) + "_tmp.xml";
if ((System.IO.File.Exists(destFile) && (System.IO.File.GetLastWriteTime(destFile) > System.IO.File.GetLastWriteTime(StrFileXml))))
{
StrFileXml = destFile;
break;
}
CatalogConverter cv = new CatalogConverter();
- StrFileXml = cv.ConvertProfiler(StrFileXml,StrPathImg);
+ StrFileXml = cv.ConvertProfiler(StrFileXml);
}
else
StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalogTemp", "");
break;
}
+ StrPathImg = xmlreader.GetValueAsString(CurrentConfig, "AntPicture", "");
StrSelect = xmlreader.GetValueAsString(CurrentConfig, "StrSelect", "");
StrActors = xmlreader.GetValueAsString(CurrentConfig, "StrActors", "");
StrDfltSelect = xmlreader.GetValueAsString(CurrentConfig, "StrDfltSelect", "");
@@ -1183,12 +1178,11 @@
//--------------------------------------------------------------------------------------------
private string Choice_Config()
{
- choice_menu = true;
GUIDialogMenu dlg = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
if (dlg == null)
{
StrFileXml = "";
- return CurrentConfig;
+ return "";
}
dlg.Reset();
dlg.SetHeading(924); // menu
@@ -1204,7 +1198,7 @@
if (dlg.SelectedLabel == -1)
{
StrFileXml = "";
- return CurrentConfig;
+ return "";
}
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MyFilms.xml"))
{
@@ -1299,6 +1293,7 @@
GetFilmList(l_index);
}
+
}
}
@@ -1392,11 +1387,16 @@
}
if (choice_view == "Config")
{
- //Change "Config":
- save_config_values();
- mydivx.Clear();
- Load_Config(Choice_Config(),true);
- Fin_Charge_Init(true);
+ string oldConfig = CurrentConfig;
+ string newView = Choice_Config();
+ if (newView != "" && newView != oldConfig) // if user escapes dialog or bad value leave system unchanged
+ {
+ //Change "Config":
+ save_config_values();
+ mydivx.Clear();
+ Load_Config(newView, true);
+ Fin_Charge_Init(true);
+ }
return;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-03-31 11:14:18
|
Revision: 266
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=266&view=rev
Author: zebons
Date: 2007-03-31 04:14:14 -0700 (Sat, 31 Mar 2007)
Log Message:
-----------
add rating for DVDProfiler
Correct some bugs on ESC key press
add a reset of last-position when quit setup (for cleaning when a bug is encountered with that function)
Modified Paths:
--------------
trunk/plugins/MyFilms/CatalogConverter.cs
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilmsSetup.cs
Modified: trunk/plugins/MyFilms/CatalogConverter.cs
===================================================================
--- trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-31 08:54:56 UTC (rev 265)
+++ trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-31 11:14:14 UTC (rev 266)
@@ -20,7 +20,7 @@
ProfilerDict.Add("SortTitle", "TranslatedTitle");
ProfilerDict.Add("SortTitle1", "FormattedTitle");
ProfilerDict.Add("CollectionNumber", "Number");
- ProfilerDict.Add("Notes/Rating", "Rating");
+ ProfilerDict.Add("Review/ReviewFilm", "Rating");
ProfilerDict.Add("Notes/File", "URL");
ProfilerDict.Add("Notes/Country", "Country");
ProfilerDict.Add("Year", "Year");
@@ -32,10 +32,16 @@
ProfilerDict.Add("Picture", "Picture");
}
- public string ConvertProfiler(string source)
+ public string ConvertProfiler(string source, string folderimage)
{
//string destFile = Path.GetTempPath()+@"AntTempFile.xml";
- string destFile = source.Substring(0, source.Length - 4) + "_tmp.xml";
+ //string destFile = source.Substring(0, source.Length - 4) + "_tmp.xml";
+ string WStrPathImg;
+ if (folderimage.Substring(folderimage.Length - 1) == "\\")
+ WStrPathImg = folderimage.Substring(0, folderimage.LastIndexOf(@"\"));
+ else
+ WStrPathImg = folderimage;
+ string destFile = WStrPathImg + "\\" + source.Substring(source.LastIndexOf(@"\") + 1, source.Length - source.LastIndexOf(@"\") - 5) + "_tmp.xml";
XmlTextWriter destXml = new XmlTextWriter(destFile,Encoding.Default);
destXml.Formatting = Formatting.Indented;
destXml.WriteStartDocument();
@@ -68,16 +74,10 @@
string Country = null;
if (nodeNotes != null && nodeNotes.InnerText != null)
{
- MessageBox.Show(nodeNotes.InnerText + ", " + nodeNotes.InnerText.IndexOf("<File>").ToString() + ", " + nodeNotes.InnerText.IndexOf("</File>").ToString());
if (nodeNotes.InnerText.IndexOf("<File>") != -1)
File = nodeNotes.InnerText.Substring(nodeNotes.InnerText.IndexOf("<File>") + 6, nodeNotes.InnerText.IndexOf("</File>") - nodeNotes.InnerText.IndexOf("<File>") - 6);
if (nodeNotes.InnerText.IndexOf("<Country>") != -1)
Country = nodeNotes.InnerText.Substring(nodeNotes.InnerText.IndexOf("<Country>") + 9, nodeNotes.InnerText.IndexOf("</Country>") - nodeNotes.InnerText.IndexOf("<Country>") - 9);
- //if (nodeNotes.InnerText.IndexOf("<Rating>") != -1)
- // Rating = nodeNotes.InnerText.Substring(nodeNotes.InnerText.IndexOf("<Rating>") + 8, nodeNotes.InnerText.IndexOf("</Rating>") - nodeNotes.InnerText.IndexOf("<Rating>") - 8);
- MessageBox.Show(File);
- MessageBox.Show(Country);
- MessageBox.Show(Rating);
}
string genre = String.Empty;
@@ -125,7 +125,7 @@
credits += String.Format("{0} {1}", firstname, lastname);
}
}
- //rec.Image = folderName + @"\" + nodeID.InnerText.Trim() + "f.jpg";
+ string Image = folderimage + @"\" + nodeID.InnerText.Trim() + "f.jpg";
XmlNode nodeRating = nodeDVD.SelectSingleNode("Review/ReviewFilm");
if (nodeRating != null && nodeRating.InnerText != null)
Rating = nodeRating.InnerText + ".0";
@@ -141,13 +141,14 @@
WriteAntAtribute(destXml, "SortTitle1", nodeTitle.InnerText);
WriteAntAtribute(destXml, "Notes/File", File);
WriteAntAtribute(destXml, "Notes/Country", Country);
- WriteAntAtribute(destXml, "Notes/Rating", Rating);
+ WriteAntAtribute(destXml, "Review/ReviewFilm", Rating);
WriteAntAtribute(destXml, "Year", nodeYear.InnerText);
WriteAntAtribute(destXml, "RunningTime", nodeDuration.InnerText);
WriteAntAtribute(destXml, "Genres", genre);
WriteAntAtribute(destXml, "Credits", credits);
WriteAntAtribute(destXml, "Actors", cast);
- WriteAntAtribute(destXml, "Picture", nodeID.InnerText.Trim() + "f.jpg");
+// WriteAntAtribute(destXml, "Picture", nodeID.InnerText.Trim() + "f.jpg");
+ WriteAntAtribute(destXml, "Picture", Image);
if (nodeOverview != null && nodeOverview.InnerText != null)
WriteAntAtribute(destXml, "Overview", nodeOverview.InnerText);
else
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-03-31 08:54:56 UTC (rev 265)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-03-31 11:14:14 UTC (rev 266)
@@ -912,18 +912,12 @@
//-----------------------------------------------------------------------------------------
private bool ControlFichierDonn\xE9es()
{
+ if (StrFileXml == "")
+ return false;
if (File.Exists(StrFileXml))
- {
- choice_menu = false;
return true;
- }
else
{
- if (choice_menu)
- {
- choice_menu = false;
- return false;
- }
GUIDialogOK dlgOk = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
dlgOk.SetHeading(3);//my videos
dlgOk.SetLine(1, "The ANT '.xml' file is missing");
@@ -1139,6 +1133,7 @@
StrViewText2 = xmlreader.GetValueAsString(CurrentConfig, "AntViewText2", "");
StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalog", "");
StrFileType = xmlreader.GetValueAsString(CurrentConfig, "CatalogType", "0");
+ StrPathImg = xmlreader.GetValueAsString(CurrentConfig, "AntPicture", "");
switch (StrFileType)
{
case "0":
@@ -1146,21 +1141,25 @@
case "1":
if (create_temp)
{
- string destFile = StrFileXml.Substring(0, StrFileXml.Length - 4) + "_tmp.xml";
+ string WStrPathImg;
+ if (StrPathImg.Substring(StrPathImg.Length - 1) == "\\")
+ WStrPathImg = StrPathImg.Substring(0, StrPathImg.LastIndexOf(@"\"));
+ else
+ WStrPathImg = StrPathImg;
+ string destFile = WStrPathImg + "\\" + StrFileXml.Substring(StrFileXml.LastIndexOf(@"\") + 1, StrFileXml.Length - StrFileXml.LastIndexOf(@"\") - 5) + "_tmp.xml";
if ((System.IO.File.Exists(destFile) && (System.IO.File.GetLastWriteTime(destFile) > System.IO.File.GetLastWriteTime(StrFileXml))))
{
StrFileXml = destFile;
break;
}
CatalogConverter cv = new CatalogConverter();
- StrFileXml = cv.ConvertProfiler(StrFileXml);
+ StrFileXml = cv.ConvertProfiler(StrFileXml,StrPathImg);
}
else
StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalogTemp", "");
break;
}
- StrPathImg = xmlreader.GetValueAsString(CurrentConfig, "AntPicture", "");
StrSelect = xmlreader.GetValueAsString(CurrentConfig, "StrSelect", "");
StrActors = xmlreader.GetValueAsString(CurrentConfig, "StrActors", "");
StrDfltSelect = xmlreader.GetValueAsString(CurrentConfig, "StrDfltSelect", "");
@@ -1189,7 +1188,7 @@
if (dlg == null)
{
StrFileXml = "";
- return "";
+ return CurrentConfig;
}
dlg.Reset();
dlg.SetHeading(924); // menu
@@ -1205,7 +1204,7 @@
if (dlg.SelectedLabel == -1)
{
StrFileXml = "";
- return "";
+ return CurrentConfig;
}
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MyFilms.xml"))
{
@@ -1300,7 +1299,6 @@
GetFilmList(l_index);
}
-
}
}
Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-03-31 08:54:56 UTC (rev 265)
+++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-03-31 11:14:14 UTC (rev 266)
@@ -31,7 +31,7 @@
private void MesFilmsSetup_Load(object sender, EventArgs e)
{
-// Refresh_Items();
+ Refresh_Items(false);
textBox1.Text = MyFilms_xmlreader.GetValueAsString("MyFilms", "PluginName", "Films");
MesFilms_nb_config = MyFilms_xmlreader.GetValueAsInt("MyFilms", "NbConfig", -1);
for (int i = 0; i < (int)MesFilms_nb_config; i++)
@@ -323,7 +323,7 @@
Config_Name.Items.Add(w_Config_Name);
Config_Name.Text = w_Config_Name;
// Config_Name.ResetText();
-// Refresh_Items();
+ Refresh_Items(false);
}
private void butPath_Click(object sender, EventArgs e)
@@ -354,7 +354,7 @@
private void Config_Name_SelectedIndexChanged(object sender, EventArgs e)
{
-// Refresh_Items();
+ Refresh_Items(false);
CatalogType.SelectedIndex = Convert.ToInt16(MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "CatalogType", "0"));
MesFilmsCat.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "AntCatalog", "");
MesFilmsImg.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "AntPicture", "");
@@ -403,9 +403,14 @@
View_Dflt_Item.Items.Add(AntViewItem2.Text);
View_Dflt_Item.Items.Remove("");
}
- private void Refresh_Items()
+ private void Refresh_Items(bool all)
{
CatalogType.SelectedIndex = 0;
+ StrDfltSelect = "";
+ mydivx.Clear();
+ Config_Dflt.Checked = false;
+ if (!all)
+ return;
MesFilmsCat.ResetText();
MesFilmsImg.ResetText();
AntStorage.ResetText();
@@ -441,7 +446,6 @@
TitleDelim.ResetText();
View_Dflt_Item.ResetText();
View_Dflt_Text.ResetText();
- Config_Dflt.Checked = false;
View_Dflt_Item.Items.Clear();
View_Dflt_Item.Items.Add("(none)");
View_Dflt_Item.Items.Add("Year");
@@ -517,13 +521,14 @@
if ((Config_Name.Text) == MyFilms_xmlreader.GetValueAsString("MyFilms", "Default_Config", ""))
MyFilms_xmlwriter.RemoveEntry("MyFilms", "Default_Config");
Config_Name.Items.Remove(Config_Name.Text);
- Refresh_Items();
+ Refresh_Items(true);
Config_Name.ResetText();
}
}
private void MesFilmsSetup_Quit(object sender, FormClosedEventArgs e)
{
+ MyFilms_xmlwriter.SetValue("MyFilms", "Current_Config", "");
if (Config_Name.Items.Count == 0)
{
DialogResult dialogResult = MessageBox.Show("No Configuration defined; the plugin'll not work !", "Information", MessageBoxButtons.OKCancel,
@@ -541,6 +546,8 @@
for (int i = 0; i < (int)Config_Name.Items.Count; i++)
{
MyFilms_xmlwriter.SetValue("MyFilms", "ConfigName" + i, Config_Name.Items[i]);
+ MyFilms_xmlwriter.SetValue("ConfigName" + i, "IndexItem", -1);
+ MyFilms_xmlwriter.SetValue("ConfigName" + i, "LastID", "");
if (Config_Name.Items.Count == 1)
MyFilms_xmlwriter.SetValue("MyFilms", "Default_Config", Config_Name.Items[i]);
}
@@ -591,7 +598,7 @@
break;
}
CatalogConverter cc = new CatalogConverter();
- mydivx.ReadXml(cc.ConvertProfiler(MesFilmsCat.Text));
+ mydivx.ReadXml(cc.ConvertProfiler(MesFilmsCat.Text,MesFilmsImg.Text));
break;
}
DataRow[] movies = mydivx.Movie.Select(StrDfltSelect + AntTitle1.Text + " not like ''");
@@ -637,7 +644,8 @@
private void button1_Click(object sender, EventArgs e)
{
CatalogConverter cc = new CatalogConverter();
- cc.ConvertProfiler(MesFilmsCat.Text);
+ cc.ConvertProfiler(MesFilmsCat.Text, MesFilmsImg.Text);
}
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2007-03-31 08:54:58
|
Revision: 265
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=265&view=rev
Author: dukus
Date: 2007-03-31 01:54:56 -0700 (Sat, 31 Mar 2007)
Log Message:
-----------
language helper compatibilities fix for latest SVN
Modified Paths:
--------------
trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs
trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs
Modified: trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs
===================================================================
--- trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs 2007-03-31 06:54:43 UTC (rev 264)
+++ trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs 2007-03-31 08:54:56 UTC (rev 265)
@@ -8,6 +8,7 @@
using System.IO;
using System.Globalization;
using MediaPortal.Configuration;
+using MediaPortal.GUI.Library;
namespace MPInstaler
@@ -25,51 +26,28 @@
deflang.Load("English");
lang.Load("English");
}
+
private void LoadLanguages()
{
- // Get system language
- string strLongLanguage = CultureInfo.CurrentCulture.EnglishName;
- int iTrimIndex = strLongLanguage.IndexOf(" ", 0, strLongLanguage.Length);
- string strShortLanguage = strLongLanguage.Substring(0, iTrimIndex);
- bool bExactLanguageFound = false;
- if (Directory.Exists(LanguageDirectory))
+ //_availableLanguages = new Dictionary<string, CultureInfo>();
+
+ DirectoryInfo dir = new DirectoryInfo(LanguageDirectory);
+ foreach (FileInfo file in dir.GetFiles("strings_*.xml"))
{
- string[] folders = Directory.GetDirectories(LanguageDirectory, "*.*");
+ int pos = file.Name.IndexOf('_') + 1;
+ string cultName = file.Name.Substring(pos, file.Name.Length - file.Extension.Length - pos);
- foreach (string folder in folders)
+ try
{
- string fileName = folder.Substring(folder.LastIndexOf(@"\") + 1);
-
- //
- // Exclude cvs folder
- //
- if (fileName.ToLower() != "cvs")
- {
- if (fileName.Length > 0)
- {
- fileName = fileName.Substring(0, 1).ToUpper() + fileName.Substring(1);
- languageComboBox.Items.Add(fileName);
- languageComboBox2.Items.Add(fileName);
-
- // Check language file to user region language
- if (fileName.ToLower() == strLongLanguage.ToLower())
- {
- languageComboBox2.Text = fileName;
- bExactLanguageFound = true;
- }
- else if (!bExactLanguageFound && (fileName.ToLower() == strShortLanguage.ToLower()))
- {
- languageComboBox2.Text = fileName;
- }
- }
- }
+ CultureInfo cultInfo = new CultureInfo(cultName);
+ languageComboBox.Items.Add(cultInfo.EnglishName);
+ languageComboBox2.Items.Add(cultInfo.EnglishName);
}
- }
+ catch (ArgumentException)
+ {
+ }
- if (languageComboBox2.Text == "")
- {
- languageComboBox2.Text = "English";
}
}
Modified: trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs
===================================================================
--- trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-03-31 06:54:43 UTC (rev 264)
+++ trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-03-31 08:54:56 UTC (rev 265)
@@ -6,6 +6,7 @@
using System.Net;
using System.Xml;
using System.Drawing;
+using System.Globalization;
using ICSharpCode.SharpZipLib.Zip;
using System.Windows.Forms;
using MediaPortal.Configuration;
@@ -463,14 +464,40 @@
public class MPLanguageHelper
{
public List<LanguageString> Language;
- public string iChars;
+ public string iChars;
+ public string iName;
public string fileName=string.Empty;
public bool isLoaded=false;
+ private Dictionary<String, String> _availableLanguages;
Encoding docencoding = null ;
public MPLanguageHelper()
{
Language = new List<LanguageString>();
+ Load_Names();
}
+
+ public void Load_Names()
+ {
+
+ _availableLanguages = new Dictionary<string, string>();
+
+ DirectoryInfo dir = new DirectoryInfo(Config.GetFolder(Config.Dir.Language));
+ foreach (FileInfo file in dir.GetFiles("strings_*.xml"))
+ {
+ int pos = file.Name.IndexOf('_') + 1;
+ string cultName = file.Name.Substring(pos, file.Name.Length - file.Extension.Length - pos);
+
+ try
+ {
+ CultureInfo cultInfo = new CultureInfo(cultName);
+ _availableLanguages.Add(cultInfo.EnglishName, cultName);
+ }
+ catch (ArgumentException)
+ {
+ }
+
+ }
+ }
public void Add(LanguageString ls)
{
this.Language.Sort(new LanguageStringComparer());
@@ -494,8 +521,11 @@
}
public void Load(string lg)
{
- isLoaded = LoadMap(Config.GetFile(Config.Dir.Language, lg + @"\strings.xml"));
- fileName = Config.GetFile(Config.Dir.Language, lg + @"\strings.xml");
+ if (_availableLanguages.ContainsKey(lg))
+ {
+ isLoaded = LoadMap(Config.GetFile(Config.Dir.Language, "strings_" + _availableLanguages[lg] + ".xml"));
+ fileName = Config.GetFile(Config.Dir.Language, "strings_" + _availableLanguages[lg] + ".xml");
+ }
}
public void Save()
{
@@ -511,25 +541,31 @@
{
this.Language.Sort(new LanguageStringComparer());
XmlTextWriter writer = null;
- writer = new XmlTextWriter(strFileName, docencoding);
+ writer = new XmlTextWriter(strFileName, Encoding.UTF8);
writer.Formatting = Formatting.Indented;
+ writer.IndentChar=' ';
writer.WriteStartDocument();
- writer.WriteStartElement("strings");
+ writer.WriteStartElement("Language");
+ if (!String.IsNullOrEmpty(this.iName))
+ writer.WriteAttributeString("name", this.iName.Trim());
if(!String.IsNullOrEmpty(this.iChars))
- writer.WriteElementString("characters", this.iChars.Trim());
+ writer.WriteAttributeString("characters", this.iChars.Trim());
+ writer.WriteStartElement("Section");
+ writer.WriteAttributeString("name", "unmapped");
foreach (LanguageString ls in this.Language)
{
- writer.WriteStartElement("string");
+ writer.WriteStartElement("String");
+ writer.WriteAttributeString("id", ls.dwCode);
if (!String.IsNullOrEmpty(ls.prefix))
- writer.WriteAttributeString("Prefix",ls.prefix);
+ writer.WriteAttributeString("prefix",ls.prefix);
if (!String.IsNullOrEmpty(ls.sufix))
- writer.WriteAttributeString("Suffix", ls.sufix);
- writer.WriteElementString("id",ls.dwCode);
- writer.WriteElementString("value", ls.mapSting);
+ writer.WriteAttributeString("suffix", ls.sufix);
+ writer.WriteValue(ls.mapSting);
writer.WriteEndElement();
}
writer.WriteEndElement();
+ writer.WriteEndElement();
writer.WriteEndDocument();
writer.Close();
}
@@ -555,25 +591,25 @@
doc.Load(reader);
if (doc.DocumentElement == null) return false;
string strRoot = doc.DocumentElement.Name;
- if (strRoot != "strings") return false;
- XmlNode nodeChars = doc.DocumentElement.SelectSingleNode("/strings/characters");
+ if (strRoot != "Language") return false;
+ //XmlNode nodeChars = doc.DocumentElement.SelectSingleNode("Language");
+ XmlNode nodeChars = doc.DocumentElement;
if (nodeChars != null)
{
- iChars = nodeChars.InnerText;
+ iChars = nodeChars.Attributes["characters"].Value;
+ iName = nodeChars.Attributes["name"].Value;
}
- XmlNodeList list = doc.DocumentElement.SelectNodes("/strings/string");
+ XmlNodeList list = doc.DocumentElement.SelectNodes("Section/String");
foreach (XmlNode node in list)
{
- //StringBuilder builder = new StringBuilder();
- LanguageString ls = new LanguageString();
- ls.dwCode = node.SelectSingleNode("id").InnerText;
-
- XmlAttribute prefix = node.Attributes["Prefix"];
+ LanguageString ls = new LanguageString();
+ ls.dwCode = node.Attributes["id"].Value;
+ XmlAttribute prefix = node.Attributes["prefix"];
if (prefix != null)
ls.prefix = prefix.Value;
else ls.prefix = String.Empty;
- ls.mapSting=node.SelectSingleNode("value").InnerText;
- XmlAttribute suffix = node.Attributes["Suffix"];
+ ls.mapSting=node.InnerText;
+ XmlAttribute suffix = node.Attributes["suffix"];
if (suffix != null)
ls.sufix = suffix.Value;
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2007-03-31 06:54:49
|
Revision: 264
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=264&view=rev
Author: dukus
Date: 2007-03-30 23:54:43 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Reading correct rating
Modified Paths:
--------------
trunk/plugins/MyFilms/CatalogConverter.cs
Modified: trunk/plugins/MyFilms/CatalogConverter.cs
===================================================================
--- trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-30 21:17:54 UTC (rev 263)
+++ trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-31 06:54:43 UTC (rev 264)
@@ -73,8 +73,8 @@
File = nodeNotes.InnerText.Substring(nodeNotes.InnerText.IndexOf("<File>") + 6, nodeNotes.InnerText.IndexOf("</File>") - nodeNotes.InnerText.IndexOf("<File>") - 6);
if (nodeNotes.InnerText.IndexOf("<Country>") != -1)
Country = nodeNotes.InnerText.Substring(nodeNotes.InnerText.IndexOf("<Country>") + 9, nodeNotes.InnerText.IndexOf("</Country>") - nodeNotes.InnerText.IndexOf("<Country>") - 9);
- if (nodeNotes.InnerText.IndexOf("<Rating>") != -1)
- Rating = nodeNotes.InnerText.Substring(nodeNotes.InnerText.IndexOf("<Rating>") + 8, nodeNotes.InnerText.IndexOf("</Rating>") - nodeNotes.InnerText.IndexOf("<Rating>") - 8);
+ //if (nodeNotes.InnerText.IndexOf("<Rating>") != -1)
+ // Rating = nodeNotes.InnerText.Substring(nodeNotes.InnerText.IndexOf("<Rating>") + 8, nodeNotes.InnerText.IndexOf("</Rating>") - nodeNotes.InnerText.IndexOf("<Rating>") - 8);
MessageBox.Show(File);
MessageBox.Show(Country);
MessageBox.Show(Rating);
@@ -126,6 +126,9 @@
}
}
//rec.Image = folderName + @"\" + nodeID.InnerText.Trim() + "f.jpg";
+ XmlNode nodeRating = nodeDVD.SelectSingleNode("Review/ReviewFilm");
+ if (nodeRating != null && nodeRating.InnerText != null)
+ Rating = nodeRating.InnerText + ".0";
if (nodeNumber != null && nodeNumber.InnerText != null)
WriteAntAtribute(destXml,"CollectionNumber",nodeNumber.InnerText);
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-03-30 21:17:56
|
Revision: 263
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=263&view=rev
Author: zebons
Date: 2007-03-30 14:17:54 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Return to the last position
Some bug on setup
Modified Paths:
--------------
trunk/plugins/MyFilms/AntMovieCatalog.Designer.cs
trunk/plugins/MyFilms/AntMovieCatalog.xsd
trunk/plugins/MyFilms/CatalogConverter.cs
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
trunk/plugins/MyFilms/MesFilmsSetup.cs
Modified: trunk/plugins/MyFilms/AntMovieCatalog.Designer.cs
===================================================================
--- trunk/plugins/MyFilms/AntMovieCatalog.Designer.cs 2007-03-30 10:01:07 UTC (rev 262)
+++ trunk/plugins/MyFilms/AntMovieCatalog.Designer.cs 2007-03-30 21:17:54 UTC (rev 263)
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
-// This code was generated by a tool.
-// Runtime Version:2.0.50727.42
+// Ce code a été généré par un outil.
+// Version du runtime :2.0.50727.42
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+// le code est régénéré.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -1475,7 +1475,8 @@
return ((int)(this[this.tableCatalog.AntMovieCatalog_IdColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'AntMovieCatalog_Id\' in table \'Catalog\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'AntMovieCatalog_Id\' dans la table \'Catalog\' est DBNull" +
+ ".", e);
}
}
set {
@@ -1490,7 +1491,7 @@
return ((string)(this[this.tableCatalog.PropertiesColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Properties\' in table \'Catalog\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Properties\' dans la table \'Catalog\' est DBNull.", e);
}
}
set {
@@ -1562,7 +1563,7 @@
return ((int)(this[this.tableContents.Catalog_IdColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Catalog_Id\' in table \'Contents\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Catalog_Id\' dans la table \'Contents\' est DBNull.", e);
}
}
set {
@@ -1614,7 +1615,7 @@
return ((int)(this[this.tableMovie.NumberColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Number\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Number\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1629,7 +1630,7 @@
return ((string)(this[this.tableMovie.CheckedColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Checked\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Checked\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1644,7 +1645,7 @@
return ((string)(this[this.tableMovie.MediaLabelColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'MediaLabel\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'MediaLabel\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1659,7 +1660,7 @@
return ((string)(this[this.tableMovie.MediaTypeColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'MediaType\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'MediaType\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1674,7 +1675,7 @@
return ((string)(this[this.tableMovie.SourceColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Source\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Source\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1689,7 +1690,7 @@
return ((string)(this[this.tableMovie.DateColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Date\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Date\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1704,7 +1705,7 @@
return ((string)(this[this.tableMovie.BorrowerColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Borrower\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Borrower\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1719,7 +1720,7 @@
return ((decimal)(this[this.tableMovie.RatingColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Rating\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Rating\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1734,7 +1735,7 @@
return ((string)(this[this.tableMovie.OriginalTitleColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'OriginalTitle\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'OriginalTitle\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1749,7 +1750,7 @@
return ((string)(this[this.tableMovie.TranslatedTitleColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'TranslatedTitle\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'TranslatedTitle\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1764,7 +1765,7 @@
return ((string)(this[this.tableMovie.FormattedTitleColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'FormattedTitle\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'FormattedTitle\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1779,7 +1780,7 @@
return ((string)(this[this.tableMovie.DirectorColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Director\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Director\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1794,7 +1795,7 @@
return ((string)(this[this.tableMovie.ProducerColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Producer\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Producer\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1809,7 +1810,7 @@
return ((string)(this[this.tableMovie.CountryColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Country\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Country\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1824,7 +1825,7 @@
return ((string)(this[this.tableMovie.CategoryColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Category\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Category\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1839,7 +1840,7 @@
return ((string)(this[this.tableMovie.YearColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Year\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Year\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1854,7 +1855,7 @@
return ((string)(this[this.tableMovie.LengthColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Length\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Length\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1869,7 +1870,7 @@
return ((string)(this[this.tableMovie.ActorsColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Actors\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Actors\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1884,7 +1885,7 @@
return ((string)(this[this.tableMovie.URLColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'URL\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'URL\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1899,7 +1900,7 @@
return ((string)(this[this.tableMovie.DescriptionColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Description\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Description\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1914,7 +1915,7 @@
return ((string)(this[this.tableMovie.CommentsColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Comments\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Comments\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1929,7 +1930,7 @@
return ((string)(this[this.tableMovie.VideoFormatColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'VideoFormat\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'VideoFormat\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1944,7 +1945,7 @@
return ((string)(this[this.tableMovie.VideoBitrateColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'VideoBitrate\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'VideoBitrate\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1959,7 +1960,7 @@
return ((string)(this[this.tableMovie.AudioFormatColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'AudioFormat\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'AudioFormat\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1974,7 +1975,7 @@
return ((string)(this[this.tableMovie.AudioBitrateColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'AudioBitrate\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'AudioBitrate\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -1989,7 +1990,7 @@
return ((string)(this[this.tableMovie.ResolutionColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Resolution\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Resolution\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -2004,7 +2005,7 @@
return ((string)(this[this.tableMovie.FramerateColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Framerate\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Framerate\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -2019,7 +2020,7 @@
return ((string)(this[this.tableMovie.LanguagesColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Languages\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Languages\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -2034,7 +2035,7 @@
return ((string)(this[this.tableMovie.SubtitlesColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Subtitles\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Subtitles\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -2049,7 +2050,7 @@
return ((System.DateTime)(this[this.tableMovie.DateAddedColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'DateAdded\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'DateAdded\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -2064,7 +2065,7 @@
return ((string)(this[this.tableMovie.SizeColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Size\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Size\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -2079,7 +2080,7 @@
return ((string)(this[this.tableMovie.DisksColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Disks\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Disks\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -2094,7 +2095,7 @@
return ((string)(this[this.tableMovie.PictureColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Picture\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Picture\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
@@ -2109,7 +2110,7 @@
return ((int)(this[this.tableMovie.Contents_IdColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("The value for column \'Contents_Id\' in table \'Movie\' is DBNull.", e);
+ throw new System.Data.StrongTypingException("La valeur pour la colonne \'Contents_Id\' dans la table \'Movie\' est DBNull.", e);
}
}
set {
Modified: trunk/plugins/MyFilms/AntMovieCatalog.xsd
===================================================================
--- trunk/plugins/MyFilms/AntMovieCatalog.xsd 2007-03-30 10:01:07 UTC (rev 262)
+++ trunk/plugins/MyFilms/AntMovieCatalog.xsd 2007-03-30 21:17:54 UTC (rev 263)
@@ -18,58 +18,58 @@
<xs:element name="Catalog" msprop:Generator_UserTableName="Catalog" msprop:Generator_RowDeletedName="CatalogRowDeleted" msprop:Generator_RowChangedName="CatalogRowChanged" msprop:Generator_RowClassName="CatalogRow" msprop:Generator_RowChangingName="CatalogRowChanging" msprop:Generator_RowEvArgName="CatalogRowChangeEvent" msprop:Generator_RowEvHandlerName="CatalogRowChangeEventHandler" msprop:Generator_TableClassName="CatalogDataTable" msprop:Generator_TableVarName="tableCatalog" msprop:Generator_RowDeletingName="CatalogRowDeleting" msprop:Generator_TablePropName="Catalog">
<xs:complexType>
<xs:sequence>
- <xs:element name="Properties" msprop:Generator_UserColumnName="Properties" msprop:Generator_ColumnVarNameInTable="columnProperties" msprop:Generator_ColumnPropNameInRow="Properties" msprop:Generator_ColumnPropNameInTable="PropertiesColumn" type="xs:string" minOccurs="0" msdata:Ordinal="1" />
+ <xs:element name="Properties" msprop:Generator_UserColumnName="Properties" msprop:Generator_ColumnPropNameInRow="Properties" msprop:Generator_ColumnVarNameInTable="columnProperties" msprop:Generator_ColumnPropNameInTable="PropertiesColumn" type="xs:string" minOccurs="0" msdata:Ordinal="1" />
<xs:element name="Contents" msprop:Generator_UserTableName="Contents" msprop:Generator_RowDeletedName="ContentsRowDeleted" msprop:Generator_RowChangedName="ContentsRowChanged" msprop:Generator_RowClassName="ContentsRow" msprop:Generator_RowChangingName="ContentsRowChanging" msprop:Generator_RowEvArgName="ContentsRowChangeEvent" msprop:Generator_RowEvHandlerName="ContentsRowChangeEventHandler" msprop:Generator_TableClassName="ContentsDataTable" msprop:Generator_TableVarName="tableContents" msprop:Generator_RowDeletingName="ContentsRowDeleting" msprop:Generator_TablePropName="Contents" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
<xs:element name="Movie" msprop:Generator_UserTableName="Movie" msprop:Generator_RowDeletedName="MovieRowDeleted" msprop:Generator_RowChangedName="MovieRowChanged" msprop:Generator_RowClassName="MovieRow" msprop:Generator_RowChangingName="MovieRowChanging" msprop:Generator_RowEvArgName="MovieRowChangeEvent" msprop:Generator_RowEvHandlerName="MovieRowChangeEventHandler" msprop:Generator_TableClassName="MovieDataTable" msprop:Generator_TableVarName="tableMovie" msprop:Generator_RowDeletingName="MovieRowDeleting" msprop:Generator_TablePropName="Movie" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
- <xs:element name="DateAdded" msdata:ReadOnly="true" msdata:Expression="Convert(Date,'System.DateTime')" msprop:Generator_UserColumnName="DateAdded" msprop:Generator_ColumnVarNameInTable="columnDateAdded" msprop:Generator_ColumnPropNameInRow="DateAdded" msprop:Generator_ColumnPropNameInTable="DateAddedColumn" type="xs:dateTime" minOccurs="0" msdata:Ordinal="29" />
+ <xs:element name="DateAdded" msdata:ReadOnly="true" msdata:Expression="Convert(Date,'System.DateTime')" msprop:Generator_UserColumnName="DateAdded" msprop:Generator_ColumnPropNameInRow="DateAdded" msprop:Generator_ColumnVarNameInTable="columnDateAdded" msprop:Generator_ColumnPropNameInTable="DateAddedColumn" type="xs:dateTime" minOccurs="0" msdata:Ordinal="29" />
</xs:sequence>
- <xs:attribute name="Number" msprop:Generator_UserColumnName="Number" msprop:Generator_ColumnVarNameInTable="columnNumber" msprop:Generator_ColumnPropNameInRow="Number" msprop:Generator_ColumnPropNameInTable="NumberColumn" type="xs:int" />
- <xs:attribute name="Checked" msprop:Generator_UserColumnName="Checked" msprop:Generator_ColumnVarNameInTable="columnChecked" msprop:Generator_ColumnPropNameInRow="Checked" msprop:Generator_ColumnPropNameInTable="CheckedColumn" type="xs:string" />
- <xs:attribute name="MediaLabel" msprop:Generator_UserColumnName="MediaLabel" msprop:Generator_ColumnPropNameInRow="MediaLabel" msprop:Generator_ColumnVarNameInTable="columnMediaLabel" msprop:Generator_ColumnPropNameInTable="MediaLabelColumn" type="xs:string" />
- <xs:attribute name="MediaType" msprop:Generator_UserColumnName="MediaType" msprop:Generator_ColumnVarNameInTable="columnMediaType" msprop:Generator_ColumnPropNameInRow="MediaType" msprop:Generator_ColumnPropNameInTable="MediaTypeColumn" type="xs:string" />
- <xs:attribute name="Source" msprop:Generator_UserColumnName="Source" msprop:Generator_ColumnPropNameInRow="Source" msprop:Generator_ColumnVarNameInTable="columnSource" msprop:Generator_ColumnPropNameInTable="SourceColumn" type="xs:string" />
- <xs:attribute name="Date" msprop:Generator_UserColumnName="Date" msprop:Generator_ColumnVarNameInTable="columnDate" msprop:Generator_ColumnPropNameInRow="Date" msprop:Generator_ColumnPropNameInTable="DateColumn" type="xs:string" />
- <xs:attribute name="Borrower" msprop:Generator_UserColumnName="Borrower" msprop:Generator_ColumnVarNameInTable="columnBorrower" msprop:Generator_ColumnPropNameInRow="Borrower" msprop:Generator_ColumnPropNameInTable="BorrowerColumn" type="xs:string" />
- <xs:attribute name="Rating" msprop:Generator_UserColumnName="Rating" msprop:Generator_ColumnVarNameInTable="columnRating" msprop:Generator_ColumnPropNameInRow="Rating" msprop:Generator_ColumnPropNameInTable="RatingColumn" type="xs:decimal" />
- <xs:attribute name="OriginalTitle" msprop:Generator_UserColumnName="OriginalTitle" msprop:Generator_ColumnVarNameInTable="columnOriginalTitle" msprop:Generator_ColumnPropNameInRow="OriginalTitle" msprop:Generator_ColumnPropNameInTable="OriginalTitleColumn" type="xs:string" />
- <xs:attribute name="TranslatedTitle" msprop:Generator_UserColumnName="TranslatedTitle" msprop:Generator_ColumnVarNameInTable="columnTranslatedTitle" msprop:Generator_ColumnPropNameInRow="TranslatedTitle" msprop:Generator_ColumnPropNameInTable="TranslatedTitleColumn" type="xs:string" />
- <xs:attribute name="FormattedTitle" msprop:Generator_UserColumnName="FormattedTitle" msprop:Generator_ColumnVarNameInTable="columnFormattedTitle" msprop:Generator_ColumnPropNameInRow="FormattedTitle" msprop:Generator_ColumnPropNameInTable="FormattedTitleColumn" type="xs:string" />
- <xs:attribute name="Director" msprop:Generator_UserColumnName="Director" msprop:Generator_ColumnVarNameInTable="columnDirector" msprop:Generator_ColumnPropNameInRow="Director" msprop:Generator_ColumnPropNameInTable="DirectorColumn" type="xs:string" />
- <xs:attribute name="Producer" msprop:Generator_UserColumnName="Producer" msprop:Generator_ColumnVarNameInTable="columnProducer" msprop:Generator_ColumnPropNameInRow="Producer" msprop:Generator_ColumnPropNameInTable="ProducerColumn" type="xs:string" />
- <xs:attribute name="Country" msprop:Generator_UserColumnName="Country" msprop:Generator_ColumnVarNameInTable="columnCountry" msprop:Generator_ColumnPropNameInRow="Country" msprop:Generator_ColumnPropNameInTable="CountryColumn" type="xs:string" />
- <xs:attribute name="Category" msprop:Generator_UserColumnName="Category" msprop:Generator_ColumnVarNameInTable="columnCategory" msprop:Generator_ColumnPropNameInRow="Category" msprop:Generator_ColumnPropNameInTable="CategoryColumn" type="xs:string" />
- <xs:attribute name="Year" msprop:Generator_UserColumnName="Year" msprop:Generator_ColumnVarNameInTable="columnYear" msprop:Generator_ColumnPropNameInRow="Year" msprop:Generator_ColumnPropNameInTable="YearColumn" type="xs:string" />
- <xs:attribute name="Length" msprop:Generator_UserColumnName="Length" msprop:Generator_ColumnVarNameInTable="columnLength" msprop:Generator_ColumnPropNameInRow="Length" msprop:Generator_ColumnPropNameInTable="LengthColumn" type="xs:string" />
- <xs:attribute name="Actors" msprop:Generator_UserColumnName="Actors" msprop:Generator_ColumnVarNameInTable="columnActors" msprop:Generator_ColumnPropNameInRow="Actors" msprop:Generator_ColumnPropNameInTable="ActorsColumn" type="xs:string" />
- <xs:attribute name="URL" msprop:Generator_UserColumnName="URL" msprop:Generator_ColumnPropNameInRow="URL" msprop:Generator_ColumnVarNameInTable="columnURL" msprop:Generator_ColumnPropNameInTable="URLColumn" type="xs:string" />
- <xs:attribute name="Description" msprop:Generator_UserColumnName="Description" msprop:Generator_ColumnVarNameInTable="columnDescription" msprop:Generator_ColumnPropNameInRow="Description" msprop:Generator_ColumnPropNameInTable="DescriptionColumn" type="xs:string" />
- <xs:attribute name="Comments" msprop:Generator_UserColumnName="Comments" msprop:Generator_ColumnVarNameInTable="columnComments" msprop:Generator_ColumnPropNameInRow="Comments" msprop:Generator_ColumnPropNameInTable="CommentsColumn" type="xs:string" />
- <xs:attribute name="VideoFormat" msprop:Generator_UserColumnName="VideoFormat" msprop:Generator_ColumnVarNameInTable="columnVideoFormat" msprop:Generator_ColumnPropNameInRow="VideoFormat" msprop:Generator_ColumnPropNameInTable="VideoFormatColumn" type="xs:string" />
- <xs:attribute name="VideoBitrate" msprop:Generator_UserColumnName="VideoBitrate" msprop:Generator_ColumnVarNameInTable="columnVideoBitrate" msprop:Generator_ColumnPropNameInRow="VideoBitrate" msprop:Generator_ColumnPropNameInTable="VideoBitrateColumn" type="xs:string" />
- <xs:attribute name="AudioFormat" msprop:Generator_UserColumnName="AudioFormat" msprop:Generator_ColumnVarNameInTable="columnAudioFormat" msprop:Generator_ColumnPropNameInRow="AudioFormat" msprop:Generator_ColumnPropNameInTable="AudioFormatColumn" type="xs:string" />
- <xs:attribute name="AudioBitrate" msprop:Generator_UserColumnName="AudioBitrate" msprop:Generator_ColumnVarNameInTable="columnAudioBitrate" msprop:Generator_ColumnPropNameInRow="AudioBitrate" msprop:Generator_ColumnPropNameInTable="AudioBitrateColumn" type="xs:string" />
- <xs:attribute name="Resolution" msprop:Generator_UserColumnName="Resolution" msprop:Generator_ColumnVarNameInTable="columnResolution" msprop:Generator_ColumnPropNameInRow="Resolution" msprop:Generator_ColumnPropNameInTable="ResolutionColumn" type="xs:string" />
- <xs:attribute name="Framerate" msprop:Generator_UserColumnName="Framerate" msprop:Generator_ColumnVarNameInTable="columnFramerate" msprop:Generator_ColumnPropNameInRow="Framerate" msprop:Generator_ColumnPropNameInTable="FramerateColumn" type="xs:string" />
- <xs:attribute name="Languages" msprop:Generator_UserColumnName="Languages" msprop:Generator_ColumnPropNameInRow="Languages" msprop:Generator_ColumnVarNameInTable="columnLanguages" msprop:Generator_ColumnPropNameInTable="LanguagesColumn" type="xs:string" />
- <xs:attribute name="Subtitles" msprop:Generator_UserColumnName="Subtitles" msprop:Generator_ColumnPropNameInRow="Subtitles" msprop:Generator_ColumnVarNameInTable="columnSubtitles" msprop:Generator_ColumnPropNameInTable="SubtitlesColumn" type="xs:string" />
- <xs:attribute name="Size" msprop:Generator_UserColumnName="Size" msprop:Generator_ColumnVarNameInTable="columnSize" msprop:Generator_ColumnPropNameInRow="Size" msprop:Generator_ColumnPropNameInTable="SizeColumn" type="xs:string" />
- <xs:attribute name="Disks" msprop:Generator_UserColumnName="Disks" msprop:Generator_ColumnVarNameInTable="columnDisks" msprop:Generator_ColumnPropNameInRow="Disks" msprop:Generator_ColumnPropNameInTable="DisksColumn" type="xs:string" />
- <xs:attribute name="Picture" msprop:Generator_UserColumnName="Picture" msprop:Generator_ColumnVarNameInTable="columnPicture" msprop:Generator_ColumnPropNameInRow="Picture" msprop:Generator_ColumnPropNameInTable="PictureColumn" type="xs:string" />
- <xs:attribute name="Contents_Id" msprop:Generator_UserColumnName="Contents_Id" msprop:Generator_ColumnVarNameInTable="columnContents_Id" msprop:Generator_ColumnPropNameInRow="Contents_Id" msprop:Generator_ColumnPropNameInTable="Contents_IdColumn" type="xs:int" use="prohibited" />
+ <xs:attribute name="Number" msprop:Generator_UserColumnName="Number" msprop:Generator_ColumnPropNameInRow="Number" msprop:Generator_ColumnVarNameInTable="columnNumber" msprop:Generator_ColumnPropNameInTable="NumberColumn" type="xs:int" />
+ <xs:attribute name="Checked" msprop:Generator_UserColumnName="Checked" msprop:Generator_ColumnPropNameInRow="Checked" msprop:Generator_ColumnVarNameInTable="columnChecked" msprop:Generator_ColumnPropNameInTable="CheckedColumn" type="xs:string" />
+ <xs:attribute name="MediaLabel" msprop:Generator_UserColumnName="MediaLabel" msprop:Generator_ColumnVarNameInTable="columnMediaLabel" msprop:Generator_ColumnPropNameInRow="MediaLabel" msprop:Generator_ColumnPropNameInTable="MediaLabelColumn" type="xs:string" />
+ <xs:attribute name="MediaType" msprop:Generator_UserColumnName="MediaType" msprop:Generator_ColumnPropNameInRow="MediaType" msprop:Generator_ColumnVarNameInTable="columnMediaType" msprop:Generator_ColumnPropNameInTable="MediaTypeColumn" type="xs:string" />
+ <xs:attribute name="Source" msprop:Generator_UserColumnName="Source" msprop:Generator_ColumnVarNameInTable="columnSource" msprop:Generator_ColumnPropNameInRow="Source" msprop:Generator_ColumnPropNameInTable="SourceColumn" type="xs:string" />
+ <xs:attribute name="Date" msprop:Generator_UserColumnName="Date" msprop:Generator_ColumnPropNameInRow="Date" msprop:Generator_ColumnVarNameInTable="columnDate" msprop:Generator_ColumnPropNameInTable="DateColumn" type="xs:string" />
+ <xs:attribute name="Borrower" msprop:Generator_UserColumnName="Borrower" msprop:Generator_ColumnPropNameInRow="Borrower" msprop:Generator_ColumnVarNameInTable="columnBorrower" msprop:Generator_ColumnPropNameInTable="BorrowerColumn" type="xs:string" />
+ <xs:attribute name="Rating" msprop:Generator_UserColumnName="Rating" msprop:Generator_ColumnPropNameInRow="Rating" msprop:Generator_ColumnVarNameInTable="columnRating" msprop:Generator_ColumnPropNameInTable="RatingColumn" type="xs:decimal" />
+ <xs:attribute name="OriginalTitle" msprop:Generator_UserColumnName="OriginalTitle" msprop:Generator_ColumnPropNameInRow="OriginalTitle" msprop:Generator_ColumnVarNameInTable="columnOriginalTitle" msprop:Generator_ColumnPropNameInTable="OriginalTitleColumn" type="xs:string" />
+ <xs:attribute name="TranslatedTitle" msprop:Generator_UserColumnName="TranslatedTitle" msprop:Generator_ColumnPropNameInRow="TranslatedTitle" msprop:Generator_ColumnVarNameInTable="columnTranslatedTitle" msprop:Generator_ColumnPropNameInTable="TranslatedTitleColumn" type="xs:string" />
+ <xs:attribute name="FormattedTitle" msprop:Generator_UserColumnName="FormattedTitle" msprop:Generator_ColumnPropNameInRow="FormattedTitle" msprop:Generator_ColumnVarNameInTable="columnFormattedTitle" msprop:Generator_ColumnPropNameInTable="FormattedTitleColumn" type="xs:string" />
+ <xs:attribute name="Director" msprop:Generator_UserColumnName="Director" msprop:Generator_ColumnPropNameInRow="Director" msprop:Generator_ColumnVarNameInTable="columnDirector" msprop:Generator_ColumnPropNameInTable="DirectorColumn" type="xs:string" />
+ <xs:attribute name="Producer" msprop:Generator_UserColumnName="Producer" msprop:Generator_ColumnPropNameInRow="Producer" msprop:Generator_ColumnVarNameInTable="columnProducer" msprop:Generator_ColumnPropNameInTable="ProducerColumn" type="xs:string" />
+ <xs:attribute name="Country" msprop:Generator_UserColumnName="Country" msprop:Generator_ColumnPropNameInRow="Country" msprop:Generator_ColumnVarNameInTable="columnCountry" msprop:Generator_ColumnPropNameInTable="CountryColumn" type="xs:string" />
+ <xs:attribute name="Category" msprop:Generator_UserColumnName="Category" msprop:Generator_ColumnPropNameInRow="Category" msprop:Generator_ColumnVarNameInTable="columnCategory" msprop:Generator_ColumnPropNameInTable="CategoryColumn" type="xs:string" />
+ <xs:attribute name="Year" msprop:Generator_UserColumnName="Year" msprop:Generator_ColumnPropNameInRow="Year" msprop:Generator_ColumnVarNameInTable="columnYear" msprop:Generator_ColumnPropNameInTable="YearColumn" type="xs:string" />
+ <xs:attribute name="Length" msprop:Generator_UserColumnName="Length" msprop:Generator_ColumnPropNameInRow="Length" msprop:Generator_ColumnVarNameInTable="columnLength" msprop:Generator_ColumnPropNameInTable="LengthColumn" type="xs:string" />
+ <xs:attribute name="Actors" msprop:Generator_UserColumnName="Actors" msprop:Generator_ColumnPropNameInRow="Actors" msprop:Generator_ColumnVarNameInTable="columnActors" msprop:Generator_ColumnPropNameInTable="ActorsColumn" type="xs:string" />
+ <xs:attribute name="URL" msprop:Generator_UserColumnName="URL" msprop:Generator_ColumnVarNameInTable="columnURL" msprop:Generator_ColumnPropNameInRow="URL" msprop:Generator_ColumnPropNameInTable="URLColumn" type="xs:string" />
+ <xs:attribute name="Description" msprop:Generator_UserColumnName="Description" msprop:Generator_ColumnPropNameInRow="Description" msprop:Generator_ColumnVarNameInTable="columnDescription" msprop:Generator_ColumnPropNameInTable="DescriptionColumn" type="xs:string" />
+ <xs:attribute name="Comments" msprop:Generator_UserColumnName="Comments" msprop:Generator_ColumnPropNameInRow="Comments" msprop:Generator_ColumnVarNameInTable="columnComments" msprop:Generator_ColumnPropNameInTable="CommentsColumn" type="xs:string" />
+ <xs:attribute name="VideoFormat" msprop:Generator_UserColumnName="VideoFormat" msprop:Generator_ColumnPropNameInRow="VideoFormat" msprop:Generator_ColumnVarNameInTable="columnVideoFormat" msprop:Generator_ColumnPropNameInTable="VideoFormatColumn" type="xs:string" />
+ <xs:attribute name="VideoBitrate" msprop:Generator_UserColumnName="VideoBitrate" msprop:Generator_ColumnPropNameInRow="VideoBitrate" msprop:Generator_ColumnVarNameInTable="columnVideoBitrate" msprop:Generator_ColumnPropNameInTable="VideoBitrateColumn" type="xs:string" />
+ <xs:attribute name="AudioFormat" msprop:Generator_UserColumnName="AudioFormat" msprop:Generator_ColumnPropNameInRow="AudioFormat" msprop:Generator_ColumnVarNameInTable="columnAudioFormat" msprop:Generator_ColumnPropNameInTable="AudioFormatColumn" type="xs:string" />
+ <xs:attribute name="AudioBitrate" msprop:Generator_UserColumnName="AudioBitrate" msprop:Generator_ColumnPropNameInRow="AudioBitrate" msprop:Generator_ColumnVarNameInTable="columnAudioBitrate" msprop:Generator_ColumnPropNameInTable="AudioBitrateColumn" type="xs:string" />
+ <xs:attribute name="Resolution" msprop:Generator_UserColumnName="Resolution" msprop:Generator_ColumnPropNameInRow="Resolution" msprop:Generator_ColumnVarNameInTable="columnResolution" msprop:Generator_ColumnPropNameInTable="ResolutionColumn" type="xs:string" />
+ <xs:attribute name="Framerate" msprop:Generator_UserColumnName="Framerate" msprop:Generator_ColumnPropNameInRow="Framerate" msprop:Generator_ColumnVarNameInTable="columnFramerate" msprop:Generator_ColumnPropNameInTable="FramerateColumn" type="xs:string" />
+ <xs:attribute name="Languages" msprop:Generator_UserColumnName="Languages" msprop:Generator_ColumnVarNameInTable="columnLanguages" msprop:Generator_ColumnPropNameInRow="Languages" msprop:Generator_ColumnPropNameInTable="LanguagesColumn" type="xs:string" />
+ <xs:attribute name="Subtitles" msprop:Generator_UserColumnName="Subtitles" msprop:Generator_ColumnVarNameInTable="columnSubtitles" msprop:Generator_ColumnPropNameInRow="Subtitles" msprop:Generator_ColumnPropNameInTable="SubtitlesColumn" type="xs:string" />
+ <xs:attribute name="Size" msprop:Generator_UserColumnName="Size" msprop:Generator_ColumnPropNameInRow="Size" msprop:Generator_ColumnVarNameInTable="columnSize" msprop:Generator_ColumnPropNameInTable="SizeColumn" type="xs:string" />
+ <xs:attribute name="Disks" msprop:Generator_UserColumnName="Disks" msprop:Generator_ColumnPropNameInRow="Disks" msprop:Generator_ColumnVarNameInTable="columnDisks" msprop:Generator_ColumnPropNameInTable="DisksColumn" type="xs:string" />
+ <xs:attribute name="Picture" msprop:Generator_UserColumnName="Picture" msprop:Generator_ColumnPropNameInRow="Picture" msprop:Generator_ColumnVarNameInTable="columnPicture" msprop:Generator_ColumnPropNameInTable="PictureColumn" type="xs:string" />
+ <xs:attribute name="Contents_Id" msprop:Generator_UserColumnName="Contents_Id" msprop:Generator_ColumnPropNameInRow="Contents_Id" msprop:Generator_ColumnVarNameInTable="columnContents_Id" msprop:Generator_ColumnPropNameInTable="Contents_IdColumn" type="xs:int" use="prohibited" />
</xs:complexType>
</xs:element>
</xs:sequence>
- <xs:attribute name="Contents_Id" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="Contents_Id" msprop:Generator_ColumnVarNameInTable="columnContents_Id" msprop:Generator_ColumnPropNameInRow="Contents_Id" msprop:Generator_ColumnPropNameInTable="Contents_IdColumn" type="xs:int" msdata:AllowDBNull="false" use="prohibited" />
- <xs:attribute name="Catalog_Id" msprop:Generator_UserColumnName="Catalog_Id" msprop:Generator_ColumnVarNameInTable="columnCatalog_Id" msprop:Generator_ColumnPropNameInRow="Catalog_Id" msprop:Generator_ColumnPropNameInTable="Catalog_IdColumn" type="xs:int" use="prohibited" />
+ <xs:attribute name="Contents_Id" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="Contents_Id" msprop:Generator_ColumnPropNameInRow="Contents_Id" msprop:Generator_ColumnVarNameInTable="columnContents_Id" msprop:Generator_ColumnPropNameInTable="Contents_IdColumn" type="xs:int" msdata:AllowDBNull="false" use="prohibited" />
+ <xs:attribute name="Catalog_Id" msprop:Generator_UserColumnName="Catalog_Id" msprop:Generator_ColumnPropNameInRow="Catalog_Id" msprop:Generator_ColumnVarNameInTable="columnCatalog_Id" msprop:Generator_ColumnPropNameInTable="Catalog_IdColumn" type="xs:int" use="prohibited" />
</xs:complexType>
</xs:element>
</xs:sequence>
- <xs:attribute name="AntMovieCatalog_Id" msprop:Generator_UserColumnName="AntMovieCatalog_Id" msprop:Generator_ColumnVarNameInTable="columnAntMovieCatalog_Id" msprop:Generator_ColumnPropNameInRow="AntMovieCatalog_Id" msprop:Generator_ColumnPropNameInTable="AntMovieCatalog_IdColumn" type="xs:int" use="prohibited" />
- <xs:attribute name="Catalog_Id" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="Catalog_Id" msprop:Generator_ColumnVarNameInTable="columnCatalog_Id" msprop:Generator_ColumnPropNameInRow="Catalog_Id" msprop:Generator_ColumnPropNameInTable="Catalog_IdColumn" type="xs:int" msdata:AllowDBNull="false" use="prohibited" />
+ <xs:attribute name="AntMovieCatalog_Id" msprop:Generator_UserColumnName="AntMovieCatalog_Id" msprop:Generator_ColumnPropNameInRow="AntMovieCatalog_Id" msprop:Generator_ColumnVarNameInTable="columnAntMovieCatalog_Id" msprop:Generator_ColumnPropNameInTable="AntMovieCatalog_IdColumn" type="xs:int" use="prohibited" />
+ <xs:attribute name="Catalog_Id" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="Catalog_Id" msprop:Generator_ColumnPropNameInRow="Catalog_Id" msprop:Generator_ColumnVarNameInTable="columnCatalog_Id" msprop:Generator_ColumnPropNameInTable="Catalog_IdColumn" type="xs:int" msdata:AllowDBNull="false" use="prohibited" />
</xs:complexType>
</xs:element>
</xs:choice>
Modified: trunk/plugins/MyFilms/CatalogConverter.cs
===================================================================
--- trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-30 10:01:07 UTC (rev 262)
+++ trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-30 21:17:54 UTC (rev 263)
@@ -138,7 +138,7 @@
WriteAntAtribute(destXml, "SortTitle1", nodeTitle.InnerText);
WriteAntAtribute(destXml, "Notes/File", File);
WriteAntAtribute(destXml, "Notes/Country", Country);
-// WriteAntAtribute(destXml, "Notes/Rating", Rating);
+ WriteAntAtribute(destXml, "Notes/Rating", Rating);
WriteAntAtribute(destXml, "Year", nodeYear.InnerText);
WriteAntAtribute(destXml, "RunningTime", nodeDuration.InnerText);
WriteAntAtribute(destXml, "Genres", genre);
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-03-30 10:01:07 UTC (rev 262)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-03-30 21:17:54 UTC (rev 263)
@@ -134,6 +134,7 @@
public string WStrSortSens = null;
public bool boolreturn = false;
public bool boolstorage = false;
+ public bool choice_menu = false;
string StrDfltSelect = null;
string CurrentSortMethod = null;
decimal w_rating = 0;
@@ -256,13 +257,15 @@
{
if (GetPrevFilmList() || (actionType.wID != Action.ActionType.ACTION_PREVIOUS_MENU)) return;
}
- if (actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU)
- {
- using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings("MyFilms.xml"))
- {
- xmlwriter.SetValue("MyFilms", "Current_Config", "");
- }
- }
+ //if (actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU)
+ //{
+ // if (choice_menu)
+ // base.OnPreviousWindow();
+ //// using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings("MyFilms.xml"))
+ //// {
+ //// xmlwriter.SetValue("MyFilms", "Current_Config", "");
+ //// }
+ //}
base.OnAction(actionType);
}
//---------------------------------------------------------------------------------------
@@ -910,9 +913,17 @@
private bool ControlFichierDonn\xE9es()
{
if (File.Exists(StrFileXml))
+ {
+ choice_menu = false;
return true;
+ }
else
{
+ if (choice_menu)
+ {
+ choice_menu = false;
+ return false;
+ }
GUIDialogOK dlgOk = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
dlgOk.SetHeading(3);//my videos
dlgOk.SetLine(1, "The ANT '.xml' file is missing");
@@ -1173,6 +1184,7 @@
//--------------------------------------------------------------------------------------------
private string Choice_Config()
{
+ choice_menu = true;
GUIDialogMenu dlg = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
if (dlg == null)
{
@@ -1383,13 +1395,13 @@
if (choice_view == "Config")
{
//Change "Config":
+ save_config_values();
mydivx.Clear();
Load_Config(Choice_Config(),true);
Fin_Charge_Init(true);
return;
}
}
-
#endregion
}
}
\ No newline at end of file
Modified: trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-03-30 10:01:07 UTC (rev 262)
+++ trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-03-30 21:17:54 UTC (rev 263)
@@ -703,7 +703,7 @@
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(69, 13);
this.label10.TabIndex = 34;
- this.label10.Text = "Version 4.0.1";
+ this.label10.Text = "Version 4.1.0";
//
// textBox1
//
Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-03-30 10:01:07 UTC (rev 262)
+++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-03-30 21:17:54 UTC (rev 263)
@@ -139,12 +139,16 @@
AntViewItem2.Focus();
return;
}
+ if (AntViewItem1.Text.Length == 0)
+ AntViewItem1.Text = "(none)";
if (!(AntViewItem1.Text == "(none)") && (AntViewText1.Text.Length == 0))
{
System.Windows.Forms.MessageBox.Show("The Supplementary View Label is mandatory with corresponding Item !", "Configuration", MessageBoxButtons.OK, MessageBoxIcon.Stop);
AntViewText1.Focus();
return;
}
+ if (AntViewItem2.Text.Length == 0)
+ AntViewItem2.Text = "(none)";
if (!(AntViewItem2.Text == "(none)") && (AntViewText2.Text.Length == 0))
{
System.Windows.Forms.MessageBox.Show("The Supplementary View Label is mandatory with corresponding Item !", "Configuration", MessageBoxButtons.OK, MessageBoxIcon.Stop);
@@ -255,10 +259,6 @@
if (AntTitle2.Text.Length == 0)
AntTitle2.Text = "(none)";
- if (AntViewItem1.Text.Length == 0)
- AntViewItem1.Text = "(none)";
- if (AntViewItem2.Text.Length == 0)
- AntViewItem2.Text = "(none)";
if (AntUpdItem1.Text.Length == 0)
AntUpdItem1.Text = "(none)";
if (AntUpdItem2.Text.Length == 0)
@@ -395,6 +395,8 @@
View_Dflt_Text.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "ViewDfltText", "");
if((Config_Name.Text) == MyFilms_xmlreader.GetValueAsString("MyFilms", "Default_Config", ""))
Config_Dflt.Checked = true;
+ else
+ Config_Dflt.Checked = false;
if (!(AntViewItem1.Text == "Country") & !(AntViewItem1.Text == "Category") & !(AntViewItem1.Text == "Year") & !(AntViewItem1.Text == "(none)"))
View_Dflt_Item.Items.Add(AntViewItem1.Text);
if (!(AntViewItem2.Text == "Country") & !(AntViewItem2.Text == "Category") & !(AntViewItem2.Text == "Year") & !(AntViewItem2.Text == "(none)"))
@@ -512,12 +514,11 @@
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "StrSortSens");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "IndexItem");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "TitleDelim");
-
- Refresh_Items();
- Config_Name.ResetText();
if ((Config_Name.Text) == MyFilms_xmlreader.GetValueAsString("MyFilms", "Default_Config", ""))
MyFilms_xmlwriter.RemoveEntry("MyFilms", "Default_Config");
Config_Name.Items.Remove(Config_Name.Text);
+ Refresh_Items();
+ Config_Name.ResetText();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mp...@us...> - 2007-03-30 10:01:11
|
Revision: 262
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=262&view=rev
Author: mpod_sf
Date: 2007-03-30 03:01:07 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Initial check-in of the My Refresh Plugin (works with MP SVN Build 13639 and higher)
Added Paths:
-----------
trunk/plugins/My Refresh/
trunk/plugins/My Refresh/MyRefresh.cs
trunk/plugins/My Refresh/MyRefresh.csproj
Added: trunk/plugins/My Refresh/MyRefresh.cs
===================================================================
--- trunk/plugins/My Refresh/MyRefresh.cs (rev 0)
+++ trunk/plugins/My Refresh/MyRefresh.cs 2007-03-30 10:01:07 UTC (rev 262)
@@ -0,0 +1,144 @@
+namespace MediaPortal.Plugins
+{
+ using MediaPortal.GUI.Library;
+ using MediaPortal.Configuration;
+ using System;
+ using System.IO;
+ using System.Windows.Forms;
+
+ public class MyRefresh : IPluginReceiver, IPlugin, ISetupForm
+ {
+ private string _language = string.Empty;
+ private string _refreshHotkeys = "Rr";
+
+ public string Author()
+ {
+ return "Smirnoff";
+ }
+
+ public bool CanEnable()
+ {
+ return true;
+ }
+
+ public bool DefaultEnabled()
+ {
+ return true;
+ }
+
+ public string Description()
+ {
+ return "Plugin to allow skinners to view skin changes without the need to restart, Press F5";
+ }
+
+ public bool GetHome(out string buttonText, out string buttonImage, out string buttonImageFocused, out string hoverImage)
+ {
+ string text;
+ hoverImage = text = "";
+ buttonImageFocused = text;
+ buttonText = buttonImage = text;
+ return false;
+ }
+
+ public int GetWindowId()
+ {
+ return 0;
+ }
+
+ public bool HasSetup()
+ {
+ return false;
+ }
+
+ private void OnAction(Action action)
+ {
+ if ((action.wID == Action.ActionType.ACTION_KEY_PRESSED) && (this._refreshHotkeys.IndexOf((char)action.m_key.KeyChar, 0) != -1))
+ {
+ this.Refresh(false);
+ }
+ if ((action.wID == Action.ActionType.ACTION_KEY_PRESSED) && (this._refreshHotkeys.IndexOf('a', 0) != -1))
+ {
+ this.Refresh(true);
+ }
+ }
+
+ public string PluginName()
+ {
+ return "My Refresh";
+ }
+
+ private void Refresh(bool refreshEverything)
+ {
+ if (refreshEverything && File.Exists(GUIGraphicsContext.SkinCacheFolder + @"\packedgfx2.bxml"))
+ {
+ File.Delete(GUIGraphicsContext.SkinCacheFolder + @"\packedgfx2.bxml");
+ }
+ if (refreshEverything)
+ {
+ GUITextureManager.Clear();
+ GUITextureManager.Init();
+ }
+ if (refreshEverything)
+ {
+ //GUILocalizeStrings.Clear();
+ GUILocalizeStrings.Load(@"language\" + this._language + @"\strings.xml");
+ }
+ if (refreshEverything)
+ {
+ GUIFontManager.LoadFonts(@"skin\" + GUIGraphicsContext.Skin + @"\fonts.xml");
+ GUIFontManager.InitializeDeviceObjects();
+ }
+ GUIControlFactory.ClearReferences();
+ GUIControlFactory.LoadReferences(GUIGraphicsContext.Skin + @"\references.xml");
+ GUIWindowManager.OnResize();
+ GUIWindow window = GUIWindowManager.GetWindow(GUIWindowManager.ActiveWindow);
+ if (GUIWindowManager.IsRouted)
+ {
+ window = GUIWindowManager.GetWindow(GUIWindowManager.RoutedWindow);
+ }
+ if (window != null)
+ {
+ window.Restore();
+ GUIWindowManager.ActivateWindow(window.GetID);
+ }
+ }
+
+ public void ShowPlugin()
+ {
+ }
+
+ public void Start()
+ {
+ Log.Info("MyRefresh: Plugin started", new object[0]);
+ using (MediaPortal.Profile.Settings settings = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
+ {
+ this._language = settings.GetValueAsString("skin", "language", string.Empty);
+ }
+ if (this._language == string.Empty)
+ {
+ this._language = "English";
+ }
+ GUIWindowManager.OnNewAction += new OnActionHandler(this.OnAction);
+ }
+
+ public void Stop()
+ {
+ GUIWindowManager.OnNewAction -= new OnActionHandler(this.OnAction);
+ }
+
+ public bool WndProc(ref Message msg)
+ {
+ if (msg.Msg != 0x101)
+ {
+ return false;
+ }
+ if (msg.WParam != ((IntPtr)0x74))
+ {
+ return false;
+ }
+ this.Refresh((Control.ModifierKeys & Keys.Control) != Keys.None);
+ return true;
+ }
+ }
+}
+
Added: trunk/plugins/My Refresh/MyRefresh.csproj
===================================================================
--- trunk/plugins/My Refresh/MyRefresh.csproj (rev 0)
+++ trunk/plugins/My Refresh/MyRefresh.csproj 2007-03-30 10:01:07 UTC (rev 262)
@@ -0,0 +1,122 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{0F2811BE-6B64-42B6-B374-B4ED04648825}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon>
+ </ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>MyRefresh</AssemblyName>
+ <AssemblyOriginatorKeyFile>
+ </AssemblyOriginatorKeyFile>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>Library</OutputType>
+ <RootNamespace>MyRefresh</RootNamespace>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+ <StartupObject>
+ </StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <OutputPath>bin\Debug\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>false</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <OutputPath>bin\Release\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>false</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>none</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ <PlatformTarget>x86</PlatformTarget>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <BaseAddress>285212672</BaseAddress>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <BaseAddress>285212672</BaseAddress>
+ <Optimize>true</Optimize>
+ <DebugType>
+ </DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Windows.Forms" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="MyRefresh.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\Documents\Coding\Mediaportal Check\Core\Core.csproj">
+ <Project>{02FFFC1F-2555-4B99-8B01-3432D0673855}</Project>
+ <Name>Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Documents\Coding\Mediaportal Check\Utils\Utils.csproj">
+ <Project>{6DA0E4DF-6230-4642-98B5-E690BB6942BB}</Project>
+ <Name>Utils</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
\ 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: <an...@us...> - 2007-03-30 04:30:55
|
Revision: 261
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=261&view=rev
Author: and-81
Date: 2007-03-29 21:30:54 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/TV3ExtChannelChanger/ReadMe.txt
trunk/plugins/TV3ExtChannelChanger/TV3ExtChannelChanger.cs
Modified: trunk/plugins/TV3ExtChannelChanger/ReadMe.txt
===================================================================
--- trunk/plugins/TV3ExtChannelChanger/ReadMe.txt 2007-03-29 22:07:25 UTC (rev 260)
+++ trunk/plugins/TV3ExtChannelChanger/ReadMe.txt 2007-03-30 04:30:54 UTC (rev 261)
@@ -1,4 +1,4 @@
-TV3 External Channel Changer v1.0.2
+TV3 External Channel Changer v1.0.3
-------------------------------------
Adds External Channel Changing to the TV Server.
Modified: trunk/plugins/TV3ExtChannelChanger/TV3ExtChannelChanger.cs
===================================================================
--- trunk/plugins/TV3ExtChannelChanger/TV3ExtChannelChanger.cs 2007-03-29 22:07:25 UTC (rev 260)
+++ trunk/plugins/TV3ExtChannelChanger/TV3ExtChannelChanger.cs 2007-03-30 04:30:54 UTC (rev 261)
@@ -92,10 +92,8 @@
[CLSCompliant(false)]
public void Start(IController controller)
{
- Log.Info("TV3ExtChannelChanger: Version {0}", PluginVersion);
+ Log.Info("TV3ExtChannelChanger: Start");
- Log.Debug("TV3ExtChannelChanger: Platform is {0}", (IntPtr.Size == 4 ? "32-bit" : "64-bit"));
-
TvBusinessLayer layer = new TvBusinessLayer();
LogVerbose = Convert.ToBoolean(layer.GetSetting("TV3ExtChannelChangerLogVerbose", "False").Value);
@@ -106,6 +104,8 @@
public void Stop()
{
+ Log.Info("TV3ExtChannelChanger: Stop");
+
GlobalServiceProvider.Instance.Get<ITvServerEvent>().OnTvServerEvent -= new TvServerEventHandler(events_OnTvServerEvent);
}
@@ -122,18 +122,17 @@
void events_OnTvServerEvent(object sender, EventArgs eventArgs)
{
TvServerEventArgs tvEvent = (TvServerEventArgs)eventArgs;
+ if (tvEvent.EventType != TvServerEventType.StartZapChannel)
+ return;
+
AnalogChannel analogChannel = tvEvent.channel as AnalogChannel;
-
if (analogChannel == null)
return;
- if (tvEvent.EventType == TvServerEventType.StartZapChannel)
- {
- if (LogVerbose)
- Log.Info("TV3ExtChannelChanger: Card: {0}, Channel: {1}, {2}", tvEvent.Card.Id, analogChannel.ChannelNumber, analogChannel.Name);
+ if (LogVerbose)
+ Log.Info("TV3ExtChannelChanger: Card: {0}, Channel: {1}, {2}", tvEvent.Card.Id, analogChannel.ChannelNumber, analogChannel.Name);
- ProcessExternalChannel(analogChannel.ChannelNumber.ToString(), tvEvent.Card.Id);
- }
+ ProcessExternalChannel(analogChannel.ChannelNumber.ToString(), tvEvent.Card.Id);
}
static bool ProcessExternalChannel(string externalChannel, int cardId)
@@ -309,7 +308,7 @@
}
catch (Exception ex)
{
- Log.Error("TV3ExtChannelChanger: ProcessExternalChannel() {0}", ex.Message);
+ Log.Error("TV3ExtChannelChanger - ProcessExternalChannel(): {0}", ex.Message);
returnCode = false;
}
@@ -441,7 +440,7 @@
}
catch (Exception ex)
{
- Log.Error("TV3ExtChannelChanger: ProcessRunCommand() {0}", ex.Message);
+ Log.Error("TV3ExtChannelChanger - ProcessRunCommand(): {0}", ex.Message);
return false;
}
@@ -513,7 +512,7 @@
}
catch (Exception ex)
{
- Log.Error("TV3ExtChannelChanger: ProcessSerialCommand() {0}", ex.Message);
+ Log.Error("TV3ExtChannelChanger - ProcessSerialCommand(): {0}", ex.Message);
if (serialPort != null)
serialPort.Close();
@@ -605,7 +604,7 @@
}
catch (Exception ex)
{
- Log.Error("TV3ExtChannelChanger: Error processing Message Command: {0}", ex.Message);
+ Log.Error("TV3ExtChannelChanger - ProcessMessageCommand(): {0}", ex.Message);
return false;
}
}
@@ -629,7 +628,7 @@
}
catch (Exception ex)
{
- Log.Error("TV3ExtChannelChanger: Error processing Key Command \"{0}\"", ex.Message);
+ Log.Error("TV3ExtChannelChanger - ProcessKeyCommand(): {0}", ex.Message);
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-03-29 22:07:26
|
Revision: 260
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=260&view=rev
Author: zebons
Date: 2007-03-29 15:07:25 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyFilms/CatalogConverter.cs
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilms.csproj
trunk/plugins/MyFilms/MesFilmsSetup.cs
Modified: trunk/plugins/MyFilms/CatalogConverter.cs
===================================================================
--- trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-29 22:00:24 UTC (rev 259)
+++ trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-29 22:07:25 UTC (rev 260)
@@ -4,6 +4,8 @@
using System.IO;
using System.Xml;
using MediaPortal.GUI.Library;
+using System.Windows.Forms;
+using System.Globalization;
namespace MesFilms
{
@@ -18,7 +20,9 @@
ProfilerDict.Add("SortTitle", "TranslatedTitle");
ProfilerDict.Add("SortTitle1", "FormattedTitle");
ProfilerDict.Add("CollectionNumber", "Number");
- ProfilerDict.Add("Rating", "Rating");
+ ProfilerDict.Add("Notes/Rating", "Rating");
+ ProfilerDict.Add("Notes/File", "URL");
+ ProfilerDict.Add("Notes/Country", "Country");
ProfilerDict.Add("Year", "Year");
ProfilerDict.Add("RunningTime", "Length");
ProfilerDict.Add("Actors", "Actors");
@@ -35,7 +39,7 @@
XmlTextWriter destXml = new XmlTextWriter(destFile,Encoding.Default);
destXml.Formatting = Formatting.Indented;
destXml.WriteStartDocument();
- //destXml.WriteStartElement("AntMovieCatalog");
+ destXml.WriteStartElement("AntMovieCatalog");
//destXml.WriteAttributeString("Format","35");
//destXml.WriteAttributeString("Version", "3.5.0 (2005-05-29)");
//destXml.WriteAttributeString("Date", "5/4/2006 7:25:51 PM");
@@ -55,10 +59,26 @@
XmlNode nodeNumber = nodeDVD.SelectSingleNode("CollectionNumber");
XmlNode nodeTitle = nodeDVD.SelectSingleNode("Title");
XmlNode nodeOTitle = nodeDVD.SelectSingleNode("OriginalTitle");
- XmlNode nodeRating = nodeDVD.SelectSingleNode("Rating");
+ XmlNode nodeNotes = nodeDVD.SelectSingleNode("Notes");
XmlNode nodeYear = nodeDVD.SelectSingleNode("ProductionYear");
XmlNode nodeDuration = nodeDVD.SelectSingleNode("RunningTime");
XmlNode nodeOverview = nodeDVD.SelectSingleNode("Overview");
+ string File = null;
+ string Rating = null;
+ string Country = null;
+ if (nodeNotes != null && nodeNotes.InnerText != null)
+ {
+ MessageBox.Show(nodeNotes.InnerText + ", " + nodeNotes.InnerText.IndexOf("<File>").ToString() + ", " + nodeNotes.InnerText.IndexOf("</File>").ToString());
+ if (nodeNotes.InnerText.IndexOf("<File>") != -1)
+ File = nodeNotes.InnerText.Substring(nodeNotes.InnerText.IndexOf("<File>") + 6, nodeNotes.InnerText.IndexOf("</File>") - nodeNotes.InnerText.IndexOf("<File>") - 6);
+ if (nodeNotes.InnerText.IndexOf("<Country>") != -1)
+ Country = nodeNotes.InnerText.Substring(nodeNotes.InnerText.IndexOf("<Country>") + 9, nodeNotes.InnerText.IndexOf("</Country>") - nodeNotes.InnerText.IndexOf("<Country>") - 9);
+ if (nodeNotes.InnerText.IndexOf("<Rating>") != -1)
+ Rating = nodeNotes.InnerText.Substring(nodeNotes.InnerText.IndexOf("<Rating>") + 8, nodeNotes.InnerText.IndexOf("</Rating>") - nodeNotes.InnerText.IndexOf("<Rating>") - 8);
+ MessageBox.Show(File);
+ MessageBox.Show(Country);
+ MessageBox.Show(Rating);
+ }
string genre = String.Empty;
XmlNodeList genreList = nodeDVD.SelectNodes("Genres/Genre");
@@ -105,11 +125,6 @@
credits += String.Format("{0} {1}", firstname, lastname);
}
}
-// XmlNode nodeFile = nodeDVD.SelectSingleNode("Notes/File");
-// string File = "";
-// if (nodeFile != null && nodeFile.InnerText != null)
-// File = nodeFile.InnerText;
-
//rec.Image = folderName + @"\" + nodeID.InnerText.Trim() + "f.jpg";
if (nodeNumber != null && nodeNumber.InnerText != null)
WriteAntAtribute(destXml,"CollectionNumber",nodeNumber.InnerText);
@@ -121,8 +136,9 @@
WriteAntAtribute(destXml, "Title", nodeTitle.InnerText);
WriteAntAtribute(destXml, "SortTitle", nodeTitle.InnerText);
WriteAntAtribute(destXml, "SortTitle1", nodeTitle.InnerText);
-// WriteAntAtribute(destXml, "SortTitle1", File);
- WriteAntAtribute(destXml, "Rating","0");
+ WriteAntAtribute(destXml, "Notes/File", File);
+ WriteAntAtribute(destXml, "Notes/Country", Country);
+// WriteAntAtribute(destXml, "Notes/Rating", Rating);
WriteAntAtribute(destXml, "Year", nodeYear.InnerText);
WriteAntAtribute(destXml, "RunningTime", nodeDuration.InnerText);
WriteAntAtribute(destXml, "Genres", genre);
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-03-29 22:00:24 UTC (rev 259)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-03-29 22:07:25 UTC (rev 260)
@@ -256,6 +256,13 @@
{
if (GetPrevFilmList() || (actionType.wID != Action.ActionType.ACTION_PREVIOUS_MENU)) return;
}
+ if (actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU)
+ {
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings("MyFilms.xml"))
+ {
+ xmlwriter.SetValue("MyFilms", "Current_Config", "");
+ }
+ }
base.OnAction(actionType);
}
//---------------------------------------------------------------------------------------
@@ -300,6 +307,8 @@
else
{
if (CurrentConfig == "")
+ CurrentConfig = xmlreader.GetValueAsString("MyFilms", "Current_Config", "");
+ if (CurrentConfig == "")
CurrentConfig = Choice_Config();
Load_Config(CurrentConfig,true);
Fin_Charge_Init(true);
@@ -1126,6 +1135,12 @@
case "1":
if (create_temp)
{
+ string destFile = StrFileXml.Substring(0, StrFileXml.Length - 4) + "_tmp.xml";
+ if ((System.IO.File.Exists(destFile) && (System.IO.File.GetLastWriteTime(destFile) > System.IO.File.GetLastWriteTime(StrFileXml))))
+ {
+ StrFileXml = destFile;
+ break;
+ }
CatalogConverter cv = new CatalogConverter();
StrFileXml = cv.ConvertProfiler(StrFileXml);
}
Modified: trunk/plugins/MyFilms/MesFilms.csproj
===================================================================
--- trunk/plugins/MyFilms/MesFilms.csproj 2007-03-29 22:00:24 UTC (rev 259)
+++ trunk/plugins/MyFilms/MesFilms.csproj 2007-03-29 22:07:25 UTC (rev 260)
@@ -29,9 +29,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Core, Version=1.0.2548.1824, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Core, Version=1.0.2576.34540, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Stable\Core.DLL</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Svn\Core.dll</HintPath>
</Reference>
<Reference Include="Databases, Version=1.0.2548.1828, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -48,9 +48,9 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="Utils, Version=1.0.2548.1816, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Utils, Version=1.0.2576.34538, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Stable\Utils.DLL</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Svn\Utils.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-03-29 22:00:24 UTC (rev 259)
+++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-03-29 22:07:25 UTC (rev 260)
@@ -31,7 +31,7 @@
private void MesFilmsSetup_Load(object sender, EventArgs e)
{
- Refresh_Items();
+// Refresh_Items();
textBox1.Text = MyFilms_xmlreader.GetValueAsString("MyFilms", "PluginName", "Films");
MesFilms_nb_config = MyFilms_xmlreader.GetValueAsInt("MyFilms", "NbConfig", -1);
for (int i = 0; i < (int)MesFilms_nb_config; i++)
@@ -354,7 +354,7 @@
private void Config_Name_SelectedIndexChanged(object sender, EventArgs e)
{
- Refresh_Items();
+// Refresh_Items();
CatalogType.SelectedIndex = Convert.ToInt16(MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "CatalogType", "0"));
MesFilmsCat.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "AntCatalog", "");
MesFilmsImg.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "AntPicture", "");
@@ -583,6 +583,12 @@
mydivx.ReadXml(MesFilmsCat.Text);
break;
case 1:
+ string destFile = MesFilmsCat.Text.Substring(0, MesFilmsCat.Text.Length - 4) + "_tmp.xml";
+ if ((System.IO.File.Exists(destFile) && (System.IO.File.GetLastWriteTime(destFile) > System.IO.File.GetLastWriteTime(MesFilmsCat.Text))))
+ {
+ mydivx.ReadXml(destFile);
+ break;
+ }
CatalogConverter cc = new CatalogConverter();
mydivx.ReadXml(cc.ConvertProfiler(MesFilmsCat.Text));
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-03-29 22:00:26
|
Revision: 259
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=259&view=rev
Author: zebons
Date: 2007-03-29 15:00:24 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
Removed file/folder
Removed Paths:
-------------
trunk/plugins/MyFilms/MesFilms.suo
Deleted: trunk/plugins/MyFilms/MesFilms.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2007-03-29 20:57:47
|
Revision: 258
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=258&view=rev
Author: saamand
Date: 2007-03-29 13:57:45 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs
trunk/plugins/MyLyrics/MyLyrics.suo
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2007-03-29 16:15:51 UTC (rev 257)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsEngine.csproj 2007-03-29 20:57:45 UTC (rev 258)
@@ -125,7 +125,7 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>::copy $(TargetFileName) "C:\Program Files\Team MediaPortal\MediaPortal"</PostBuildEvent>
+ <PostBuildEvent>copy $(TargetFileName) "C:\Program Files\Team MediaPortal\MediaPortal"</PostBuildEvent>
<PreBuildEvent>
</PreBuildEvent>
</PropertyGroup>
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-03-29 16:15:51 UTC (rev 257)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-03-29 20:57:45 UTC (rev 258)
@@ -30,37 +30,15 @@
public class GUIMyLyrics : GUIWindow, ILyricForm, ISetupForm
{
- #region Fields that is consisted and related to the MP session, and not MyLyrics session
+ #region Fields related to the MyLyrics in general
+
public static int WINDOW_MYLYRICS = 90478;
- int m_GoogleLicenseKeyIndex = 0;
- const int MAX_NO_OF_LICENSE_KEYS = 5;
- string[] m_GoogleLicenseKeys = new String[5] { "", "", "", "", "" };
- int startingScrollSpeedVertical = 2;
- const int SHIFT_WHEN_HIT = 10;
- #endregion
- #region Fields related to the skin engine
- [SkinControlAttribute(20)]
- //protected GUITextScrollUpControl CONTROL_Lyric = null;
- protected GUITextControl CONTROL_Lyric = null;
- enum Controls
- {
- CONTROL_BACKGROUND = 1,
- CONTROL_LBTrack = 10,
- CONTROL_LBStatus = 11,
- CONTROL_Lyric = 20
- }
- #endregion
+ private int selectedScreen = 0;
+ string lyricsScreenXML = "";
- #region Fields related to the MyLyrics, and therefore will be reset after each MyLyrics session
bool exitingMyLyrics = false;
- LRC.SimpleLRC lrc;
- IEnumerator enumerator;
- System.Windows.Forms.Timer timer;
- Stopwatch stopwatch;
- string nextTimeToShow;
- string nextLineToShow;
- int lineCounter;
+ bool firstTime = false;
// worker thread
Thread m_LyricControllerThread;
@@ -81,7 +59,6 @@
String[] m_sitesToSearch;
-
// Database and log settings
internal static LyricsDatabase LyricsDB = null;
internal static LyricsDatabase LyricsMarkedDB = null;
@@ -91,6 +68,74 @@
#endregion
+ #region Fields related to one of lyrics modes
+
+ enum LyricGUI_Controls
+ {
+ CONTROL_BACKGROUND = 1,
+ CONTROL_LBTrack = 10,
+ CONTROL_LBStatus = 11,
+ CONTROL_Lyric = 20
+ }
+
+ #endregion
+
+ #region Fields related to LRC mode
+ const int SHIFT_WHEN_HIT = 10;
+
+ LRC.SimpleLRC lrc;
+ IEnumerator enumerator;
+ System.Windows.Forms.Timer timer;
+ Stopwatch stopwatch;
+ string nextTimeToShow;
+ string nextLineToShow;
+ int lineCounter;
+
+ #endregion
+
+ #region Fields releated to the editor mode
+
+ internal const int TAG_IN_ROUND = 5;
+ internal int currentLineToTag = 1;
+ internal int tagRoundFinished = 0;
+ internal int min = 0;
+ internal int sec = 0;
+ internal int msec = 0;
+
+ string[] lines;
+
+ enum EditorGUI_Controls : int
+ {
+ CONTROL_BACKGROUND = 1,
+ CONTROL_LBTrack = 10,
+ CONTROL_LBStatus = 11,
+
+ CONTROL_TAGBUTTON = 50,
+
+ CONTROL_TIME = 100,
+ CONTROL_TIME1 = 101,
+ CONTROL_TIME2 = 102,
+ CONTROL_TIME3 = 103,
+ CONTROL_TIME4 = 104,
+ CONTROL_TIME5 = 105,
+
+ CONTROL_LINE = 200,
+ CONTROL_LINE1 = 201,
+ CONTROL_LINE2 = 202,
+ CONTROL_LINE3 = 203,
+ CONTROL_LINE4 = 204,
+ CONTROL_LINE5 = 205,
+
+ CONTROL_LINE_DONE = 300,
+ CONTROL_LINE1_DONE = 301,
+ CONTROL_LINE2_DONE = 302,
+ CONTROL_LINE3_DONE = 303,
+ CONTROL_LINE4_DONE = 304,
+ CONTROL_LINE5_DONE = 305
+ }
+ #endregion
+
+
public GUIMyLyrics()
{
m_EventStopThread = new ManualResetEvent(false);
@@ -101,12 +146,37 @@
public override bool Init()
{
- string lyricsXML = "";
+ int lyricsScreen = 0;
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
{
- lyricsXML = (string)xmlreader.GetValueAsString("myLyrics", "myLyricsXml", "myLyrics.xml");
+ lyricsScreen = (int)xmlreader.GetValueAsInt("myLyrics", "myLyricsScreen", (int)MyLyricsSettings.Screen.LYRICS_BASIC);
}
- return Load(GUIGraphicsContext.Skin + @"\" + lyricsXML);
+
+ switch (lyricsScreen)
+ {
+ case (int)MyLyricsSettings.Screen.LYRICS_BASIC:
+ selectedScreen = (int)MyLyricsSettings.Screen.LYRICS_BASIC;
+ lyricsScreenXML = "MyLyrics.xml";
+ break;
+ case (int)MyLyricsSettings.Screen.LYRICS_WIDE:
+ selectedScreen = (int)MyLyricsSettings.Screen.LYRICS_WIDE;
+ lyricsScreenXML = "MyLyricsWide.xml";
+ break;
+ case (int)MyLyricsSettings.Screen.LRC_BASIC:
+ selectedScreen = (int)MyLyricsSettings.Screen.LRC_BASIC;
+ lyricsScreenXML = "MyLyricsLRC.xml";
+ break;
+ case (int)MyLyricsSettings.Screen.LRC_EDITOR:
+ selectedScreen = (int)MyLyricsSettings.Screen.LRC_EDITOR;
+ lyricsScreenXML = "MyLyricsEditor.xml";
+ break;
+ default:
+ selectedScreen = (int)MyLyricsSettings.Screen.LYRICS_BASIC;
+ lyricsScreenXML = "MyLyrics.xml";
+ break;
+ }
+
+ return Load(GUIGraphicsContext.Skin + @"\" + lyricsScreenXML);
}
public override void OnAction(Action action)
@@ -114,49 +184,21 @@
switch (action.wID)
{
case Action.ActionType.ACTION_PREVIOUS_MENU:
- {
- GUIWindowManager.ShowPreviousWindow();
- return;
- }
- case Action.ActionType.ACTION_KEY_PRESSED:
- {
- //MessageBox.Show(action.m_key.KeyChar.ToString());
- if (action.m_key != null)
- {
-
- // Check key
- //if (((action.m_key.KeyChar >= '0') && (action.m_key.KeyChar <= '9')))
- //{
- // GUIGraphicsContext.ScrollSpeedVertical = action.m_key.KeyChar - 48;
- // CONTROL_Lyric.Label = m_LyricText;
- // return;
- //}
-
- if (action.m_key.KeyChar == (int)Keys.Enter)
- {
- if (GUIGraphicsContext.ScrollSpeedVertical == 12)
- {
- GUIGraphicsContext.ScrollSpeedVertical = 1;
- }
- else if (GUIGraphicsContext.ScrollSpeedVertical == 1)
- {
- GUIGraphicsContext.ScrollSpeedVertical = 12;
- }
- return;
- }
-
- if (action.m_key.KeyChar == (int)Keys.Back)
- {
- }
- }
- }
- break;
+ {
+ GUIWindowManager.ShowPreviousWindow();
+ return;
+ }
}
base.OnAction(action);
}
private void resetAll()
{
+
+ //deregister the handler!
+ GUIPropertyManager.OnPropertyChanged -= this.trackChangeHandler;
+
+ firstTime = false;
exitingMyLyrics = true;
m_artist = "";
m_title = "";
@@ -194,45 +236,195 @@
LoadSettings();
- startingScrollSpeedVertical = GUIGraphicsContext.ScrollSpeedVertical;
- GUIGraphicsContext.ScrollSpeedVertical = 1;
LyricDiagnostics.OpenLog(MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Log, logName));
- //LyricDiagnostics.OpenLog(MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Log, logName));
- LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Start, 0, LyricDiagnostics.elapsedTimeString() + "MyLyrics opens");
+ LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Start, 0, LyricDiagnostics.elapsedTimeString() + "MyLyrics opens, screen: " + lyricsScreenXML);
return true;
}
+ case GUIMessage.MessageType.GUI_MSG_CLICKED:
+ {
+ //get sender control
+ int iControl = message.SenderControlId;
+
+ if (selectedScreen == (int)MyLyricsSettings.Screen.LRC_EDITOR)
+ {
+ if (iControl == (int)EditorGUI_Controls.CONTROL_TAGBUTTON)
+ {
+ string time = min.ToString() + ":" + sec.ToString() + "." + stopwatch.ElapsedMilliseconds;
+ GUIControl.SetControlLabel(GetID, (int)EditorGUI_Controls.CONTROL_TIME + currentLineToTag, time);
+ GUIControl.HideControl(GetID, (int)EditorGUI_Controls.CONTROL_LINE + currentLineToTag);
+
+ // If a new round has to start
+ if (++currentLineToTag == TAG_IN_ROUND + 1)
+ {
+ currentLineToTag = 1;
+ ++tagRoundFinished;
+
+ for (int i = 1; i <= TAG_IN_ROUND; i++)
+ {
+ GUIControl.ShowControl(GetID, (int)EditorGUI_Controls.CONTROL_LINE + i);
+ GUIControl.SetControlLabel(GetID, (int)EditorGUI_Controls.CONTROL_TIME + i, "");
+ GUIControl.SetControlLabel(GetID, (int)EditorGUI_Controls.CONTROL_LINE + i, lines[tagRoundFinished * TAG_IN_ROUND + i]);
+ GUIControl.SetControlLabel(GetID, (int)EditorGUI_Controls.CONTROL_LINE_DONE + i, lines[tagRoundFinished * TAG_IN_ROUND + i]);
+ }
+ }
+ }
+ }
+ return true;
+ }
case GUIMessage.MessageType.GUI_MSG_WINDOW_DEINIT:
{
- SaveSettings();
StopThread();
resetAll();
- GUIGraphicsContext.ScrollSpeedVertical = startingScrollSpeedVertical;
- LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Stop, 0, LyricDiagnostics.elapsedTimeString() + "MyLyrics closes");
+ LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Stop, 0, LyricDiagnostics.elapsedTimeString() + "MyLyrics closes, screen: " + lyricsScreenXML);
+ break;
}
- break;
+ }
+ return base.OnMessage(message);
+ }
- //case GUIMessage.MessageType.GUI_MSG_ITEM_FOCUS_CHANGED:
- // {
+ //event driven handler to detect track change
+ private void trackChangeHandler(string tag2, string value)
+ {
+ if (tag2.Equals("#Play.Current.Track") && !exitingMyLyrics) // track has changed
+ {
+ if (!value.Equals("")) // additional check
+ {
+ lyricsFound = false;
+ StopThread();
- // }
- // break;
+ MusicTag tag = new MusicTag();
+ tag.Artist = GUIPropertyManager.GetProperty("#Play.Current.Artist");
+ tag.Title = GUIPropertyManager.GetProperty("#Play.Current.Title");
+
+ findLyric(tag);
+ }
+ else
+ {
+ m_artist = "";
+ m_title = "";
+ m_TrackText = "";
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_LBTrack, m_StatusText);
+ m_StatusText = "No music file playing";
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_LBStatus, m_StatusText);
+ m_LyricText = "";
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_Lyric, m_LyricText);
+ }
}
- return base.OnMessage(message);
}
+ //event driven handler to detect track change
+ private void timeHandler(string tag2, string value)
+ {
+ if (tag2.Equals("#currentplaytime") && !exitingMyLyrics)
+ {
+ if (stopwatch != null && stopwatch.IsRunning)
+ {
+ stopwatch.Stop();
+ }
+
+ stopwatch = new Stopwatch();
+ stopwatch.Start();
+
+ string[] timeStrings = value.Split(':');
+ min = int.Parse(timeStrings[0]);
+ sec = int.Parse(timeStrings[1]);
+
+ if (!value.Equals("")) // additional check
+ {
+ lyricsFound = false;
+ StopThread();
+
+ MusicTag tag = new MusicTag();
+ tag.Artist = GUIPropertyManager.GetProperty("#Play.Current.Artist");
+ tag.Title = GUIPropertyManager.GetProperty("#Play.Current.Title");
+
+ findLyric(tag);
+ }
+ else
+ {
+ m_artist = "";
+ m_title = "";
+ m_TrackText = "";
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_LBTrack, m_StatusText);
+ m_StatusText = "No music file playing";
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_LBStatus, m_StatusText);
+ m_LyricText = "";
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_Lyric, m_LyricText);
+ }
+ }
+ }
+
public override void Process()
{
+ if (firstTime && selectedScreen == (int)MyLyricsSettings.Screen.LRC_EDITOR)
+ {
+ firstTime = false;
+
+ string artist = LyricUtil.capatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Artist"));
+ string title = LyricUtil.capatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Title"));
+
+ string lyric = "";
+
+ if (DatabaseUtil.IsTrackInLyricsDatabase(LyricsDB, artist, title).Equals(DatabaseUtil.LYRIC_FOUND))
+ {
+ LyricsItem item = LyricsDB[DatabaseUtil.CorrectKeyFormat(artist, title)];
+ lyric = item.Lyrics;
+
+ lines = lyric.Split(new string[1] { "\n" }, StringSplitOptions.None);
+
+ for (int i = tagRoundFinished * TAG_IN_ROUND; i < (tagRoundFinished + 1) * TAG_IN_ROUND; i++)
+ {
+ GUIControl.SetControlLabel(GetID, (int)EditorGUI_Controls.CONTROL_LINE + i, lines[i]);
+ GUIControl.SetControlLabel(GetID, (int)EditorGUI_Controls.CONTROL_LINE_DONE + i, lines[i]);
+ }
+ }
+ }
+ else if (firstTime && !exitingMyLyrics) //when mylyrics is opened while music is already playing, trackChangeHandler won't be called
+ {
+ lyricsFound = false;
+ StopThread();
+ firstTime = false;
+
+ MusicTag tag = new MusicTag();
+ tag.Artist = GUIPropertyManager.GetProperty("#Play.Current.Artist");
+ tag.Title = GUIPropertyManager.GetProperty("#Play.Current.Title");
+
+ if (!tag.Artist.Equals("")) findLyric(tag);
+ else
+ {
+ m_artist = "";
+ m_title = "";
+ m_TrackText = "";
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_LBTrack, m_StatusText);
+ m_StatusText = "No music file playing";
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_LBStatus, m_StatusText);
+ m_LyricText = "";
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_Lyric, m_LyricText);
+ }
+ }
+
+
+ /*
if (isNewTrack() && exitingMyLyrics == false)
{
lyricsFound = false;
StopThread();
m_Path = g_Player.CurrentFile;
MusicTag tag = MediaPortal.TagReader.TagReader.ReadTag(m_Path);
-
+
+
+ //quick and dirty CDA support hack :)
+ if (g_Player.IsCDA)
+ {
+ tag = new MusicTag();
+ tag.Artist = GUIPropertyManager.GetProperty("#Play.Current.Artist");
+ tag.Title = GUIPropertyManager.GetProperty("#Play.Current.Title");
+ }
+
if (!m_Path.Equals(""))
{
- findLyric(tag);
+ //findLyric(tag);
}
else
{
@@ -245,7 +437,9 @@
m_LyricText = "";
GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_Lyric, m_LyricText);
}
- }
+ }*/
+
+
base.Process();
}
@@ -256,14 +450,25 @@
void LoadSettings()
{
+ firstTime = true;
+
// Clear and update labels
- GUIControl.ClearControl(GetID, (int)Controls.CONTROL_LBStatus);
- GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_LBStatus, m_StatusText);
- GUIControl.ClearControl(GetID, (int)Controls.CONTROL_LBTrack);
- GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_LBTrack, m_TrackText);
- GUIControl.ClearControl(GetID, (int)Controls.CONTROL_Lyric);
- GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_Lyric, m_LyricText);
+ if (selectedScreen != (int)MyLyricsSettings.Screen.LRC_EDITOR)
+ {
+ GUIControl.ClearControl(GetID, (int)LyricGUI_Controls.CONTROL_LBStatus);
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_LBStatus, m_StatusText);
+ GUIControl.ClearControl(GetID, (int)LyricGUI_Controls.CONTROL_LBTrack);
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_LBTrack, m_TrackText);
+ GUIControl.ClearControl(GetID, (int)LyricGUI_Controls.CONTROL_Lyric);
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_Lyric, m_LyricText);
+ GUIPropertyManager.OnPropertyChanged += new GUIPropertyManager.OnPropertyChangedHandler(trackChangeHandler);
+ }
+ else if(selectedScreen == (int)MyLyricsSettings.Screen.LRC_EDITOR)
+ {
+ GUIPropertyManager.OnPropertyChanged += new GUIPropertyManager.OnPropertyChangedHandler(timeHandler);
+ }
+
bool useLyricWiki, useEvilLabs, useLyrics007, useLyricsOnDemand, useSeekLyrics, useHotLyrics;
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
@@ -315,6 +520,7 @@
fs = new FileStream(path, FileMode.Open);
LyricsMarkedDB = (LyricsDatabase)bf.Deserialize(fs);
fs.Close();
+
}
void SaveSettings()
@@ -330,17 +536,17 @@
{
m_EventStopThread.Reset();
- GUIControl.ClearControl(GetID, (int)Controls.CONTROL_Lyric);
- GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_Lyric, "");
+ GUIControl.ClearControl(GetID, (int)LyricGUI_Controls.CONTROL_Lyric);
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_Lyric, "");
if (tag != null && tag.Artist != "")
{
m_artist = tag.Artist.Trim();
m_title = tag.Title.Trim();
m_TrackText = m_artist + " - " + m_title;
- GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_LBTrack, m_TrackText);
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_LBTrack, m_TrackText);
m_StatusText = "Searching for a matching lyric. Please wait a moment...";
- GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_LBStatus, m_StatusText);
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_LBStatus, m_StatusText);
LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + "findLyric(" + m_artist + ", " + m_title + ")");
@@ -362,7 +568,7 @@
resetLrcFields();
m_StatusText = "";
- GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_LBStatus, m_StatusText);
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_LBStatus, m_StatusText);
if (lrc == null)
{
@@ -386,8 +592,8 @@
{
m_StatusText = "";
m_LyricText = "";
- GUIControl.ClearControl(GetID, (int)Controls.CONTROL_LBStatus);
- GUIControl.ClearControl(GetID, (int)Controls.CONTROL_Lyric);
+ GUIControl.ClearControl(GetID, (int)LyricGUI_Controls.CONTROL_LBStatus);
+ GUIControl.ClearControl(GetID, (int)LyricGUI_Controls.CONTROL_Lyric);
// setup timer and stopwatch
timer = new System.Windows.Forms.Timer();
@@ -438,9 +644,9 @@
else
{
m_TrackText = "";
- GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_LBTrack, m_StatusText);
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_LBTrack, m_StatusText);
m_StatusText = "The music tag isn't complete";
- GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_LBStatus, m_StatusText);
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_LBStatus, m_StatusText);
return;
}
}
@@ -452,10 +658,10 @@
{
lineCounter = 0;
m_LyricText = "";
- GUIControl.ClearControl(GetID, (int)Controls.CONTROL_Lyric);
+ GUIControl.ClearControl(GetID, (int)LyricGUI_Controls.CONTROL_Lyric);
}
m_LyricText += (nextLineToShow);
- GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_Lyric, m_LyricText);
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_Lyric, m_LyricText);
calculateNextInterval();
}
@@ -467,7 +673,7 @@
while (currentLine.Time == 0)
{
m_LyricText += (currentLine.Line);
- GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_Lyric, m_LyricText);
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_Lyric, m_LyricText);
++lineCounter;
enumerator.MoveNext();
@@ -477,7 +683,7 @@
nextTimeToShow = currentLine.TimeString;
nextLineToShow = currentLine.Line;
//MessageBox.Show(g_Player.CurrentPosition.ToString());
- int temp = (int)(currentLine.Time - (int)(g_Player.CurrentPosition*1000));
+ int temp = (int)(currentLine.Time - (int)(g_Player.CurrentPosition * 1000));
if (temp > 0)
{
timer.Interval = temp;
@@ -487,7 +693,7 @@
//MessageBox.Show("temp: " + temp);
}
-// lbTestSecondsLeft.Text = ((long)(stopwatch.ElapsedMilliseconds / 1000)).ToString();
+ // lbTestSecondsLeft.Text = ((long)(stopwatch.ElapsedMilliseconds / 1000)).ToString();
}
else
{
@@ -506,8 +712,9 @@
m_LyricText = lyricText;
m_StatusText = "";
- GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_LBStatus, m_StatusText);
- GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_Lyric, m_LyricText);
+
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_LBStatus, m_StatusText);
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_Lyric, m_LyricText);
}
private void SaveLyricToDatabase(string site)
@@ -567,7 +774,7 @@
string line1 = (string)value[0];
string line2 = (string)value[1];
m_StatusText = line1 + "\r\n" + line2;
- GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_LBStatus, m_StatusText);
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_LBStatus, m_StatusText);
}
}
@@ -619,7 +826,7 @@
{
LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + "Search terminates: No lyric found...");
m_StatusText = "No lyric found";
- GUIControl.SetControlLabel(GetID, (int)Controls.CONTROL_LBStatus, m_StatusText);
+ GUIControl.SetControlLabel(GetID, (int)LyricGUI_Controls.CONTROL_LBStatus, m_StatusText);
}
}
}
@@ -715,4 +922,4 @@
#endregion
}
-}
+}
\ No newline at end of file
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-03-29 16:15:51 UTC (rev 257)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-03-29 20:57:45 UTC (rev 258)
@@ -5,7 +5,7 @@
<ProductVersion>8.0.50727</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>
@@ -131,6 +131,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>::copy $(TargetFileName) "C:\Program Files\Team MediaPortal\MediaPortal\plugins\windows"</PostBuildEvent>
+ <PostBuildEvent>copy $(TargetFileName) "C:\Program Files\Team MediaPortal\MediaPortal\plugins\windows"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs 2007-03-29 16:15:51 UTC (rev 257)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs 2007-03-29 20:57:45 UTC (rev 258)
@@ -6,6 +6,15 @@
{
class MyLyricsSettings
{
+
+ internal enum Screen : int
+ {
+ LYRICS_BASIC = 0,
+ LYRICS_WIDE = 1,
+ LRC_BASIC = 2,
+ LRC_EDITOR = 3
+ }
+
// Database settings
internal static LyricsDatabase LyricsDB = null;
internal static LyricsDatabase LyricsMarkedDB = null;
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs 2007-03-29 16:15:51 UTC (rev 257)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs 2007-03-29 20:57:45 UTC (rev 258)
@@ -32,6 +32,8 @@
this.tabPageLyricsDatabase = new MediaPortal.UserInterface.Controls.MPTabPage();
this.tabPageSetup = new MediaPortal.UserInterface.Controls.MPTabPage();
this.mpGroupBox2 = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.comboLyricsPage = new MediaPortal.UserInterface.Controls.MPComboBox();
+ this.lbLyricsPage = new MediaPortal.UserInterface.Controls.MPLabel();
this.tbPluginName = new MediaPortal.UserInterface.Controls.MPTextBox();
this.lbPluginName = new MediaPortal.UserInterface.Controls.MPLabel();
this.gbLyricSites = new MediaPortal.UserInterface.Controls.MPGroupBox();
@@ -94,8 +96,6 @@
this.btSave = new MediaPortal.UserInterface.Controls.MPButton();
this.btClose = new MediaPortal.UserInterface.Controls.MPButton();
this.bgWorkerSearch = new System.ComponentModel.BackgroundWorker();
- this.lbLyricsPage = new MediaPortal.UserInterface.Controls.MPLabel();
- this.comboLyricsPage = new MediaPortal.UserInterface.Controls.MPComboBox();
this.tabControl.SuspendLayout();
this.tabPageSetup.SuspendLayout();
this.mpGroupBox2.SuspendLayout();
@@ -160,6 +160,30 @@
this.mpGroupBox2.TabStop = false;
this.mpGroupBox2.Text = "Basic settings";
//
+ // comboLyricsPage
+ //
+ this.comboLyricsPage.BorderColor = System.Drawing.Color.Empty;
+ this.comboLyricsPage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboLyricsPage.FormattingEnabled = true;
+ this.comboLyricsPage.Items.AddRange(new object[] {
+ "Lyrics page (basic)",
+ "Lyrics page (wide)",
+ "LRC page (basic)",
+ "LRC page (editor)"});
+ this.comboLyricsPage.Location = new System.Drawing.Point(96, 58);
+ this.comboLyricsPage.Name = "comboLyricsPage";
+ this.comboLyricsPage.Size = new System.Drawing.Size(144, 21);
+ this.comboLyricsPage.TabIndex = 16;
+ //
+ // lbLyricsPage
+ //
+ this.lbLyricsPage.AutoSize = true;
+ this.lbLyricsPage.Location = new System.Drawing.Point(13, 61);
+ this.lbLyricsPage.Name = "lbLyricsPage";
+ this.lbLyricsPage.Size = new System.Drawing.Size(64, 13);
+ this.lbLyricsPage.TabIndex = 15;
+ this.lbLyricsPage.Text = "Lyrics page:";
+ //
// tbPluginName
//
this.tbPluginName.BorderColor = System.Drawing.Color.Empty;
@@ -821,29 +845,6 @@
this.bgWorkerSearch.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.bgWorkerSearch_RunWorkerCompleted);
this.bgWorkerSearch.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.bgWorkerSearch_ProgressChanged);
//
- // lbLyricsPage
- //
- this.lbLyricsPage.AutoSize = true;
- this.lbLyricsPage.Location = new System.Drawing.Point(13, 61);
- this.lbLyricsPage.Name = "lbLyricsPage";
- this.lbLyricsPage.Size = new System.Drawing.Size(64, 13);
- this.lbLyricsPage.TabIndex = 15;
- this.lbLyricsPage.Text = "Lyrics page:";
- //
- // comboLyricsPage
- //
- this.comboLyricsPage.BorderColor = System.Drawing.Color.Empty;
- this.comboLyricsPage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboLyricsPage.FormattingEnabled = true;
- this.comboLyricsPage.Items.AddRange(new object[] {
- "Basic lyrics page",
- "Wide lyrics page",
- "LRC creation page"});
- this.comboLyricsPage.Location = new System.Drawing.Point(96, 58);
- this.comboLyricsPage.Name = "comboLyricsPage";
- this.comboLyricsPage.Size = new System.Drawing.Size(144, 21);
- this.comboLyricsPage.TabIndex = 16;
- //
// MyLyricsSetup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-03-29 16:15:51 UTC (rev 257)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-03-29 20:57:45 UTC (rev 258)
@@ -132,21 +132,9 @@
{
tbLimit.Text = xmlreader.GetValueAsString("myLyrics", "limit", m_TotalTitles.ToString());
tbPluginName.Text = xmlreader.GetValueAsString("myLyrics", "pluginsName", "My Lyrics");
-
- string xmlPage = xmlreader.GetValueAsString("myLyrics", "myLyricsXml", "myLyrics.xml");
- if (xmlPage.Equals("myLyrics.xml"))
- {
- comboLyricsPage.SelectedIndex = 0;
- }
- else if (xmlPage.Equals("myLyricsWide.xml"))
- {
- comboLyricsPage.SelectedIndex = 1;
- }
- else if (xmlPage.Equals("myLyricsEditor.xml"))
- {
- comboLyricsPage.SelectedIndex = 2;
- }
+ int xmlScreen = xmlreader.GetValueAsInt("myLyrics", "myLyricsScreen", (int)MyLyricsSettings.Screen.LYRICS_BASIC);
+ comboLyricsPage.SelectedIndex = xmlScreen;
lbSongsLimitNote.Text = ("(You have currently " + m_TotalTitles.ToString() + " titles in your music database)");
@@ -332,21 +320,8 @@
xmlwriter.SetValue("myLyrics", "useSeekLyrics", cbSeekLyrics.Checked.ToString());
xmlwriter.SetValue("myLyrics", "useHotLyrics", cbHotLyrics.Checked.ToString());
- string xmlPage = "";
- if (comboLyricsPage.SelectedIndex == 0)
- {
- xmlPage = "myLyrics.xml";
- }
- else if (comboLyricsPage.SelectedIndex == 1)
- {
- xmlPage = "myLyricsWide.xml";
- }
- else if (comboLyricsPage.SelectedIndex == 2)
- {
- xmlPage = "myLyricsEditor.xml";
- }
-
- xmlwriter.SetValue("myLyrics", "myLyricsXml", xmlPage);
+ int xmlScreen = comboLyricsPage.SelectedIndex;
+ xmlwriter.SetValue("myLyrics", "myLyricsScreen", xmlScreen);
}
}
Modified: trunk/plugins/MyLyrics/MyLyrics.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-03-29 16:15:53
|
Revision: 257
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=257&view=rev
Author: and-81
Date: 2007-03-29 09:15:51 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
Removed ComSkipLauncher plugin as it has now been integrated into TV Server SVN
Removed Paths:
-------------
trunk/plugins/ComSkipLauncher TVE3/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2007-03-29 08:29:35
|
Revision: 256
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=256&view=rev
Author: misterd_sf
Date: 2007-03-29 01:29:33 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
MPlayer: Added OSD for seek steps and jump to
Modified Paths:
--------------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-03-29 05:27:39 UTC (rev 255)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-03-29 08:29:33 UTC (rev 256)
@@ -309,6 +309,11 @@
/// Path to mplayer.exe
/// </summary>
private String mplayerPath;
+
+ /// <summary>
+ /// Timeout before a seek step is performed
+ /// </summary>
+ private int seekStepTimeout;
#endregion
#region ctor
@@ -473,6 +478,12 @@
extensionSettings.Add(settings.Name, settings);
videoArguments = xmlreader.GetValueAsString("mplayer", "videoArguments", String.Empty);
audioArguments = xmlreader.GetValueAsString("mplayer", "audioArguments", String.Empty);
+ string timeout = (xmlreader.GetValueAsString("movieplayer", "skipsteptimeout", "1500"));
+
+ if (timeout == string.Empty)
+ seekStepTimeout = 1500;
+ else
+ seekStepTimeout = Convert.ToInt16(timeout);
}
try {
loadXMLData();
@@ -778,6 +789,13 @@
public String[] SupportedExtensions {
get { return m_supportedExtensions; }
}
+
+ /// <summary>
+ /// Timeout before a seek step is performed
+ /// </summary>
+ public int SeekStepTimeout {
+ get { return seekStepTimeout; }
+ }
#endregion
}
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-03-29 05:27:39 UTC (rev 255)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-03-29 08:29:33 UTC (rev 256)
@@ -256,6 +256,16 @@
/// Configuration Manager
/// </summary>
private ConfigurationManager configManager;
+
+ /// <summary>
+ /// OSD Timestamp
+ /// </summary>
+ private String _timeStamp;
+
+ /// <summary>
+ /// Position in the osd timestamp
+ /// </summary>
+ private int _timeCodePosition;
#endregion
#region ctor
@@ -477,6 +487,15 @@
/// </summary>
/// <param name="text">osd command</param>
private void sendOSDText(string text) {
+ sendOSDText(text, displayDuration);
+ }
+
+ /// <summary>
+ /// Sends a OSD command to the mplayer process
+ /// </summary>
+ /// <param name="text">osd command</param>
+ /// <param name="duration">Duration to display</param>
+ private void sendOSDText(string text, int duration) {
if (_isFullScreen) {
sendCommand("osd_show_text \"" + text + "\" " + displayDuration + " 0");
}
@@ -495,7 +514,7 @@
if (result.StartsWith("ANS_TIME_POSITION=")) {
additionalTime = DateTime.Now;
Double.TryParse(result.Substring(18).Replace(".",
- CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator),out baseTime);
+ CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator), out baseTime);
} else if (result.StartsWith("ANS_PERCENT_POSITION=")) {
additionalTime = DateTime.Now;
int tempValue;
@@ -516,12 +535,12 @@
String help = result.Substring(7);
int index = help.IndexOf('_');
int temp;
- Int32.TryParse(help.Substring(0, index),out temp);
+ Int32.TryParse(help.Substring(0, index), out temp);
index = result.IndexOf('=');
audioNames[temp] = result.Substring(index + 1);
} else if (result.StartsWith("ID_SUBTITLE_ID")) {
int temp;
- Int32.TryParse(result.Substring(15),out temp);
+ Int32.TryParse(result.Substring(15), out temp);
if (!subtitleNames.ContainsKey(temp)) {
subtitleID.Add(numberOfSubtitles, temp);
subtitleNames.Add(temp, Strings.Unknown);
@@ -531,7 +550,7 @@
String help = result.Substring(7);
int index = help.IndexOf('_');
int temp;
- Int32.TryParse(help.Substring(0, index),out temp);
+ Int32.TryParse(help.Substring(0, index), out temp);
index = result.IndexOf('=');
subtitleNames[temp] = result.Substring(index + 1);
} else if (result.StartsWith("Exiting... (End of file)")) {
@@ -547,7 +566,7 @@
Int32.TryParse(temp.Substring(0, pos), out videoWith);
temp = temp.Substring(pos + 1);
pos = temp.IndexOf(' ');
- Int32.TryParse(temp.Substring(0, pos),out videoHeight);
+ Int32.TryParse(temp.Substring(0, pos), out videoHeight);
Log.Info("MPlayer: ASPECT: " + videoWith + "x" + videoHeight);
_needUpdate = true;
SetVideoWindow();
@@ -914,7 +933,7 @@
return speed;
}
set {
- if (value > 0) {
+ if (value > 0 && value != speed) {
speed = value;
sendCommand("speed_set " + speed);
if (speed > 9) {
@@ -1111,6 +1130,34 @@
osdVisible = false;
}
break;
+ case Action.ActionType.ACTION_MOVE_LEFT:
+ case Action.ActionType.ACTION_STEP_BACK:
+ case Action.ActionType.ACTION_MOVE_RIGHT:
+ case Action.ActionType.ACTION_STEP_FORWARD:
+ if (!osdVisible) {
+ String description = g_Player.GetStepDescription();
+ if (!String.IsNullOrEmpty(description)) {
+ sendOSDText("Seek: " + description, configManager.SeekStepTimeout);
+ } else {
+ sendOSDText("", 1);
+ }
+ }
+ break;
+ case Action.ActionType.ACTION_KEY_PRESSED:
+ if (!osdVisible && action.m_key != null) {
+ char chKey = (char)action.m_key.KeyChar;
+ if (chKey >= '0' && chKey <= '9') {
+ if (g_Player.CanSeek) {
+ ChangetheTimeCode(chKey);
+ if (!String.IsNullOrEmpty(_timeStamp)) {
+ sendOSDText("Jump to: " + _timeStamp);
+ } else {
+ sendOSDText("", 1);
+ }
+ }
+ }
+ }
+ break;
}
}
@@ -1128,6 +1175,23 @@
}
}
+
+ private void ChangetheTimeCode(char chKey) {
+ if (_timeCodePosition <= 4) {
+ //00:12
+ _timeStamp += chKey;
+ _timeCodePosition++;
+ if (_timeCodePosition == 2) {
+ _timeStamp += ":";
+ _timeCodePosition++;
+ }
+ }
+ if (_timeCodePosition > 4) {
+ _timeStamp = "";
+ _timeCodePosition = 0;
+ }
+ }
+
#endregion
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-03-29 05:27:42
|
Revision: 255
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=255&view=rev
Author: zebons
Date: 2007-03-28 22:27:39 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
DVDProfiler compatibility update
Modified Paths:
--------------
trunk/plugins/MyFilms/CatalogConverter.cs
Modified: trunk/plugins/MyFilms/CatalogConverter.cs
===================================================================
--- trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-28 16:22:27 UTC (rev 254)
+++ trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-29 05:27:39 UTC (rev 255)
@@ -105,6 +105,11 @@
credits += String.Format("{0} {1}", firstname, lastname);
}
}
+// XmlNode nodeFile = nodeDVD.SelectSingleNode("Notes/File");
+// string File = "";
+// if (nodeFile != null && nodeFile.InnerText != null)
+// File = nodeFile.InnerText;
+
//rec.Image = folderName + @"\" + nodeID.InnerText.Trim() + "f.jpg";
if (nodeNumber != null && nodeNumber.InnerText != null)
WriteAntAtribute(destXml,"CollectionNumber",nodeNumber.InnerText);
@@ -116,6 +121,7 @@
WriteAntAtribute(destXml, "Title", nodeTitle.InnerText);
WriteAntAtribute(destXml, "SortTitle", nodeTitle.InnerText);
WriteAntAtribute(destXml, "SortTitle1", nodeTitle.InnerText);
+// WriteAntAtribute(destXml, "SortTitle1", File);
WriteAntAtribute(destXml, "Rating","0");
WriteAntAtribute(destXml, "Year", nodeYear.InnerText);
WriteAntAtribute(destXml, "RunningTime", nodeDuration.InnerText);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ove...@us...> - 2007-03-28 16:22:45
|
Revision: 254
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=254&view=rev
Author: overture
Date: 2007-03-28 09:22:27 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IPTVPlugin/IPTVPlugin.csproj
Modified: trunk/plugins/IPTVPlugin/IPTVPlugin.csproj
===================================================================
--- trunk/plugins/IPTVPlugin/IPTVPlugin.csproj 2007-03-28 16:17:27 UTC (rev 253)
+++ trunk/plugins/IPTVPlugin/IPTVPlugin.csproj 2007-03-28 16:22:27 UTC (rev 254)
@@ -57,10 +57,15 @@
<Compile Include="GUIListCategoriesIPTV.cs" />
</ItemGroup>
<ItemGroup>
- <Folder Include="XMLs" />
- <Content Include="XMLs\MyIPTVChannelList.xml" />
- <Content Include="XMLs\MyIPTVhome.xml" />
- <Content Include="XMLs\MyIPTVCategoryList.xml" />
+ <Folder Include="New Folder" />
+ <Folder Include="XMLs\New Folder" />
+ <Folder Include="XMLs\Skins\New Folder" />
+ <Folder Include="XMLs\New Folder" />
+ <Content Include="XMLs\Skins\mce\MyIPTVCategoryList.xml" />
+ <Content Include="XMLs\Skins\mce\MyIPTVChannelList.xml" />
+ <Content Include="XMLs\Skins\mce\MyIPTVhome.xml" />
+ <Content Include="XMLs\StateDetails\IPTVMiniPluginDLLs.xml" />
+ <Content Include="XMLs\StateDetails\IPTVsettings.xml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
</Project>
\ 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: <ove...@us...> - 2007-03-28 16:17:31
|
Revision: 253
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=253&view=rev
Author: overture
Date: 2007-03-28 09:17:27 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/IPTVPlugin/XMLs/Skins/mce/
trunk/plugins/IPTVPlugin/XMLs/Skins/mce/MyIPTVCategoryList.xml
trunk/plugins/IPTVPlugin/XMLs/Skins/mce/MyIPTVChannelList.xml
trunk/plugins/IPTVPlugin/XMLs/Skins/mce/MyIPTVhome.xml
Added: trunk/plugins/IPTVPlugin/XMLs/Skins/mce/MyIPTVCategoryList.xml
===================================================================
--- trunk/plugins/IPTVPlugin/XMLs/Skins/mce/MyIPTVCategoryList.xml (rev 0)
+++ trunk/plugins/IPTVPlugin/XMLs/Skins/mce/MyIPTVCategoryList.xml 2007-03-28 16:17:27 UTC (rev 253)
@@ -0,0 +1,78 @@
+<window>
+ <id>6600</id>
+ <defaultcontrol>2</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+ <control>
+ <description>BackGround</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>720</width>
+ <height>576</height>
+ <texture>background.png</texture>
+ </control>
+ <control>
+ <description>an Image</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>75</posX>
+ <posY>370</posY>
+ <texture>hover_my tv.png</texture>
+ </control>
+ <control>
+ <description>text label</description>
+ <type>label</type>
+ <id>1</id>
+ <posX>250</posX>
+ <posY>70</posY>
+ <label>My IPTV</label>
+ <font>font16</font>
+ <align>right</align>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <type>group</type>
+ <description>group element</description>
+ <animation>FlyInFromLeft</animation>
+ <control>
+ <description>View-As button</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>60</posX>
+ <posY>150</posY>
+ <width>150</width>
+ <label>100</label>
+ <onleft>10</onleft>
+ <onright>10</onright>
+ </control>
+
+ </control>
+ <control>
+ <type>group</type>
+ <description>group element</description>
+ <animation>FlyInFromTop</animation>
+ <control>
+ <description>Categories</description>
+ <type>listcontrol</type>
+ <id>10</id>
+ <posX>300</posX>
+ <posY>150</posY>
+ <width>340</width>
+ <height>300</height>
+ <textXOff>10</textXOff>
+ <textYOff>2</textYOff>
+ <textXOff2>320</textXOff2>
+ <textYOff2>2</textYOff2>
+ <spaceBetweenItems>5</spaceBetweenItems>
+ <textureHeight>25</textureHeight>
+ <keepaspectratio>no</keepaspectratio>
+ <font2>font10</font2>
+ <font3>font10</font3>
+ <onleft>2</onleft>
+ <onright>2</onright>
+ </control>
+ </control>
+ </controls>
+</window>
Added: trunk/plugins/IPTVPlugin/XMLs/Skins/mce/MyIPTVChannelList.xml
===================================================================
--- trunk/plugins/IPTVPlugin/XMLs/Skins/mce/MyIPTVChannelList.xml (rev 0)
+++ trunk/plugins/IPTVPlugin/XMLs/Skins/mce/MyIPTVChannelList.xml 2007-03-28 16:17:27 UTC (rev 253)
@@ -0,0 +1,58 @@
+<window>
+ <id>6599</id>
+ <defaultcontrol>2</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+ <control>
+ <description>BackGround</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>720</width>
+ <height>576</height>
+ <texture>background.png</texture>
+ </control>
+ <control>
+ <description>an Image</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>75</posX>
+ <posY>370</posY>
+ <texture>hover_my tv.png</texture>
+ </control>
+ <control>
+ <description>text label</description>
+ <type>label</type>
+ <id>1</id>
+ <posX>250</posX>
+ <posY>70</posY>
+ <label>My IPTV</label>
+ <font>font16</font>
+ <align>right</align>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>Categories</description>
+ <type>listcontrol</type>
+ <id>11</id>
+ <posX>300</posX>
+ <posY>150</posY>
+ <width>340</width>
+ <height>300</height>
+ <textXOff>10</textXOff>
+ <textYOff>2</textYOff>
+ <textXOff2>320</textXOff2>
+ <textYOff2>2</textYOff2>
+ <spaceBetweenItems>5</spaceBetweenItems>
+ <textureHeight>25</textureHeight>
+ <keepaspectratio>no</keepaspectratio>
+ <font2>font10</font2>
+ <font3>font10</font3>
+ <onleft>2</onleft>
+ <onright>2</onright>
+ <onup>2</onup>
+ <ondown>2</ondown>
+ </control>
+ </controls>
+</window>
Added: trunk/plugins/IPTVPlugin/XMLs/Skins/mce/MyIPTVhome.xml
===================================================================
--- trunk/plugins/IPTVPlugin/XMLs/Skins/mce/MyIPTVhome.xml (rev 0)
+++ trunk/plugins/IPTVPlugin/XMLs/Skins/mce/MyIPTVhome.xml 2007-03-28 16:17:27 UTC (rev 253)
@@ -0,0 +1,91 @@
+<window>
+ <id>6598</id>
+ <defaultcontrol>2</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+ <control>
+ <description>BackGround</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>720</width>
+ <height>576</height>
+ <texture>background.png</texture>
+ </control>
+ <control>
+ <description>an Image</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>75</posX>
+ <posY>370</posY>
+ <texture>hover_my tv.png</texture>
+ </control>
+ <control>
+ <description>text label</description>
+ <type>label</type>
+ <id>1</id>
+ <posX>250</posX>
+ <posY>70</posY>
+ <label>My IPTV</label>
+ <font>font16</font>
+ <align>right</align>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <type>group</type>
+ <description>group element</description>
+ <animation>FlyInFromLeft</animation>
+ <control>
+ <description>View-As button</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>60</posX>
+ <posY>150</posY>
+ <width>190</width>
+ <label>100</label>
+ <onleft>99</onleft>
+ <onright>99</onright>
+ <onup>8</onup>
+ <ondown>8</ondown>
+ </control>
+ <control>
+ <description>TV On/Off button</description>
+ <type>togglebutton</type>
+ <id>8</id>
+ <posX>60</posX>
+ <posY>185</posY>
+ <width>190</width>
+ <height>32</height>
+ <textXOff>10</textXOff>
+ <textYOff>5</textYOff>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ <disabledcolor>60ffffff</disabledcolor>
+ <label>707</label>
+ <AltTextureFocus>togglebutton-off-focus.png</AltTextureFocus>
+ <AltTextureNoFocus>togglebutton-off-nofocus.png</AltTextureNoFocus>
+ <textureFocus>togglebutton-on-focus.png</textureFocus>
+ <textureNoFocus>togglebutton-on-nofocus.png</textureNoFocus>
+ <onup>2</onup>
+ <ondown>2</ondown>
+ <onright>99</onright>
+ <onleft>99</onleft>
+ </control>
+ </control>
+ <control>
+ <description>video window</description>
+ <type>videowindow</type>
+ <id>99</id>
+ <posX>300</posX>
+ <posY>107</posY>
+ <width>350</width>
+ <height>260</height>
+ <onleft>2</onleft>
+ <onright>2</onright>
+ <action>18</action>
+ <textureFocus>video_window_focus.png</textureFocus>
+ </control>
+ </controls>
+</window>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ove...@us...> - 2007-03-28 16:16:28
|
Revision: 252
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=252&view=rev
Author: overture
Date: 2007-03-28 09:15:58 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/IPTVPlugin/XMLs/Skins/
Removed Paths:
-------------
trunk/plugins/IPTVPlugin/XMLs/Skin/
trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVCategoryList.xml
trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVChannelList.xml
trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVhome.xml
Copied: trunk/plugins/IPTVPlugin/XMLs/Skins (from rev 251, trunk/plugins/IPTVPlugin/XMLs/Skin)
Deleted: trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVCategoryList.xml
===================================================================
--- trunk/plugins/IPTVPlugin/XMLs/Skin/MyIPTVCategoryList.xml 2007-03-28 16:13:39 UTC (rev 251)
+++ trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVCategoryList.xml 2007-03-28 16:15:58 UTC (rev 252)
@@ -1,78 +0,0 @@
-<window>
- <id>6600</id>
- <defaultcontrol>2</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <controls>
- <control>
- <description>BackGround</description>
- <type>image</type>
- <id>1</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>720</width>
- <height>576</height>
- <texture>background.png</texture>
- </control>
- <control>
- <description>an Image</description>
- <type>image</type>
- <id>1</id>
- <posX>75</posX>
- <posY>370</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <description>text label</description>
- <type>label</type>
- <id>1</id>
- <posX>250</posX>
- <posY>70</posY>
- <label>My IPTV</label>
- <font>font16</font>
- <align>right</align>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <type>group</type>
- <description>group element</description>
- <animation>FlyInFromLeft</animation>
- <control>
- <description>View-As button</description>
- <type>button</type>
- <id>2</id>
- <posX>60</posX>
- <posY>150</posY>
- <width>150</width>
- <label>100</label>
- <onleft>10</onleft>
- <onright>10</onright>
- </control>
-
- </control>
- <control>
- <type>group</type>
- <description>group element</description>
- <animation>FlyInFromTop</animation>
- <control>
- <description>Categories</description>
- <type>listcontrol</type>
- <id>10</id>
- <posX>300</posX>
- <posY>150</posY>
- <width>340</width>
- <height>300</height>
- <textXOff>10</textXOff>
- <textYOff>2</textYOff>
- <textXOff2>320</textXOff2>
- <textYOff2>2</textYOff2>
- <spaceBetweenItems>5</spaceBetweenItems>
- <textureHeight>25</textureHeight>
- <keepaspectratio>no</keepaspectratio>
- <font2>font10</font2>
- <font3>font10</font3>
- <onleft>2</onleft>
- <onright>2</onright>
- </control>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVChannelList.xml
===================================================================
--- trunk/plugins/IPTVPlugin/XMLs/Skin/MyIPTVChannelList.xml 2007-03-28 16:13:39 UTC (rev 251)
+++ trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVChannelList.xml 2007-03-28 16:15:58 UTC (rev 252)
@@ -1,58 +0,0 @@
-<window>
- <id>6599</id>
- <defaultcontrol>2</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <controls>
- <control>
- <description>BackGround</description>
- <type>image</type>
- <id>1</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>720</width>
- <height>576</height>
- <texture>background.png</texture>
- </control>
- <control>
- <description>an Image</description>
- <type>image</type>
- <id>1</id>
- <posX>75</posX>
- <posY>370</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <description>text label</description>
- <type>label</type>
- <id>1</id>
- <posX>250</posX>
- <posY>70</posY>
- <label>My IPTV</label>
- <font>font16</font>
- <align>right</align>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>Categories</description>
- <type>listcontrol</type>
- <id>11</id>
- <posX>300</posX>
- <posY>150</posY>
- <width>340</width>
- <height>300</height>
- <textXOff>10</textXOff>
- <textYOff>2</textYOff>
- <textXOff2>320</textXOff2>
- <textYOff2>2</textYOff2>
- <spaceBetweenItems>5</spaceBetweenItems>
- <textureHeight>25</textureHeight>
- <keepaspectratio>no</keepaspectratio>
- <font2>font10</font2>
- <font3>font10</font3>
- <onleft>2</onleft>
- <onright>2</onright>
- <onup>2</onup>
- <ondown>2</ondown>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVhome.xml
===================================================================
--- trunk/plugins/IPTVPlugin/XMLs/Skin/MyIPTVhome.xml 2007-03-28 16:13:39 UTC (rev 251)
+++ trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVhome.xml 2007-03-28 16:15:58 UTC (rev 252)
@@ -1,91 +0,0 @@
-<window>
- <id>6598</id>
- <defaultcontrol>2</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <controls>
- <control>
- <description>BackGround</description>
- <type>image</type>
- <id>1</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>720</width>
- <height>576</height>
- <texture>background.png</texture>
- </control>
- <control>
- <description>an Image</description>
- <type>image</type>
- <id>1</id>
- <posX>75</posX>
- <posY>370</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <description>text label</description>
- <type>label</type>
- <id>1</id>
- <posX>250</posX>
- <posY>70</posY>
- <label>My IPTV</label>
- <font>font16</font>
- <align>right</align>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <type>group</type>
- <description>group element</description>
- <animation>FlyInFromLeft</animation>
- <control>
- <description>View-As button</description>
- <type>button</type>
- <id>2</id>
- <posX>60</posX>
- <posY>150</posY>
- <width>190</width>
- <label>100</label>
- <onleft>99</onleft>
- <onright>99</onright>
- <onup>8</onup>
- <ondown>8</ondown>
- </control>
- <control>
- <description>TV On/Off button</description>
- <type>togglebutton</type>
- <id>8</id>
- <posX>60</posX>
- <posY>185</posY>
- <width>190</width>
- <height>32</height>
- <textXOff>10</textXOff>
- <textYOff>5</textYOff>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- <colordiffuse>ffffffff</colordiffuse>
- <disabledcolor>60ffffff</disabledcolor>
- <label>707</label>
- <AltTextureFocus>togglebutton-off-focus.png</AltTextureFocus>
- <AltTextureNoFocus>togglebutton-off-nofocus.png</AltTextureNoFocus>
- <textureFocus>togglebutton-on-focus.png</textureFocus>
- <textureNoFocus>togglebutton-on-nofocus.png</textureNoFocus>
- <onup>2</onup>
- <ondown>2</ondown>
- <onright>99</onright>
- <onleft>99</onleft>
- </control>
- </control>
- <control>
- <description>video window</description>
- <type>videowindow</type>
- <id>99</id>
- <posX>300</posX>
- <posY>107</posY>
- <width>350</width>
- <height>260</height>
- <onleft>2</onleft>
- <onright>2</onright>
- <action>18</action>
- <textureFocus>video_window_focus.png</textureFocus>
- </control>
- </controls>
-</window>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ove...@us...> - 2007-03-28 16:13:55
|
Revision: 251
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=251&view=rev
Author: overture
Date: 2007-03-28 09:13:39 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/IPTVPlugin/XMLs/Skin/
Removed Paths:
-------------
trunk/plugins/IPTVPlugin/XMLs/Skins/
Copied: trunk/plugins/IPTVPlugin/XMLs/Skin (from rev 250, trunk/plugins/IPTVPlugin/XMLs/Skins)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ove...@us...> - 2007-03-28 16:13:04
|
Revision: 250
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=250&view=rev
Author: overture
Date: 2007-03-28 09:12:46 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/IPTVPlugin/XMLs/Skins/
trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVCategoryList.xml
trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVChannelList.xml
trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVhome.xml
trunk/plugins/IPTVPlugin/XMLs/StateDetails/
trunk/plugins/IPTVPlugin/XMLs/StateDetails/IPTVMiniPluginDLLs.xml
trunk/plugins/IPTVPlugin/XMLs/StateDetails/IPTVsettings.xml
Removed Paths:
-------------
trunk/plugins/IPTVPlugin/XMLs/MyIPTVCategoryList.xml
trunk/plugins/IPTVPlugin/XMLs/MyIPTVChannelList.xml
trunk/plugins/IPTVPlugin/XMLs/MyIPTVhome.xml
Deleted: trunk/plugins/IPTVPlugin/XMLs/MyIPTVCategoryList.xml
===================================================================
--- trunk/plugins/IPTVPlugin/XMLs/MyIPTVCategoryList.xml 2007-03-28 14:12:54 UTC (rev 249)
+++ trunk/plugins/IPTVPlugin/XMLs/MyIPTVCategoryList.xml 2007-03-28 16:12:46 UTC (rev 250)
@@ -1,78 +0,0 @@
-<window>
- <id>6600</id>
- <defaultcontrol>2</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <controls>
- <control>
- <description>BackGround</description>
- <type>image</type>
- <id>1</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>720</width>
- <height>576</height>
- <texture>background.png</texture>
- </control>
- <control>
- <description>an Image</description>
- <type>image</type>
- <id>1</id>
- <posX>75</posX>
- <posY>370</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <description>text label</description>
- <type>label</type>
- <id>1</id>
- <posX>250</posX>
- <posY>70</posY>
- <label>My IPTV</label>
- <font>font16</font>
- <align>right</align>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <type>group</type>
- <description>group element</description>
- <animation>FlyInFromLeft</animation>
- <control>
- <description>View-As button</description>
- <type>button</type>
- <id>2</id>
- <posX>60</posX>
- <posY>150</posY>
- <width>150</width>
- <label>100</label>
- <onleft>10</onleft>
- <onright>10</onright>
- </control>
-
- </control>
- <control>
- <type>group</type>
- <description>group element</description>
- <animation>FlyInFromTop</animation>
- <control>
- <description>Categories</description>
- <type>listcontrol</type>
- <id>10</id>
- <posX>300</posX>
- <posY>150</posY>
- <width>340</width>
- <height>300</height>
- <textXOff>10</textXOff>
- <textYOff>2</textYOff>
- <textXOff2>320</textXOff2>
- <textYOff2>2</textYOff2>
- <spaceBetweenItems>5</spaceBetweenItems>
- <textureHeight>25</textureHeight>
- <keepaspectratio>no</keepaspectratio>
- <font2>font10</font2>
- <font3>font10</font3>
- <onleft>2</onleft>
- <onright>2</onright>
- </control>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/IPTVPlugin/XMLs/MyIPTVChannelList.xml
===================================================================
--- trunk/plugins/IPTVPlugin/XMLs/MyIPTVChannelList.xml 2007-03-28 14:12:54 UTC (rev 249)
+++ trunk/plugins/IPTVPlugin/XMLs/MyIPTVChannelList.xml 2007-03-28 16:12:46 UTC (rev 250)
@@ -1,58 +0,0 @@
-<window>
- <id>6599</id>
- <defaultcontrol>2</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <controls>
- <control>
- <description>BackGround</description>
- <type>image</type>
- <id>1</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>720</width>
- <height>576</height>
- <texture>background.png</texture>
- </control>
- <control>
- <description>an Image</description>
- <type>image</type>
- <id>1</id>
- <posX>75</posX>
- <posY>370</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <description>text label</description>
- <type>label</type>
- <id>1</id>
- <posX>250</posX>
- <posY>70</posY>
- <label>My IPTV</label>
- <font>font16</font>
- <align>right</align>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <description>Categories</description>
- <type>listcontrol</type>
- <id>11</id>
- <posX>300</posX>
- <posY>150</posY>
- <width>340</width>
- <height>300</height>
- <textXOff>10</textXOff>
- <textYOff>2</textYOff>
- <textXOff2>320</textXOff2>
- <textYOff2>2</textYOff2>
- <spaceBetweenItems>5</spaceBetweenItems>
- <textureHeight>25</textureHeight>
- <keepaspectratio>no</keepaspectratio>
- <font2>font10</font2>
- <font3>font10</font3>
- <onleft>2</onleft>
- <onright>2</onright>
- <onup>2</onup>
- <ondown>2</ondown>
- </control>
- </controls>
-</window>
Deleted: trunk/plugins/IPTVPlugin/XMLs/MyIPTVhome.xml
===================================================================
--- trunk/plugins/IPTVPlugin/XMLs/MyIPTVhome.xml 2007-03-28 14:12:54 UTC (rev 249)
+++ trunk/plugins/IPTVPlugin/XMLs/MyIPTVhome.xml 2007-03-28 16:12:46 UTC (rev 250)
@@ -1,91 +0,0 @@
-<window>
- <id>6598</id>
- <defaultcontrol>2</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <controls>
- <control>
- <description>BackGround</description>
- <type>image</type>
- <id>1</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>720</width>
- <height>576</height>
- <texture>background.png</texture>
- </control>
- <control>
- <description>an Image</description>
- <type>image</type>
- <id>1</id>
- <posX>75</posX>
- <posY>370</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <description>text label</description>
- <type>label</type>
- <id>1</id>
- <posX>250</posX>
- <posY>70</posY>
- <label>My IPTV</label>
- <font>font16</font>
- <align>right</align>
- <textcolor>ffffffff</textcolor>
- </control>
- <control>
- <type>group</type>
- <description>group element</description>
- <animation>FlyInFromLeft</animation>
- <control>
- <description>View-As button</description>
- <type>button</type>
- <id>2</id>
- <posX>60</posX>
- <posY>150</posY>
- <width>190</width>
- <label>100</label>
- <onleft>99</onleft>
- <onright>99</onright>
- <onup>8</onup>
- <ondown>8</ondown>
- </control>
- <control>
- <description>TV On/Off button</description>
- <type>togglebutton</type>
- <id>8</id>
- <posX>60</posX>
- <posY>185</posY>
- <width>190</width>
- <height>32</height>
- <textXOff>10</textXOff>
- <textYOff>5</textYOff>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- <colordiffuse>ffffffff</colordiffuse>
- <disabledcolor>60ffffff</disabledcolor>
- <label>707</label>
- <AltTextureFocus>togglebutton-off-focus.png</AltTextureFocus>
- <AltTextureNoFocus>togglebutton-off-nofocus.png</AltTextureNoFocus>
- <textureFocus>togglebutton-on-focus.png</textureFocus>
- <textureNoFocus>togglebutton-on-nofocus.png</textureNoFocus>
- <onup>2</onup>
- <ondown>2</ondown>
- <onright>99</onright>
- <onleft>99</onleft>
- </control>
- </control>
- <control>
- <description>video window</description>
- <type>videowindow</type>
- <id>99</id>
- <posX>300</posX>
- <posY>107</posY>
- <width>350</width>
- <height>260</height>
- <onleft>2</onleft>
- <onright>2</onright>
- <action>18</action>
- <textureFocus>video_window_focus.png</textureFocus>
- </control>
- </controls>
-</window>
Added: trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVCategoryList.xml
===================================================================
--- trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVCategoryList.xml (rev 0)
+++ trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVCategoryList.xml 2007-03-28 16:12:46 UTC (rev 250)
@@ -0,0 +1,78 @@
+<window>
+ <id>6600</id>
+ <defaultcontrol>2</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+ <control>
+ <description>BackGround</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>720</width>
+ <height>576</height>
+ <texture>background.png</texture>
+ </control>
+ <control>
+ <description>an Image</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>75</posX>
+ <posY>370</posY>
+ <texture>hover_my tv.png</texture>
+ </control>
+ <control>
+ <description>text label</description>
+ <type>label</type>
+ <id>1</id>
+ <posX>250</posX>
+ <posY>70</posY>
+ <label>My IPTV</label>
+ <font>font16</font>
+ <align>right</align>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <type>group</type>
+ <description>group element</description>
+ <animation>FlyInFromLeft</animation>
+ <control>
+ <description>View-As button</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>60</posX>
+ <posY>150</posY>
+ <width>150</width>
+ <label>100</label>
+ <onleft>10</onleft>
+ <onright>10</onright>
+ </control>
+
+ </control>
+ <control>
+ <type>group</type>
+ <description>group element</description>
+ <animation>FlyInFromTop</animation>
+ <control>
+ <description>Categories</description>
+ <type>listcontrol</type>
+ <id>10</id>
+ <posX>300</posX>
+ <posY>150</posY>
+ <width>340</width>
+ <height>300</height>
+ <textXOff>10</textXOff>
+ <textYOff>2</textYOff>
+ <textXOff2>320</textXOff2>
+ <textYOff2>2</textYOff2>
+ <spaceBetweenItems>5</spaceBetweenItems>
+ <textureHeight>25</textureHeight>
+ <keepaspectratio>no</keepaspectratio>
+ <font2>font10</font2>
+ <font3>font10</font3>
+ <onleft>2</onleft>
+ <onright>2</onright>
+ </control>
+ </control>
+ </controls>
+</window>
Added: trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVChannelList.xml
===================================================================
--- trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVChannelList.xml (rev 0)
+++ trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVChannelList.xml 2007-03-28 16:12:46 UTC (rev 250)
@@ -0,0 +1,58 @@
+<window>
+ <id>6599</id>
+ <defaultcontrol>2</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+ <control>
+ <description>BackGround</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>720</width>
+ <height>576</height>
+ <texture>background.png</texture>
+ </control>
+ <control>
+ <description>an Image</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>75</posX>
+ <posY>370</posY>
+ <texture>hover_my tv.png</texture>
+ </control>
+ <control>
+ <description>text label</description>
+ <type>label</type>
+ <id>1</id>
+ <posX>250</posX>
+ <posY>70</posY>
+ <label>My IPTV</label>
+ <font>font16</font>
+ <align>right</align>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>Categories</description>
+ <type>listcontrol</type>
+ <id>11</id>
+ <posX>300</posX>
+ <posY>150</posY>
+ <width>340</width>
+ <height>300</height>
+ <textXOff>10</textXOff>
+ <textYOff>2</textYOff>
+ <textXOff2>320</textXOff2>
+ <textYOff2>2</textYOff2>
+ <spaceBetweenItems>5</spaceBetweenItems>
+ <textureHeight>25</textureHeight>
+ <keepaspectratio>no</keepaspectratio>
+ <font2>font10</font2>
+ <font3>font10</font3>
+ <onleft>2</onleft>
+ <onright>2</onright>
+ <onup>2</onup>
+ <ondown>2</ondown>
+ </control>
+ </controls>
+</window>
Added: trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVhome.xml
===================================================================
--- trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVhome.xml (rev 0)
+++ trunk/plugins/IPTVPlugin/XMLs/Skins/MyIPTVhome.xml 2007-03-28 16:12:46 UTC (rev 250)
@@ -0,0 +1,91 @@
+<window>
+ <id>6598</id>
+ <defaultcontrol>2</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+ <control>
+ <description>BackGround</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>720</width>
+ <height>576</height>
+ <texture>background.png</texture>
+ </control>
+ <control>
+ <description>an Image</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>75</posX>
+ <posY>370</posY>
+ <texture>hover_my tv.png</texture>
+ </control>
+ <control>
+ <description>text label</description>
+ <type>label</type>
+ <id>1</id>
+ <posX>250</posX>
+ <posY>70</posY>
+ <label>My IPTV</label>
+ <font>font16</font>
+ <align>right</align>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <type>group</type>
+ <description>group element</description>
+ <animation>FlyInFromLeft</animation>
+ <control>
+ <description>View-As button</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>60</posX>
+ <posY>150</posY>
+ <width>190</width>
+ <label>100</label>
+ <onleft>99</onleft>
+ <onright>99</onright>
+ <onup>8</onup>
+ <ondown>8</ondown>
+ </control>
+ <control>
+ <description>TV On/Off button</description>
+ <type>togglebutton</type>
+ <id>8</id>
+ <posX>60</posX>
+ <posY>185</posY>
+ <width>190</width>
+ <height>32</height>
+ <textXOff>10</textXOff>
+ <textYOff>5</textYOff>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ <disabledcolor>60ffffff</disabledcolor>
+ <label>707</label>
+ <AltTextureFocus>togglebutton-off-focus.png</AltTextureFocus>
+ <AltTextureNoFocus>togglebutton-off-nofocus.png</AltTextureNoFocus>
+ <textureFocus>togglebutton-on-focus.png</textureFocus>
+ <textureNoFocus>togglebutton-on-nofocus.png</textureNoFocus>
+ <onup>2</onup>
+ <ondown>2</ondown>
+ <onright>99</onright>
+ <onleft>99</onleft>
+ </control>
+ </control>
+ <control>
+ <description>video window</description>
+ <type>videowindow</type>
+ <id>99</id>
+ <posX>300</posX>
+ <posY>107</posY>
+ <width>350</width>
+ <height>260</height>
+ <onleft>2</onleft>
+ <onright>2</onright>
+ <action>18</action>
+ <textureFocus>video_window_focus.png</textureFocus>
+ </control>
+ </controls>
+</window>
Added: trunk/plugins/IPTVPlugin/XMLs/StateDetails/IPTVMiniPluginDLLs.xml
===================================================================
--- trunk/plugins/IPTVPlugin/XMLs/StateDetails/IPTVMiniPluginDLLs.xml (rev 0)
+++ trunk/plugins/IPTVPlugin/XMLs/StateDetails/IPTVMiniPluginDLLs.xml 2007-03-28 16:12:46 UTC (rev 250)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<interface>
+ <type>
+ <dll state="On" name="WorldWideMedaiProject">C:\Documents and Settings\pnm\My Documents\SharpDevelop Projects\WWMPMiniPlugin\bin\Debug\WWMPMiniPlugin.dll</dll>
+ </type>
+</interface>
\ No newline at end of file
Added: trunk/plugins/IPTVPlugin/XMLs/StateDetails/IPTVsettings.xml
===================================================================
--- trunk/plugins/IPTVPlugin/XMLs/StateDetails/IPTVsettings.xml (rev 0)
+++ trunk/plugins/IPTVPlugin/XMLs/StateDetails/IPTVsettings.xml 2007-03-28 16:12:46 UTC (rev 250)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<settings>
+ <proxydetails>
+ <useproxy>True</useproxy>
+ <usedefaultproxy>True</usedefaultproxy>
+ <proxyuser>
+ </proxyuser>
+ <proxypassword>
+ </proxypassword>
+ <proxyipaddress>10.153.1.35</proxyipaddress>
+ <proxyport>8080</proxyport>
+ </proxydetails>
+</settings>
\ 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: <moi...@us...> - 2007-03-28 14:13:01
|
Revision: 249
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=249&view=rev
Author: moiristo
Date: 2007-03-28 07:12:54 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IPTV@UT/IP...@UT...
Added Paths:
-----------
trunk/plugins/IPTV@UT/README.txt
trunk/plugins/IPTV@UT/[ Wide Skin ]/
trunk/plugins/IPTV@UT/[ Wide Skin ]/MyIPTV.xml
Modified: trunk/plugins/IPTV@UT/IP...@UT...
===================================================================
(Binary files differ)
Added: trunk/plugins/IPTV@UT/README.txt
===================================================================
--- trunk/plugins/IPTV@UT/README.txt (rev 0)
+++ trunk/plugins/IPTV@UT/README.txt 2007-03-28 14:12:54 UTC (rev 249)
@@ -0,0 +1,72 @@
+MyIPTV v0.3 (01-02-2007)
+
+This plugin is specifically made for IPTV@UT, a service that provides VLC udp streams
+for use by students of the university of Twente (NL). It can load *.vlc and *.m3u playlists containing
+video/audio channels and uses the VLC ActiveX plugin to play these channels within MP.
+
+
+-----Installation-----
+
+1) Make sure you installed the latest version of VLC from www.videolan.org.
+ Copy 'libvlc.dll' from '\<VLC root directory>\VLC' to the MP root folder
+
+2) Go to /Release/Plugins/ExternalPlayers and copy the dll to your /Plugins/ExternalPlayers folder
+
+ !!!This will overwrite your ExternalPlayers.dll file. Please backup this file before doing this!!!
+
+ The VLC plugin is the same as was used by early versions of the Dreambox plugin.
+ The adjustments made should not cause any trouble for users using that plugin.
+
+3) Copy the plugin in /Release/Plugins/Windows to your /Plugins/Windows folder
+
+4) Copy the skin file to your currently used skin directory (The default xml should be fine for most skins)
+
+4) Enable the VideoLan plugin in the MP configuration, configure it if necessary,
+ and configure the IPTV plugin.
+
+5) Create a *.vlc or *.m3u playlist. An example is shown below:
+
+ #EXTM3U
+
+ #EXTINF:-1,Nederland 1
+ #EXTVLCOPT:filter=deinterlace --
+ #EXTVLCOPT:vout-filter=deinterlace -- These 3 lines are unnecessary, but are usually generated by vlc
+ #EXTVLCOPT:deinterlace-mode=blend --
+ udp://@233.81.233.161:10294
+
+6) Try it out!
+
+
+-----TODO/BUGS-----
+
+- Fullscreen OSD? ==> Probably not possible, unless a VMR9 filter is created for VLC
+- Scheduled recording, timeshifting
+- Manage recordings
+
+-----Version history-----
+
+0.3
+- VideoLan: Created ExternalPlayers.dll for MP0.2.2_SVN. A version for 0.2.2 can be created on request
+- VideoLan: Switched from ActiveX to a native C# library
+- VideoLan: More action support, like big/medium/short step forward/backword, ability to make screenshots, DVD menu handling, audio/subtitle track rotation...
+- VideoLan: Recording support (A Record-action in MP starts/stops the recording). It stores the recordings in /<MP root folder/vlciptv/.
+- VideoLan: Removed the logo when not playing streams
+
+- IPTV: Redesigned the UI to overcome problems caused by the fact that overlays cannot be laid over the videolan plugin
+- IPTV: Context menu removed
+- IPTV: Recordings button added
+
+0.2:
+- Videolan: Created ExternalPlayers.dll for both MP0.2.1 and MP0.2.1_SVN (different configuration file I/O)
+- Videolan: Fixed configuration not being written to file, because the Config class doesn't like text such as
+ udp://,http://. Now you only need to specify the protocol, e.g. udp,http,...
+- Videolan: Some bugfixes
+- IPTV: Allowed zapping in fullscreen
+- IPTV: Allowed loading *.m3u playlists
+- IPTV: #EXTINF-tags are not obligatory anymore
+- IPTV: Pressing 1..9 (remote) zaps to channel 1..9 respectively in the playlist
+- IPTV: Skin files updated
+- IPTV: Several bugfixes
+
+0.1:
+- Initial release
Added: trunk/plugins/IPTV@UT/[ Wide Skin ]/MyIPTV.xml
===================================================================
--- trunk/plugins/IPTV@UT/[ Wide Skin ]/MyIPTV.xml (rev 0)
+++ trunk/plugins/IPTV@UT/[ Wide Skin ]/MyIPTV.xml 2007-03-28 14:12:54 UTC (rev 249)
@@ -0,0 +1,101 @@
+<window>
+ <id>7500</id>
+ <defaultcontrol>19</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <define>#header.label:My IPTV</define>
+ <define>#header.image:</define>
+ <define>#header.hover:hover_my tv.png</define>
+ <controls>
+ <import>common.window.xml</import>
+ <control>
+ <type>image</type>
+ <description>background image</description>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>background.png</texture>
+ </control>
+ <control>
+ <type>listcontrol</type>
+ <description>afleveringen</description>
+ <id>19</id>
+ <posX>355</posX>
+ <posY>180</posY>
+ <width>410</width>
+ <onup>17</onup>
+ <font2>font10</font2>
+ <font3>font10</font3>
+ <textureHeight>25</textureHeight>
+ <IconYOff>3</IconYOff>
+ <textYOff>-4</textYOff>
+ </control>
+ <control>
+ <description>video rectangle</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>142</posX>
+ <posY>532</posY>
+ <width>214</width>
+ <height>178</height>
+ <texture>playback_background.png</texture>
+ <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ </control>
+ <control>
+ <type>videowindow</type>
+ <description>video window</description>
+ <id>99</id>
+ <posX>157</posX>
+ <posY>546</posY>
+ <width>180</width>
+ <height>144</height>
+ <colordiffuse>ffffffff</colordiffuse>
+ <onright>19</onright>
+ <onup>17</onup>
+ <ondown>21</ondown>
+ <animation>WindowClose</animation>
+ <action>18</action>
+ <textureFocus>tv_green_border.png</textureFocus>
+ </control>
+ <control>
+ <type>group</type>
+ <description>group element</description>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="slide" time="250" start="-300,0">WindowOpen</animation>
+ <animation effect="slide" time="500" end="0,-300">WindowClose</animation>
+ <layout>StackLayout</layout>
+ <posX>55</posX>
+ <posY>420</posY>
+ <control>
+ <type>button</type>
+ <description>Load playlist button</description>
+ <id>21</id>
+ <onright>19</onright>
+ <onup>99</onup>
+ <ondown>22</ondown>
+ <label>Load Playlist</label>
+ </control>
+ <control>
+ <type>button</type>
+ <description>Recordings button</description>
+ <id>22</id>
+ <onright>19</onright>
+ <onup>21</onup>
+ <ondown>19</ondown>
+ <label>Recordings</label>
+ </control>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Current Channelname</description>
+ <id>13</id>
+ <posX>170</posX>
+ <posY>705</posY>
+ <width>224</width>
+ <align>left</align>
+ <label>#IPTV.View.channel</label>
+ <textcolor>white</textcolor>
+ </control>
+ </controls>
+</window>
\ 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: <moi...@us...> - 2007-03-28 14:12:11
|
Revision: 248
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=248&view=rev
Author: moiristo
Date: 2007-03-28 07:12:05 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/VideoLAN/VideoLAN.suo
Modified: trunk/plugins/VideoLAN/VideoLAN.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
