Menu
▾
▴
mp-plugins-svn
|
From: <ze...@us...> - 2007-03-04 16:26:21
|
Revision: 154
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=154&view=rev
Author: zebons
Date: 2007-03-04 08:26:12 -0800 (Sun, 04 Mar 2007)
Log Message:
-----------
Version 4.0
Many configuration defined with setup.
Configuration by default possible.
Default view loaded at the plugin start.
Hierarchical structure defined in the title of the movies with a separator indicated in the setup.
Group by actors now ignore the role name.
Corrected bug when launching a movie without picture.
More controls on the xml database in setup.
Modified Paths:
--------------
trunk/plugins/MyFilms/AntMovieCatalog.Designer.cs
trunk/plugins/MyFilms/AntMovieCatalog.xsd
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilms.csproj
trunk/plugins/MyFilms/MesFilms.suo
trunk/plugins/MyFilms/MesFilmsDetail.cs
trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
trunk/plugins/MyFilms/MesFilmsSetup.cs
trunk/plugins/MyFilms/Properties/AssemblyInfo.cs
Modified: trunk/plugins/MyFilms/AntMovieCatalog.Designer.cs
===================================================================
--- trunk/plugins/MyFilms/AntMovieCatalog.Designer.cs 2007-03-04 14:21:06 UTC (rev 153)
+++ trunk/plugins/MyFilms/AntMovieCatalog.Designer.cs 2007-03-04 16:26:12 UTC (rev 154)
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
-// Ce code a été généré par un outil.
-// Version du runtime :2.0.50727.42
+// This code was generated by a tool.
+// Runtime Version:2.0.50727.42
//
-// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
-// le code est régénéré.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -1135,7 +1135,7 @@
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
public MovieRow AddMovieRow(
- string Number,
+ int Number,
string Checked,
string MediaLabel,
string MediaType,
@@ -1266,7 +1266,7 @@
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
private void InitClass() {
- this.columnNumber = new System.Data.DataColumn("Number", typeof(string), null, System.Data.MappingType.Attribute);
+ this.columnNumber = new System.Data.DataColumn("Number", typeof(int), null, System.Data.MappingType.Attribute);
base.Columns.Add(this.columnNumber);
this.columnChecked = new System.Data.DataColumn("Checked", typeof(string), null, System.Data.MappingType.Attribute);
base.Columns.Add(this.columnChecked);
@@ -1475,8 +1475,7 @@
return ((int)(this[this.tableCatalog.AntMovieCatalog_IdColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'AntMovieCatalog_Id\' dans la table \'Catalog\' est DBNull" +
- ".", e);
+ throw new System.Data.StrongTypingException("The value for column \'AntMovieCatalog_Id\' in table \'Catalog\' is DBNull.", e);
}
}
set {
@@ -1491,7 +1490,7 @@
return ((string)(this[this.tableCatalog.PropertiesColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Properties\' dans la table \'Catalog\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Properties\' in table \'Catalog\' is DBNull.", e);
}
}
set {
@@ -1563,7 +1562,7 @@
return ((int)(this[this.tableContents.Catalog_IdColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Catalog_Id\' dans la table \'Contents\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Catalog_Id\' in table \'Contents\' is DBNull.", e);
}
}
set {
@@ -1609,13 +1608,13 @@
}
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
- public string Number {
+ public int Number {
get {
try {
- return ((string)(this[this.tableMovie.NumberColumn]));
+ return ((int)(this[this.tableMovie.NumberColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Number\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Number\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1630,7 +1629,7 @@
return ((string)(this[this.tableMovie.CheckedColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Checked\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Checked\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1645,7 +1644,7 @@
return ((string)(this[this.tableMovie.MediaLabelColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'MediaLabel\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'MediaLabel\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1660,7 +1659,7 @@
return ((string)(this[this.tableMovie.MediaTypeColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'MediaType\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'MediaType\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1675,7 +1674,7 @@
return ((string)(this[this.tableMovie.SourceColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Source\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Source\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1690,7 +1689,7 @@
return ((string)(this[this.tableMovie.DateColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Date\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Date\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1705,7 +1704,7 @@
return ((string)(this[this.tableMovie.BorrowerColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Borrower\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Borrower\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1720,7 +1719,7 @@
return ((decimal)(this[this.tableMovie.RatingColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Rating\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Rating\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1735,7 +1734,7 @@
return ((string)(this[this.tableMovie.OriginalTitleColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'OriginalTitle\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'OriginalTitle\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1750,7 +1749,7 @@
return ((string)(this[this.tableMovie.TranslatedTitleColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'TranslatedTitle\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'TranslatedTitle\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1765,7 +1764,7 @@
return ((string)(this[this.tableMovie.FormattedTitleColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'FormattedTitle\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'FormattedTitle\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1780,7 +1779,7 @@
return ((string)(this[this.tableMovie.DirectorColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Director\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Director\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1795,7 +1794,7 @@
return ((string)(this[this.tableMovie.ProducerColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Producer\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Producer\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1810,7 +1809,7 @@
return ((string)(this[this.tableMovie.CountryColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Country\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Country\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1825,7 +1824,7 @@
return ((string)(this[this.tableMovie.CategoryColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Category\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Category\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1840,7 +1839,7 @@
return ((string)(this[this.tableMovie.YearColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Year\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Year\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1855,7 +1854,7 @@
return ((string)(this[this.tableMovie.LengthColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Length\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Length\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1870,7 +1869,7 @@
return ((string)(this[this.tableMovie.ActorsColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Actors\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Actors\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1885,7 +1884,7 @@
return ((string)(this[this.tableMovie.URLColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'URL\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'URL\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1900,7 +1899,7 @@
return ((string)(this[this.tableMovie.DescriptionColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Description\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Description\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1915,7 +1914,7 @@
return ((string)(this[this.tableMovie.CommentsColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Comments\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Comments\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1930,7 +1929,7 @@
return ((string)(this[this.tableMovie.VideoFormatColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'VideoFormat\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'VideoFormat\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1945,7 +1944,7 @@
return ((string)(this[this.tableMovie.VideoBitrateColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'VideoBitrate\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'VideoBitrate\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1960,7 +1959,7 @@
return ((string)(this[this.tableMovie.AudioFormatColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'AudioFormat\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'AudioFormat\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1975,7 +1974,7 @@
return ((string)(this[this.tableMovie.AudioBitrateColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'AudioBitrate\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'AudioBitrate\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -1990,7 +1989,7 @@
return ((string)(this[this.tableMovie.ResolutionColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Resolution\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Resolution\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -2005,7 +2004,7 @@
return ((string)(this[this.tableMovie.FramerateColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Framerate\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Framerate\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -2020,7 +2019,7 @@
return ((string)(this[this.tableMovie.LanguagesColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Languages\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Languages\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -2035,7 +2034,7 @@
return ((string)(this[this.tableMovie.SubtitlesColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Subtitles\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Subtitles\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -2050,7 +2049,7 @@
return ((System.DateTime)(this[this.tableMovie.DateAddedColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'DateAdded\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'DateAdded\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -2065,7 +2064,7 @@
return ((string)(this[this.tableMovie.SizeColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Size\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Size\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -2080,7 +2079,7 @@
return ((string)(this[this.tableMovie.DisksColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Disks\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Disks\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -2095,7 +2094,7 @@
return ((string)(this[this.tableMovie.PictureColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Picture\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Picture\' in table \'Movie\' is DBNull.", e);
}
}
set {
@@ -2110,7 +2109,7 @@
return ((int)(this[this.tableMovie.Contents_IdColumn]));
}
catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Contents_Id\' dans la table \'Movie\' est DBNull.", e);
+ throw new System.Data.StrongTypingException("The value for column \'Contents_Id\' in table \'Movie\' is DBNull.", e);
}
}
set {
Modified: trunk/plugins/MyFilms/AntMovieCatalog.xsd
===================================================================
--- trunk/plugins/MyFilms/AntMovieCatalog.xsd 2007-03-04 14:21:06 UTC (rev 153)
+++ trunk/plugins/MyFilms/AntMovieCatalog.xsd 2007-03-04 16:26:12 UTC (rev 154)
@@ -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_ColumnPropNameInRow="Properties" msprop:Generator_ColumnVarNameInTable="columnProperties" msprop:Generator_ColumnPropNameInTable="PropertiesColumn" type="xs:string" minOccurs="0" msdata:Ordinal="1" />
+ <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="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_ColumnPropNameInRow="DateAdded" msprop:Generator_ColumnVarNameInTable="columnDateAdded" 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_ColumnVarNameInTable="columnDateAdded" msprop:Generator_ColumnPropNameInRow="DateAdded" msprop:Generator_ColumnPropNameInTable="DateAddedColumn" type="xs:dateTime" minOccurs="0" msdata:Ordinal="29" />
</xs:sequence>
- <xs:attribute name="Number" msprop:Generator_UserColumnName="Number" msprop:Generator_ColumnPropNameInRow="Number" msprop:Generator_ColumnVarNameInTable="columnNumber" msprop:Generator_ColumnPropNameInTable="NumberColumn" type="xs:string" />
- <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: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:complexType>
</xs:element>
</xs:sequence>
- <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: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:complexType>
</xs:element>
</xs:sequence>
- <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: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:complexType>
</xs:element>
</xs:choice>
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-03-04 14:21:06 UTC (rev 153)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-03-04 16:26:12 UTC (rev 154)
@@ -1,3 +1,28 @@
+#region Copyright (C) 2005-2007 Team MediaPortal
+
+/*
+ * Copyright (C) 2005-2007 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
using System;
using System.Collections;
using System.Windows.Forms;
@@ -14,9 +39,9 @@
using MediaPortal.Configuration;
using MediaPortal.Util;
+using NewStringLib;
-
namespace MesFilms
{
/// <summary>
@@ -26,6 +51,8 @@
{
#region Descriptif zones Ecran
+ const int ID_MesFilmsDetail = 7987;
+
enum Controls : int
{
CTRL_BtnSrtBy = 2,
@@ -50,11 +77,16 @@
CTRL_ImgGrStar3 = 1053,
CTRL_ImgGrStar4 = 1054,
CTRL_ImgGrStar5 = 1055,
+ CTRL_ImgHStar1 = 1056,
+ CTRL_ImgHStar2 = 1057,
+ CTRL_ImgHStar3 = 1058,
+ CTRL_ImgHStar4 = 1059,
+ CTRL_ImgHStar5 = 1060,
CTRL_ImgStar1 = 1061,
CTRL_ImgStar2 = 1062,
CTRL_ImgStar3 = 1063,
CTRL_ImgStar4 = 1064,
- CTRL_ImgStar5 = 1065,
+ CTRL_ImgStar5 = 1065
}
[SkinControlAttribute((int)Controls.CTRL_TxtSelect)]
protected GUIFadeLabel TxtSelect = null;
@@ -77,7 +109,11 @@
int Ctrl_DspImage2;
bool boolselect = false;
string StrSelect = null;
- string StrTxtSelect = " ";
+ string StrTitleSelect = null;
+ string StrFilmSelect = "";
+ string StrSort = null;
+ string StrActors = null;
+ string StrTxtSelect = "";
string StrStorage = null;
string StrIdentItem = null;
string StrSort1 = null;
@@ -91,7 +127,6 @@
string StrViewDfltText = null;
string StrFileXml = null;
string StrPathImg = null;
- string StrSort = null;
string StrSortSens = null;
public string WStrSort = null;
public string WStrSelect = null;
@@ -103,11 +138,15 @@
decimal w_rating = 0;
int l_index = 0;
string FileImage = "9999";
- private AntMovieCatalog mydivx;
+ AntMovieCatalog mydivx =new AntMovieCatalog();
private string StrPluginName = "Films";
private string CurrentConfig;
private int NbConfig;
+ string TitleDelim = null;
+ string Wstar;
+ private int LastID = 0;
+
#endregion
#region events
public delegate void FilmsStoppedHandler(int stoptime, string filename);
@@ -212,68 +251,11 @@
//---------------------------------------------------------------------------------------
public override void OnAction(Action actionType)
{
- if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) || (actionType.wID == Action.ActionType.ACTION_CONTEXT_MENU))
- // Previous Menu
+ if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU))// || (actionType.wID == Action.ActionType.ACTION_CONTEXT_MENU))
+ // Previous Menu (I disabled 'press menu button exits plugin' = very annoying)
{
- if (boolselect)
- {
- StrSelect = StrTitle1.ToString() + " not like ''";
- StrTxtSelect = " ";
- TxtSelect.Label = " ";
- boolreturn = false;
- boolselect = false;
- BtnSrtBy.Label = CurrentSortMethod;
- if (StrSortSens == " ASC")
- BtnSrtBy.IsAscending = true;
- else
- BtnSrtBy.IsAscending = false;
- Afficherliste();
- return;
- }
- if (boolreturn)
- {
- boolreturn = false;
- if (WStrSort == "YEAR")
- {
- BtnSrtBy.IsAscending = false;
- WStrSortSens = " DESC";
- }
- else
- {
- BtnSrtBy.IsAscending = true;
- WStrSortSens = " ASC";
- }
- if (WStrSort == "DateAdded")
- getSelectFromDivx(StrTitle1.ToString() + " not like ''", "Date", " DESC", "*");
- else
- getSelectFromDivx(StrTitle1.ToString() + " not like ''", WStrSort, WStrSortSens, "*");
- return;
- }
- else
- {
- if (StrTxtSelect == " ")
- {
- actionType.wID = Action.ActionType.ACTION_PREVIOUS_MENU;
- base.OnAction(actionType);
- save_config_values(false);
- mydivx.Dispose();
- return;
- }
- else
- {
- StrSelect = StrTitle1.ToString() + " not like ''";
- boolselect = false;
- BtnSrtBy.Label = CurrentSortMethod;
- if (StrSortSens == " ASC")
- BtnSrtBy.IsAscending = true;
- else
- BtnSrtBy.IsAscending = false;
- StrTxtSelect = " ";
- TxtSelect.Label = StrTxtSelect;
- Afficherliste();
- return;
- }
- }
+ if (GetPrevFilmList()) return;
+ //actionType.wID = Action.ActionType.ACTION_PREVIOUS_MENU; // exit plugin DEINIT Msg will call save func
}
base.OnAction(actionType);
}
@@ -284,6 +266,7 @@
{
int dControl = messageType.TargetControlId;
int iControl = messageType.SenderControlId;
+
switch (messageType.Message)
{
case GUIMessage.MessageType.GUI_MSG_WINDOW_INIT:
@@ -294,14 +277,13 @@
base.OnMessage(messageType);
g_Player.PlayBackStopped += new MediaPortal.Player.g_Player.StoppedHandler(OnPlayBackStopped);
g_Player.PlayBackEnded += new MediaPortal.Player.g_Player.EndedHandler(OnPlayBackEnded);
- mydivx = new AntMovieCatalog();
if (g_Player.Playing)
affich_overlay();
else
supprim_overlay();
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MyFilms.xml"))
{
- if (PreviousWindowId == 7987)
+ if (PreviousWindowId == ID_MesFilmsDetail)
{
CurrentConfig = xmlreader.GetValueAsString("MyFilms", "Current_Config", "");
Load_Config(CurrentConfig);
@@ -327,29 +309,57 @@
}
return true;
+ case GUIMessage.MessageType.GUI_MSG_WINDOW_DEINIT: //called when exiting plugin either by prev menu or pressing home button
+ save_config_values();
+ mydivx.Clear();
+ mydivx.Dispose();
+ return true; // fall through to call base class?
+
case GUIMessage.MessageType.GUI_MSG_ITEM_FOCUS_CHANGED:
//---------------------------------------------------------------------------------------
// Display Informations about List Item
//---------------------------------------------------------------------------------------
+ if ((iControl == (int)Controls.CTRL_List) && !(boolselect || (lsCtlFilm.SelectedListItemIndex > -1 && lsCtlFilm.SelectedListItem.IsFolder))) //xxxx
+ {
+ if (lsCtlFilm.SelectedListItemIndex > -1)
+ {
+ affichage_Lstdetail(lsCtlFilm.SelectedListItem.ItemId, true);
+ }
+ }
+ else
+ if (lsCtlFilm.SelectedListItemIndex > -1 && lsCtlFilm.SelectedListItem.IsFolder)
+ {
+ affichage_Lstdetail(lsCtlFilm.SelectedListItem.ItemId, false);
+ }
+ else
+ {
+ masquage_Lstdetail();
+ }
base.OnMessage(messageType);
- if ((iControl == (int)Controls.CTRL_List) && (!boolselect))
- affichage_Lstdetail(lsCtlFilm.SelectedListItemIndex);
- else
- masquage_Lstdetail();
return true;
case GUIMessage.MessageType.GUI_MSG_SETFOCUS:
//---------------------------------------------------------------------------------------
// Hide Informations about List Item
//---------------------------------------------------------------------------------------
- base.OnMessage(messageType);
- if ((dControl == (int)Controls.CTRL_List) && (!boolselect))
+// 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)
- affichage_Lstdetail(lsCtlFilm.SelectedListItemIndex);
+ {
+ affichage_Lstdetail(lsCtlFilm.SelectedListItem.ItemId,true);
+ }
}
else
- masquage_Lstdetail();
+ if (lsCtlFilm.SelectedListItemIndex > -1 && lsCtlFilm.SelectedListItem.IsFolder)
+ {
+ affichage_Lstdetail(lsCtlFilm.SelectedListItem.ItemId, false);
+ }
+ else
+ {
+ masquage_Lstdetail();
+ }
+ base.OnMessage(messageType);
return true;
case GUIMessage.MessageType.GUI_MSG_CLICKED:
@@ -374,8 +384,9 @@
if (control_searchText(keyboard.Text))
{
StrSelect = StrTitle1.ToString() + " like '*" + keyboard.Text + "*'";
- TxtSelect.Label = "Selection " + GUILocalizeStrings.Get(369) + " [*" + keyboard.Text + "*]";
- Afficherliste(...
[truncated message content] |
|
From: <ze...@us...> - 2007-03-04 16:39:16
|
Revision: 157
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=157&view=rev
Author: zebons
Date: 2007-03-04 08:39:07 -0800 (Sun, 04 Mar 2007)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/MyFilms/AssemblyInfo.cs
trunk/plugins/MyFilms/CString.cs
trunk/plugins/MyFilms/MesFilms.csproj.user
trunk/plugins/MyFilms/mesfilms.FxCop
Added: trunk/plugins/MyFilms/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyFilms/AssemblyInfo.cs (rev 0)
+++ trunk/plugins/MyFilms/AssemblyInfo.cs 2007-03-04 16:39:07 UTC (rev 157)
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Les informations générales relatives à un assembly dépendent de
+// l'ensemble d'attributs suivant. Changez les valeurs de ces attributs pour modifier les informations
+// associées à un assembly.
+[assembly: AssemblyTitle("MesFilms")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Personnel")]
+[assembly: AssemblyProduct("MesFilms")]
+[assembly: AssemblyCopyright("Copyright © Personnel 2006")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// L'affectation de la valeur false à ComVisible rend les types invisibles dans cet assembly
+// aux composants COM. Si vous devez accéder à un type dans cet assembly à partir de
+// COM, affectez la valeur true à l'attribut ComVisible sur ce type.
+[assembly: ComVisible(false)]
+
+// Le GUID suivant est pour l'ID de la typelib si ce projet est exposé à COM
+[assembly: Guid("d56acbdd-1a89-478f-8339-bf5e17d5554b")]
+
+// Les informations de version pour un assembly se composent des quatre valeurs suivantes :
+//
+// Version principale
+// Version secondaire
+// Numéro de build
+// Révision
+//
+// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de révision et de build par défaut
+// en utilisant '*', comme indiqué ci-dessous :
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
Added: trunk/plugins/MyFilms/CString.cs
===================================================================
--- trunk/plugins/MyFilms/CString.cs (rev 0)
+++ trunk/plugins/MyFilms/CString.cs 2007-03-04 16:39:07 UTC (rev 157)
@@ -0,0 +1,509 @@
+#region Copyright (C) 2005-2007 Team MediaPortal
+
+/*
+ * Copyright (C) 2005-2007 Team MediaPortal
+ * http://www.team-mediaportal.com
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+namespace NewStringLib
+{
+ /// <summary>
+ /// Implementing String Methods
+ /// </summary>
+ public class NewString
+ {
+ string myString;
+
+ #region ctor
+ public NewString() { myString = String.Empty; }
+ public NewString(string value) { myString = value; }
+ #endregion
+
+ #region Left, Right & Mid
+ /// <summary>Non-static version of function below. Operates on NewString object</summary>
+ public string Left(int length) { return Left(myString, length); }
+ /// <summary>Return left hand part of a string</summary>
+ /// <param name="source">string to split</param>
+ /// <param name="length">Number of characters to return</param>
+ /// <returns>Returns left part of the string OR complete original string if length less than 1</returns>
+ public static string Left(string source, int length)
+ {
+ if( source == null ) throw new ArgumentNullException("source");
+ if (length > 0)
+ return source.Substring(0, length);
+ else
+ return source;
+ }
+
+ /// <summary>Non-static version of function below. Operates on NewString object</summary>
+ public string Right(int length) { return Right(myString, length); }
+ /// <summary>Returns right part of a string</summary>
+ /// <param name="source">string to split</param>
+ /// <param name="length">Number of characters to return</param>
+ /// <returns>Returns right part of the string OR complete original string if length less than 1</returns>
+ public static string Right(string source, int length)
+ {
+ if (source == null) throw new ArgumentNullException("source");
+
+ if (length > 0)
+ return source.Substring(source.Length - length);
+ else
+ return source;
+ }
+
+ /// <summary>Non-static version of function below. Operates on NewString object</summary>
+ public string Mid(int index) { return Mid(myString, index); }
+ /// <summary>Returns right part of a string</summary>
+ /// <param name="source">string to split</param>
+ /// <param name="index">Position in string to return from to end of string</param>
+ /// <returns>Returns right part of the string</returns>
+ public static string Mid(string source, int index)
+ {
+ if (source == null) throw new ArgumentNullException("source");
+ return source.Substring(index);
+ }
+
+
+ /// <summary>Non-static version of function below. Operates on NewString object</summary>
+ public string Mid(int index, int length) { return Mid(myString, index, length); }
+ /// <summary>Returns middle part of a string</summary>
+ /// <param name="source">string to split</param>
+ /// <param name="index">Position in string to start extract</param>
+ /// <param name="length">Number of characters to extract</param>
+ /// <returns>Returns middle part of string</returns>
+ public static string Mid(string source, int index, int length)
+ {
+ if (source == null) throw new ArgumentNullException("source");
+ return source.Substring(index, length);
+ }
+ #endregion
+
+
+ #region Positional functions
+ /// <summary>Searches for substring in string</summary>
+ /// <param name="findText">string to look for</param>
+ /// <param name="source">string to search within</param>
+ /// <returns>Position in string of first match</returns>
+ public static int Pos(string findText, string source)
+ {
+ if (source == null) throw new ArgumentNullException("source");
+
+ return source.IndexOf(findText);
+ }
+
+ /// <summary>Non-static version of function below. Operates on NewString object</summary>
+ public int PPos(string findText, int index) { return myString.IndexOf(findText, index); }
+ /// <summary>Searches for substring in string</summary>
+ /// <param name="findText">string to look for</param>
+ /// <param name="source">string to search within</param>
+ /// <param name="index">Position in string to begin searching from</param>
+ /// <returns>Position in string of next match</returns>
+ public static int PPos(string findText, string source, int index)
+ {
+ if (findText == null) throw new ArgumentNullException("findText");
+ if (source == null) throw new ArgumentNullException("source");
+ return source.IndexOf(findText, index);
+ }
+
+ /// <summary>Non-static version of function below. Operates on NewString object</summary>
+ public int NPos(string findText, int count, bool asChars) { return NPos(findText, myString, count, asChars); }
+ /// <summary>Searches for position of nth substring in string</summary>
+ /// <param name="findText">string to look for</param>
+ /// <param name="findText">string to look for</param>
+ /// <param name="source">string to search within</param>
+ /// <param name="count">find n'th match in string. If negative search backwards from end of string for -n'th match</param>
+ /// <param name="asChars">If true treat findText as a character array, matching on ANY char</param>
+ /// <returns>Position in string of n'th match</returns>
+ public static int NPos(string findText, string source, int count, bool asChars)
+ {
+ int index;
+ int iLen;
+ char[] sFindArray;
+
+ if (findText == null) throw new ArgumentNullException("findText");
+ if (source == null) throw new ArgumentNullException("source");
+
+ iLen = (asChars) ? 1 : findText.Length;
+ sFindArray = findText.ToCharArray();
+
+ if (count < 0)
+ {
+ index = NPos(Reverse(findText), Reverse(source), count * -1, asChars);
+ if (index != -1) index = source.Length - index - iLen;
+ return index;
+ }
+
+ index = -iLen;
+ do
+ {
+ index = (asChars) ? source.IndexOfAny(sFindArray, index + 1) : source.IndexOf(findText, index + iLen);
+ count--;
+ }while (index >= 0 && count > 0);
+ if (count > 0) index = -1; //not found enough
+ return index;
+ }
+
+ /// <summary>Non-static version of function below. Operates on NewString object</summary>
+ public int PosCount(string findText, bool asChars) { return PosCount(findText, myString, asChars); }
+ /// <summary>count how many substrings are present in the string</summary>
+ /// <param name="findText">string to look for</param>
+ /// <param name="source">string to search within</param>
+ /// <param name="asChars">If true treat findText as a character array, matching on ANY char</param>
+ /// <returns>Count of substrings found</returns>
+ public static int PosCount(string findText, string source, bool asChars)
+ {
+ int index;
+ int count=-1;
+ int iLen;
+ char[] sFindArray;
+
+ if (findText == null) throw new ArgumentNullException("findText");
+ if (source == null) throw new ArgumentNullException("source");
+
+ iLen = (asChars) ? 1 : findText.Length;
+ sFindArray = findText.ToCharArray();
+
+ index = -iLen;
+ do
+ {
+ index = (asChars) ? source.IndexOfAny(sFindArray, index+1) : source.IndexOf(findText, index+iLen);
+ count++;
+ } while (index >= 0);
+ return count;
+ }
+ #endregion
+
+ #region Positional extraction functions
+ /// <summary>Non-static version of function below. Operates on NewString object</summary>
+ public string NPosMid(string findText, int startCount, int endCount, bool include, bool asChars)
+ { return NPosMid(findText, myString, startCount, endCount, include, asChars); }
+ /// <summary>Gets the middle string between 2 matches of a substring in a string</summary>
+ /// <param name="findText">string to look for</param>
+ /// <param name="source">string to search within</param>
+ /// <param name="startCount">Find n'th match in string. If negative search back from end of string. If 0 or no match grab from string start</param>
+ /// <param name="endCount">Find n'th match in string. If negative search back from end of string. If 0 or no match grab to string end</param>
+ /// <param name="include">If true include the findText substring in returned string</param>
+ /// <param name="asChars">If true treat findText as a character array, matching on ANY char</param>
+ /// <returns>Middle string Between n'th and n'th match of findText in source</returns>
+ public static string NPosMid(string findText, string source, int startCount, int endCount, bool include, bool asChars)
+ {
+ int iLen;
+
+ if (findText == null) throw new ArgumentNullException("findText");
+ if (source == null) throw new ArgumentNullException("source");
+
+ iLen = (asChars) ? 1 : findText.Length;
+
+ if (startCount != 0) //dont bother looking if 0
+ {
+ startCount = NPos(findText, source, startCount, asChars); //get pos of begin'th occurrence
+ if (startCount >= 0 && !include) startCount += iLen;
+ }
+ // else (leave as 0 no need to = -1)
+
+ if (endCount != 0)
+ {
+ endCount = NPos(findText, source, endCount, asChars); //get pos of end'th occurrence
+ if (endCount >= 0 && include) endCount += iLen;
+ }
+ else
+ endCount = -1; //dont bother looking if 0, set -1 for later
+
+ if (startCount < 0) startCount = 0; //set startCount to start of str
+ if (endCount < 0) endCount = source.Length; //set endCount to end of str+1
+
+ return source.Substring(startCount, endCount - startCount);
+ }
+
+
+ /// <summary>Non-static version of function below. Operates on NewString object</summary>
+ public string NPosLeft(string findText, int count, bool include, bool asChars)
+ { return NPosMid(findText, myString, 0, count, include, asChars); }
+ /// <summary>Gets the left part of a string before the n'th match of a substring in a string</summary>
+ /// <param name="findText">string to look for</param>
+ /// <param name="source">string to search within</param>
+ /// <param name="count">Find n'th match in string. If negative search back from end of string. If 0 or no match grab from string start</param>
+ /// <param name="include">If true include the findText substring in returned string</param>
+ /// <param name="asChars">If true treat findText as a character array, matching on ANY char</param>
+ /// <returns>Left string before n'th match of findText in source</returns>
+ public static string NPosLeft(string findText, string source, int count, bool include, bool asChars)
+ { return NPosMid(findText, source, 0, count, include, asChars); }
+
+ /// <summary>Non-static version of function below. Operates on NewString object</summary>
+ public string PosLeft(string findText)
+ { return NPosMid(findText, myString, 0, 1, false, false); }
+ /// <summary>Gets the left part of a string before the first match of a substring in a string</summary>
+ /// <param name="findText">string to look for</param>
+ /// <param name="source">string to search within</param>
+ /// <returns>Left string before first match of findText in source</returns>
+ public static string PosLeft(string findText, string source)
+ { return NPosMid(findText, source, 0, 1, false, false); }
+
+
+ /// <summary>Non-static version of function below. Operates on NewString object</summary>
+ public string NPosRight(string findText, int count, bool include, bool asChars)
+ { return NPosMid(findText, myString, count, 0, include, asChars); }
+ /// <summary>Gets the right part of a string after the n'th match of a substring in a string</summary>
+ /// <param name="findText">String to look for</param>
+ /// <param name="source">String to search within</param>
+ /// <param name="count">Find n'th match in string. If negative search back from end of string. If 0 or no match grab to end of string</param>
+ /// <param name="include">If true include the findText substring in returned string</param>
+ /// <param name="asChars">If true treat findText as a character array, matching on ANY char</param>
+ /// <returns>Right string after n'th match of findText in source</returns>
+ public static string NPosRight(string findText, string source, int count, bool include, bool asChars)
+ { return NPosMid(findText, source, count, 0, include, asChars); }
+
+ /// <summary>Non-static version of function below. Operates on NewString object</summary>
+ public string PosRight(string findText)
+ { return NPosMid(findText, myString, 1, 0, false, false); }
+ /// <summary>Gets the right part of a string after the first match of a substring in a string</summary>
+ /// <param name="findText">String to look for</param>
+ /// <param name="source">String to search within</param>
+ /// <returns>Right string after first match of findText in source</returns>
+ public static string PosRight(string findText, string source)
+ { return NPosMid(findText, source, 1, 0, false, false); }
+ #endregion
+
+ #region Search & Replace functions
+ /// <summary>Non-static version of function below. Operates on NewString object</summary>
+ public string NPosReplaceString(string findText, string replaceText, int count)
+ { return NPosReplaceString(findText, replaceText, myString, count); }
+ /// <summary>Replaces all occurences of findText with replaceText in sStr from after n'th instance of findText</summary>
+ /// <param name="findText">String to look for</param>
+ /// <param name="replaceText">String to replace it with</param>
+ /// <param name="source">String to search within</param>
+ /// <param name="count">Find n'th match in string.</param>
+ /// <returns>New string with replacements</returns>
+ public static string NPosReplaceString(string findText, string replaceText, string source, int count)
+ {
+ string source2;
+
+ if (findText == null) throw new ArgumentNullException("findText");
+ if (replaceText == null) throw new ArgumentNullException("replaceText");
+ if (source == null) throw new ArgumentNullException("source");
+
+ source2 = NPosRight(findText, source, count, false, false);
+ if (source2.Length != 0)
+ return source.Substring(0, source.Length - source2.Length) + source2.Replace(findText, replaceText);
+ else
+ return source;
+ }
+
+
+ /// <summary>Non-static version of function below. Operates on NewString object</summary>
+ public string PosReplaceString(string startText, string endText, string replaceText, int index)
+ { return PosReplaceString(startText, endText, replaceText, myString, index); }
+ /// <summary>Replaces all occurences of text between 2 different substrings with a 3rd substring</summary>
+ /// <param name="startText">String to look for to begin replace</param>
+ /// <param name="endText">String to look for to end replace. Can be empty "" to just replace sFindBegs not range between</param>
+ /// <param name="replaceText">String to replace it with. Can be empty "" to just erase each match</param>
+ /// <param name="source">String to search within</param>
+ /// <param name="index">Position in string to begin search/replacing from</param>
+ /// <returns>New string with replacements</returns>
+ public static string PosReplaceString(string startText, string endText, string replaceText, string source, int index)
+ {
+ int pEnd;
+
+ if (startText == null) throw new ArgumentNullException("startText");
+ if (endText == null) throw new ArgumentNullException("endText");
+ if (replaceText == null) throw new ArgumentNullException("replaceText");
+ if (source == null) throw new ArgumentNullException("source");
+
+ if (index < 0) index = 0;
+ while (true)
+ {
+ index = source.IndexOf(startText, index);
+ if (index == -1) break;
+
+ if (endText.Length != 0)
+ {
+ pEnd = source.IndexOf(endText, index + 1);
+ if (pEnd == -1) break;
+ pEnd = pEnd + endText.Length;
+ }
+ else
+ pEnd = index + startText.Length;
+
+ source = source.Remove(index, pEnd - index);
+ if (replaceText.Length != 0) source = source.Insert(index, replaceText);
+ index = index + replaceText.Length;
+ if (index > source.Length) break;
+ }
+ return source;
+ }
+
+
+ /// <summary>Non-static version of function below. Operates on NewString object</summary>
+ public string PosReplace(string replaceText, int index)
+ { return PosReplace(replaceText, myString, index); }
+ /// <summary>Replace text of equel length to new text with the new text</summary>
+ /// <param name="replaceText">String to replace</param>
+ /// <param name="index">Position in string to replace at</param>
+ /// <returns>New string with replacements</returns>
+ public static string PosReplace(string replaceText, string source, int index)
+ {
+ if (replaceText == null) throw new ArgumentNullException("replaceText");
+ if (source == null) throw new ArgumentNullException("source");
+
+ source = source.Remove(index, replaceText.Length);
+ source = source.Insert(index, replaceText);
+ return source;
+ }
+
+
+ /// <summary>Non-static version of function below. Operates on NewString object</summary>
+ public string StripChars(string strip)
+ { return StripChars(strip, myString); }
+ /// <summary>Removes all chars in supplied string</summary>
+ /// <param name="strip">String of chars to remove from string</param>
+ /// <param name="source">String to search within</param>
+ /// <returns>New string without strip within it</returns>
+ public static string StripChars(string strip, string source)
+ {
+ if (strip == null) throw new ArgumentNullException("strip");
+ if (source == null) throw new ArgumentNullException("source");
+
+ for (int i = 0; i < strip.Length; i++)
+ source = source.Replace(strip.Substring(i, 1), null);
+ return source; // xxx check if original affected
+ }
+ #endregion
+
+
+ #region Conversion functions
+ /// <summary>Convert String to ProperCase</summary>
+ /// <param name="source">String to be converted to ProperCase</param>
+ /// <returns>The ProperCase String</returns>
+ public string ProperCase(){return ProperCase (myString);}
+ public static string ProperCase(string source)
+ {
+ char[] sFindArray = { ' ', '\t', '\n', '.' };
+ int index = 0;
+ char[] sArray;
+
+ if (source == null) throw new ArgumentNullException("source");
+
+ sArray = source.ToCharArray();
+
+ do
+ {
+ sArray[index] = Char.ToUpper(sArray[index], CultureInfo.CurrentCulture);
+ index = source.IndexOfAny(sFindArray, index) + 1;
+ } while (index > 0 && index < source.Length);
+ return new string(sArray);
+ }
+
+
+ /// <summary>Recursion Reverse function to Reverse a given String</summary>
+ /// <param name="source">String to be Reversed</param>
+ /// <returns>The Reversed string</returns>
+ public string Reverse() { return Reverse(myString); }
+ public static string Reverse(string source)
+ {
+ if (source == null) throw new ArgumentNullException("source");
+
+ if (source.Length == 1)
+ {
+ return source;
+ }
+ else
+ {
+ return Reverse( source.Substring(1) ) + source.Substring(0,1);
+ }
+ }
+
+
+ /// <summary>Converts any multiple adjacent spaces to a single space</summary>
+ /// <returns>The trimmed string</returns>
+ public string TrimToSingleSpace() { return TrimToSingleSpace(myString); }
+ public static string TrimToSingleSpace(string source)
+ {
+ int intPos;
+
+ if (source == null) throw new ArgumentNullException("source");
+
+ intPos = source.IndexOf(" ");
+ if (intPos == -1)
+ {
+ return source;
+ }
+ else
+ {
+ return TrimToSingleSpace(source.Substring(0,intPos) + source.Substring(intPos+1));
+ }
+ }
+ #endregion
+
+
+ #region Non_String_functions
+ // -------- NON-STRING BUT USEFUL FUNCS ADDED HERE FOR NOW ------------
+
+ /// <summary>Returns the smaller of 2 values</summary>
+ /// <param name="val1">First value to compare</param>
+ /// <param name="val2">Second value to compare</param>
+ /// <returns>Smaller value</returns>
+ public static T Min<T>(T val1, T val2)
+ {
+ T retVal = val2;
+ if (Comparer<T>.Default.Compare(val1, val2) < 0)
+ retVal = val1;
+ return retVal;
+ }
+
+ /// <summary>Returns the greater of 2 values</summary>
+ /// <param name="val1">First value to compare</param>
+ /// <param name="val2">Second value to compare</param>
+ /// <returns>Greater value value</returns>
+ public static T Max<T>(T val1, T val2)
+ {
+ T retVal = val1;
+ if (Comparer<T>.Default.Compare(val1, val2) < 0)
+ retVal = val2;
+ return retVal;
+ }
+ #endregion
+
+
+ //private static void Test()
+ //{
+ // string text1 = "the.cat.sat.on.the.mat";
+ // string text2 = "The cat sat on the mat the cat";
+ // string text;
+ // int index;
+
+ // text = Left(text1, 5); //the.c"
+ // text = Mid(text1, 5, 5); // "at.sa"
+ // text = Right(text1, 5); // "e.mat"
+ // index = NPos("the", text1, 2, false); //15
+ // text = NPosMid(".", text1, 2, -2, false, false); // "sat.on"
+ // text = PosReplaceString(".", ".", "-blah-", text1, 4); // "the.cat-blah-on-blah-mat"
+ // text = ProperCase(text1); //"The.Cat.Sat.On.The.Mat"
+ // text = Reverse(text1); //"tam.eht.no.tas.tac.eht"
+ // text = TrimToSingleSpace(text2); // "The cat sat on the mat the cat"
+ // text = StripChars("aeiou", text1); // "th.ct.st.n.th.mt"
+ // text = NPosReplaceString("the", "a", text1, 0); //"a.cat.sat.on.a.mat";
+ //}
+ }
+}
Added: trunk/plugins/MyFilms/MesFilms.csproj.user
===================================================================
--- trunk/plugins/MyFilms/MesFilms.csproj.user (rev 0)
+++ trunk/plugins/MyFilms/MesFilms.csproj.user 2007-03-04 16:39:07 UTC (rev 157)
@@ -0,0 +1,13 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ReferencePath>D:\devel\vs2005\mediaportal\xbmc\bin\Debug\;D:\devel\vs2005\mediaportal\xbmc\bin\Debug\plugins\windows\</ReferencePath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <StartAction>Program</StartAction>
+ <StartProgram>D:\devel\vs2005\mediaportal\xbmc\bin\Debug\MediaPortal.exe</StartProgram>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <StartAction>Program</StartAction>
+ <StartProgram>D:\devel\vs2005\mediaportal\xbmc\bin\Release\MediaPortal.exe</StartProgram>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Added: trunk/plugins/MyFilms/mesfilms.FxCop
===================================================================
--- trunk/plugins/MyFilms/mesfilms.FxCop (rev 0)
+++ trunk/plugins/MyFilms/mesfilms.FxCop 2007-03-04 16:39:07 UTC (rev 157)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FxCopProject Version="1.35" Name="My FxCop Project">
+ <ProjectOptions>
+ <SharedProject>True</SharedProject>
+ <Stylesheet Apply="False">http://www.gotdotnet.com/team/fxcop//xsl/1.35/FxCopReport.xsl</Stylesheet>
+ <SaveMessages>
+ <Project Status="Active, Excluded" NewOnly="False" />
+ <Report Status="Active" NewOnly="False" />
+ </SaveMessages>
+ <ProjectFile Compress="True" DefaultTargetCheck="True" DefaultRuleCheck="True" SaveByRuleGroup="" Deterministic="True" />
+ <EnableMultithreadedLoad>True</EnableMultithreadedLoad>
+ <EnableMultithreadedAnalysis>True</EnableMultithreadedAnalysis>
+ <SourceLookup>True</SourceLookup>
+ <AnalysisExceptionsThreshold>10</AnalysisExceptionsThreshold>
+ <RuleExceptionsThreshold>1</RuleExceptionsThreshold>
+ <Spelling Locale="en-us" />
+ <VersionAware>False</VersionAware>
+ <OverrideRuleVisibilities>False</OverrideRuleVisibilities>
+ <CustomDictionaries SearchFxCopDir="True" SearchUserProfile="True" SearchProjectDir="True" />
+ <SearchGlobalAssemblyCache>False</SearchGlobalAssemblyCache>
+ <DeadlockDetectionTimeout>120</DeadlockDetectionTimeout>
+ </ProjectOptions>
+ <Targets>
+ <Target Name="$(ProjectDir)/../mediaportal/xbmc/bin/Debug/Core.dll" Analyze="False" AnalyzeAllChildren="False" />
+ <Target Name="$(ProjectDir)/../mediaportal/xbmc/bin/Debug/plugins/windows/MesFilms.dll" Analyze="True" AnalyzeAllChildren="False">
+ <Modules AnalyzeAllChildren="False">
+ <Module Name="mesfilms.dll" Analyze="True" AnalyzeAllChildren="False">
+ <Namespaces AnalyzeAllChildren="False">
+ <Namespace Name="NewStringLib" Analyze="True" AnalyzeAllChildren="True" />
+ </Namespaces>
+ <Resources AnalyzeAllChildren="False" />
+ </Module>
+ </Modules>
+ </Target>
+ </Targets>
+ <Rules>
+ <RuleFiles>
+ <RuleFile Name="$(FxCopDir)\Rules\DesignRules.dll" Enabled="True" AllRulesEnabled="True" />
+ <RuleFile Name="$(FxCopDir)\Rules\GlobalizationRules.dll" Enabled="True" AllRulesEnabled="True" />
+ <RuleFile Name="$(FxCopDir)\Rules\InteroperabilityRules.dll" Enabled="True" AllRulesEnabled="True" />
+ <RuleFile Name="$(FxCopDir)\Rules\MobilityRules.dll" Enabled="True" AllRulesEnabled="True" />
+ <RuleFile Name="$(FxCopDir)\Rules\NamingRules.dll" Enabled="True" AllRulesEnabled="True" />
+ <RuleFile Name="$(FxCopDir)\Rules\PerformanceRules.dll" Enabled="True" AllRulesEnabled="True" />
+ <RuleFile Name="$(FxCopDir)\Rules\PortabilityRules.dll" Enabled="True" AllRulesEnabled="True" />
+ <RuleFile Name="$(FxCopDir)\Rules\SecurityRules.dll" Enabled="True" AllRulesEnabled="True" />
+ <RuleFile Name="$(FxCopDir)\Rules\UsageRules.dll" Enabled="True" AllRulesEnabled="True" />
+ </RuleFiles>
+ <Groups />
+ <Settings />
+ </Rules>
+ <FxCopReport Version="1.35">
+ <Namespaces>
+ <Namespace Name="NewStringLib">
+ <Messages>
+ <Message TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020" Status="Excluded" Created="2007-02-17 13:12:35Z">
+ <Issue>
+ <Item>NewStringLib</Item>
+ </Issue>
+ </Message>
+ </Messages>
+ </Namespace>
+ </Namespaces>
+ <Targets>
+ <Target Name="$(ProjectDir)/../mediaportal/xbmc/bin/Debug/plugins/windows/MesFilms.dll">
+ <Modules>
+ <Module Name="mesfilms.dll">
+ <Messages>
+ <Message TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209" Created="2007-02-17 12:07:04Z">
+ <Issue>
+ <Item>MesFilms</Item>
+ </Issue>
+ </Message>
+ <Message TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210" Created="2007-02-17 12:07:04Z">
+ <Issue Name="NoStrongName">
+ <Item>MesFilms</Item>
+ </Issue>
+ </Message>
+ <Message TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014" Created="2007-02-17 12:07:04Z">
+ <Issue Name="NoAttr">
+ <Item>MesFilms</Item>
+ </Issue>
+ </Message>
+ </Messages>
+ </Module>
+ </Modules>
+ </Target>
+ </Targets>
+ <Rules>
+ <Rule TypeName="AssembliesShouldDeclareMinimumSecurity" Category="Microsoft.Usage" CheckId="CA2209">
+ <Resolution Name="Default">No valid permission requests were found for assembly '{0}'. You should always specify the minimum security permissions using SecurityAction.RequestMinimum.</Resolution>
+ </Rule>
+ <Rule TypeName="AssembliesShouldHaveValidStrongNames" Category="Microsoft.Design" CheckId="CA2210">
+ <Resolution Name="NoStrongName">Sign '{0}' with a strong name key.</Resolution>
+ </Rule>
+ <Rule TypeName="AvoidNamespacesWithFewTypes" Category="Microsoft.Design" CheckId="CA1020">
+ <Resolution Name="Default">Consider merging the types defined in '{0}' with another namespace.</Resolution>
+ </Rule>
+ <Rule TypeName="MarkAssembliesWithClsCompliant" Category="Microsoft.Design" CheckId="CA1014">
+ <Resolution Name="NoAttr">'{0}' should be marked with CLSCompliantAttribute and its value should be true.</Resolution>
+ </Rule>
+ </Rules>
+ </FxCopReport>
+</FxCopProject>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-03-05 06:56:21
|
Revision: 158
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=158&view=rev
Author: zebons
Date: 2007-03-04 22:56:19 -0800 (Sun, 04 Mar 2007)
Log Message:
-----------
Suppress of Mepo Green skin (not compatible with 0.2.2.x)
Removed Paths:
-------------
trunk/plugins/MyFilms/skin/MePo Green Wide/
Property Changed:
----------------
trunk/plugins/MyFilms/
Property changes on: trunk/plugins/MyFilms
___________________________________________________________________
Name: svn:ignore
+ bin
obj
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-03-10 23:27:31
|
Revision: 177
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=177&view=rev
Author: zebons
Date: 2007-03-10 15:27:29 -0800 (Sat, 10 Mar 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilms.csproj
trunk/plugins/MyFilms/MesFilms.suo
trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
trunk/plugins/MyFilms/MesFilmsSetup.cs
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-03-10 14:46:25 UTC (rev 176)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-03-10 23:27:29 UTC (rev 177)
@@ -580,8 +580,8 @@
if (boolselect)
{
string sLabel = lsCtlFilm.SelectedListItem.Label;
- if (WStrSort == "DateAdded")
- StrSelect = "Date" + " like '" + DateTime.Parse(sLabel).ToShortDateString() + "'";
+ if (WStrSort == "Date")
+ StrSelect = "Date" + " like '" + string.Format("{0:dd/MM/yyyy}",DateTime.Parse(sLabel).ToShortDateString()) + "'";
else
{
if (sLabel == "")
@@ -1006,13 +1006,13 @@
else
{
champselect = enr[WStrSort].ToString();
- arSplit = champselect.Split(Sep, StringSplitOptions.None);//will add "" entries also, //StringSplitOptions.RemoveEmptyEntries
- for (wi = 0; wi < arSplit.Length; wi++)
- if (arSplit[wi].IndexOf("(") > 0)
- w_tableau.Add(arSplit[wi].Substring(0, arSplit[wi].IndexOf("(")).Trim());
- else
- w_tableau.Add(arSplit[wi].Trim());
}
+ arSplit = champselect.Split(Sep, StringSplitOptions.None);//will add "" entries also, //StringSplitOptions.RemoveEmptyEntries
+ for (wi = 0; wi < arSplit.Length; wi++)
+ if (arSplit[wi].IndexOf("(") > 0)
+ w_tableau.Add(arSplit[wi].Substring(0, arSplit[wi].IndexOf("(")).Trim());
+ else
+ w_tableau.Add(arSplit[wi].Trim());
}
if (WStrSortSens == " ASC")
w_tableau.Sort(0, w_tableau.Count, null);
@@ -1225,7 +1225,10 @@
{
if (StrViewDfltText.Length == 0)
{
- Change_view(StrViewDfltItem);
+ if (StrViewDfltItem == StrViewItem1)
+ Change_view("View1");
+ else
+ Change_view("View2");
}
else
// View List as selected
@@ -1315,7 +1318,7 @@
return;
}
if (choice_view == "View1")
- {
+ {
// Change View by "View1":
WStrSort = StrViewItem1; // specific user View1
WStrSortSens = " ASC";
Modified: trunk/plugins/MyFilms/MesFilms.csproj
===================================================================
--- trunk/plugins/MyFilms/MesFilms.csproj 2007-03-10 14:46:25 UTC (rev 176)
+++ trunk/plugins/MyFilms/MesFilms.csproj 2007-03-10 23:27:29 UTC (rev 177)
@@ -31,7 +31,7 @@
<ItemGroup>
<Reference Include="Core, Version=1.0.2548.1824, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\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>
@@ -50,7 +50,7 @@
<Reference Include="System.Xml" />
<Reference Include="Utils, Version=1.0.2548.1816, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\MesFilms\Core_Stable\Utils.DLL</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Svn\Utils.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/MyFilms/MesFilms.suo
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-03-10 14:46:25 UTC (rev 176)
+++ trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-03-10 23:27:29 UTC (rev 177)
@@ -141,6 +141,7 @@
this.AntUpdItem1 = new System.Windows.Forms.ComboBox();
this.AntUpdText1 = new System.Windows.Forms.TextBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
+ this.TitleDelim = new System.Windows.Forms.TextBox();
this.label9 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.AntTitle2 = new System.Windows.Forms.ComboBox();
@@ -160,7 +161,6 @@
this.View_Dflt_Text = new System.Windows.Forms.TextBox();
this.ButDelet = new System.Windows.Forms.Button();
this.Config_Dflt = new System.Windows.Forms.CheckBox();
- this.TitleDelim = new System.Windows.Forms.TextBox();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
@@ -618,6 +618,14 @@
this.groupBox5.TabStop = false;
this.groupBox5.Text = "AnTitle Order";
//
+ // TitleDelim
+ //
+ this.TitleDelim.Location = new System.Drawing.Point(357, 19);
+ this.TitleDelim.MaxLength = 1;
+ this.TitleDelim.Name = "TitleDelim";
+ this.TitleDelim.Size = new System.Drawing.Size(20, 20);
+ this.TitleDelim.TabIndex = 20;
+ //
// label9
//
this.label9.AutoSize = true;
@@ -689,11 +697,11 @@
// label10
//
this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(755, 40);
+ this.label10.Location = new System.Drawing.Point(746, 40);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(60, 13);
+ this.label10.Size = new System.Drawing.Size(69, 13);
this.label10.TabIndex = 34;
- this.label10.Text = "Version 4.0";
+ this.label10.Text = "Version 4.0.1";
//
// textBox1
//
@@ -823,14 +831,6 @@
this.Config_Dflt.UseVisualStyleBackColor = true;
this.Config_Dflt.Enter += new System.EventHandler(this.Config_Name_Control);
//
- // TitleDelim
- //
- this.TitleDelim.Location = new System.Drawing.Point(357, 19);
- this.TitleDelim.MaxLength = 1;
- this.TitleDelim.Name = "TitleDelim";
- this.TitleDelim.Size = new System.Drawing.Size(20, 20);
- this.TitleDelim.TabIndex = 20;
- //
// MesFilmsSetup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-03-10 14:46:25 UTC (rev 176)
+++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-03-10 23:27:29 UTC (rev 177)
@@ -394,6 +394,11 @@
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;
+ 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)"))
+ View_Dflt_Item.Items.Add(AntViewItem2.Text);
+ View_Dflt_Item.Items.Remove("");
}
private void Refresh_Items()
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <du...@us...> - 2007-03-24 12:57:03
|
Revision: 217
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=217&view=rev
Author: dukus
Date: 2007-03-24 05:56:46 -0700 (Sat, 24 Mar 2007)
Log Message:
-----------
First attempt to implement a support for DVDProfiler
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilms.csproj
trunk/plugins/MyFilms/MesFilms.suo
trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
trunk/plugins/MyFilms/MesFilmsSetup.cs
Added Paths:
-----------
trunk/plugins/MyFilms/CatalogConverter.cs
Added: trunk/plugins/MyFilms/CatalogConverter.cs
===================================================================
--- trunk/plugins/MyFilms/CatalogConverter.cs (rev 0)
+++ trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-24 12:56:46 UTC (rev 217)
@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Xml;
+
+namespace MesFilms
+{
+ class CatalogConverter
+ {
+ public Dictionary<string, string> ProfilerDict;
+
+ public CatalogConverter()
+ {
+ ProfilerDict = new Dictionary<string, string>();
+ ProfilerDict.Add("Title", "OriginalTitle");
+ ProfilerDict.Add("SortTitle", "TranslatedTitle");
+ ProfilerDict.Add("SortTitle1", "FormattedTitle");
+ ProfilerDict.Add("CollectionNumber", "Number");
+ ProfilerDict.Add("Rating", "Rating");
+ ProfilerDict.Add("Year", "Year");
+ ProfilerDict.Add("RunningTime", "Length");
+ ProfilerDict.Add("Actors", "Actors");
+ ProfilerDict.Add("Genres", "Category");
+ ProfilerDict.Add("Credits", "Director");
+ ProfilerDict.Add("Overview", "Description");
+ ProfilerDict.Add("Picture", "Picture");
+ }
+
+ public string ConvertProfiler(string source)
+ {
+ string destFile = Path.GetTempPath()+@"\"+"AntTempFile.xml";
+ XmlTextWriter destXml = new XmlTextWriter(destFile,Encoding.Default);
+ destXml.Formatting = Formatting.Indented;
+ destXml.WriteStartDocument();
+ //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");
+ //destXml.WriteEndElement();
+ destXml.WriteStartElement("Catalog");
+ destXml.WriteElementString("Properties", "");
+ destXml.WriteStartElement("Contents");
+ try
+ {
+ XmlDocument doc = new XmlDocument();
+ doc.Load(source);
+ XmlNodeList dvdList = doc.DocumentElement.SelectNodes("/Collection/DVD");
+ foreach (XmlNode nodeDVD in dvdList)
+ {
+ destXml.WriteStartElement("Movie");
+ XmlNode nodeID = nodeDVD.SelectSingleNode("ID");
+ XmlNode nodeNumber = nodeDVD.SelectSingleNode("CollectionNumber");
+ XmlNode nodeTitle = nodeDVD.SelectSingleNode("Title");
+ XmlNode nodeRating = nodeDVD.SelectSingleNode("Rating");
+ XmlNode nodeYear = nodeDVD.SelectSingleNode("ProductionYear");
+ XmlNode nodeDuration = nodeDVD.SelectSingleNode("RunningTime");
+ XmlNode nodeOverview = nodeDVD.SelectSingleNode("Overview");
+
+ string genre = String.Empty;
+ XmlNodeList genreList = nodeDVD.SelectNodes("Genres/Genre");
+ foreach (XmlNode nodeGenre in genreList)
+ {
+ if (genre.Length > 0) genre += " / ";
+ genre += nodeGenre.InnerText;
+ }
+ string cast = String.Empty;
+ XmlNodeList actorsList = nodeDVD.SelectNodes("Actors/Actor");
+ foreach (XmlNode nodeActor in actorsList)
+ {
+ string firstname = String.Empty;
+ string lastname = String.Empty;
+ string role = String.Empty;
+ XmlNode nodeFirstName = nodeActor.SelectSingleNode("FirstName");
+ XmlNode nodeLastName = nodeActor.SelectSingleNode("LastName");
+ XmlNode nodeRole = nodeActor.SelectSingleNode("Role");
+ if (nodeFirstName != null && nodeFirstName.InnerText != null) firstname = nodeFirstName.InnerText;
+ if (nodeLastName != null && nodeLastName.InnerText != null) lastname = nodeLastName.InnerText;
+ if (nodeRole != null && nodeRole.InnerText != null) role = nodeRole.InnerText;
+ string line = String.Format("{0} {1} as {2}\n", firstname, lastname, role);
+ cast += line;
+ }
+
+ string credits = String.Empty;
+ XmlNodeList creditsList = nodeDVD.SelectNodes("Credits/Credit");
+ foreach (XmlNode nodeCredit in creditsList)
+ {
+ string firstname = String.Empty;
+ string lastname = String.Empty;
+ XmlNode nodeFirstName = nodeCredit.SelectSingleNode("FirstName");
+ XmlNode nodeLastName = nodeCredit.SelectSingleNode("LastName");
+ XmlNode nodeType = nodeCredit.SelectSingleNode("CreditSubtype");
+ if (nodeType != null && nodeType.InnerText != null && nodeType.InnerText == "Director")
+ {
+ if (credits.Length > 0) credits += " / ";
+ if (nodeFirstName != null && nodeFirstName.InnerText != null) firstname = nodeFirstName.InnerText;
+ if (nodeLastName != null && nodeLastName.InnerText != null) lastname = nodeLastName.InnerText;
+ credits += String.Format("{0} {1}", firstname, lastname);
+ }
+ }
+ //rec.Image = folderName + @"\" + nodeID.InnerText.Trim() + "f.jpg";
+ if (nodeNumber != null && nodeNumber.InnerText != null)
+ WriteAntAtribute(destXml,"CollectionNumber",nodeNumber.InnerText);
+ else
+ WriteAntAtribute(destXml, "CollectionNumber", nodeNumber.InnerText);
+ WriteAntAtribute(destXml, "Title", nodeTitle.InnerText);
+ WriteAntAtribute(destXml, "SortTitle", nodeTitle.InnerText);
+ WriteAntAtribute(destXml, "SortTitle1", nodeTitle.InnerText);
+ WriteAntAtribute(destXml, "Rating","0" );
+ 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");
+ if (nodeOverview != null && nodeOverview.InnerText != null)
+ WriteAntAtribute(destXml, "Overview", nodeOverview.InnerText);
+ else
+ WriteAntAtribute(destXml, "Overview", "");
+
+ destXml.WriteEndElement();
+ }
+
+ }
+ catch
+ {
+ return"";
+ }
+ destXml.WriteEndElement();
+ destXml.WriteEndElement();
+ destXml.Close();
+ return destFile;
+ }
+
+ private void WriteAntAtribute(XmlTextWriter tw,string key, string value)
+ {
+ string at="";
+ if (ProfilerDict.TryGetValue(key, out at))
+ {
+ tw.WriteAttributeString(at, value);
+ }
+ }
+ }
+
+}
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-03-24 10:39:53 UTC (rev 216)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-03-24 12:56:46 UTC (rev 217)
@@ -1111,6 +1111,15 @@
StrViewItem2 = xmlreader.GetValueAsString(CurrentConfig, "AntViewItem2", "");
StrViewText2 = xmlreader.GetValueAsString(CurrentConfig, "AntViewText2", "");
StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalog", "");
+ switch (xmlreader.GetValueAsString(CurrentConfig, "CatalogType", ""))
+ {
+ case "0":
+ break;
+ case "1":
+ CatalogConverter cv = new CatalogConverter();
+ StrFileXml = cv.ConvertProfiler(StrFileXml);
+ break;
+ }
StrPathImg = xmlreader.GetValueAsString(CurrentConfig, "AntPicture", "");
StrSelect = xmlreader.GetValueAsString(CurrentConfig, "StrSelect", "");
StrActors = xmlreader.GetValueAsString(CurrentConfig, "StrActors", "");
Modified: trunk/plugins/MyFilms/MesFilms.csproj
===================================================================
--- trunk/plugins/MyFilms/MesFilms.csproj 2007-03-24 10:39:53 UTC (rev 216)
+++ trunk/plugins/MyFilms/MesFilms.csproj 2007-03-24 12:56:46 UTC (rev 217)
@@ -63,6 +63,7 @@
<DependentUpon>AntMovieCatalog.xsd</DependentUpon>
</Compile>
<Compile Include="AssemblyInfo.cs" />
+ <Compile Include="CatalogConverter.cs" />
<Compile Include="CString.cs" />
<Compile Include="MesFilms.cs" />
<Compile Include="MesFilmsDetail.cs" />
Modified: trunk/plugins/MyFilms/MesFilms.suo
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-03-24 10:39:53 UTC (rev 216)
+++ trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-03-24 12:56:46 UTC (rev 217)
@@ -155,6 +155,8 @@
this.Config_Name = new System.Windows.Forms.ComboBox();
this.label12 = new System.Windows.Forms.Label();
this.groupBox7 = new System.Windows.Forms.GroupBox();
+ this.label13 = new System.Windows.Forms.Label();
+ this.CatalogType = new System.Windows.Forms.ComboBox();
this.ButSave = new System.Windows.Forms.Button();
this.groupBox8 = new System.Windows.Forms.GroupBox();
this.View_Dflt_Item = new System.Windows.Forms.ComboBox();
@@ -176,9 +178,9 @@
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(7, 22);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(144, 13);
+ this.label1.Size = new System.Drawing.Size(93, 13);
this.label1.TabIndex = 0;
- this.label1.Text = "Ant Movie Catalog File (XML)";
+ this.label1.Text = "Catalog File (XML)";
//
// MesFilmsCat
//
@@ -223,9 +225,9 @@
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(7, 48);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(119, 13);
+ this.label2.Size = new System.Drawing.Size(100, 13);
this.label2.TabIndex = 3;
- this.label2.Text = "Ant Picture Path (IMG) ";
+ this.label2.Text = "Picture Path (IMG) ";
//
// ButQuit
//
@@ -741,6 +743,8 @@
//
// groupBox7
//
+ this.groupBox7.Controls.Add(this.label13);
+ this.groupBox7.Controls.Add(this.CatalogType);
this.groupBox7.Controls.Add(this.ButSave);
this.groupBox7.Controls.Add(this.groupBox8);
this.groupBox7.Controls.Add(this.ButDelet);
@@ -772,6 +776,28 @@
this.groupBox7.TabStop = false;
this.groupBox7.Text = "Config Infos";
//
+ // label13
+ //
+ this.label13.AutoSize = true;
+ this.label13.Location = new System.Drawing.Point(490, 22);
+ this.label13.Name = "label13";
+ this.label13.Size = new System.Drawing.Size(70, 13);
+ this.label13.TabIndex = 42;
+ this.label13.Text = "Catalog Type";
+ //
+ // CatalogType
+ //
+ this.CatalogType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.CatalogType.FormattingEnabled = true;
+ this.CatalogType.Items.AddRange(new object[] {
+ "Ant Movie Catalog",
+ "DVD Profiler"});
+ this.CatalogType.Location = new System.Drawing.Point(566, 21);
+ this.CatalogType.Name = "CatalogType";
+ this.CatalogType.Size = new System.Drawing.Size(235, 21);
+ this.CatalogType.TabIndex = 41;
+ this.CatalogType.SelectedIndexChanged += new System.EventHandler(this.CatalogType_SelectedIndexChanged);
+ //
// ButSave
//
this.ButSave.Location = new System.Drawing.Point(496, 432);
@@ -934,6 +960,8 @@
private ComboBox AntFilterComb;
private ComboBox AntFilterSign2;
private TextBox TitleDelim;
+ private Label label13;
+ private ComboBox CatalogType;
}
}
\ No newline at end of file
Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-03-24 10:39:53 UTC (rev 216)
+++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-03-24 12:56:46 UTC (rev 217)
@@ -53,7 +53,7 @@
AntItem1.Items.Add("(none)");
AntItem2.Items.Add("(none)");
AntItem3.Items.Add("(none)");
-
+ CatalogType.SelectedIndex = 0;
foreach (DataColumn dc in ds.Movie.Columns)
{
// if (dc.Expression.Equals(""))
@@ -272,7 +272,7 @@
if (MyFilms_xmlreader.GetValueAsString("MyFilms", "Default_Config", "") == Config_Name.Text)
MyFilms_xmlwriter.RemoveEntry("MyFilms", "Default_Config");
}
-
+ MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "CatalogType", CatalogType.SelectedIndex.ToString());
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "AntCatalog", MesFilmsCat.Text.ToString());
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "AntPicture", MesFilmsImg.Text.ToString());
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "AntStorage", AntStorage.Text.ToString());
@@ -355,6 +355,7 @@
private void Config_Name_SelectedIndexChanged(object sender, EventArgs e)
{
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", "");
AntStorage.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "AntStorage", "");
@@ -402,6 +403,7 @@
}
private void Refresh_Items()
{
+ CatalogType.SelectedIndex = 0;
MesFilmsCat.ResetText();
MesFilmsImg.ResetText();
AntStorage.ResetText();
@@ -465,6 +467,7 @@
MessageBoxIcon.Question);
if (dialogResult == DialogResult.Yes)
{
+ MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "CatalogType");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntCatalog");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntPicture");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntStorage");
@@ -573,9 +576,17 @@
if (reader != null)
{
reader.Close();
-
- mydivx.ReadXml(MesFilmsCat.Text);
-
+
+ switch (CatalogType.SelectedIndex)
+ {
+ case 0:
+ mydivx.ReadXml(MesFilmsCat.Text);
+ break;
+ case 1:
+ CatalogConverter cc = new CatalogConverter();
+ mydivx.ReadXml(cc.ConvertProfiler(MesFilmsCat.Text));
+ break;
+ }
DataRow[] movies = mydivx.Movie.Select(StrDfltSelect + AntTitle1.Text + " not like ''");
if (mydivx.Movie.Count > 0)
if (movies.Length > 0)
@@ -604,5 +615,22 @@
MesFilmsCat.Focus();
}
}
+
+ private void CatalogType_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ switch( CatalogType.SelectedIndex)
+ {
+ case 0:
+ break;
+ case 1:
+ break;
+ }
+ }
+
+ private void button1_Click(object sender, EventArgs e)
+ {
+ CatalogConverter cc = new CatalogConverter();
+ cc.ConvertProfiler(MesFilmsCat.Text);
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hap...@us...> - 2007-03-27 08:43:17
|
Revision: 229
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=229&view=rev
Author: happytalk
Date: 2007-03-27 01:43:15 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Remembers navigational position & Prev button now works as in other media plugs
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilmsDetail.cs
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-03-26 20:59:59 UTC (rev 228)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-03-27 08:43:15 UTC (rev 229)
@@ -251,11 +251,9 @@
//---------------------------------------------------------------------------------------
public override void OnAction(Action actionType)
{
- if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU))// || (actionType.wID == Action.ActionType.ACTION_CONTEXT_MENU))
- // Previous Menu (I disabled 'press menu button exits plugin' = very annoying)
+ if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) || (actionType.wID == Action.ActionType.ACTION_PARENT_DIR))
{
- if (GetPrevFilmList()) return;
- //actionType.wID = Action.ActionType.ACTION_PREVIOUS_MENU; // exit plugin DEINIT Msg will call save func
+ if (GetPrevFilmList() || (actionType.wID != Action.ActionType.ACTION_PREVIOUS_MENU)) return;
}
base.OnAction(actionType);
}
@@ -1136,6 +1134,7 @@
boolselect = xmlreader.GetValueAsBool(CurrentConfig, "boolselect", false);
WStrSort = xmlreader.GetValueAsString(CurrentConfig, "WStrSort", "");
Wstar = xmlreader.GetValueAsString(CurrentConfig, "Wstar", "");
+ LastID = xmlreader.GetValueAsInt(CurrentConfig, "LastID", -1);
}
}
//--------------------------------------------------------------------------------------------
@@ -1223,7 +1222,7 @@
StrSelect = StrTitle1.ToString() + " not like ''";
TxtSelect.Label = StrTxtSelect = "";
boolselect = false;
- l_index = -1;
+ //l_index = -1;
if (StrSortSens == " ASC")
BtnSrtBy.IsAscending = true;
else
Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-03-26 20:59:59 UTC (rev 228)
+++ trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-03-27 08:43:15 UTC (rev 229)
@@ -153,11 +153,10 @@
//---------------------------------------------------------------------------------------
public override void OnAction(Action actionType)
{
- if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU))// || (actionType.wID == Action.ActionType.ACTION_CONTEXT_MENU)) // press menu button exits plugin!!?
- // Previous Menu
+ if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) || (actionType.wID == Action.ActionType.ACTION_PARENT_DIR))
{
save_config_values(0);
- //actionType.wID = Action.ActionType.ACTION_PREVIOUS_MENU; // exit plugin DEINIT Msg will call save func
+ actionType.wID = Action.ActionType.ACTION_PREVIOUS_MENU; // exit plugin DEINIT Msg will call save func
}
base.OnAction(actionType);
return;
@@ -763,7 +762,7 @@
using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings("MyFilms.xml"))
{
xmlwriter.SetValue(CurrentConfig, "IndexItem", r[StrIndex]["Number"]);
- if (ID != -1) xmlwriter.SetValue("MesFilms", "LastID", ID);
+ if (ID != -1) xmlwriter.SetValue(CurrentConfig, "LastID", ID);
}
}
#endregion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-03-27 17:01:34
|
Revision: 241
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=241&view=rev
Author: zebons
Date: 2007-03-27 10:00:56 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Compatibility for DVDProfiler Database : manage a temporary database
Modified Paths:
--------------
trunk/plugins/MyFilms/CatalogConverter.cs
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilms.csproj
trunk/plugins/MyFilms/MesFilms.suo
trunk/plugins/MyFilms/MesFilmsDetail.cs
Modified: trunk/plugins/MyFilms/CatalogConverter.cs
===================================================================
--- trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-27 16:52:34 UTC (rev 240)
+++ trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-27 17:00:56 UTC (rev 241)
@@ -3,6 +3,7 @@
using System.Text;
using System.IO;
using System.Xml;
+using MediaPortal.GUI.Library;
namespace MesFilms
{
@@ -29,7 +30,8 @@
public string ConvertProfiler(string source)
{
- string destFile = Path.GetTempPath()+@"\"+"AntTempFile.xml";
+ //string destFile = Path.GetTempPath()+@"AntTempFile.xml";
+ string destFile = source.Substring(0, source.Length - 4) + "_tmp.xml";
XmlTextWriter destXml = new XmlTextWriter(destFile,Encoding.Default);
destXml.Formatting = Formatting.Indented;
destXml.WriteStartDocument();
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-03-27 16:52:34 UTC (rev 240)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-03-27 17:00:56 UTC (rev 241)
@@ -126,6 +126,7 @@
string StrViewDfltItem = null;
string StrViewDfltText = null;
string StrFileXml = null;
+ string StrFileType = null;
string StrPathImg = null;
string StrSortSens = null;
public string WStrSort = null;
@@ -284,7 +285,7 @@
if (PreviousWindowId == ID_MesFilmsDetail)
{
CurrentConfig = xmlreader.GetValueAsString("MyFilms", "Current_Config", "");
- Load_Config(CurrentConfig);
+ Load_Config(CurrentConfig ,false);
Fin_Charge_Init(false);
}
else
@@ -300,7 +301,7 @@
{
if (CurrentConfig == "")
CurrentConfig = Choice_Config();
- Load_Config(CurrentConfig);
+ Load_Config(CurrentConfig,true);
Fin_Charge_Init(true);
}
}
@@ -1086,9 +1087,17 @@
xmlwriter.SetValueAsBool(CurrentConfig, "boolselect", boolselect);
xmlwriter.SetValue(CurrentConfig, "WStrSort", WStrSort);
xmlwriter.SetValue(CurrentConfig, "Wstar", Wstar);
+ switch (StrFileType)
+ {
+ case "0":
+ break;
+ case "1":
+ xmlwriter.SetValue(CurrentConfig, "AntCatalogTemp", StrFileXml.ToString());
+ break;
+ }
}
}
- private void Load_Config(string CurrentConfig)
+ private void Load_Config(string CurrentConfig,bool create_temp)
{
//-----------------------------------------------------------------------------------------------
// Load Config Parameters in MyFilms.xml file (section CurrentConfig)
@@ -1109,14 +1118,21 @@
StrViewItem2 = xmlreader.GetValueAsString(CurrentConfig, "AntViewItem2", "");
StrViewText2 = xmlreader.GetValueAsString(CurrentConfig, "AntViewText2", "");
StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalog", "");
- switch (xmlreader.GetValueAsString(CurrentConfig, "CatalogType", ""))
+ StrFileType = xmlreader.GetValueAsString(CurrentConfig, "CatalogType", "0");
+ switch (StrFileType)
{
case "0":
break;
case "1":
- CatalogConverter cv = new CatalogConverter();
- StrFileXml = cv.ConvertProfiler(StrFileXml);
+ if (create_temp)
+ {
+ CatalogConverter cv = new CatalogConverter();
+ StrFileXml = cv.ConvertProfiler(StrFileXml);
+ }
+ else
+ StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalogTemp", "");
break;
+
}
StrPathImg = xmlreader.GetValueAsString(CurrentConfig, "AntPicture", "");
StrSelect = xmlreader.GetValueAsString(CurrentConfig, "StrSelect", "");
@@ -1353,7 +1369,7 @@
{
//Change "Config":
mydivx.Clear();
- Load_Config(Choice_Config());
+ Load_Config(Choice_Config(),true);
Fin_Charge_Init(true);
return;
}
Modified: trunk/plugins/MyFilms/MesFilms.csproj
===================================================================
--- trunk/plugins/MyFilms/MesFilms.csproj 2007-03-27 16:52:34 UTC (rev 240)
+++ trunk/plugins/MyFilms/MesFilms.csproj 2007-03-27 17:00:56 UTC (rev 241)
@@ -31,7 +31,7 @@
<ItemGroup>
<Reference Include="Core, Version=1.0.2548.1824, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Svn\Core.dll</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Stable\Core.DLL</HintPath>
</Reference>
<Reference Include="Databases, Version=1.0.2548.1828, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -50,7 +50,7 @@
<Reference Include="System.Xml" />
<Reference Include="Utils, Version=1.0.2548.1816, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Svn\Utils.dll</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Stable\Utils.DLL</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/MyFilms/MesFilms.suo
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-03-27 16:52:34 UTC (rev 240)
+++ trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-03-27 17:00:56 UTC (rev 241)
@@ -207,6 +207,14 @@
StrTitleSelect = xmlreader.GetValueAsString(CurrentConfig, "StrTitleSelect", "");
StrFilmSelect = xmlreader.GetValueAsString(CurrentConfig, "StrFilmSelect", "");
TitleDelim = xmlreader.GetValueAsString(CurrentConfig, "TitleDelim", ".");
+ switch (xmlreader.GetValueAsString(CurrentConfig, "CatalogType", "0"))
+ {
+ case "0":
+ break;
+ case "1":
+ StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalogTemp", "");
+ break;
+ }
}
if (TxtSelect.Length == 0)
GUIPropertyManager.SetProperty("#select", " ");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-03-27 21:08:35
|
Revision: 243
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=243&view=rev
Author: zebons
Date: 2007-03-27 14:08:33 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Corrected some problems with DVDProfiler compatibility.
Modified Paths:
--------------
trunk/plugins/MyFilms/CatalogConverter.cs
trunk/plugins/MyFilms/MesFilms.suo
Modified: trunk/plugins/MyFilms/CatalogConverter.cs
===================================================================
--- trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-27 18:44:08 UTC (rev 242)
+++ trunk/plugins/MyFilms/CatalogConverter.cs 2007-03-27 21:08:33 UTC (rev 243)
@@ -54,6 +54,7 @@
XmlNode nodeID = nodeDVD.SelectSingleNode("ID");
XmlNode nodeNumber = nodeDVD.SelectSingleNode("CollectionNumber");
XmlNode nodeTitle = nodeDVD.SelectSingleNode("Title");
+ XmlNode nodeOTitle = nodeDVD.SelectSingleNode("OriginalTitle");
XmlNode nodeRating = nodeDVD.SelectSingleNode("Rating");
XmlNode nodeYear = nodeDVD.SelectSingleNode("ProductionYear");
XmlNode nodeDuration = nodeDVD.SelectSingleNode("RunningTime");
@@ -63,7 +64,7 @@
XmlNodeList genreList = nodeDVD.SelectNodes("Genres/Genre");
foreach (XmlNode nodeGenre in genreList)
{
- if (genre.Length > 0) genre += " / ";
+ if (genre.Length > 0) genre += ", ";
genre += nodeGenre.InnerText;
}
string cast = String.Empty;
@@ -79,7 +80,11 @@
if (nodeFirstName != null && nodeFirstName.InnerText != null) firstname = nodeFirstName.InnerText;
if (nodeLastName != null && nodeLastName.InnerText != null) lastname = nodeLastName.InnerText;
if (nodeRole != null && nodeRole.InnerText != null) role = nodeRole.InnerText;
- string line = String.Format("{0} {1} as {2}\n", firstname, lastname, role);
+ string line;
+ if (role.Length == 0)
+ line = String.Format("{0} {1}, ", firstname, lastname);
+ else
+ line = String.Format("{0} {1} ({2}), ", firstname, lastname, role);
cast += line;
}
@@ -94,7 +99,7 @@
XmlNode nodeType = nodeCredit.SelectSingleNode("CreditSubtype");
if (nodeType != null && nodeType.InnerText != null && nodeType.InnerText == "Director")
{
- if (credits.Length > 0) credits += " / ";
+ if (credits.Length > 0) credits += ", ";
if (nodeFirstName != null && nodeFirstName.InnerText != null) firstname = nodeFirstName.InnerText;
if (nodeLastName != null && nodeLastName.InnerText != null) lastname = nodeLastName.InnerText;
credits += String.Format("{0} {1}", firstname, lastname);
@@ -105,10 +110,13 @@
WriteAntAtribute(destXml,"CollectionNumber",nodeNumber.InnerText);
else
WriteAntAtribute(destXml, "CollectionNumber", nodeNumber.InnerText);
- WriteAntAtribute(destXml, "Title", nodeTitle.InnerText);
+ if (nodeOTitle != null && nodeOTitle.InnerText != null)
+ WriteAntAtribute(destXml, "Title", nodeOTitle.InnerText);
+ else
+ WriteAntAtribute(destXml, "Title", nodeTitle.InnerText);
WriteAntAtribute(destXml, "SortTitle", nodeTitle.InnerText);
WriteAntAtribute(destXml, "SortTitle1", nodeTitle.InnerText);
- WriteAntAtribute(destXml, "Rating","0" );
+ WriteAntAtribute(destXml, "Rating","0");
WriteAntAtribute(destXml, "Year", nodeYear.InnerText);
WriteAntAtribute(destXml, "RunningTime", nodeDuration.InnerText);
WriteAntAtribute(destXml, "Genres", genre);
Modified: 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: <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-11-18 18:46:19
|
Revision: 1075
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1075&view=rev
Author: zebons
Date: 2007-11-18 10:46:16 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
MyFilms v4.3.0
Modified Paths:
--------------
trunk/plugins/MyFilms/Configuration.cs
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilms.csproj
trunk/plugins/MyFilms/MesFilmsDetail.cs
trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
trunk/plugins/MyFilms/MesFilmsSetup.cs
trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml
trunk/plugins/MyFilms/skin/BlueTwo/MesFilmsDetail.xml
Added Paths:
-----------
trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_No_Cover.png
trunk/plugins/MyFilms/skin/BlueTwo/MesFilms_Visible.xml
trunk/plugins/MyFilms/skin/BlueTwo wide/MesFilms_Visible.xml
Modified: trunk/plugins/MyFilms/Configuration.cs
===================================================================
--- trunk/plugins/MyFilms/Configuration.cs 2007-11-18 11:51:50 UTC (rev 1074)
+++ trunk/plugins/MyFilms/Configuration.cs 2007-11-18 18:46:16 UTC (rev 1075)
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using MediaPortal.Configuration;
+using System.IO;
@@ -21,7 +22,9 @@
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
{
StrStorage = xmlreader.GetValueAsString(CurrentConfig, "AntStorage", "");
- StrDirStor = xmlreader.GetValueAsString(CurrentConfig, "PathStorage", "");
+ StrDirStor = xmlreader.GetValueAsString(CurrentConfig, "PathStorage", "");
+ SearchFile = xmlreader.GetValueAsString(CurrentConfig, "SearchFileName", "False");
+ ItemSearchFile = xmlreader.GetValueAsString(CurrentConfig, "ItemSearchFileName", "");
StrIdentItem = xmlreader.GetValueAsString(CurrentConfig, "AntIdentItem", "");
StrTitle1 = xmlreader.GetValueAsString(CurrentConfig, "AntTitle1", "");
StrTitle2 = xmlreader.GetValueAsString(CurrentConfig, "AntTitle2", "");
@@ -83,8 +86,8 @@
StrTxtSelect = xmlreader.GetValueAsString(CurrentConfig, "Selection", "");
StrIndex = xmlreader.GetValueAsInt(CurrentConfig, "IndexItem", -1);
StrTIndex = xmlreader.GetValueAsString(CurrentConfig, "TitleItem", "");
- Boolselect = xmlreader.GetValueAsBool(CurrentConfig, "conf.Boolselect", false);
- boolreturn = xmlreader.GetValueAsBool(CurrentConfig, "conf.Boolreturn", false);
+ Boolselect = xmlreader.GetValueAsBool(CurrentConfig, "Boolselect", false);
+ Boolreturn = xmlreader.GetValueAsBool(CurrentConfig, "Boolreturn", false);
WStrSort = xmlreader.GetValueAsString(CurrentConfig, "WStrSort", "");
wselectedlabel = xmlreader.GetValueAsString(CurrentConfig, "WSelectedLabel", "");
Wstar = xmlreader.GetValueAsString(CurrentConfig, "Wstar", "");
@@ -92,6 +95,7 @@
StrViewDfltItem = xmlreader.GetValueAsString(CurrentConfig, "ViewDfltItem", "");
StrViewDfltText = xmlreader.GetValueAsString(CurrentConfig, "ViewDfltText", "");
TitleDelim = xmlreader.GetValueAsString(CurrentConfig, "TitleDelim", ".");
+ DefaultCover = xmlreader.GetValueAsString(CurrentConfig, "DefaultCover", "");
}
if (StrSelect == "")
@@ -102,8 +106,10 @@
StrSort = StrTitle1;
if (StrSortSens == "")
StrSortSens = " ASC";
+
+ }
+
- }
// static values
private static string currentConfig = string.Empty;
public static string CurrentConfig
@@ -249,6 +255,18 @@
get { return strStorage; }
set { strStorage = value; }
}
+ private string searchFile = "False";
+ public string SearchFile
+ {
+ get { return searchFile; }
+ set { searchFile = value; }
+ }
+ private string itemSearchFile = string.Empty;
+ public string ItemSearchFile
+ {
+ get { return itemSearchFile; }
+ set { itemSearchFile = value; }
+ }
private string strIdentItem = string.Empty;
public string StrIdentItem
{
@@ -387,6 +405,12 @@
get { return wstar; }
set { wstar = value; }
}
+ private string defaultcover = string.Empty;
+ public string DefaultCover
+ {
+ get { return defaultcover; }
+ set { defaultcover = value; }
+ }
private int strLayOut = int.MinValue;
public int StrLayOut
{
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-11-18 11:51:50 UTC (rev 1074)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-11-18 18:46:16 UTC (rev 1075)
@@ -66,16 +66,6 @@
CTRL_BtnSearchA = 5,
CTRL_BtnLayout = 6,
CTRL_TxtSelect = 12,
- CTRL_LblList = 20,
- CTRL_LblIcons = 21,
- CTRL_LblBigIcons = 22,
- CTRL_LblFilmStrip = 23,
- //CTRL_BtnStop = 319,
- //CTRL_BtnPause = 315,
- //CTRL_BtnBack = 312,
- //CTRL_BtnSuiv = 322,
- //CTRL_BtnRewind = 313,
- //CTRL_BtnForward = 323,
CTRL_List = 1026,
CTRL_Image = 1020,
CTRL_Image2 = 1021,
@@ -83,21 +73,6 @@
CTRL_TxtGenre = 1024,
CTRL_Texte = 1025,
CTRL_Title = 1027,
- //CTRL_ImgGrStar1 = 1051,
- //CTRL_ImgGrStar2 = 1052,
- //CTRL_ImgGrStar3 = 1053,
- //CTRL_ImgGrStar4 = 1054,
- //CTRL_ImgGrStar5 = 1055,
- //CTRL_ImgHStar1 = 1056,
- //CTRL_ImgHStar2 = 1057,
- //CTRL_ImgHStar3 = 1058,
- //CTRL_ImgHStar4 = 1059,
- //CTRL_ImgHStar5 = 1060,
- //CTRL_ImgStar1 = 1061,
- //CTRL_ImgStar2 = 1062,
- //CTRL_ImgStar3 = 1063,
- //CTRL_ImgStar4 = 1064,
- //CTRL_ImgStar5 = 1065,
CTRL_NbObjects = 2073
}
[SkinControlAttribute((int)Controls.CTRL_TxtSelect)]
@@ -106,8 +81,6 @@
protected GUISortButtonControl BtnSrtBy = null;
[SkinControlAttribute((int)Controls.CTRL_List)]
protected GUIFacadeControl facadeView = null;
- //[SkinControlAttribute((int)Controls.CTRL_List)]
- //protected GUIListControl lsCtlFilm = null;
[SkinControlAttribute((int)Controls.CTRL_Texte)]
protected GUITextScrollUpControl ScrlLstText = null;
[SkinControlAttribute((int)Controls.CTRL_Title)]
@@ -246,6 +219,12 @@
if (actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU)
if (GetPrevFilmList())
return;
+
+ //if (((actionType.wID == Action.ActionType.ACTION_MOVE_RIGHT) || (actionType.wID == Action.ActionType.ACTION_MOVE_LEFT))
+ // && ((facadeView.SelectedListItem.ItemId > -1) && (!facadeView.SelectedListItem.IsFolder)))
+ // affichage_Lstdetail(facadeView.SelectedListItem.ItemId, true, facadeView.SelectedListItem.Label);
+
+
base.OnAction(actionType);
}
//---------------------------------------------------------------------------------------
@@ -301,7 +280,7 @@
}
else
{
- if (facadeView.SelectedListItemIndex > -1 && facadeView.SelectedListItem.IsFolder)
+ if (facadeView.SelectedListItemIndex > -1 && !facadeView.SelectedListItem.IsFolder)
{
affichage_Lstdetail(facadeView.SelectedListItem.ItemId, false, facadeView.SelectedListItem.Label);
}
@@ -314,35 +293,6 @@
base.OnMessage(messageType);
return true;
- //case GUIMessage.MessageType.GUI_MSG_SETFOCUS:
- // //---------------------------------------------------------------------------------------
- // // Hide Informations about List Item
- // //---------------------------------------------------------------------------------------
- // if ((iControl == 0) && (dControl == (int)Controls.CTRL_List))
- // {
- // base.OnMessage(messageType);
- // return true;
- // }
- // if ((dControl == (int)Controls.CTRL_List) && !(conf.Boolselect || (facadeView.SelectedListItemIndex > -1 && facadeView.SelectedListItem.IsFolder))) //xxxx
- // {
- // if (facadeView.SelectedListItemIndex > -1)
- // {
- // affichage_Lstdetail(facadeView.SelectedListItem.ItemId, true, facadeView.SelectedListItem.Label);
- // }
- // }
- // else
- // if (facadeView.SelectedListItemIndex > -1 && facadeView.SelectedListItem.IsFolder)
- // {
- // affichage_Lstdetail(facadeView.SelectedListItem.ItemId, false, facadeView.SelectedListItem.Label);
- // }
- // else
- // {
- // GUIControl.ShowControl(GetID, 34);
- //affichage_rating(0);
- // }
- // base.OnMessage(messageType);
- // return true;
-
case GUIMessage.MessageType.GUI_MSG_CLICKED:
//---------------------------------------------------------------------------------------
// Mouse/Keyboard Clicked
@@ -474,7 +424,7 @@
if (!facadeView.SelectedListItem.IsFolder && !conf.Boolselect)
// New Window for detailed selected item information
{
- conf.StrIndex = facadeView.SelectedListItemIndex;
+ conf.StrIndex = facadeView.SelectedListItem.ItemId;
GUIWindowManager.ActivateWindow(ID_MesFilmsDetail);
}
else
@@ -620,34 +570,16 @@
facadeView.Clear();
//----------------------------------------------------------------------------------------
// Load the DataSet.
+ int number = -1;
foreach (DataRow r in BaseMesFilms.LectureDonn\xE9es(conf.StrDfltSelect, conf.StrFilmSelect, conf.StrSort, conf.StrSortSens))
{
+ number++;
if (conf.Boolreturn)//in case of selection by view verify if value correspond excatly to the searched string
{
- //string[] split;
- //if (conf.WStrSort == "DateAdded")
- // split = string.Format("{0:yyyy/MM/dd}", r[conf.WStrSort]).Split(new Char[] { ',' });
- //else
- // split = r[conf.WStrSort].ToString().Split(new Char[] { ',','(',')',});
- //foreach (string s in split)
- //{
- // if (s.Trim().ToLower() == conf.Wselectedlabel.Trim().ToLower())
- // goto suite;
- //}
- //goto fin;
- //string[] split;
- //if (conf.WStrSort == "DateAdded")
- // split = string.Format("{0:yyyy/MM/dd}", r[conf.WStrSort]).Split(new Char[] { ',' });
- //else
- // split = r[conf.WStrSort].ToString().Split(new Char[] { ',','(',')',});
- //foreach (string s in split)
- //{
- // if (s.Trim().ToLower() == conf.Wselectedlabel.Trim().ToLower())
- // goto suite;
- //}
if (r[conf.WStrSort].ToString().IndexOfAny (conf.Wselectedlabel.Trim().ToCharArray ()) >=0)
goto suite;
- goto fin; }
+ goto fin;
+ }
suite:
string wthumb = item.ThumbnailImage;
@@ -674,7 +606,6 @@
iCnt = 1;
item = new GUIListItem();
item.Label = sFullTitle; // Set = full subfolders path initially
- item.ItemId = (int)(r["Number"]);
switch (conf.StrSort)
{
case "TranslatedTitle":
@@ -702,22 +633,17 @@
break;
}
if (r["Picture"].ToString().IndexOf(":\\") == -1)
- {
- item.ThumbnailImage = conf.StrPathImg + "\\" + r["Picture"].ToString();
- item.IconImage = conf.StrPathImg + "\\" + r["Picture"].ToString();
- }
+ conf.FileImage = conf.StrPathImg + "\\" + r["Picture"].ToString();
else
- {
- item.ThumbnailImage = r["Picture"].ToString();
- item.IconImage = conf.StrPathImg + "\\" + r["Picture"].ToString();
- }
- //if ((!System.IO.File.Exists(item.IconImage)) || r["Picture"].ToString().Length == 0)
- //{
- // item.ThumbnailImage = "Films_No_Cover.png";
- // item.IconImage = Config.Dir.Skin + "\\media\\Films_No_Cover.png";
- //}
+ conf.FileImage = r["Picture"].ToString();
+ if (!System.IO.File.Exists(conf.FileImage))
+ conf.FileImage = conf.DefaultCover;
+ item.ThumbnailImage = conf.FileImage;
+ item.IconImage = conf.FileImage;
+// item.IconImageBig = conf.FileImage;
+ item.ItemId = number;
+
item.OnItemSelected += new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(item_OnItemSelected);
- //item.OnRetrieveArt += new MediaPortal.GUI.Library.GUIListItem.RetrieveCoverArtHandler(OnRetrieveCoverArt);
facadeView.Add(item);
if (iSelItem == -2) //set selected item = passed in string?
@@ -779,9 +705,6 @@
{
int r, i;
- //if (rating == 0)
- // r = -1; //=> hide all
- //else
r = Decimal.ToInt32(Decimal.Round(rating, MidpointRounding.AwayFromZero)); // by setting rating here can easily modify for diff effect
if (r > 10) r = 10;
for (i = 0; i < 10; i++)
@@ -798,8 +721,9 @@
//----------------------------------------------------------------------------------------
private void affichage_Lstdetail(int ItemId, bool wrep, string wlabel)//wrep = false display only image
{
- DataRow[] r = BaseMesFilms.LectureDonn\xE9es("Number = " + ItemId.ToString(), "", "", "");
- if (r.Length == 0)
+ // DataRow[] r = BaseMesFilms.LectureDonn\xE9es("Number = " + ItemId.ToString(), "", "", "");
+ DataRow[] r = BaseMesFilms.LectureDonn\xE9es(conf.StrDfltSelect, conf.StrFilmSelect, conf.StrSort, conf.StrSortSens);
+ if (ItemId > r.Length)
{
GUIControl.ShowControl(GetID, 34);
affichage_rating(0);
@@ -808,17 +732,17 @@
GUIControl.HideControl(GetID, 34);
try
{
- if (!(conf.FileImage == conf.StrPathImg + "\\" + r[0]["Picture"].ToString() || conf.FileImage == r[0]["Picture"].ToString()))
+ if (!(conf.FileImage == conf.StrPathImg + "\\" + r[ItemId]["Picture"].ToString() || conf.FileImage == r[ItemId]["Picture"].ToString()))
{
//if (conf.FileImage != "9999")
- {
- ImgLstFilm.FreeResources();
- }
- ImgLstFilm2.FreeResources();
- if (r[0]["Picture"].ToString().IndexOf(":\\") == -1)
- conf.FileImage = conf.StrPathImg + "\\" + r[0]["Picture"].ToString();
+ // ImgLstFilm.FreeResources();
+ // ImgLstFilm2.FreeResources();
+ if (r[ItemId]["Picture"].ToString().IndexOf(":\\") == -1)
+ conf.FileImage = conf.StrPathImg + "\\" + r[ItemId]["Picture"].ToString();
else
- conf.FileImage = r[0]["Picture"].ToString();
+ conf.FileImage = r[ItemId]["Picture"].ToString();
+ if (!System.IO.File.Exists(conf.FileImage))
+ conf.FileImage = conf.DefaultCover;
ImgLstFilm.SetFileName(conf.FileImage);
ImgLstFilm2.SetFileName(conf.FileImage);
}
@@ -826,11 +750,6 @@
catch
{
conf.FileImage = "9999";
- //FileImage = Config.Dir.Skin + "\\media\\Films_No_Cover.png";
- //GUIControl.HideControl(GetID, Ctrl_DspImage);
- //GUIControl.HideControl(GetID, Ctrl_DspImage2);
- //GUIControl.ShowControl(GetID, 34);
- //affichage_rating(0);
}
if (!wrep)
{
@@ -839,13 +758,14 @@
return;
}
ScrlLstText.Clear();
- ScrlLstText.Label = r[0]["Description"].ToString().Replace('|', ' ');
+ ScrlLstText.Label = r[ItemId]["Description"].ToString().Replace('|', ' ');
+ TitleSelect.Label = r[ItemId][conf.StrTitle1].ToString();
TitleSelect.Label = wlabel;
- TxtLstGenre.Label = r[0]["Category"].ToString();
- TxtLstYear.Label = r[0]["Year"].ToString();
+ TxtLstGenre.Label = r[ItemId]["Category"].ToString();
+ TxtLstYear.Label = r[ItemId]["Year"].ToString();
try
{
- conf.W_rating = (decimal)r[0]["Rating"];
+ conf.W_rating = (decimal)r[ItemId]["Rating"];
}
catch
{
@@ -994,7 +914,10 @@
if (arSplit[wi].IndexOf("(") > 0)
wzone = arSplit[wi].Substring(0, arSplit[wi].IndexOf("(")).Trim();
else
- wzone = arSplit[wi].Trim();
+ if (arSplit[wi].IndexOf(" as ") > 0)
+ wzone = arSplit[wi].Substring(0, arSplit[wi].IndexOf(" as ")).Trim();
+ else
+ wzone = arSplit[wi].Trim();
if (wzone.Length > 0)
w_tableau.Add(wzone);
}
@@ -1064,6 +987,7 @@
conf.Boolselect = true;
conf.Boolreturn = false;
}
+
}
//--------------------------------------------------------------------------------------------
// Initial Windows load. If LoadDfltSlct = true => load default select if any
@@ -1158,37 +1082,25 @@
//--------------------------------------------------------------------------------------------
private void Change_LayOut(int wLayOut)
{
- GUIControl.HideControl(GetID, (int)Controls.CTRL_LblList);
switch (wLayOut)
{
case 1:
GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(100));
- GUIControl.ShowControl(GetID, (int)Controls.CTRL_LblIcons);
- GUIControl.HideControl(GetID, (int)Controls.CTRL_LblList);
facadeView.View = GUIFacadeControl.ViewMode.SmallIcons;
break;
case 2:
GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(417));
- GUIControl.ShowControl(GetID, (int)Controls.CTRL_LblBigIcons);
- GUIControl.HideControl(GetID, (int)Controls.CTRL_LblIcons);
facadeView.View = GUIFacadeControl.ViewMode.LargeIcons;
break;
case 3:
GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(733));
- GUIControl.ShowControl(GetID, (int)Controls.CTRL_LblFilmStrip);
- GUIControl.HideControl(GetID, (int)Controls.CTRL_LblBigIcons);
facadeView.View = GUIFacadeControl.ViewMode.Filmstrip;
break;
default:
GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(101));
- GUIControl.ShowControl(GetID, (int)Controls.CTRL_LblList);
- GUIControl.HideControl(GetID, (int)Controls.CTRL_LblFilmStrip);
facadeView.View = GUIFacadeControl.ViewMode.List;
break;
}
- //GUIControl.HideControl(GetID, facadeView.GetID);
- //int iControl = facadeView.GetID;
- //GUIControl.ShowControl(GetID, iControl);
GUIControl.FocusControl(GetID, facadeView.GetID);
}
//--------------------------------------------------------------------------------------------
Modified: trunk/plugins/MyFilms/MesFilms.csproj
===================================================================
--- trunk/plugins/MyFilms/MesFilms.csproj 2007-11-18 11:51:50 UTC (rev 1074)
+++ trunk/plugins/MyFilms/MesFilms.csproj 2007-11-18 18:46:16 UTC (rev 1075)
@@ -30,26 +30,26 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Core, Version=1.0.2546.32606, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Core, Version=0.2.3.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_SVN\Core.DLL</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Rc3\Core.DLL</HintPath>
</Reference>
- <Reference Include="Databases, Version=1.0.2546.32610, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Databases, Version=0.2.3.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_SVN\Databases.DLL</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Rc3\Databases.DLL</HintPath>
</Reference>
- <Reference Include="Dialogs, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Dialogs, Version=0.2.3.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_SVN\Dialogs.dll</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Rc3\Dialogs.DLL</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="Utils, Version=1.0.2546.32604, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Utils, Version=2.2.2.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_SVN\Utils.DLL</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Rc3\Utils.DLL</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-11-18 11:51:50 UTC (rev 1074)
+++ trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-11-18 18:46:16 UTC (rev 1075)
@@ -80,8 +80,6 @@
[SkinControlAttribute((int)Controls.CTRL_ImgDD)]
protected GUIImage ImgDD = null;
- string ItemSearchFile = null;
- bool SearchFile = false;
string wzone = null;
int StrMax = 0;
public SQLiteClient m_db;
@@ -158,6 +156,7 @@
// Windows Init
//---------------------------------------------------------------------------------------
g_Player.PlayBackStarted += new MediaPortal.Player.g_Player.StartedHandler(OnPlayBackStarted);
+ //g_Player.PlayBackEnded += new MediaPortal.Player.g_Player.EndedHandler(OnPlayBackEnded);
m_directory.SetExtensions(Utils.VideoExtensions);
base.OnMessage(messageType);
@@ -253,15 +252,15 @@
base.OnMessage(messageType);
return true;
}
- //-------------------------------------------------------------------------------------------
- // Load the XML data.
- //-------------------------------------------------------------------------------------------
- private DataRow[] LectureDonn\xE9es(string StrFilmSelect, string StrSort, string StrSortSens)
- {
- r = BaseMesFilms.LectureDonn\xE9es(StrFilmSelect, StrSort, StrSortSens);
- StrMax = (int)r.Length;
- return r;
- }
+ ////-------------------------------------------------------------------------------------------
+ //// Load the XML data.
+ ////-------------------------------------------------------------------------------------------
+ //private DataRow[] LectureDonn\xE9es(string StrFilmSelect, string StrSort, string StrSortSens)
+ //{
+ // r = BaseMesFilms.LectureDonn\xE9es(StrFilmSelect, StrSort, StrSortSens);
+ // StrMax = (int)r.Length;
+ // return r;
+ //}
//--------------------------------------------------------------------------------------------
// Update specifics Infos
//--------------------------------------------------------------------------------------------
@@ -464,6 +463,9 @@
file = MesFilms.conf.StrPathImg + "\\" + r[MesFilms.conf.StrIndex]["Picture"].ToString();
else
file = r[MesFilms.conf.StrIndex]["Picture"].ToString();
+ if (!System.IO.File.Exists(file))
+ file = MesFilms.conf.DefaultCover;
+
ImgDetFilm.SetFileName(file );
ImgDetFilm2.SetFileName(file);
if (!(MesFilms.conf.StrStorage.Length == 0) && !(MesFilms.conf.StrStorage == "(none)"))
@@ -634,17 +636,21 @@
string fileName = null;
if (!(MesFilms.conf.StrStorage == null) && !(MesFilms.conf.StrStorage == "(none)") && !(MesFilms.conf.StrStorage == ""))
{
- fileName = (string)r[select_item][MesFilms.conf.StrStorage];
+ try
+ { fileName = (string)r[select_item][MesFilms.conf.StrStorage]; }
+ catch
+ { fileName = ""; }
+
if ((fileName == ""))
// recherche nom de fichier par titre du film
- if ((SearchFile) && (first))
+ if ((MesFilms.conf.SearchFile == "True") && (first))
{
- if (ItemSearchFile.Length > 0)
+ if (MesFilms.conf.ItemSearchFile.Length > 0)
{
- fileName = Search_FileName(r[select_item][ItemSearchFile].ToString(), MesFilms.conf.StrDirStor);
+ fileName = Search_FileName(r[select_item][MesFilms.conf.ItemSearchFile].ToString(), MesFilms.conf.StrDirStor);
if (fileName.Length > 0)
{
- r[MesFilms.conf.StrIndex][MesFilms.conf.StrStorage] = fileName;
+ r[MesFilms.conf.StrIndex][MesFilms.conf.StrStorage] = fileName.Substring(fileName.LastIndexOf(@"\") + 1);
Update_XML_database(false, MesFilms.conf.StrIndex, MesFilms.conf.StrStorage);
}
}
@@ -777,7 +783,11 @@
VideoDatabase.SetMovieDuration(idFile, movieDuration);
}
}
+ //private void OnPlayBackEnded(MediaPortal.Player.g_Player.MediaType type, string filename)
+ //{
+ // System.Windows.Forms.MessageBox.Show("OnPlayBackEnded");
+ //}
private void AddFileToDatabase(string strFile,int select_item)
{
if (!Utils.IsVideo(strFile)) return;
@@ -827,59 +837,71 @@
bool asked = false;
string wfile = null;
GUIDialogOK dlgOk = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
- if (PlayListFactory.IsPlayList(filename.Trim()))
+ wfile = filename.Trim();
+ string wstordir = MesFilms.conf.StrDirStor;
+ if (PlayListFactory.IsPlayList(wfile))
{
wfile = LoadPlaylist(filename.Trim());
- if (!(wfile == ""))
- multifile = true;
- else
+ wstordir = wfile.Substring(0, wfile.LastIndexOf(@"\")).Trim() + ";" + wstordir;
+
+ if (wfile == "")
{
- first = false;
- wfile = GUILocalizeStrings.Get(136) + " : max 15 " + GUILocalizeStrings.Get(100003);
- dlgOk.SetHeading(3);//my videos
- dlgOk.SetLine(1, 1036);//no video found
- dlgOk.SetLine(2, wfile);//ANT File Name
- dlgOk.SetLine(3, 477);//Unable to load playlist
- dlgOk.DoModal(GetID);
- return; // fist time ask for mounting; second time stop
+ if (first) // first time asking for mounting
+ {
+ first = false;
+ wfile = GUILocalizeStrings.Get(136) + " : max 15 " + GUILocalizeStrings.Get(100003);
+ dlgOk.SetHeading(3);//my videos
+ dlgOk.SetLine(1, 1036);//no video found
+ dlgOk.SetLine(2, wfile);//ANT File Name
+ dlgOk.SetLine(3, 477);//Unable to load playlist
+ dlgOk.DoModal(GetID);
+ return; // fist time ask for mounting; second time stop
+ }
+ else
+ return; // second time no asking
}
}
// search character ";" => playlist (multiple files)
string[] split;
- split = filename.ToString().Split(new Char[] { ',', ';' });
+ split = wfile.ToString().Split(new Char[] { ',', ';' });
if (split.Length > 1)
+ multifile = true;
+ else
multifile = false;
- else
- multifile = true;
foreach (string file in split)
{
- wfile = SearchMovie(file.Trim(), MesFilms.conf.StrDirStor);
+ wfile = SearchMovie(file.Trim(), wstordir);
if (wfile == "false")
{
// file not found
- // ask for mounting file
- dlgOk.SetHeading(3);//my videos
- dlgOk.SetLine(1, 219);//no disc
- if (!(MesFilms.conf.StrIdentItem == null) && !(MesFilms.conf.StrIdentItem == "(none)") && !(MesFilms.conf.StrIdentItem == ""))
- if (MesFilms.conf.StrIdentLabel.Length > 0)
- dlgOk.SetLine(2, MesFilms.conf.StrIdentLabel.ToString() + " = " + r[select_item][MesFilms.conf.StrIdentItem].ToString());//Label Identification for Media
+ if (first)
+ // ask for mounting file first time
+ {
+ dlgOk.SetHeading(3);//my videos
+ dlgOk.SetLine(1, 219);//no disc
+ if (!(MesFilms.conf.StrIdentItem == null) && !(MesFilms.conf.StrIdentItem == "(none)") && !(MesFilms.conf.StrIdentItem == ""))
+ if (MesFilms.conf.StrIdentLabel.Length > 0)
+ dlgOk.SetLine(2, MesFilms.conf.StrIdentLabel.ToString() + " = " + r[select_item][MesFilms.conf.StrIdentItem].ToString());//Label Identification for Media
+ else
+ dlgOk.SetLine(2, "'" + MesFilms.conf.StrIdentItem.ToString() + "' = " + r[select_item][MesFilms.conf.StrIdentItem].ToString());//ANT Item Identification for Media
else
- dlgOk.SetLine(2, "'" + MesFilms.conf.StrIdentItem.ToString() + "' = " + r[select_item][MesFilms.conf.StrIdentItem].ToString());//ANT Item Identification for Media
+ dlgOk.SetLine(2, "' disc n\xB0 = " + r[select_item]["Number"].ToString());//ANT Number for Identification Media
+ dlgOk.SetLine(3, wfile);//ANT File Name
+ dlgOk.DoModal(GetID);
+ PlayMovie_Divx(filename, select_item, false); // try a second time. Maybe disc mounted
+ return;
+ }
else
- dlgOk.SetLine(2, "' disc n\xB0 = " + r[select_item]["Number"].ToString());//ANT Number for Identification Media
- dlgOk.SetLine(3, wfile);//ANT File Name
- dlgOk.DoModal(GetID);
- PlayMovie_Divx(filename, select_item, false); // try a second time. Maybe disc mounted
- return;
+ return; //no asking second time
}
else
{
// file found update database and add to playlist
- idMovie = update_database(file, select_item, idMovie);
+ idMovie = update_database(wfile, select_item, idMovie);
if (!multifile)
{ //case monofile search files belonging same movie (extension cdx or diskx)
- string folder = file.Substring(0, file.LastIndexOf(@"\")).Trim();
- wfile = folder + "\\" + file.Substring(file.LastIndexOf(@"\") + 1);
+ string folder = wfile.Substring(0, wfile.LastIndexOf(@"\")).Trim();
+ // wfile = folder + "\\" + wfile.Substring(file.LastIndexOf(@"\") + 1);
ArrayList items = m_directory.GetDirectory(folder.ToString());
for (int i = 0; i < items.Count; ++i)
@@ -1049,13 +1071,16 @@
// File.Copy(MesFilms.conf.StrPathImg + "\\" + r1[select_item]["Picture"].ToString(), LargeThumb, true);
//else
// File.Copy(r1[select_item]["Picture"].ToString(), LargeThumb, true);
- string wimage;
+ string wImage;
if (r1[select_item]["Picture"].ToString().IndexOf(":\\") == -1)
- wimage = MesFilms.conf.StrPathImg + "\\" + r1[select_item]["Picture"].ToString();
+ wImage = MesFilms.conf.StrPathImg + "\\" + r1[select_item]["Picture"].ToString();
else
- wimage = r1[select_item]["Picture"].ToString();
- MediaPortal.Util.Picture.CreateThumbnail(wimage, strThumb, 128, 128, 0);
- MediaPortal.Util.Picture.CreateThumbnail(wimage, LargeThumb, 512, 512, 0);
+ wImage = r1[select_item]["Picture"].ToString();
+ if (!System.IO.File.Exists(wImage))
+ wImage = Config.Dir.Skin + "\\media\\Films_No_Cover.png";
+
+ MediaPortal.Util.Picture.CreateThumbnail(wImage, strThumb, 128, 128, 0);
+ MediaPortal.Util.Picture.CreateThumbnail(wImage, LargeThumb, 512, 512, 0);
}
catch
{
@@ -1370,10 +1395,10 @@
}
return false;
}
- // static public void PlayMovieFromPlayList(bool NoResumeMovie)
- // {
- // PlayMovieFromPlayList(NoResumeMovie, -1);
- // }
+ static public void PlayMovieFromPlayList(bool NoResumeMovie)
+ {
+ PlayMovieFromPlayList(NoResumeMovie, -1);
+ }
static public void PlayMovieFromPlayList(bool NoResumeMovie, int iMovieIndex)
{
string filename;
Modified: trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-11-18 11:51:50 UTC (rev 1074)
+++ trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-11-18 18:46:16 UTC (rev 1075)
@@ -186,6 +186,9 @@
this.ButSave = new System.Windows.Forms.Button();
this.Config_Dflt = new System.Windows.Forms.CheckBox();
this.Config_Menu = new System.Windows.Forms.CheckBox();
+ this.DutDefCov = new System.Windows.Forms.Button();
+ this.DefaultCover = new System.Windows.Forms.TextBox();
+ this.label19 = new System.Windows.Forms.Label();
this.General.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox11.SuspendLayout();
@@ -208,9 +211,9 @@
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(676, 42);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(75, 13);
+ this.label10.Size = new System.Drawing.Size(69, 13);
this.label10.TabIndex = 34;
- this.label10.Text = "Version 4.2.6a";
+ this.label10.Text = "Version 4.3.0";
//
// textBox1
//
@@ -459,6 +462,9 @@
//
// groupBox5
//
+ this.groupBox5.Controls.Add(this.DutDefCov);
+ this.groupBox5.Controls.Add(this.DefaultCover);
+ this.groupBox5.Controls.Add(this.label19);
this.groupBox5.Controls.Add(this.label17);
this.groupBox5.Controls.Add(this.TitleDelim);
this.groupBox5.Controls.Add(this.label9);
@@ -467,7 +473,7 @@
this.groupBox5.Controls.Add(this.AntTitle1);
this.groupBox5.Location = new System.Drawing.Point(7, 208);
this.groupBox5.Name = "groupBox5";
- this.groupBox5.Size = new System.Drawing.Size(453, 76);
+ this.groupBox5.Size = new System.Drawing.Size(453, 100);
this.groupBox5.TabIndex = 61;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "Title Order";
@@ -510,9 +516,9 @@
// AntTitle2
//
this.AntTitle2.FormattingEnabled = true;
- this.AntTitle2.Location = new System.Drawing.Point(131, 41);
+ this.AntTitle2.Location = new System.Drawing.Point(132, 41);
this.AntTitle2.Name = "AntTitle2";
- this.AntTitle2.Size = new System.Drawing.Size(156, 21);
+ this.AntTitle2.Size = new System.Drawing.Size(155, 21);
this.AntTitle2.TabIndex = 11;
//
// AntTitle1
@@ -1088,6 +1094,32 @@
this.Config_Menu.Text = "Display Always Configuration\'s Menu (if no Default Config)";
this.Config_Menu.UseVisualStyleBackColor = true;
//
+ // DutDefCov
+ //
+ this.DutDefCov.Location = new System.Drawing.Point(401, 66);
+ this.DutDefCov.Name = "DutDefCov";
+ this.DutDefCov.Size = new System.Drawing.Size(32, 22);
+ this.DutDefCov.TabIndex = 69;
+ this.DutDefCov.Text = "...";
+ this.DutDefCov.UseVisualStyleBackColor = true;
+ this.DutDefCov.Click += new System.EventHandler(this.DutDefCov_Click);
+ //
+ // DefaultCover
+ //
+ this.DefaultCover.Location = new System.Drawing.Point(132, 68);
+ this.DefaultCover.Name = "DefaultCover";
+ this.DefaultCover.Size = new System.Drawing.Size(259, 20);
+ this.DefaultCover.TabIndex = 68;
+ //
+ // label19
+ //
+ this.label19.AutoSize = true;
+ this.label19.Location = new System.Drawing.Point(8, 71);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(74, 13);
+ this.label19.TabIndex = 67;
+ this.label19.Text = "Default Poster";
+ //
// MesFilmsSetup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1231,6 +1263,9 @@
private CheckBox Config_Menu;
private Label label18;
private TextBox Selected_Enreg;
+ private Button DutDefCov;
+ private TextBox DefaultCover;
+ private Label label19;
}
}
\ No newline at end of file
Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-11-18 11:51:50 UTC (rev 1074)
+++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-11-18 18:46:16 UTC (rev 1075)
@@ -417,6 +417,7 @@
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "Dwp", crypto.Crypter(Dwp.Text));
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "SearchFileName", SearchFileName.Checked);
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "ItemSearchFileName", ItemSearchFileName.Text);
+ MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "DefaultCover", DefaultCover.Text);
if (CatalogType.SelectedIndex == 1)
{
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "SortTitle", SortTitle.Checked);
@@ -522,6 +523,7 @@
else
SortTitle.Checked = false;
ItemSearchFileName.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "ItemSearchFileName", "");
+ DefaultCover.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "DefaultCover", "");
View_Dflt_Item.Items.Remove(View_Dflt_Item.Text);
View_Dflt_Item.Items.Add(View_Dflt_Item.Text);
View_Dflt_Item.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "ViewDfltItem", "(none)");
@@ -593,6 +595,7 @@
LayOut.ResetText();
View_Dflt_Item.ResetText();
View_Dflt_Text.ResetText();
+ DefaultCover.ResetText();
Dwp.ResetText();
Rpt_Dwp.ResetText();
ItemSearchFileName.ResetText();
@@ -627,6 +630,8 @@
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntPicture");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntStorage");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "PathStorage");
+ MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "SearchFileName");
+ MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "ItemSearchFileName");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntIdentItem");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntIdentLabel");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntTitle1");
@@ -671,6 +676,7 @@
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "Dwp");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "SortTitle");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "DVDPTagField");
+ MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "DefaultCover");
if ((Config_Name.Text) == MyFilms_xmlreader.GetValueAsString("MyFilms", "Default_Config", ""))
MyFilms_xmlwriter.RemoveEntry("MyFilms", "Default_Config");
if ((Config_Name.Text) == MyFilms_xmlreader.GetValueAsString("MyFilms", "Current_Config", ""))
@@ -864,5 +870,15 @@
{
Selected_Enreg_TextChanged();
}
+
+ private void DutDefCov_Click(object sender, EventArgs e)
+ {
+ openFileDialog1.RestoreDirectory = true;
+ openFileDialog1.DefaultExt = "jpg";
+ openFileDialog1.Filter = "JPG Files|*.jpg|PNG Files|*.png|BMP Files|*.bmp|All Files|*.*";
+ openFileDialog1.Title = "Default display Cover";
+ if (openFileDialog1.ShowDialog(this) == DialogResult.OK)
+ DefaultCover.Text = openFileDialog1.FileName;
+ }
}
}
Added: trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_No_Cover.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_No_Cover.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml
===================================================================
--- trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml 2007-11-18 11:51:50 UTC (rev 1074)
+++ trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml 2007-11-18 18:46:16 UTC (rev 1075)
@@ -1,455 +1,498 @@
<window>
- <id>7986</id>
- <defaultcontrol>6</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <controls>
- <import>common.time.xml</import>
- <control>
- <type>image</type>
- <description>BG</description>
- <id>1</id>
- <posX>0</posX>
- <posY>0</posY>
- <texture>background.png</texture>
- </control>
- <control>
- <type>image</type>
- <id>24</id>
- <posX>64</posX>
- <posY>70</posY>
- <width>67</width>
- <height>40</height>
- <colordiffuse>9fffffff</colordiffuse>
- <texture>amclogo.png</texture>
- <keepaspectratio>yes</keepaspectratio>
- </control>
- <control>
- <type>image</type>
- <id>25</id>
- <posX>56</posX>
- <posY>16</posY>
- <texture>videos_logo.png</texture>
- </control>
- <control>
- <type>group</type>
- <description>group element</description>
- <id>1</id>
- <posX>60</posX>
- <posY>97</posY>
- <width>198</width>
- <height>140</height>
- <layout>StackLayout</layout>
- <animation effect="slide" time="400" start="-300,0">WindowOpen</animation>
- <animation effect="slide" time="400" end="0,-300" >WindowClose</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- <animation effect="fade" time="250">WindowOpen</animation>
- <mpe>
- <layout>Grid</layout>
- <spring>no</spring>
- <spacing>0</spacing>
- <padding>
- <top>0</top>
- <right>0</right>
- <bottom>0</bottom>
- <left>0</left>
- </padding>
- </mpe>
- <control>
- <type>button</type>
- <description>Layout</description>
- <id>6</id>
- <posX>60</posX>
- <posY>97</posY>
- <onleft>5</onleft>
- <onright>1026</onright>
- <onup>5</onup>
- <ondown>2</ondown>
- <animation>unfocus</animation>
- <label>101</label>
- <textcolor>ff000000</textcolor>
- </control>
- <control>
- <type>sortbutton</type>
- <id>2</id>
- <posX>60</posX>
- <posY>129</posY>
- <onleft>6</onleft>
- <onright>1026</onright>
- <onup>6</onup>
- <ondown>3</ondown>
- <textureAscendingFocused>arrow_round_up_focus.png</textureAscendingFocused>
- <font>font13</font>
- <textureFocus>menu_list_focus.png</textureFocus>
- <textYOff>5</textYOff>
- <animation>unfocus</animation>
- <textXOff>10</textXOff>
- <disabledcolor>60ffffff</disabledcolor>
- <label>103</label>
- <offsetSortButtonY>8</offsetSortButtonY>
- <offsetSortButtonX>165</offsetSortButtonX>
- <textcolor>White</textcolor>
- <textureNoFocus>menu_list_nofocus.png</textureNoFocus>
- <textureAscending>arrow_round_up_nofocus.png</textureAscending>
- <textureDescending>arrow_round_down_nofocus.png</textureDescending>
- <textureDescendingFocused>arrow_round_down_focus.png</textureDescendingFocused>
- </control>
- <control>
- <type>button</type>
- <description>Switch view</description>
- <id>3</id>
- <posX>60</posX>
- <posY>161</posY>
- <onleft>2</onleft>
- <onright>1026</onright>
- <onup>2</onup>
- <ondown>4</ondown>
- <animation>unfocus</animation>
- <label>457</label>
- <textcolor>ff000000</textcolor>
- </control>
- <control>
- <type>button</type>
- <description>Search by Films</description>
- <id>4</id>
- <posX>60</posX>
- <posY>193</posY>
- <onleft>3</onleft>
- <onright>1026</onright>
- <onup>3</onup>
- <ondown>5</ondown>
- <animation>unfocus</animation>
- <label>137</label>
- <textcolor>ff000000</textcolor>
- </control>
- <control>
- <type>button</type>
- <description>Search by Actors</description>
- <id>5</id>
- <posX>60</posX>
- <posY>225</posY>
- <onleft>4</onleft>
- <onright>1026</onright>
- <onup>4</onup>
- <ondown>6</ondown>
- <animation>unfocus</animation>
- <label>137</label>
- <textcolor>ff000000</textcolor>
- </control>
+ <id>7986</id>
+ <defaultcontrol>6</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+ <import>common.time.xml</import>
+ <import>MesFilms_Visible.xml</import>
+ <control>
+ <type>image</type>
+ <description>BG</description>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>background.png</texture>
+ </control>
+ <control>
+ <type>image</type>
+ <id>1</id>
+ <posX>64</posX>
+ <posY>70</posY>
+ <width>67</width>
+ <height>40</height>
+ <colordiffuse>9fffffff</colordiffuse>
+ <texture>amclogo.png</texture>
+ <keepaspectratio>yes</keepaspectratio>
+ </control>
+ <control>
+ <type>image</type>
+ <id>1</id>
+ <posX>56</posX>
+ <posY>16</posY>
+ <texture>videos_logo.png</texture>
+ </control>
+ <control>
+ <type>image</type>
+ <id>1019</id>
+ <posX>50</posX>
+ <posY>250</posY>
+ <width>180</width>
+ <height>250</height>
+ <texture>hover_my films.png</texture>
+ <visible>!player.hasmedia+facadeview.filmstrip |!player.hasmedia+!control.hasfocus(1026)</visible>
+ <keepaspectratio>yes</keepaspectratio>
+ </control>
- </control>
- <control>
- <type>fadelabel</type>
- <id>12</id>
- <posX>344</posX>
- <posY>68</posY>
- <width>272</width>
- <height>24</height>
- <label>label</label>
- <font>font14</font>
- <textcolor>ffa9d0f7</textcolor>
- <disabledcolor>ff808080</disabledcolor>
- </control>
- <control>
- <type>group</type>
- <animation effect="slide" time="400" start="0,-300">WindowOpen</animation>
- <animation effect="slide" time="400" end="800,0" >WindowClose</animation>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- <control>
- <description>composite control consisting of a list control and a thumbnail panel</description>
- <type>facadeview</type>
- <id>1026</id>
- <control>
- <description>Thumbnail Panel</description>
- <type>thumbnailpanel</type>
- <scrollOffset>1</scrollOffset>
- <onleft>6</onleft>
- <itemWidth>72</itemWidth>
- <textureWidth>58</textureWidth>
- <thumbWidth>44</thumbWidth>
- <thumbPosX>7</thumbPosX>
- <textureWidthBig>85</textureWidthBig>
- <textureHeightBig>116</textureHeightBig>
- <itemWidthBig>108</itemWidthBig>
- <itemHeightBig>138</itemHeightBig>
- <thumbWidthBig>64</thumbWidthBig>
- <thumbHeightBig>90</thumbHeightBig>
- <thumbPosXBig>10</thumbPosXBig>
- </control>
- <control>
- <type>listcontrol</type>
- <description>listcontrol</description>
- <posX>260</posX>
- <posY>97</posY>
- <width>440</width>
- <height>354</height>
- <onleft>6</onleft>
- <font>font13</font>
- </control>
- <control>
- <description>Filmstrip view</description>
- <type>filmstrip</type>
- <width>440</width>
- <height>354</height>
- <onleft>6</onleft>
- <backgroundx>354</backgroundx>
- <backgroundy>99</backgroundy>
- <backgroundwidth>238</backgroundwidth>
- <backgroundheight>336</backgroundheight>
- <InfoImagex>366</InfoImagex>
- <InfoImagey>118</InfoImagey>
- <InfoImagewidth>197</InfoImagewidth>
- <InfoImageheight>274</InfoImageheight>
- </control>
+ <control>
+ <type>group</type>
+ <description>group element</description>
+ <posX>60</posX>
+ <posY>97</posY>
+ <width>198</width>
+ <height>140</height>
+ <layout>StackLayout</layout>
+ <animation effect="slide" time="400" start="-300,0">WindowOpen</animation>
+ <animation effect="slide" time="400" end="0,-300" >WindowClose</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <mpe>
+ <layout>Grid</layout>
+ <spring>no</spring>
+ <spacing>0</spacing>
+ <padding>
+ <top>0</top>
+ <right>0</right>
+ <bottom>0</bottom>
+ <left>0</left>
+ </padding>
+ </mpe>
+ <control>
+ <type>button</type>
+ <description>Layout</description>
+ <id>6</id>
+ <posX>60</posX>
+ <posY>97</posY>
+ <onleft>5</onleft>
+ <onright>1026</onright>
+ <onup>5</onup>
+ <ondown>2</ondown>
+ <animation>unfocus</animation>
+ <label>101</label>
+ <textcolor>ff000000</textcolor>
+ </control>
+ <control>
+ <type>sortbutton</type>
+ <id>2</id>
+ <posX>60</posX>
+ <posY>129</posY>
+ <onleft>6</onleft>
+ <onright>1026</onright>
+ <onup>6</onup>
+ <ondown>3</ondown>
+ <textureAscendingFocused>arrow_round_up_focus.png</textureAscendingFocused>
+ <font>font13</font>
+ <textureFocus>menu_list_focus.png</textureFocus>
+ <textYOff>5</textYOff>
+ <animation>unfocus</animation>
+ <textXOff>10</textXOff>
+ <disabledcolor>60ffffff</disabledcolor>
+ <label>103</label>
+ <offsetSortButtonY>8</offsetSortButtonY>
+ <offsetSortButtonX>165</offsetSortButtonX>
+ <textcolor>White</textcolor>
+ <textureNoFocus>menu_list_nofocus.png</textureNoFocus>
+ <textureAscending>arrow_round_up_nofocus.png</textureAscending>
+ <textureDescending>arrow_round_down_nofocus.png</textureDescending>
+ <textureDescendingFocused>arrow_round_down_focus.png</textureDescendingFocused>
+ </control>
+ <control>
+ <type>button</type>
+ <description>Switch view</description>
+ <id>3</id>
+ <posX>60</posX>
+ <posY>161</posY>
+ <onleft>2</onleft>
+ <onright>1026</onright>
+ <onup>2</onup>
+ <ondown>4</ondown>
+ <animation>unfocus</animation>
+ <label>457</label>
+ <textcolor>ff000000</textcolor>
+ </control>
+ <control>
+ <type>button</type>
+ <description>Search by Films</description>
+ <id>4</id>
+ <posX>60</posX>
+ <posY>193</posY>
+ <onleft>3</onleft>
+ <onright>1026</onright>
+ <onup>3</onup>
+ <ondown>5</ondown>
+ <animation>unfocus</animation>
+ <label>137</label>
+ <textcolor>ff000000</textcolor>
+ </control>
+ <control>
+ <type>button</type>
+ <description>Search by Actors</description>
+ <id>5</id>
+ <posX>60</posX>
+ <posY>225</posY>
+ <onleft>4</onleft>
+ <onright>1026</onright>
+ <onup>4</onup>
+ <ondown>6</ondown>
+ <animation>unfocus</animation>
+ <label>137</label>
+ <textcolor>ff000000</textcolor>
+ </control>
- </control>
- <control>
- <type>textboxscrollup</type>
- <description>Biography value</description>
- <id>1025</id>
- <posX>260</posX>
- <posY>414</posY>
- <width>440</width>
- <height>100</height>
- <colordiffuse>ffffffff</colordiffuse>
- <onleft>1026</onleft>
- <onright>1026</onright>
- <onup>1026</onup>
- <ondown>1026</ondown>
- <font>font12</font>
- <speed>10</speed>
- <textcolor>FFFFFFFF</textcolor>
- <label>-</label>
- <seperator>------------------------------------------------------------------------------------------------------------------------------</seperator>
- </control>
- <control>
- <type>fadelabel</type>
- <description>Title (during Icons)</description>
- <id>1027</id>
- <posX>65</posX>
- <posY>470</posY>
- <onleft>6</onleft>
- <onright>1026</onright>
- <onup>1026</onup>
- <ondown>1026</ondown>
- <font>font12</font>
- <width>175</width>
- <height>24</height>
- <label>-</label>
- </control>
- </control>
- <control>
- <type>image</type>
- <id>1065</id>
- <posX>219</posX>
- <posY>370</posY>
- <width>36</width>
- <height>36</height>
- <visible>no</visible>
- <texture>star.png</texture>
- <centered>yes</centered>
- </control>
- <control>
- <type>image</type>
- <id>1064</id>
- <posX>222</posX>
- <posY>...
[truncated message content] |
|
From: <ze...@us...> - 2007-12-01 16:54:10
|
Revision: 1114
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1114&view=rev
Author: zebons
Date: 2007-12-01 08:54:02 -0800 (Sat, 01 Dec 2007)
Log Message:
-----------
My Films v4.3.2
Modified Paths:
--------------
trunk/plugins/MyFilms/CatalogConverter.cs
trunk/plugins/MyFilms/Configuration.cs
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilms.csproj
trunk/plugins/MyFilms/MesFilmsDetail.cs
trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
trunk/plugins/MyFilms/MesFilmsSetup.cs
trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/MesFilms.common.facade.xml
trunk/plugins/MyFilms/skin/BlackMyst/MesFilms.xml
trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml
trunk/plugins/MyFilms/skin/Project Mayhem 3/MesFilms.xml
trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_first_focus.png
trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_first_nofocus.png
trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_last_focus.png
trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_last_nofocus.png
trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_next_focus.PNG
trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_next_nofocus.PNG
trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_prior_focus.PNG
trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_prior_nofocus.PNG
trunk/plugins/MyFilms/skin/SpinSafe Revolve/MesFilms.xml
trunk/plugins/MyFilms/skin/SpinSafe Revolve/MesFilmsDetail.xml
Added Paths:
-----------
trunk/plugins/MyFilms/skin/Monochrome/
trunk/plugins/MyFilms/skin/Monochrome/Media/
trunk/plugins/MyFilms/skin/Monochrome/Media/Films_DD.png
trunk/plugins/MyFilms/skin/Monochrome/Media/Films_first_focus.png
trunk/plugins/MyFilms/skin/Monochrome/Media/Films_first_nofocus.png
trunk/plugins/MyFilms/skin/Monochrome/Media/Films_last_focus.png
trunk/plugins/MyFilms/skin/Monochrome/Media/Films_last_nofocus.png
trunk/plugins/MyFilms/skin/Monochrome/Media/Films_next_focus.PNG
trunk/plugins/MyFilms/skin/Monochrome/Media/Films_next_nofocus.PNG
trunk/plugins/MyFilms/skin/Monochrome/Media/Films_prior_focus.PNG
trunk/plugins/MyFilms/skin/Monochrome/Media/Films_prior_nofocus.PNG
trunk/plugins/MyFilms/skin/Monochrome/Media/amclogo.png
trunk/plugins/MyFilms/skin/Monochrome/Media/hover_my films.png
trunk/plugins/MyFilms/skin/Monochrome/MesFilms.xml
trunk/plugins/MyFilms/skin/Monochrome/MesFilmsDetail.xml
trunk/plugins/MyFilms/skin/Monochrome/MesFilms_Visible.xml
trunk/plugins/MyFilms/skin/Xface/MesFilms.common.window.xml
Modified: trunk/plugins/MyFilms/CatalogConverter.cs
===================================================================
--- trunk/plugins/MyFilms/CatalogConverter.cs 2007-11-30 16:37:26 UTC (rev 1113)
+++ trunk/plugins/MyFilms/CatalogConverter.cs 2007-12-01 16:54:02 UTC (rev 1114)
@@ -37,7 +37,7 @@
}
public string TagFullName;
- public string ConvertProfiler(string source, string folderimage, bool SortTitle, string TagField)
+ public string ConvertProfiler(string source, string folderimage, bool SortTitle, string TagField, bool OnlyFile)
{
//string destFile = Path.GetTempPath()+@"AntTempFile.xml";
//string destFile = source.Substring(0, source.Length - 4) + "_tmp.xml";
@@ -90,6 +90,9 @@
{
if (nodeNotes.InnerText.IndexOf("<File>") != -1)
File = nodeNotes.InnerText.Substring(nodeNotes.InnerText.IndexOf("<File>") + 6, nodeNotes.InnerText.IndexOf("</File>") - nodeNotes.InnerText.IndexOf("<File>") - 6);
+ else
+ if (OnlyFile)
+ File = nodeNotes.InnerText.Trim();
if (nodeNotes.InnerText.IndexOf("<Country>") != -1)
Country = nodeNotes.InnerText.Substring(nodeNotes.InnerText.IndexOf("<Country>") + 9, nodeNotes.InnerText.IndexOf("</Country>") - nodeNotes.InnerText.IndexOf("<Country>") - 9);
}
Modified: trunk/plugins/MyFilms/Configuration.cs
===================================================================
--- trunk/plugins/MyFilms/Configuration.cs 2007-11-30 16:37:26 UTC (rev 1113)
+++ trunk/plugins/MyFilms/Configuration.cs 2007-12-01 16:54:02 UTC (rev 1114)
@@ -64,11 +64,12 @@
break;
}
bool SortTitle = false;
- if (xmlreader.GetValueAsString(CurrentConfig, "SortTitle", "False") == "True")
- SortTitle = true;
+ bool OnlyFile = false;
+ SortTitle = xmlreader.GetValueAsBool(CurrentConfig, "SortTitle", false);
+ OnlyFile = xmlreader.GetValueAsBool(CurrentConfig, "OnlyFile", false);
string TagField = xmlreader.GetValueAsString(CurrentConfig, "DVDPTagField", "");
CatalogConverter cv = new CatalogConverter(TagField);
- StrFileXml = cv.ConvertProfiler(StrFileXml, StrPathImg, SortTitle, TagField);
+ StrFileXml = cv.ConvertProfiler(StrFileXml, StrPathImg, SortTitle, TagField,OnlyFile);
}
else
StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalogTemp", "");
@@ -96,6 +97,12 @@
StrViewDfltText = xmlreader.GetValueAsString(CurrentConfig, "ViewDfltText", "");
TitleDelim = xmlreader.GetValueAsString(CurrentConfig, "TitleDelim", ".");
DefaultCover = xmlreader.GetValueAsString(CurrentConfig, "DefaultCover", "");
+ CmdExe = xmlreader.GetValueAsString(CurrentConfig, "CmdExe", "");
+ if (CmdExe == "(none)")
+ CmdExe = "";
+ CmdPar = xmlreader.GetValueAsString(CurrentConfig, "CmdPar", "");
+ if (CmdPar == "(none)")
+ CmdPar = "";
AlwaysDefaultView = xmlreader.GetValueAsBool(CurrentConfig, "AlwaysDefaultView", false);
if (AlwaysDefaultView)
{
@@ -424,6 +431,18 @@
get { return defaultcover; }
set { defaultcover = value; }
}
+ private string cmdExe = string.Empty;
+ public string CmdExe
+ {
+ get { return cmdExe; }
+ set { cmdExe = value; }
+ }
+ private string cmdPar = string.Empty;
+ public string CmdPar
+ {
+ get { return cmdPar; }
+ set { cmdPar = value; }
+ }
private int strLayOut = int.MinValue;
public int StrLayOut
{
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-11-30 16:37:26 UTC (rev 1113)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-12-01 16:54:02 UTC (rev 1114)
@@ -220,11 +220,6 @@
if (GetPrevFilmList())
return;
- //if (((actionType.wID == Action.ActionType.ACTION_MOVE_RIGHT) || (actionType.wID == Action.ActionType.ACTION_MOVE_LEFT))
- // && ((facadeView.SelectedListItem.ItemId > -1) && (!facadeView.SelectedListItem.IsFolder)))
- // affichage_Lstdetail(facadeView.SelectedListItem.ItemId, true, facadeView.SelectedListItem.Label);
-
-
base.OnAction(actionType);
}
//---------------------------------------------------------------------------------------
@@ -264,8 +259,6 @@
Configuration.SaveConfiguration(Configuration.CurrentConfig, -1, "");
else
Configuration.SaveConfiguration(Configuration.CurrentConfig, facadeView.SelectedListItem.ItemId, facadeView.SelectedListItem.Label);
- //mydivx.Clear();
- //mydivx.Dispose();
facadeView.Clear();
facadeView.FreeResources();
return true; // fall through to call base class?
@@ -339,7 +332,6 @@
{
if (control_searchText(keyboard.Text))
{
- //Change_LayOut(0);
conf.WStrSort = "ACTORS";
conf.Wselectedlabel = "";
conf.WStrSortSens = " ASC";
@@ -643,7 +635,6 @@
conf.FileImage = conf.DefaultCover;
item.ThumbnailImage = conf.FileImage;
item.IconImage = conf.FileImage;
-// item.IconImageBig = conf.FileImage;
item.ItemId = number;
try
{
@@ -692,7 +683,10 @@
}
if ((conf.StrIndex > facadeView.Count - 1) || (conf.StrIndex < 0))
conf.StrIndex = 0;
-
+ if (facadeView.Count == 0)
+ GUIControl.ShowControl(GetID, 34);
+ else
+ GUIControl.HideControl(GetID, 34);
GUIPropertyManager.SetProperty("#nbobjects", facadeView.Count.ToString() + " " + GUILocalizeStrings.Get(127));
GUIControl.SelectItemControl(GetID, (int)Controls.CTRL_List, (int)conf.StrIndex);
if (facadeView.Count == 1 && item.IsFolder)
@@ -731,7 +725,6 @@
//----------------------------------------------------------------------------------------
private void affichage_Lstdetail(int ItemId, bool wrep, string wlabel)//wrep = false display only image
{
- // DataRow[] r = BaseMesFilms.LectureDonn\xE9es("Number = " + ItemId.ToString(), "", "", "");
DataRow[] r = BaseMesFilms.LectureDonn\xE9es(conf.StrDfltSelect, conf.StrFilmSelect, conf.StrSort, conf.StrSortSens);
if (ItemId > r.Length)
{
@@ -742,20 +735,14 @@
GUIControl.HideControl(GetID, 34);
try
{
- //if (!(conf.FileImage == conf.StrPathImg + "\\" + r[ItemId]["Picture"].ToString() || conf.FileImage == r[ItemId]["Picture"].ToString()))
- //{
- //if (conf.FileImage != "9999")
- // ImgLstFilm.FreeResources();
- // ImgLstFilm2.FreeResources();
- if (r[ItemId]["Picture"].ToString().IndexOf(":\\") == -1)
- conf.FileImage = conf.StrPathImg + "\\" + r[ItemId]["Picture"].ToString();
- else
- conf.FileImage = r[ItemId]["Picture"].ToString();
- if (!System.IO.File.Exists(conf.FileImage))
- conf.FileImage = conf.DefaultCover;
- ImgLstFilm.SetFileName(conf.FileImage);
- ImgLstFilm2.SetFileName(conf.FileImage);
- //}
+ if (r[ItemId]["Picture"].ToString().IndexOf(":\\") == -1)
+ conf.FileImage = conf.StrPathImg + "\\" + r[ItemId]["Picture"].ToString();
+ else
+ conf.FileImage = r[ItemId]["Picture"].ToString();
+ if (!System.IO.File.Exists(conf.FileImage))
+ conf.FileImage = conf.DefaultCover;
+ ImgLstFilm.SetFileName(conf.FileImage);
+ ImgLstFilm2.SetFileName(conf.FileImage);
}
catch
{
@@ -804,7 +791,6 @@
if (!conf.Boolselect)
GetFilmList();
else
- //getSelectFromDivx(conf.StrTitle1.ToString() + " not like ''", conf.WStrSort, conf.StrSortSens, "*", true, "");
getSelectFromDivx(conf.StrSelect, conf.WStrSort, conf.StrSortSens, conf.Wstar, true, "");
return;
}
@@ -820,7 +806,6 @@
}
if (item.IsFolder) filmstrip.InfoImageFileName = item.ThumbnailImage;
- // else filmstrip.InfoImageFileName = MediaPortal.Util.Utils.ConvertToLargeCoverArt(item.ThumbnailImage);
else filmstrip.InfoImageFileName = item.ThumbnailImage;
}
@@ -906,15 +891,10 @@
BtnSrtBy.Label = GUILocalizeStrings.Get(103);
conf.Boolselect = true;
conf.Wselectedlabel = "";
- //conf.StrActors = "";
- // boolreturn = true;
if (ClearIndex) conf.StrIndex = 0;
- //facadeView.FreeResources();
Change_LayOut(0);
facadeView.Clear();
-
- //foreach (DataRow enr in LectureDonn\xE9es(WstrSelect, WStrSort, WStrSortSens))
foreach (DataRow enr in BaseMesFilms.LectureDonn\xE9es(conf.StrDfltSelect, WstrSelect, WStrSort, WStrSortSens))
{
if ((WStrSort == "Date") || (WStrSort == "DateAdded"))
@@ -947,7 +927,6 @@
for (wi = 0; wi != w_tableau.Count; wi++)
{
champselect = w_tableau[wi].ToString();
-// if ((Wnb_enr > 0) && (string.Compare(champselect.ToString(), wchampselect.ToString(), true) == 0))
if (string.Compare(champselect.ToString(), wchampselect.ToString(), true) == 0)
Wnb_enr++;
else
@@ -965,18 +944,6 @@
Wnb_enr = 1;
wchampselect = champselect.ToString();
}
- //else
- //{
- // if ((Wnb_enr > 0) && (wchampselect.Length > 0))
- // {
- // item = new GUIListItem();
- // item.Label = wchampselect.ToString();
- // item.Label2 = Wnb_enr.ToString();
- // facadeView.Add(item);
- // if (SelItem != "" && item.Label == SelItem) conf.StrIndex = facadeView.Count - 1; //test if this item is one to select
- // Wnb_enr = 0;
- // }
- //}
}
}
@@ -997,7 +964,10 @@
if ((conf.StrIndex > facadeView.Count - 1) || (conf.StrIndex < 0)) //check index within bounds, will be unless xml file heavily edited
conf.StrIndex = 0;
- GUIControl.ShowControl(GetID, 34);
+ if (facadeView.Count == 0)
+ GUIControl.HideControl(GetID, 34);
+ else
+ GUIControl.ShowControl(GetID, 34);
GUIPropertyManager.SetProperty("#nbobjects", facadeView.Count.ToString() + " " + GUILocalizeStrings.Get(127));
GUIControl.SelectItemControl(GetID, (int)Controls.CTRL_List, (int)conf.StrIndex);
}
@@ -1035,7 +1005,6 @@
{
//chargement des films
BaseMesFilms.LoadFilm(conf.StrFileXml);
-// conf = new Configuration(Configuration.CurrentConfig, false);
}
Layout = conf.StrLayOut;
@@ -1051,7 +1020,6 @@
BtnSrtBy.SortChanged += new SortEventHandler(SortChanged);
if (conf.Boolselect)
{
- //Change_LayOut(0);
getSelectFromDivx(conf.StrSelect, conf.WStrSort, conf.StrSortSens, conf.Wstar, false, ""); // preserve index from last time
}
else
@@ -1066,7 +1034,6 @@
conf.StrSelect = conf.StrTitle1.ToString() + " not like ''";
TxtSelect.Label = conf.StrTxtSelect = "";
conf.Boolselect = false;
- //StrIndex = -1;
if (conf.StrSortSens == " ASC")
BtnSrtBy.IsAscending = true;
else
@@ -1091,7 +1058,6 @@
conf.Boolselect = false;
conf.Boolreturn = true;
conf.WStrSort = conf.StrViewDfltItem;
- //conf.Wselectedlabel = "";
if (conf.StrViewDfltItem == "DateAdded")
conf.StrSelect = "Date" + " like '" + DateTime.Parse(conf.StrViewDfltText).ToShortDateString() + "'";
else
@@ -1157,7 +1123,6 @@
if (choice_view.ToLower() == "year")
{
// Change View by Year
- //Change_LayOut(0);
conf.WStrSort = "YEAR";
conf.WStrSortSens = " DESC";
BtnSrtBy.IsAscending = false;
@@ -1167,7 +1132,6 @@
if (choice_view.ToLower() == "category")
{
// Change View by "Category":
- //Change_LayOut(0);
conf.WStrSort = "CATEGORY";
conf.WStrSortSens = " ASC";
BtnSrtBy.IsAscending = true;
@@ -1177,7 +1141,6 @@
if (choice_view.ToLower() == "country")
{
// Change View by "Country":
- //Change_LayOut(0);
conf.WStrSort = "COUNTRY";
conf.WStrSortSens = " ASC";
BtnSrtBy.IsAscending = true;
@@ -1204,7 +1167,6 @@
if ((choice_view.ToLower() == "view1") || (choice_view.ToLower() == conf.StrViewItem1.ToLower()))
{
// Change View by "View1":
- //Change_LayOut(0);
conf.WStrSort = conf.StrViewItem1; // specific user View1
conf.WStrSortSens = " ASC";
BtnSrtBy.IsAscending = true;
@@ -1217,7 +1179,6 @@
if ((choice_view.ToLower() == "view2") || (choice_view.ToLower() == conf.StrViewItem2.ToLower()))
{
// Change View by "View2":
- //Change_LayOut(0);
conf.WStrSort = conf.StrViewItem2;
conf.WStrSortSens = " ASC";
BtnSrtBy.IsAscending = true;
@@ -1231,9 +1192,8 @@
{
string newConfig = Configuration.Choice_Config(GetID);
newConfig = Configuration.Control_Access_Config(newConfig, GetID);
-
+
if (newConfig != "") // if user escapes dialog or bad value leave system unchanged
- //if (newConfig != "" && newConfig != Configuration.CurrentConfig) // if user escapes dialog or bad value leave system unchanged
{
//Change "Config":
Configuration.SaveConfiguration(Configuration.CurrentConfig, facadeView.SelectedListItem.ItemId, facadeView.SelectedListItem.Label);
Modified: trunk/plugins/MyFilms/MesFilms.csproj
===================================================================
--- trunk/plugins/MyFilms/MesFilms.csproj 2007-11-30 16:37:26 UTC (rev 1113)
+++ trunk/plugins/MyFilms/MesFilms.csproj 2007-12-01 16:54:02 UTC (rev 1114)
@@ -30,26 +30,26 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Core, Version=0.2.3.0, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Core, Version=0.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Rc3\Core.DLL</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_v0.2.3 SVN\Core.dll</HintPath>
</Reference>
- <Reference Include="Databases, Version=0.2.3.0, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Databases, Version=0.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Rc3\Databases.DLL</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_v0.2.3 SVN\Databases.dll</HintPath>
</Reference>
- <Reference Include="Dialogs, Version=0.2.3.0, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Dialogs, Version=0.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Rc3\Dialogs.DLL</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_v0.2.3 SVN\Dialogs.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="Utils, Version=2.2.2.0, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Utils, Version=2.2.2.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Rc3\Utils.DLL</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_v0.2.3 SVN\Utils.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-11-30 16:37:26 UTC (rev 1113)
+++ trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-12-01 16:54:02 UTC (rev 1114)
@@ -27,11 +27,12 @@
using System.Collections;
using System.Windows.Forms;
using System.Text.RegularExpressions;
-using MediaPortal.Util;
using System.Data;
+using System.Diagnostics;
-using MediaPortal.Playlists;
using System.IO;
+using MediaPortal.Util;
+using MediaPortal.Playlists;
using MediaPortal.Dialogs;
using MediaPortal.Player;
using MediaPortal.Video.Database;
@@ -39,7 +40,6 @@
using MediaPortal.GUI.Library;
using SQLite.NET;
using MediaPortal.Configuration;
-using Core.Util;
using NewStringLib;
namespace MesFilms
@@ -156,7 +156,6 @@
// Windows Init
//---------------------------------------------------------------------------------------
g_Player.PlayBackStarted += new MediaPortal.Player.g_Player.StartedHandler(OnPlayBackStarted);
- //g_Player.PlayBackEnded += new MediaPortal.Player.g_Player.EndedHandler(OnPlayBackEnded);
m_directory.SetExtensions(Utils.VideoExtensions);
base.OnMessage(messageType);
@@ -252,15 +251,6 @@
base.OnMessage(messageType);
return true;
}
- ////-------------------------------------------------------------------------------------------
- //// Load the XML data.
- ////-------------------------------------------------------------------------------------------
- //private DataRow[] LectureDonn\xE9es(string StrFilmSelect, string StrSort, string StrSortSens)
- //{
- // r = BaseMesFilms.LectureDonn\xE9es(StrFilmSelect, StrSort, StrSortSens);
- // StrMax = (int)r.Length;
- // return r;
- //}
//--------------------------------------------------------------------------------------------
// Update specifics Infos
//--------------------------------------------------------------------------------------------
@@ -413,7 +403,6 @@
//-------------------------------------------------------------------------------------------
private string control_searchNum(string stext)
{
- //Regex maRegexp = new Regex("^[0-9]{1,2}[\\.,][0-9]{1}$");
Regex maRegexp = new Regex("^[0-9]{1,2}[\\.,]?[0-9]?$");
if (!maRegexp.IsMatch(stext))
{
@@ -442,7 +431,6 @@
// selects records and sets StrIndex based on ItemId (leaves unchanged if ItemId=-1).
private void afficher_init(int ItemId)
{
- // r = BaseMesFilms.LectureDonn\xE9es(MesFilms.conf.StrDfltSelect, MesFilms.conf.StrSelect, MesFilms.conf.StrSort, MesFilms.conf.StrSortSens);
r = BaseMesFilms.LectureDonn\xE9es(MesFilms.conf.StrDfltSelect, MesFilms.conf.StrFilmSelect, MesFilms.conf.StrSort, MesFilms.conf.StrSortSens);
StrMax = r.Length;
}
@@ -632,6 +620,9 @@
// Play Movie
//-------------------------------------------------------------------------------------------
{
+ // Run externaly Program before Playing if defined in setup
+ if ((MesFilms.conf.CmdPar.Length > 0) && (MesFilms.conf.CmdPar != "(none)"))
+ RunProgram(MesFilms.conf.CmdExe, r[MesFilms.conf.StrIndex][MesFilms.conf.CmdPar].ToString());
if (g_Player.Playing)
g_Player.Stop();
string fileName = null;
@@ -784,11 +775,6 @@
VideoDatabase.SetMovieDuration(idFile, movieDuration);
}
}
- //private void OnPlayBackEnded(MediaPortal.Player.g_Player.MediaType type, string filename)
- //{
- // System.Windows.Forms.MessageBox.Show("OnPlayBackEnded");
-
- //}
private void AddFileToDatabase(string strFile,int select_item)
{
if (!Utils.IsVideo(strFile)) return;
@@ -887,7 +873,7 @@
dlgOk.SetLine(2, "'" + MesFilms.conf.StrIdentItem.ToString() + "' = " + r[select_item][MesFilms.conf.StrIdentItem].ToString());//ANT Item Identification for Media
else
dlgOk.SetLine(2, "' disc n\xB0 = " + r[select_item]["Number"].ToString());//ANT Number for Identification Media
- dlgOk.SetLine(3, wfile);//ANT File Name
+ dlgOk.SetLine(3, file);//ANT File Name
dlgOk.DoModal(GetID);
PlayMovie_Divx(filename, select_item, false); // try a second time. Maybe disc mounted
return;
@@ -994,7 +980,6 @@
}
// play movie...
-
PlayMovieFromPlayList(NoResumeMovie, wselectedFileIndex - 1);
}
}
@@ -1065,13 +1050,9 @@
{ movieDetails.Year = 0; }
string strThumb = MediaPortal.Util.Utils.GetCoverArtName(Thumbs.MovieTitle, movieDetails.Title);
string LargeThumb = MediaPortal.Util.Utils.GetLargeCoverArtName(Thumbs.MovieTitle, movieDetails.Title);
-
+
try
{
- //if (r1[select_item]["Picture"].ToString().IndexOf(":\\") == -1)
- // File.Copy(MesFilms.conf.StrPathImg + "\\" + r1[select_item]["Picture"].ToString(), LargeThumb, true);
- //else
- // File.Copy(r1[select_item]["Picture"].ToString(), LargeThumb, true);
string wImage;
if (r1[select_item]["Picture"].ToString().IndexOf(":\\") == -1)
wImage = MesFilms.conf.StrPathImg + "\\" + r1[select_item]["Picture"].ToString();
@@ -1079,9 +1060,18 @@
wImage = r1[select_item]["Picture"].ToString();
if (!System.IO.File.Exists(wImage))
wImage = Config.Dir.Skin + "\\media\\Films_No_Cover.png";
-
- MediaPortal.Util.Picture.CreateThumbnail(wImage, strThumb, 128, 128, 0);
- MediaPortal.Util.Picture.CreateThumbnail(wImage, LargeThumb, 512, 512, 0);
+ if (!System.IO.File.Exists(strThumb))
+ {
+ if (System.IO.File.Exists(wImage))
+ {
+ // CreateThumbnail Version 0.2.3 + SVN
+ if (Picture.CreateThumbnail(wImage, strThumb, (int)Thumbs.ThumbResolution, (int)Thumbs.ThumbResolution, 0, Thumbs.SpeedThumbsSmall))
+ Picture.CreateThumbnail(wImage, LargeThumb, (int)Thumbs.ThumbLargeResolution, (int)Thumbs.ThumbLargeResolution, 0, Thumbs.SpeedThumbsLarge);
+ //// CreateThumbnail Version 0.2.3 Stable
+ //if (Picture.CreateThumbnail(wImage, strThumb, (int)Thumbs.ThumbResolution, (int)Thumbs.ThumbResolution, 0))
+ // Picture.CreateThumbnail(wImage, LargeThumb, (int)Thumbs.ThumbLargeResolution, (int)Thumbs.ThumbLargeResolution, 0);
+ }
+ }
}
catch
{
@@ -1218,11 +1208,16 @@
file = file.Replace("\xEF", "[i\xEF]");
file = file.Replace("\xE7", "[c\xE7]");
oRegex = new System.Text.RegularExpressions.Regex(file);
+ string wpath;
foreach (string path in SearchDir)
{
- if (System.IO.Directory.Exists(path))
+ if (!(path.LastIndexOf(@"\") == path.Length - 1))
+ wpath = path + "\\";
+ else
+ wpath = path;
+ if (System.IO.Directory.Exists(wpath))
{
- DirectoryInfo dirsInf = new DirectoryInfo(path);
+ DirectoryInfo dirsInf = new DirectoryInfo(wpath);
//On retourne une liste d'informations sur les fichiers contenus dans le r\xE9pertoire
FileSystemInfo[] filesInf = dirsInf.GetFileSystemInfos();
@@ -1234,22 +1229,12 @@
foreach (System.Text.RegularExpressions.Match oMatch in oMatches)
{
if (MediaPortal.Util.Utils.IsVideo(fi.Name) || VirtualDirectory.IsImageFile(System.IO.Path.GetExtension(fi.Name)))
- if (path.LastIndexOf(@"\") + 1 == path.Length)
- result.Add(path + fi.Name);
- else
- result.Add(path + "\\" + fi.Name);
+ result.Add(wpath + fi.Name);
else
{
if (fi.Attributes.ToString() == "Directory")
- if (path.LastIndexOf(@"\") + 1 == path.Length)
- {
- if (System.IO.File.Exists(path.Trim() + fi.Name.Trim() + "\\VIDEO_TS\\VIDEO_TS.IFO"))
- result.Add(path.Trim() + fi.Name.Trim() + "\\VIDEO_TS\\VIDEO_TS.IFO");
- }
- else
- if (System.IO.File.Exists(path.Trim() + "\\" + fi.Name.Trim() + "\\VIDEO_TS\\VIDEO_TS.IFO"))
- result.Add(path.Trim() + "\\" + fi.Name.Trim() + "\\VIDEO_TS\\VIDEO_TS.IFO");
-
+ if (System.IO.File.Exists(path.Trim() + fi.Name.Trim() + "\\VIDEO_TS\\VIDEO_TS.IFO"))
+ result.Add(wpath.Trim() + fi.Name.Trim() + "\\VIDEO_TS\\VIDEO_TS.IFO");
}
}
}
@@ -1307,35 +1292,18 @@
else
{
string file = filename.Substring(filename.LastIndexOf(@"\") + 1);
- string wdirstor = StrDirStor;
- if (wdirstor.Length > 0)
+ System.Text.RegularExpressions.Regex oRegex;
+ oRegex = new System.Text.RegularExpressions.Regex(";");
+ string[] SearchDir = oRegex.Split(StrDirStor);
+ string wpath;
+ foreach (string path in SearchDir)
{
- int start = 0;
- int end = wdirstor.Length;
- int at = 0;
- int count;
- while ((start <= end) && (at > -1))
- {
- count = end - start;
- at = wdirstor.IndexOf(";", start, count);
- if (at == -1)
- {
- if (wdirstor.Substring(end - start - 1, 1).Trim() == "\\")
- if (System.IO.File.Exists(wdirstor.Substring(start, end - start).Trim().ToString() + file))
- return (wdirstor.Substring(start, end - start).Trim().ToString() + file);
- else
- if (System.IO.File.Exists(wdirstor.Substring(start, end - start).Trim().ToString() + "\\" + file))
- return (wdirstor.Substring(start, end - start).Trim().ToString() + "\\" + file);
- break;
- }
- if (wdirstor.Substring(at - start - 1, 1).Trim() == "\\")
- if (System.IO.File.Exists(wdirstor.Substring(start, at - start).Trim().ToString() + file))
- return (wdirstor.Substring(start, at - start).Trim().ToString() + file);
- else
- if (System.IO.File.Exists(wdirstor.Substring(start, at - start).Trim().ToString() + "\\" + file))
- return (wdirstor.Substring(start, at - start).Trim().ToString() + "\\" + file);
- start = at + 1;
- }
+ if (!(path.LastIndexOf(@"\") == path.Length - 1))
+ wpath = path + "\\";
+ else
+ wpath = path;
+ if (System.IO.File.Exists(wpath + file))
+ return (wpath + file);
}
string[] drives = Environment.GetLogicalDrives();
foreach (string drive in drives)
@@ -1345,9 +1313,7 @@
string driverLetter = drive.Substring(0, 1);
filename = String.Format(@"{0}:\", driverLetter) + file;
if (System.IO.File.Exists(filename))
- {
return filename;
- }
}
}
return "false";
@@ -1486,6 +1452,29 @@
return DaemonTools.IsMounted(file);
}
+ private void RunProgram(string exeName, string argsLine)
+ {
+ if (exeName.Length > 0)
+ {
+ ProcessStartInfo psI = new ProcessStartInfo(exeName, argsLine);
+ Process newProcess = new Process();
+
+ try
+ {
+ newProcess.StartInfo.FileName = exeName;
+ newProcess.StartInfo.Arguments = argsLine;
+ newProcess.StartInfo.UseShellExecute = true;
+ newProcess.StartInfo.CreateNoWindow = true;
+ newProcess.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
+ newProcess.Start();
+ }
+
+ catch (Exception e)
+ {
+ throw e;
+ }
+ }
+ }
}
}
#endregion
Modified: trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-11-30 16:37:26 UTC (rev 1113)
+++ trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-12-01 16:54:02 UTC (rev 1114)
@@ -139,6 +139,9 @@
this.MesFilmsCat = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.groupBox12 = new System.Windows.Forms.GroupBox();
+ this.CmdPar = new System.Windows.Forms.ComboBox();
+ this.CmdExe = new System.Windows.Forms.TextBox();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.AntSort = new System.Windows.Forms.ComboBox();
this.AntTSort = new System.Windows.Forms.TextBox();
@@ -190,12 +193,15 @@
this.ButSave = new System.Windows.Forms.Button();
this.Config_Dflt = new System.Windows.Forms.CheckBox();
this.Config_Menu = new System.Windows.Forms.CheckBox();
+ this.groupBox13 = new System.Windows.Forms.GroupBox();
+ this.OnlyFile = new System.Windows.Forms.CheckBox();
this.General.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox11.SuspendLayout();
this.groupBox7.SuspendLayout();
this.groupBox5.SuspendLayout();
this.tabPage2.SuspendLayout();
+ this.groupBox12.SuspendLayout();
this.groupBox6.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox2.SuspendLayout();
@@ -205,6 +211,7 @@
this.tabPage3.SuspendLayout();
this.groupBox10.SuspendLayout();
this.groupBox9.SuspendLayout();
+ this.groupBox13.SuspendLayout();
this.SuspendLayout();
//
// label10
@@ -214,7 +221,7 @@
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(69, 13);
this.label10.TabIndex = 34;
- this.label10.Text = "Version 4.3.1";
+ this.label10.Text = "Version 4.3.2";
//
// textBox1
//
@@ -260,7 +267,7 @@
this.General.Location = new System.Drawing.Point(12, 66);
this.General.Name = "General";
this.General.SelectedIndex = 0;
- this.General.Size = new System.Drawing.Size(755, 349);
+ this.General.Size = new System.Drawing.Size(755, 380);
this.General.TabIndex = 46;
//
// tabPage1
@@ -279,7 +286,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(747, 323);
+ this.tabPage1.Size = new System.Drawing.Size(747, 354);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "General";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -614,6 +621,7 @@
//
// tabPage2
//
+ this.tabPage2.Controls.Add(this.groupBox12);
this.tabPage2.Controls.Add(this.groupBox6);
this.tabPage2.Controls.Add(this.groupBox4);
this.tabPage2.Controls.Add(this.groupBox2);
@@ -623,16 +631,42 @@
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(747, 323);
+ this.tabPage2.Size = new System.Drawing.Size(747, 354);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "Optional";
this.tabPage2.UseVisualStyleBackColor = true;
//
+ // groupBox12
+ //
+ this.groupBox12.Controls.Add(this.CmdPar);
+ this.groupBox12.Controls.Add(this.CmdExe);
+ this.groupBox12.Location = new System.Drawing.Point(369, 296);
+ this.groupBox12.Name = "groupBox12";
+ this.groupBox12.Size = new System.Drawing.Size(370, 48);
+ this.groupBox12.TabIndex = 30;
+ this.groupBox12.TabStop = false;
+ this.groupBox12.Text = "Pre-Launching Command";
+ //
+ // CmdPar
+ //
+ this.CmdPar.FormattingEnabled = true;
+ this.CmdPar.Location = new System.Drawing.Point(229, 17);
+ this.CmdPar.Name = "CmdPar";
+ this.CmdPar.Size = new System.Drawing.Size(129, 21);
+ this.CmdPar.TabIndex = 36;
+ //
+ // CmdExe
+ //
+ this.CmdExe.Location = new System.Drawing.Point(10, 18);
+ this.CmdExe.Name = "CmdExe";
+ this.CmdExe.Size = new System.Drawing.Size(213, 20);
+ this.CmdExe.TabIndex = 37;
+ //
// groupBox6
//
this.groupBox6.Controls.Add(this.AntSort);
this.groupBox6.Controls.Add(this.AntTSort);
- this.groupBox6.Location = new System.Drawing.Point(371, 22);
+ this.groupBox6.Location = new System.Drawing.Point(371, 18);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(370, 48);
this.groupBox6.TabIndex = 29;
@@ -662,7 +696,7 @@
this.groupBox4.Controls.Add(this.AntUpdText2);
this.groupBox4.Controls.Add(this.AntUpdItem1);
this.groupBox4.Controls.Add(this.AntUpdText1);
- this.groupBox4.Location = new System.Drawing.Point(369, 229);
+ this.groupBox4.Location = new System.Drawing.Point(369, 217);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(372, 70);
this.groupBox4.TabIndex = 28;
@@ -724,9 +758,9 @@
this.groupBox2.Controls.Add(this.AntFilterText2);
this.groupBox2.Controls.Add(this.AntFilterItem1);
this.groupBox2.Controls.Add(this.AntFilterText1);
- this.groupBox2.Location = new System.Drawing.Point(371, 82);
+ this.groupBox2.Location = new System.Drawing.Point(371, 72);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(370, 141);
+ this.groupBox2.Size = new System.Drawing.Size(370, 139);
this.groupBox2.TabIndex = 27;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Ant Selected Enreg.";
@@ -751,7 +785,7 @@
this.Selected_Enreg.Name = "Selected_Enreg";
this.Selected_Enreg.ReadOnly = true;
this.Selected_Enreg.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal;
- this.Selected_Enreg.Size = new System.Drawing.Size(355, 49);
+ this.Selected_Enreg.Size = new System.Drawing.Size(355, 43);
this.Selected_Enreg.TabIndex = 28;
this.Selected_Enreg.TabStop = false;
//
@@ -837,7 +871,7 @@
this.groupBox8.Controls.Add(this.LayOut);
this.groupBox8.Controls.Add(this.View_Dflt_Item);
this.groupBox8.Controls.Add(this.View_Dflt_Text);
- this.groupBox8.Location = new System.Drawing.Point(12, 221);
+ this.groupBox8.Location = new System.Drawing.Point(12, 216);
this.groupBox8.Name = "groupBox8";
this.groupBox8.Size = new System.Drawing.Size(347, 96);
this.groupBox8.TabIndex = 26;
@@ -898,7 +932,7 @@
this.groupBox3.Controls.Add(this.AntViewText1);
this.groupBox3.Controls.Add(this.AntViewItem2);
this.groupBox3.Controls.Add(this.AntViewItem1);
- this.groupBox3.Location = new System.Drawing.Point(12, 147);
+ this.groupBox3.Location = new System.Drawing.Point(12, 142);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(347, 68);
this.groupBox3.TabIndex = 24;
@@ -944,7 +978,7 @@
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.AntLabel1);
this.groupBox1.Controls.Add(this.AntItem1);
- this.groupBox1.Location = new System.Drawing.Point(12, 22);
+ this.groupBox1.Location = new System.Drawing.Point(12, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(347, 119);
this.groupBox1.TabIndex = 22;
@@ -1011,12 +1045,13 @@
//
// tabPage3
//
+ this.tabPage3.Controls.Add(this.groupBox13);
this.tabPage3.Controls.Add(this.groupBox10);
this.tabPage3.Controls.Add(this.groupBox9);
this.tabPage3.Location = new System.Drawing.Point(4, 22);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage3.Size = new System.Drawing.Size(747, 323);
+ this.tabPage3.Size = new System.Drawing.Size(747, 354);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "DVDProfiler";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -1024,7 +1059,7 @@
// groupBox10
//
this.groupBox10.Controls.Add(this.SortTitle);
- this.groupBox10.Location = new System.Drawing.Point(56, 144);
+ this.groupBox10.Location = new System.Drawing.Point(56, 119);
this.groupBox10.Name = "groupBox10";
this.groupBox10.Size = new System.Drawing.Size(327, 65);
this.groupBox10.TabIndex = 1;
@@ -1048,7 +1083,7 @@
this.groupBox9.Controls.Add(this.DVDPTagField);
this.groupBox9.Location = new System.Drawing.Point(56, 32);
this.groupBox9.Name = "groupBox9";
- this.groupBox9.Size = new System.Drawing.Size(327, 89);
+ this.groupBox9.Size = new System.Drawing.Size(327, 81);
this.groupBox9.TabIndex = 0;
this.groupBox9.TabStop = false;
this.groupBox9.Text = "Use Tags";
@@ -1085,7 +1120,7 @@
//
// ButQuit
//
- this.ButQuit.Location = new System.Drawing.Point(679, 421);
+ this.ButQuit.Location = new System.Drawing.Point(679, 452);
this.ButQuit.Name = "ButQuit";
this.ButQuit.Size = new System.Drawing.Size(64, 31);
this.ButQuit.TabIndex = 40;
@@ -1095,7 +1130,7 @@
//
// ButDelet
//
- this.ButDelet.Location = new System.Drawing.Point(599, 421);
+ this.ButDelet.Location = new System.Drawing.Point(599, 452);
this.ButDelet.Name = "ButDelet";
this.ButDelet.Size = new System.Drawing.Size(64, 31);
this.ButDelet.TabIndex = 39;
@@ -1105,7 +1140,7 @@
//
// ButSave
//
- this.ButSave.Location = new System.Drawing.Point(529, 421);
+ this.ButSave.Location = new System.Drawing.Point(529, 452);
this.ButSave.Name = "ButSave";
this.ButSave.Size = new System.Drawing.Size(64, 31);
this.ButSave.TabIndex = 47;
@@ -1133,11 +1168,31 @@
this.Config_Menu.Text = "Display Always Configuration\'s Menu (if no Default Config)";
this.Config_Menu.UseVisualStyleBackColor = true;
//
+ // groupBox13
+ //
+ this.groupBox13.Controls.Add(this.OnlyFile);
+ this.groupBox13.Location = new System.Drawing.Point(56, 190);
+ this.groupBox13.Name = "groupBox13";
+ this.groupBox13.Size = new System.Drawing.Size(327, 65);
+ this.groupBox13.TabIndex = 2;
+ this.groupBox13.TabStop = false;
+ this.groupBox13.Text = "Notes Field";
+ //
+ // OnlyFile
+ //
+ this.OnlyFile.AutoSize = true;
+ this.OnlyFile.Location = new System.Drawing.Point(24, 28);
+ this.OnlyFile.Name = "OnlyFile";
+ this.OnlyFile.Size = new System.Drawing.Size(221, 17);
+ this.OnlyFile.TabIndex = 0;
+ this.OnlyFile.Text = "Notes Field contains only Movie Filename";
+ this.OnlyFile.UseVisualStyleBackColor = true;
+ //
// MesFilmsSetup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(780, 476);
+ this.ClientSize = new System.Drawing.Size(795, 495);
this.Controls.Add(this.Config_Menu);
this.Controls.Add(this.ButSave);
this.Controls.Add(this.Config_Dflt);
@@ -1163,6 +1218,8 @@
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
this.tabPage2.ResumeLayout(false);
+ this.groupBox12.ResumeLayout(false);
+ this.groupBox12.PerformLayout();
this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout();
this.groupBox4.ResumeLayout(false);
@@ -1180,6 +1237,8 @@
this.groupBox10.PerformLayout();
this.groupBox9.ResumeLayout(false);
this.groupBox9.PerformLayout();
+ this.groupBox13.ResumeLayout(false);
+ this.groupBox13.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -1280,6 +1339,11 @@
private TextBox DefaultCover;
private Label label19;
private CheckBox AlwaysDefaultView;
+ private GroupBox groupBox12;
+ private ComboBox CmdPar;
+ private TextBox CmdExe;
+ private GroupBox groupBox13;
+ private CheckBox OnlyFile;
}
}
\ No newline at end of file
Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-11-30 16:37:26 UTC (rev 1113)
+++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-12-01 16:54:02 UTC (rev 1114)
@@ -62,6 +62,7 @@
ToolTip1.SetToolTip(this.ButQuit, "No comments...");
ToolTip1.SetToolTip(this.groupBox9, "With those options, you can use specifics Tags DVDP's Fields" + "\n" + "and store either with Genre field either in another field" + "\n" + "of the generated DB.");
ToolTip1.SetToolTip(this.groupBox10, "With that option, you can store either the DVDP's Sorted field" + "\n" + "either the Original Title of the generated DB.");
+ ToolTip1.SetToolTip(this.groupBox12, "Tou can define here a Command and the ANT field item containing" + "\n" + "the parameter value to be launch before playing a movie.");
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++)
@@ -90,6 +91,7 @@
AntItem1.Items.Add("(none)");
AntItem2.Items.Add("(none)");
AntItem3.Items.Add("(none)");
+ CmdPar.Items.Add("(none)");
CatalogType.SelectedIndex = 0;
foreach (DataColumn dc in ds.Movie.Columns)
{
@@ -104,6 +106,7 @@
AntTitle2.Items.Add(dc.ColumnName);
AntFilterItem1.Items.Add(dc.ColumnName);
AntFilterItem2.Items.Add(dc.ColumnName);
+ CmdPar.Items.Add(dc.ColumnName);
if (!(dc.ColumnName == "Rating") & !(dc.ColumnName == "Date") & !(dc.ColumnName == "Year") & !(dc.ColumnName == "Category") & !(dc.ColumnName == "Country") && !(dc.ColumnName == "TranslatedTitle") && !(dc.ColumnName == "OriginalTitle") && !(dc.ColumnName == "FormattedTitle") && !(dc.ColumnName == "Description") && !(dc.ColumnName == "Comments"))
{
AntViewItem1.Items.Add(dc.ColumnName);
@@ -130,7 +133,6 @@
{
MesFilmsCat.Text = openFileDialog1.FileName;
MesFilmsImg.Text = MesFilmsCat.Text.Substring(0, MesFilmsCat.Text.LastIndexOf(@"\"));
- PathStorage.Text = MesFilmsCat.Text.Substring(0, MesFilmsCat.Text.LastIndexOf(@"\"));
}
}
@@ -311,44 +313,9 @@
return;
}
Selected_Enreg_TextChanged();
-// StrDfltSelect = "";
-// string wAntFilterSign;
-// if (AntFilterSign1.Text == "#")
-// wAntFilterSign = "<>";
-// else
-// wAntFilterSign = AntFilterSign1.Text;
-// if ((AntFilterItem1.Text.Length > 0) && !(AntFilterItem1.Text == "(none)"))
-// if (AntFilterItem1.Text == "DateAdded")
-//// StrDfltSelect = "(" + AntFilterItem1.Text + " " + wAntFilterSign + " #" + Convert.ToDateTime(AntFilterText1.Text) + "# or " + AntFilterItem1.Text + " is null) ";
-// StrDfltSelect = "(" + AntFilterItem1.Text + " " + wAntFilterSign + " #" + Convert.ToDateTime(AntFilterText1.Text) + "# ) ";
-// else
-//// StrDfltSelect = "(" + AntFilterItem1.Text + " " + wAntFilterSign + " '" + AntFilterText1.Text + "' or " + AntFilterItem1.Text + " is null) ";
-// StrDfltSelect = "(" + AntFilterItem1.Text + " " + wAntFilterSign + " '" + AntFilterText1.Text + "') ";
-// if ((AntFilterComb.Text == "or") && (StrDfltSelect.Length > 0))
-// StrDfltSelect = StrDfltSelect + " OR ";
-// else
-// if (StrDfltSelect.Length > 0)
-// StrDfltSelect = StrDfltSelect + " AND ";
-// if (AntFilterSign2.Text == "#")
-// wAntFilterSign = "<>";
-// else
-// wAntFilterSign = AntFilterSign2.Text;
-// if ((AntFilterItem2.Text.Length > 0) && !(AntFilterItem2.Text == "(none)"))
-// if (AntFilterItem2.Text == "DateAdded")
-//// StrDfltSelect = "(" + StrDfltSelect + "(" + AntFilterItem2.Text + " " + wAntFilterSign + " #" + Convert.ToDateTime(AntFilterText2.Text) + "# or " + AntFilterItem2.Text + " is null)) AND ";
-// StrDfltSelect = "(" + StrDfltSelect + "(" + AntFilterItem2.Text + " " + wAntFilterSign + " #" + Convert.ToDateTime(AntFilterText2.Text) + "# )) AND ";
-// else
-//// StrDfltSelect = "(" + StrDfltSelect + "(" + AntFilterItem2.Text + " " + wAntFilterSign + " '" + AntFilterText2.Text + "' or " + AntFilterItem2.Text + " is null)) AND ";
-// StrDfltSelect = "(" + StrDfltSelect + "(" + AntFilterItem2.Text + " " + wAntFilterSign + " '" + AntFilterText2.Text + "' )) AND ";
if (View_Dflt_Item.Text.Length == 0)
View_Dflt_Item.Text = "(none)";
Verify_Config();
- //string currentLanguage = String.Empty;
- //using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
- //{
- // currentLanguage = xmlreader.GetValueAsString("skin", "language", "English");
- //}
- //string LanguageDirectory = Config.GetFolder(Config.Dir.Language);
int WLayOut = 0;
if (LayOut.Text == "Small Icons")
WLayOut = 1;
@@ -422,9 +389,12 @@
MyFilms_xmlwriter.SetValueAsBool(Config_Name.Text.ToString(), "AlwaysDefaultView", AlwaysDefaultView.Checked);
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "ItemSearchFileName", ItemSearchFileName.Text);
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "DefaultCover", DefaultCover.Text);
+ MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "CmdExe", CmdExe.Text);
+ MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "CmdPar", CmdPar.Text);
if (CatalogType.SelectedIndex == 1)
{
- MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "SortTitle", SortTitle.Checked);
+ MyFilms_xmlwriter.SetValueAsBool(Config_Name.Text.ToString(), "SortTitle", SortTitle.Checked);
+ MyFilms_xmlwriter.SetValueAsBool(Config_Name.Text.ToString(), "OnlyFile", OnlyFile.Checked);
if (radioButton1.Checked)
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "DVDPTagField", "Category");
else
@@ -437,16 +407,19 @@
Config_Name.Items.Remove(Config_Name.Text);
Config_Name.Items.Add(w_Config_Name);
Config_Name.Text = w_Config_Name;
-// Config_Name.ResetText();
-// Refresh_Items(false);
-
}
private void butPath_Click(object sender, EventArgs e)
{
if (folderBrowserDialog1.ShowDialog(this) == DialogResult.OK)
{
- PathStorage.Text = PathStorage.Text + ";" + folderBrowserDialog1.SelectedPath;
+ if (!(folderBrowserDialog1.SelectedPath.LastIndexOf(@"\") == folderBrowserDialog1.SelectedPath.Length - 1))
+ folderBrowserDialog1.SelectedPath = folderBrowserDialog1.SelectedPath + "\\";
+
+ if (PathStorage.Text.Length == 0)
+ PathStorage.Text = folderBrowserDialog1.SelectedPath;
+ else
+ PathStorage.Text = PathStorage.Text + ";" + folderBrowserDialog1.SelectedPath;
}
}
@@ -504,8 +477,10 @@
AntLabel2.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "AntLabel2", "");
AntItem2.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "AntItem2", "");
AntItem3.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "AntItem3", "");
+ CmdPar.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "CmdPar", "(none)");
+ CmdExe.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "CmdExe", "");
TitleDelim.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "TitleDelim", "\\");
- Dwp.Text = crypto.Decrypter(MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "Dwp", ""));
+ Dwp.Text = crypto.Decrypter(MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "Dwp", ""));
Rpt_Dwp.Text = Dwp.Text;
if (MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "SearchFileName", "False") == "True")
SearchFileName.Checked = true;
@@ -523,10 +498,12 @@
radioButton2.Checked = true;
DVDPTagField.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "DVDPTagField", "");
}
- if (MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "SortTitle", "False") == "True")
- SortTitle.Checked = true;
- else
- SortTitle.Checked = false;
+ //if (MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "SortTitle", "False") == "True")
+ // SortTitle.Checked = true;
+ //else
+ // SortTitle.Checked = false;
+ SortTitle.Checked = MyFilms_xmlreader.GetValueAsBool(Config_Name.Text.ToString(), "SortTitle", false);
+ OnlyFile.Checked = MyFilms_xmlreader.GetValueAsBool(Config_Name.Text.ToString(), "OnlyFile", false);
ItemSearchFileName.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "ItemSearchFileName", "");
DefaultCover.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "DefaultCover", "");
View_Dflt_Item.Items.Remove(View_Dflt_Item.Text);
@@ -603,12 +580,15 @@
DefaultCover.ResetText();
Dwp.ResetText();
Rpt_Dwp.ResetText();
+ CmdExe.ResetText();
+ CmdPar.ResetText();
ItemSearchFileName.ResetText();
SearchFileName.Checked = false;
radioButton1.Checked = false;
radioButton2.Checked = false;
DVDPTagField.ResetText();
SortTitle.Checked = false;
+ OnlyFile.Checked = false;
AlwaysDefaultView.Checked = false;
}
@@ -703,14 +683,16 @@
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "LastID");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "Dwp");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "SortTitle");
+ MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "OnlyFile");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "DVDPTagField");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "DefaultCover");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text,...
[truncated message content] |
|
From: <ze...@us...> - 2008-02-04 21:46:01
|
Revision: 1339
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1339&view=rev
Author: zebons
Date: 2008-02-04 13:45:54 -0800 (Mon, 04 Feb 2008)
Log Message:
-----------
v4.4.1.3 compatibility with Online Folder Option for MyMovies dvd file location
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilmsDetail.cs
trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsDetail.cs 2008-02-03 22:15:46 UTC (rev 1338)
+++ trunk/plugins/MyFilms/MesFilmsDetail.cs 2008-02-04 21:45:54 UTC (rev 1339)
@@ -693,6 +693,16 @@
launch_player(fileName);
}
else
+ if (System.IO.Directory.Exists(fileName))
+ {
+ if (System.IO.File.Exists(System.IO.Path.GetFullPath(fileName) + @"VIDEO_TS\VIDEO_TS.IFO"))
+ {
+ fileName = System.IO.Path.GetFullPath(fileName) + @"VIDEO_TS\VIDEO_TS.IFO";
+ update_database(fileName, select_item, -1);
+ launch_player(fileName);
+ }
+ }
+ else
PlayMovie_Divx(fileName, select_item, first);
return;
}
Modified: trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2008-02-03 22:15:46 UTC (rev 1338)
+++ trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2008-02-04 21:45:54 UTC (rev 1339)
@@ -251,7 +251,7 @@
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(78, 13);
this.label10.TabIndex = 34;
- this.label10.Text = "Version 4.4.1.2";
+ this.label10.Text = "Version 4.4.1.3";
//
// textBox1
//
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2008-03-26 06:56:26
|
Revision: 1528
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1528&view=rev
Author: zebons
Date: 2008-03-25 23:56:24 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyFilms/AssemblyInfo.cs
trunk/plugins/MyFilms/Configuration.cs
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilms.csproj
trunk/plugins/MyFilms/MesFilmsDetail.cs
trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
trunk/plugins/MyFilms/mesfilms.FxCop
trunk/plugins/MyFilms/skin/BlackMyst/MesFilms.xml
trunk/plugins/MyFilms/skin/BlackMyst/MesFilmsDetail.xml
trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml
trunk/plugins/MyFilms/skin/BlueTwo wide/MesFilms.xml
trunk/plugins/MyFilms/skin/BlueTwo wide/MesFilmsDetail.xml
trunk/plugins/MyFilms/skin/Monochrome/MesFilms.common.facade.xml
trunk/plugins/MyFilms/skin/Monochrome/MesFilms.xml
trunk/plugins/MyFilms/skin/Project Mayhem 3/MesFilms.xml
trunk/plugins/MyFilms/skin/SpinSafe Revolve/MesFilms.xml
trunk/plugins/MyFilms/skin/Xface/MesFilms.xml
Added Paths:
-----------
trunk/plugins/MyFilms/skin/BlackMyst Blue wide/
Removed Paths:
-------------
trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/
trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_No_Cover.png
trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_first_focus.png
trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_first_nofocus.png
trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_last_focus.png
trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_last_nofocus.png
trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_next_focus.PNG
trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_next_nofocus.PNG
trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_prior_focus.PNG
trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_prior_nofocus.PNG
trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_No_Cover.png
trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_first_focus.png
trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_first_nofocus.png
trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_last_focus.png
trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_last_nofocus.png
trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_next_focus.PNG
trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_next_nofocus.PNG
trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_prior_focus.PNG
trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_prior_nofocus.PNG
trunk/plugins/MyFilms/skin/BlueTwo/Media/hover_my films.png
trunk/plugins/MyFilms/skin/BlueTwo wide/Media/Films_No_Cover.png
trunk/plugins/MyFilms/skin/Monochrome/common.time.xml
Modified: trunk/plugins/MyFilms/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyFilms/AssemblyInfo.cs 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/AssemblyInfo.cs 2008-03-26 06:56:24 UTC (rev 1528)
@@ -9,7 +9,7 @@
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Personnel")]
-[assembly: AssemblyProduct("MesFilms")]
+[assembly: AssemblyProduct("Mediaportal")]
[assembly: AssemblyCopyright("Copyright © Personnel 2006")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Modified: trunk/plugins/MyFilms/Configuration.cs
===================================================================
--- trunk/plugins/MyFilms/Configuration.cs 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/Configuration.cs 2008-03-26 06:56:24 UTC (rev 1528)
@@ -3,6 +3,7 @@
using System.Text;
using MediaPortal.Configuration;
using System.IO;
+using MediaPortal.Util;
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/MesFilms.cs 2008-03-26 06:56:24 UTC (rev 1528)
@@ -65,13 +65,13 @@
CTRL_BtnSearchA = 5,
CTRL_BtnLayout = 6,
CTRL_TxtSelect = 12,
- CTRL_List = 1026,
CTRL_Image = 1020,
CTRL_Image2 = 1021,
+ CTRL_List = 1026,
CTRL_TxtYear = 1022,
CTRL_TxtGenre = 1024,
CTRL_Texte = 1025,
- CTRL_Title = 1027,
+ //CTRL_Title = 1027,
CTRL_NbObjects = 2073
}
[SkinControlAttribute((int)Controls.CTRL_TxtSelect)]
@@ -82,8 +82,8 @@
protected GUIFacadeControl facadeView = null;
[SkinControlAttribute((int)Controls.CTRL_Texte)]
protected GUITextScrollUpControl ScrlLstText = null;
- [SkinControlAttribute((int)Controls.CTRL_Title)]
- protected GUIFadeLabel TitleSelect = null;
+ //[SkinControlAttribute((int)Controls.CTRL_Title)]
+ //protected GUIFadeLabel TitleSelect = null;
[SkinControlAttribute((int)Controls.CTRL_TxtYear)]
protected GUILabelControl TxtLstYear = null;
[SkinControlAttribute((int)Controls.CTRL_TxtGenre)]
@@ -659,6 +659,7 @@
conf.FileImage = "";
if (!System.IO.File.Exists(conf.FileImage))
conf.FileImage = conf.DefaultCover;
+
item.ThumbnailImage = conf.FileImage;
item.IconImage = conf.FileImage;
item.ItemId = number;
@@ -678,9 +679,19 @@
{
item.Year = 0;
}
+ if (conf.Stritem1.Length > 0)
+ item.MusicTag = r[conf.Stritem1].ToString();
+ else
+ item.MusicTag = string.Empty;
+ if (conf.Stritem3.Length > 0)
+ item.Path = r[conf.Stritem3].ToString();
+ else
+ item.Path = string.Empty;
item.DVDLabel = r[conf.StrTitle1].ToString();
- string wdescription = r["Description"].ToString().Replace('|', ' ');
- item.TVTag = HTMLParser.removeHtml(wdescription);
+ string wdescription = System.Web.HttpUtility.HtmlEncode(r["Description"].ToString().Replace('\x92', '\''));
+ wdescription = wdescription.ToString().Replace('|', '\n');
+ wdescription = wdescription.ToString().Replace('\x85', '.');
+ item.TVTag = System.Web.HttpUtility.HtmlDecode(MediaPortal.Util.HTMLParser.removeHtml(wdescription.ToString()));
item.AlbumInfoTag = r["Category"].ToString();
item.OnItemSelected += new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(item_OnItemSelected);
facadeView.Add(item);
@@ -690,8 +701,8 @@
if (sTitle == SelItem)
{
conf.StrIndex = facadeView.Count - 1; //test if this item is one to select
- ImgLstFilm.SetFileName(wthumb);
- ImgLstFilm2.SetFileName(wthumb);
+ //ImgLstFilm.SetFileName(wthumb);
+ //ImgLstFilm2.SetFileName(wthumb);
}
}
}
@@ -702,8 +713,8 @@
if (((int)(r["Number"]) == iSelItem))
{
conf.StrIndex = facadeView.Count - 1; //test if this item is one to select
- ImgLstFilm.SetFileName(wthumb);
- ImgLstFilm2.SetFileName(wthumb);
+ //ImgLstFilm.SetFileName(wthumb);
+ //ImgLstFilm2.SetFileName(wthumb);
}
}
else
@@ -711,11 +722,12 @@
if (((int)(r["Number"]) == iSelItem) && ((string)(r[conf.StrTitle1]) == conf.StrTIndex))
{
conf.StrIndex = facadeView.Count - 1; //test if this item is one to select
- ImgLstFilm.SetFileName(wthumb);
- ImgLstFilm2.SetFileName(wthumb);
+ //ImgLstFilm.SetFileName(wthumb);
+ //ImgLstFilm2.SetFileName(wthumb);
}
}
}
+
sPrevTitle = sTitle;
fin: ;
}
@@ -763,34 +775,53 @@
//----------------------------------------------------------------------------------------
private void affichage_Lstdetail(int ItemId, bool wrep, string wlabel)//wrep = false display only image
{
- conf.FileImage = facadeView.SelectedListItem.ThumbnailImage.ToString();
- ImgLstFilm.SetFileName(conf.FileImage);
- ImgLstFilm2.SetFileName(conf.FileImage);
-
- if (!wrep)
- {
- GUIControl.ShowControl(GetID, 34);
- affichage_rating(0);
- return;
- }
- GUIControl.HideControl(GetID, 34);
- ScrlLstText.Clear();
- ScrlLstText.Label = facadeView.SelectedListItem.TVTag.ToString();
- TitleSelect.Label = wlabel;
- TxtLstGenre.Label = facadeView.SelectedListItem.AlbumInfoTag.ToString();
- if (facadeView.SelectedListItem.Year == 0)
- TxtLstYear.Label = string.Empty;
- else
- TxtLstYear.Label = facadeView.SelectedListItem.Year.ToString();
- try
- {
- conf.W_rating = (decimal)facadeView.SelectedListItem.Rating;
- }
- catch
- {
- conf.W_rating = 0;
- }
- affichage_rating(conf.W_rating);
+ conf.FileImage = facadeView.SelectedListItem.ThumbnailImage.ToString();
+ string wlabel1 = facadeView.SelectedListItem.TVTag.ToString();
+ string wlabel2 = facadeView.SelectedListItem.AlbumInfoTag.ToString();
+ string wyear = facadeView.SelectedListItem.Year.ToString();
+ string witem1 = facadeView.SelectedListItem.MusicTag.ToString();
+ string witem3 = facadeView.SelectedListItem.Path.ToString();
+ if (!wrep)
+ {
+ GUIControl.ShowControl(GetID, 34);
+ affichage_rating(0);
+ return;
+ }
+ GUIControl.HideControl(GetID, 34);
+ ScrlLstText.Clear();
+ try
+ {
+ conf.W_rating = (decimal)facadeView.SelectedListItem.Rating;
+ }
+ catch
+ {
+ conf.W_rating = 0;
+ }
+ if (wyear == "0")
+ TxtLstYear.Label = string.Empty;
+ else
+ TxtLstYear.Label = wyear;
+ if (witem1.Length > 0)
+ {
+ GUIPropertyManager.SetProperty("#opt_item1", witem1);
+ GUIPropertyManager.SetProperty("#opt_label1", wlabel1);
+ }
+ else
+ {
+ GUIPropertyManager.SetProperty("#opt_item1", " ");
+ GUIPropertyManager.SetProperty("#opt_label1", " ");
+ }
+ if (witem3.Length > 0)
+ GUIPropertyManager.SetProperty("#opt_item3", witem3);
+ else
+ GUIPropertyManager.SetProperty("#opt_item3", " ");
+
+ //TitleSelect.Label = wlabel;
+ ImgLstFilm.SetFileName(conf.FileImage);
+ ImgLstFilm2.SetFileName(conf.FileImage);
+ ScrlLstText.Label = wlabel1;
+ TxtLstGenre.Label = wlabel2;
+ affichage_rating(conf.W_rating);
}
//-------------------------------------------------------------------------------------------
@@ -927,7 +958,7 @@
{
if (arSplit[wi].Length > 0)
{
- wzone = HTMLParser.removeHtml(arSplit[wi].Trim());
+ wzone = MediaPortal.Util.HTMLParser.removeHtml(arSplit[wi].Trim());
for (int i = 0; i <= 4; i++)
{
if (conf.RoleSeparator[i].Length > 0)
Modified: trunk/plugins/MyFilms/MesFilms.csproj
===================================================================
--- trunk/plugins/MyFilms/MesFilms.csproj 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/MesFilms.csproj 2008-03-26 06:56:24 UTC (rev 1528)
@@ -14,11 +14,11 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\..\MediaPortal\xbmc\bin\Debug\plugins\Windows\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <UseVSHostingProcess>false</UseVSHostingProcess>
+ <UseVSHostingProcess>true</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -45,6 +45,7 @@
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
+ <Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="Utils, Version=2.2.2.0, Culture=neutral, processorArchitecture=MSIL">
Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsDetail.cs 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/MesFilmsDetail.cs 2008-03-26 06:56:24 UTC (rev 1528)
@@ -528,11 +528,16 @@
else
GUIPropertyManager.SetProperty("#duree", " ");
if (r[MesFilms.conf.StrIndex]["Actors"].ToString().Length > 0)
- GUIPropertyManager.SetProperty("#acteurs", r[MesFilms.conf.StrIndex]["Actors"].ToString().Replace('|', ','));
+ GUIPropertyManager.SetProperty("#acteurs", r[MesFilms.conf.StrIndex]["Actors"].ToString().Replace('|', '\n'));
else
GUIPropertyManager.SetProperty("#acteurs", " ");
if (r[MesFilms.conf.StrIndex]["Description"].ToString().Length > 0)
- GUIPropertyManager.SetProperty("#description", HTMLParser.removeHtml(r[MesFilms.conf.StrIndex]["Description"].ToString().Replace('|', ' ')));
+ {
+ string wdescription = System.Web.HttpUtility.HtmlEncode(r[MesFilms.conf.StrIndex]["Description"].ToString().Replace('\x92', '\''));
+ wdescription = wdescription.ToString().Replace('|', '\n');
+ wdescription = wdescription.ToString().Replace('\x85', '.');
+ GUIPropertyManager.SetProperty("#description", System.Web.HttpUtility.HtmlDecode(MediaPortal.Util.HTMLParser.removeHtml(wdescription.ToString())));
+ }
else
GUIPropertyManager.SetProperty("#description", " ");
if (r[MesFilms.conf.StrIndex]["Rating"].ToString().Length > 0)
@@ -1073,7 +1078,9 @@
pathId = VideoDatabase.GetPath(strPath);
VideoDatabase.AddFile(idMovie, pathId, strFileName);
}
- movieDetails.PlotOutline = movieDetails.Plot = HTMLParser.removeHtml(r1[select_item]["Description"].ToString().Replace('|', ' '));
+ string wdescription = System.Web.HttpUtility.HtmlEncode(r1[select_item]["Description"].ToString().Replace('\x92', '\''));
+ wdescription = wdescription.ToString().Replace('|', '\n');
+ movieDetails.PlotOutline = movieDetails.Plot = System.Web.HttpUtility.HtmlDecode(MediaPortal.Util.HTMLParser.removeHtml(wdescription.ToString()));
//movieDetails.PlotOutline = r1[select_item]["Description"].ToString().Replace('|', ' ');
movieDetails.Title = r1[select_item][MesFilms.conf.StrTitle1].ToString();
@@ -1105,12 +1112,12 @@
{
if (System.IO.File.Exists(wImage))
{
- //// CreateThumbnail Version 0.2.3 + SVN
- //if (Picture.CreateThumbnail(wImage, strThumb, (int)Thumbs.ThumbResolution, (int)Thumbs.ThumbResolution, 0, Thumbs.SpeedThumbsSmall))
- // Picture.CreateThumbnail(wImage, LargeThumb, (int)Thumbs.ThumbLargeResolution, (int)Thumbs.ThumbLargeResolution, 0, Thumbs.SpeedThumbsLarge);
- // CreateThumbnail Version 0.2.3 Stable
- if (Picture.CreateThumbnail(wImage, strThumb, (int)Thumbs.ThumbResolution, (int)Thumbs.ThumbResolution, 0))
- Picture.CreateThumbnail(wImage, LargeThumb, (int)Thumbs.ThumbLargeResolution, (int)Thumbs.ThumbLargeResolution, 0);
+ // CreateThumbnail Version 0.2.3 + SVN
+ if (Picture.CreateThumbnail(wImage, strThumb, (int)Thumbs.ThumbResolution, (int)Thumbs.ThumbResolution, 0, Thumbs.SpeedThumbsSmall))
+ Picture.CreateThumbnail(wImage, LargeThumb, (int)Thumbs.ThumbLargeResolution, (int)Thumbs.ThumbLargeResolution, 0, Thumbs.SpeedThumbsLarge);
+ //// CreateThumbnail Version 0.2.3 Stable
+ //if (Picture.CreateThumbnail(wImage, strThumb, (int)Thumbs.ThumbResolution, (int)Thumbs.ThumbResolution, 0))
+ // Picture.CreateThumbnail(wImage, LargeThumb, (int)Thumbs.ThumbLargeResolution, (int)Thumbs.ThumbLargeResolution, 0);
}
}
}
Modified: trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2008-03-26 06:56:24 UTC (rev 1528)
@@ -249,9 +249,9 @@
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(676, 42);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(69, 13);
+ this.label10.Size = new System.Drawing.Size(60, 13);
this.label10.TabIndex = 34;
- this.label10.Text = "Version 4.4.2";
+ this.label10.Text = "Version 4.5";
//
// textBox1
//
@@ -277,8 +277,8 @@
this.Config_Name.Size = new System.Drawing.Size(202, 21);
this.Config_Name.Sorted = true;
this.Config_Name.TabIndex = 1;
+ this.Config_Name.Leave += new System.EventHandler(this.Config_Name_SelectedIndexChanged);
this.Config_Name.SelectedIndexChanged += new System.EventHandler(this.Config_Name_SelectedIndexChanged);
- this.Config_Name.Leave += new System.EventHandler(this.Config_Name_SelectedIndexChanged);
//
// label12
//
@@ -1555,8 +1555,8 @@
this.Controls.Add(this.ButQuit);
this.Name = "MesFilmsSetup";
this.Text = "MesFilmsSetup";
+ this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MesFilmsSetup_Quit);
this.Load += new System.EventHandler(this.MesFilmsSetup_Load);
- this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MesFilmsSetup_Quit);
this.General.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout();
Modified: trunk/plugins/MyFilms/mesfilms.FxCop
===================================================================
--- trunk/plugins/MyFilms/mesfilms.FxCop 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/mesfilms.FxCop 2008-03-26 06:56:24 UTC (rev 1528)
@@ -21,7 +21,6 @@
<DeadlockDetectionTimeout>120</DeadlockDetectionTimeout>
</ProjectOptions>
<Targets>
- <Target Name="$(ProjectDir)/../mediaportal/xbmc/bin/Debug/Core.dll" Analyze="False" AnalyzeAllChildren="False" />
<Target Name="$(ProjectDir)/../mediaportal/xbmc/bin/Debug/plugins/windows/MesFilms.dll" Analyze="True" AnalyzeAllChildren="False">
<Modules AnalyzeAllChildren="False">
<Module Name="mesfilms.dll" Analyze="True" AnalyzeAllChildren="False">
Deleted: trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_No_Cover.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_first_focus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_first_nofocus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_last_focus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_last_nofocus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_next_focus.PNG
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_next_nofocus.PNG
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_prior_focus.PNG
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_prior_nofocus.PNG
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyFilms/skin/BlackMyst/MesFilms.xml
===================================================================
--- trunk/plugins/MyFilms/skin/BlackMyst/MesFilms.xml 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/skin/BlackMyst/MesFilms.xml 2008-03-26 06:56:24 UTC (rev 1528)
@@ -448,24 +448,24 @@
<control>
<type>image</type>
<description>Thumb displayed when player.playing</description>
- <id>1020</id>
+ <id>1021</id>
<posX>100</posX>
<posY>260</posY>
<width>122</width>
<height>140</height>
- <texture>-</texture>
+ <texture>#selectedthumb</texture>
<visible>player.hasmedia +!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible>
<keepaspectratio>yes</keepaspectratio>
</control>
<control>
<type>image</type>
<description>Thumb displayed when no player.playing</description>
- <id>1021</id>
+ <id>1020</id>
<posX>65</posX>
<posY>270</posY>
<width>145</width>
<height>200</height>
- <texture>-</texture>
+ <texture>#selectedthumb</texture>
<visible>!player.hasmedia +!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible>
<keepaspectratio>yes</keepaspectratio>
</control>
@@ -475,7 +475,7 @@
<id>1022</id>
<posX>65</posX>
<posY>550</posY>
- <visible>!facadeview.filmstrip+!control.isvisible(23)+!control.isvisible(34)+control.hasfocus(1026)+!player.hasmedia</visible>
+ <visible>!control.isvisible(23)+!control.isvisible(34)+control.hasfocus(1026)+!player.hasmedia</visible>
<label>6</label>
<font>font12</font>
</control>
@@ -485,11 +485,44 @@
<id>1024</id>
<posX>112</posX>
<posY>550</posY>
- <visible>!facadeview.filmstrip+!control.isvisible(23)+!control.isvisible(34)+control.hasfocus(1026)+!player.hasmedia</visible>
+ <visible>!control.isvisible(23)+!control.isvisible(34)+control.hasfocus(1026)+!player.hasmedia</visible>
<label>6</label>
<font>font12</font>
</control>
+ <control>
+ <type>label</type>
+ <description>Optional Label1</description>
+ <id>1031</id>
+ <posX>65</posX>
+ <posY>530</posY>
+ <width>950</width>
+ <label>#opt_label1</label>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ </control>
<control>
+ <type>fadelabel</type>
+ <description>Optional Item1</description>
+ <id>1030</id>
+ <posX>112</posX>
+ <posY>530</posY>
+ <width>950</width>
+ <label>#opt_item1</label>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Optional Item3</description>
+ <id>1032</id>
+ <posX>65</posX>
+ <posY>510</posY>
+ <width>950</width>
+ <label>#opt_item3</label>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ </control>
+ <control>
<type>label</type>
<id>2073</id>
<posX>300</posX>
Modified: trunk/plugins/MyFilms/skin/BlackMyst/MesFilmsDetail.xml
===================================================================
--- trunk/plugins/MyFilms/skin/BlackMyst/MesFilmsDetail.xml 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/skin/BlackMyst/MesFilmsDetail.xml 2008-03-26 06:56:24 UTC (rev 1528)
@@ -144,8 +144,8 @@
<textcolor>ff000000</textcolor>
<width>46</width>
<height>34</height>
- <textureFocus>Films_first_focus.png</textureFocus>
- <textureNoFocus>Films_first_nofocus.png</textureNoFocus>
+ <textureFocus>osd_back_focus.png</textureFocus>
+ <textureNoFocus>osd_back_nofocus.png</textureNoFocus>
</control>
<control>
<type>button</type>
@@ -161,8 +161,8 @@
<textcolor>ff000000</textcolor>
<width>46</width>
<height>34</height>
- <textureFocus>Films_prior_focus.PNG</textureFocus>
- <textureNoFocus>Films_prior_nofocus.PNG</textureNoFocus>
+ <textureFocus>nav_back_focus.png</textureFocus>
+ <textureNoFocus>nav_back_nofocus.png</textureNoFocus>
</control>
<control>
<type>button</type>
@@ -178,8 +178,8 @@
<textcolor>ff000000</textcolor>
<width>46</width>
<height>34</height>
- <textureFocus>Films_next_focus.PNG</textureFocus>
- <textureNoFocus>Films_next_nofocus.PNG</textureNoFocus>
+ <textureFocus>nav_forward_focus.png</textureFocus>
+ <textureNoFocus>nav_forward_nofocus.png</textureNoFocus>
</control>
<control>
<type>button</type>
@@ -195,8 +195,8 @@
<textcolor>ff000000</textcolor>
<width>46</width>
<height>34</height>
- <textureFocus>Films_last_focus.png</textureFocus>
- <textureNoFocus>Films_last_nofocus.png</textureNoFocus>
+ <textureFocus>osd_next_focus.png</textureFocus>
+ <textureNoFocus>osd_next_nofocus.png</textureNoFocus>
</control>
</control>
</control>
Deleted: trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_No_Cover.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_first_focus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_first_nofocus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_last_focus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_last_nofocus.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_next_focus.PNG
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_next_nofocus.PNG
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_prior_focus.PNG
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_prior_nofocus.PNG
===================================================================
(Binary files differ)
Deleted: trunk/plugins/MyFilms/skin/BlueTwo/Media/hover_my films.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml
===================================================================
--- trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml 2008-03-26 06:56:24 UTC (rev 1528)
@@ -188,6 +188,7 @@
<thumbWidthBig>64</thumbWidthBig>
<thumbHeightBig>90</thumbHeightBig>
<thumbPosXBig>10</thumbPosXBig>
+ <textcolor>AA</textcolor>
<font>font10</font>
</control>
<control>
@@ -487,7 +488,40 @@
<label>6</label>
<font>font12</font>
</control>
+ <control>
+ <type>label</type>
+ <description>Optional Label1</description>
+ <id>1031</id>
+ <posX>65</posX>
+ <posY>570</posY>
+ <width>950</width>
+ <label>#opt_label1</label>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ </control>
<control>
+ <type>fadelabel</type>
+ <description>Optional Item1</description>
+ <id>1030</id>
+ <posX>112</posX>
+ <posY>570</posY>
+ <width>950</width>
+ <label>#opt_item1</label>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Optional Item3</description>
+ <id>1032</id>
+ <posX>65</posX>
+ <posY>590</posY>
+ <width>950</width>
+ <label>#opt_item3</label>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ </control>
+ <control>
<type>label</type>
<id>2073</id>
<posX>300</posX>
Deleted: trunk/plugins/MyFilms/skin/BlueTwo wide/Media/Films_No_Cover.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyFilms/skin/BlueTwo wide/MesFilms.xml
===================================================================
--- trunk/plugins/MyFilms/skin/BlueTwo wide/MesFilms.xml 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/skin/BlueTwo wide/MesFilms.xml 2008-03-26 06:56:24 UTC (rev 1528)
@@ -335,7 +335,40 @@
<label>6</label>
<font>font12</font>
</control>
+ <control>
+ <type>label</type>
+ <description>Optional Label1</description>
+ <id>1031</id>
+ <posX>65</posX>
+ <posY>750</posY>
+ <width>950</width>
+ <label>#opt_label1</label>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ </control>
<control>
+ <type>fadelabel</type>
+ <description>Optional Item1</description>
+ <id>1030</id>
+ <posX>150</posX>
+ <posY>750</posY>
+ <width>950</width>
+ <label>#opt_item1</label>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Optional Item3</description>
+ <id>1032</id>
+ <posX>65</posX>
+ <posY>770</posY>
+ <width>950</width>
+ <label>#opt_item3</label>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ </control>
+ <control>
<type>label</type>
<id>2073</id>
<posX>800</posX>
Modified: trunk/plugins/MyFilms/skin/BlueTwo wide/MesFilmsDetail.xml
===================================================================
--- trunk/plugins/MyFilms/skin/BlueTwo wide/MesFilmsDetail.xml 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/skin/BlueTwo wide/MesFilmsDetail.xml 2008-03-26 06:56:24 UTC (rev 1528)
@@ -441,23 +441,22 @@
<type>image</type>
<id>2024</id>
<posX>100</posX>
- <posY>340</posY>
- <height>350</height>
+ <posY>320</posY>
+ <keepaspectratio>yes</keepaspectratio>
+ <height>400</height>
<align>center</align>
<visible>!player.hasmedia</visible>
- <keepaspectratio>yes</keepaspectratio>
<texture>-</texture>
</control>
<control>
<description>Thumbnail with video playing</description>
<type>image</type>
<id>2023</id>
- <posX>155</posX>
+ <posX>130</posX>
<posY>290</posY>
- <width>180</width>
+ <keepaspectratio>yes</keepaspectratio>
<height>245</height>
<align>center</align>
- <keepaspectratio>yes</keepaspectratio>
<visible>player.hasmedia</visible>
<texture>-</texture>
</control>
Modified: trunk/plugins/MyFilms/skin/Monochrome/MesFilms.common.facade.xml
===================================================================
--- trunk/plugins/MyFilms/skin/Monochrome/MesFilms.common.facade.xml 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/skin/Monochrome/MesFilms.common.facade.xml 2008-03-26 06:56:24 UTC (rev 1528)
@@ -72,9 +72,9 @@
<spinPosY>600</spinPosY>
<spinPosX>1218</spinPosX>
<thumbWidth>243</thumbWidth>
- <thumbHeight>360</thumbHeight>
+ <thumbHeight>270</thumbHeight>
<thumbPosX>13</thumbPosX>
- <thumbPosY>11</thumbPosY>
+ <thumbPosY>0</thumbPosY>
<itemWidth>245</itemWidth>
<itemHeight>360</itemHeight>
<textureWidth>275</textureWidth>
Modified: trunk/plugins/MyFilms/skin/Monochrome/MesFilms.xml
===================================================================
--- trunk/plugins/MyFilms/skin/Monochrome/MesFilms.xml 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/skin/Monochrome/MesFilms.xml 2008-03-26 06:56:24 UTC (rev 1528)
@@ -378,5 +378,38 @@
<height>373</height>
<visible>facadeview.list</visible>
</control>
+ <control>
+ <type>label</type>
+ <description>Optional Label1</description>
+ <id>1031</id>
+ <posX>30</posX>
+ <posY>720</posY>
+ <width>950</width>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <label>#opt_label1</label>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Optional Item1</description>
+ <id>1030</id>
+ <posX>140</posX>
+ <posY>720</posY>
+ <width>950</width>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <label>#opt_item1</label>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Optional Item3</description>
+ <id>1032</id>
+ <posX>30</posX>
+ <posY>745</posY>
+ <width>950</width>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <label>#opt_item3</label>
+ </control>
</controls>
</window>
\ No newline at end of file
Deleted: trunk/plugins/MyFilms/skin/Monochrome/common.time.xml
===================================================================
--- trunk/plugins/MyFilms/skin/Monochrome/common.time.xml 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/skin/Monochrome/common.time.xml 2008-03-26 06:56:24 UTC (rev 1528)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window>
- <controls>
- <control>
- <description>Date</description>
- <type>label</type>
- <id>200</id>
- <posX>-40</posX>
- <posY>40</posY>
- <align>right</align>
- <label>#date</label>
- <textcolor>FF808080</textcolor>
- </control>
- <control>
- <description>Time</description>
- <type>label</type>
- <id>201</id>
- <posX>-40</posX>
- <posY>40</posY>
- <align>right</align>
- <label>#time</label>
- <textcolor>FF808080</textcolor>
- </control>
- <control>
- <description>Date | Time</description>
- <type>label</type>
- <id>203</id>
- <posX>1340</posX>
- <posY>725</posY>
- <label>#date | #time</label>
- <align>right</align>
- <textcolor>FF808080</textcolor>
- </control>
- </controls>
-</window>
\ No newline at end of file
Modified: trunk/plugins/MyFilms/skin/Project Mayhem 3/MesFilms.xml
===================================================================
--- trunk/plugins/MyFilms/skin/Project Mayhem 3/MesFilms.xml 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/skin/Project Mayhem 3/MesFilms.xml 2008-03-26 06:56:24 UTC (rev 1528)
@@ -174,25 +174,33 @@
<control>
<description>Filmstrip view</description>
<type>filmstrip</type>
- <width>500</width>
- <posX>238</posX>
- <height>400</height>
+ <posX>210</posX>
+ <posY>130</posY>
+ <height>200</height>
<onup>6</onup>
<onleft>6</onleft>
<keepaspectratio>yes</keepaspectratio>
- <backgroundx>364</backgroundx>
- <backgroundy>119</backgroundy>
- <backgroundwidth>194</backgroundwidth>
- <backgroundheight>280</backgroundheight>
- <InfoImagex>368</InfoImagex>
- <InfoImagey>136</InfoImagey>
- <InfoImagewidth>180</InfoImagewidth>
- <InfoImageheight>234</InfoImageheight>
- <thumbHeight>68</thumbHeight>
- <textureHeight>86</textureHeight>
- <itemWidth>78</itemWidth>
- <itemHeight>158</itemHeight>
- <font>font10</font>
+ <thumbWidth>60</thumbWidth>
+ <thumbHeight>90</thumbHeight>
+ <thumbPosX>10</thumbPosX>
+ <thumbPosY>40</thumbPosY>
+ <itemWidth>70</itemWidth>
+ <itemHeight>100</itemHeight>
+ <texturePosX>10</texturePosX>
+ <textureWidth>70</textureWidth>
+ <textureHeight>160</textureHeight>
+ <textXOff>10</textXOff>
+ <imageFolderFocus>Framefocus.png</imageFolderFocus>
+ <frame>-</frame>
+ <frameFocus>video_filmstrip_frame.png</frameFocus>
+ <background>Coverbig.png</background>
+ <thumbs flipY="true" diffuse="Thumb_Mask.png"></thumbs>
+ <InfoImage flipY="true" diffuse="Thumb_Mask.png"></InfoImage>
+ <showFrame>yes</showFrame>
+ <showFolder>no</showFolder>
+ <showBackGround>yes</showBackGround>
+ <showInfoImage>no</showInfoImage>
+ <thumbAnimation effect="zoom" end="140,140" center="0,50" time="200">Focus</thumbAnimation>
</control>
</control>
</control>
@@ -213,7 +221,7 @@
<speed>10</speed>
<label>-</label>
<font>font12</font>
- <visible>!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>!control.isvisible(34)+control.hasfocus(1026)</visible>
<seperator>------------------------------------------------------------------------------------------------------------------------------</seperator>
</control>
@@ -230,22 +238,9 @@
<font>font12</font>
<width>165</width>
<height>24</height>
- <visible>!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>!control.isvisible(34)+control.hasfocus(1026)</visible>
<label>#selecteditem</label>
</control>
- <control>
- <type>fadelabel</type>
- <description>Title (during Filmstrip)</description>
- <id>1027</id>
- <posX>376</posX>
- <posY>390</posY>
- <onleft>6</onleft>
- <onright>1026</onright>
- <font>font13</font>
- <width>350</width>
- <visible>facadeview.filmstrip+control.hasfocus(1026)</visible>
- <label>#selecteditem</label>
- </control>
<control>
<type>image</type>
<id>1</id>
@@ -255,7 +250,7 @@
<height>230</height>
<keepaspectratio>no</keepaspectratio>
<texture>context_background.png</texture>
- <visible>!facadeview.filmstrip+!control.isvisible(34)</visible>
+ <visible>!control.isvisible(34)</visible>
</control>
<control>
<type>image</type>
@@ -264,7 +259,7 @@
<posY>410</posY>
<width>36</width>
<height>36</height>
- <visible>control.isvisible(33)+!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>control.isvisible(33)+!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>star.png</texture>
<centered>yes</centered>
</control>
@@ -275,7 +270,7 @@
<posY>376</posY>
<width>30</width>
<height>30</height>
- <visible>control.isvisible(31)+!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>control.isvisible(31)+!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>star.png</texture>
<centered>yes</centered>
</control>
@@ -286,7 +281,7 @@
<posY>348</posY>
<width>24</width>
<height>24</height>
- <visible>control.isvisible(29)+!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>control.isvisible(29)+!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>star.png</texture>
<centered>yes</centered>
</control>
@@ -297,7 +292,7 @@
<posY>326</posY>
<width>18</width>
<height>18</height>
- <visible>control.isvisible(27)+!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>control.isvisible(27)+!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>star.png</texture>
<centered>yes</centered>
</control>
@@ -308,7 +303,7 @@
<posY>310</posY>
<width>12</width>
<height>12</height>
- <visible>control.isvisible(25)+!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>control.isvisible(25)+!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>star.png</texture>
<centered>yes</centered>
</control>
@@ -319,7 +314,7 @@
<posY>410</posY>
<width>36</width>
<height>36</height>
- <visible>!facadeview.filmstrip+control.isvisible(32)+!control.isvisible(33)+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>control.isvisible(32)+!control.isvisible(33)+!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>starhalf.png</texture>
<centered>yes</centered>
</control>
@@ -330,7 +325,7 @@
<posY>376</posY>
<width>30</width>
<height>30</height>
- <visible>!facadeview.filmstrip+control.isvisible(30)+!control.isvisible(31)+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>control.isvisible(30)+!control.isvisible(31)+!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>starhalf.png</texture>
<centered>yes</centered>
</control>
@@ -341,7 +336,7 @@
<posY>348</posY>
<width>24</width>
<height>24</height>
- <visible>!facadeview.filmstrip+control.isvisible(28)+!control.isvisible(29)+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>control.isvisible(28)+!control.isvisible(29)+!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>starhalf.png</texture>
<centered>yes</centered>
</control>
@@ -352,7 +347,7 @@
<posY>326</posY>
<width>18</width>
<height>18</height>
- <visible>!facadeview.filmstrip+control.isvisible(26)+!control.isvisible(27)+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>control.isvisible(26)+!control.isvisible(27)+!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>starhalf.png</texture>
<centered>yes</centered>
</control>
@@ -363,7 +358,7 @@
<posY>310</posY>
<width>12</width>
<height>12</height>
- <visible>!facadeview.filmstrip+control.isvisible(24)+!control.isvisible(25)+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>control.isvisible(24)+!control.isvisible(25)+!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>starhalf.png</texture>
<centered>yes</centered>
</control>
@@ -374,7 +369,7 @@
<posY>410</posY>
<width>36</width>
<height>36</height>
- <visible>!facadeview.filmstrip+!control.isvisible(32)+!control.isvisible(33)+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>!control.isvisible(32)+!control.isvisible(33)+!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>greystar.png</texture>
<centered>yes</centered>
</control>
@@ -385,7 +380,7 @@
<posY>376</posY>
<width>30</width>
<height>30</height>
- <visible>!facadeview.filmstrip+!control.isvisible(30)+!control.isvisible(31)+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>!control.isvisible(30)+!control.isvisible(31)+!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>greystar.png</texture>
<centered>yes</centered>
</control>
@@ -396,7 +391,7 @@
<posY>348</posY>
<width>24</width>
<height>24</height>
- <visible>!facadeview.filmstrip+!control.isvisible(28)+!control.isvisible(29)+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>!control.isvisible(28)+!control.isvisible(29)+!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>greystar.png</texture>
<centered>yes</centered>
</control>
@@ -407,7 +402,7 @@
<posY>326</posY>
<width>18</width>
<height>18</height>
- <visible>!facadeview.filmstrip+!control.isvisible(26)+!control.isvisible(27)+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>!control.isvisible(26)+!control.isvisible(27)+!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>greystar.png</texture>
<centered>yes</centered>
</control>
@@ -418,7 +413,7 @@
<posY>310</posY>
<width>12</width>
<height>12</height>
- <visible>!facadeview.filmstrip+!control.isvisible(24)+!control.isvisible(25)+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>!control.isvisible(24)+!control.isvisible(25)+!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>greystar.png</texture>
<centered>yes</centered>
</control>
@@ -430,7 +425,7 @@
<width>160</width>
<height>250</height>
<texture>hover_my films.png</texture>
- <visible>!facadeview.filmstrip+!control.isvisible(34)+!player.hasmedia+!control.hasfocus(1026)</visible>
+ <visible>!control.isvisible(34)+!player.hasmedia+!control.hasfocus(1026)</visible>
<keepaspectratio>yes</keepaspectratio>
</control>
<control>
@@ -441,7 +436,7 @@
<width>130</width>
<height>170</height>
<keepaspectratio>yes</keepaspectratio>
- <visible>player.hasmedia +!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>player.hasmedia +!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>#selectedthumb</texture>
</control>
<control>
@@ -452,7 +447,7 @@
<width>130</width>
<height>160</height>
<keepaspectratio>yes</keepaspectratio>
- <visible>!player.hasmedia +!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <visible>!player.hasmedia +!control.isvisible(34)+control.hasfocus(1026)</visible>
<texture>#selectedthumb</texture>
</control>
<control>
@@ -461,7 +456,7 @@
<id>1022</id>
<posX>8</posX>
<posY>500</posY>
- <visible>!facadeview.filmstrip+!control.isvisible(23)+!control.isvisible(34)+control.hasfocus(1026)+!player.hasmedia</visible>
+ <visible>!control.isvisible(23)+!control.isvisible(34)+control.hasfocus(1026)+!player.hasmedia</visible>
<label>6</label>
<font>font12</font>
</control>
@@ -472,12 +467,45 @@
<posX>50</posX>
<posY>500</posY>
<width>140</width>
- <visible>!facadeview.filmstrip+!control.isvisible(23)+!control.isvisible(34)+control.hasfocus(1026)+!player.hasmedia</visible>
+ <visible>!control.isvisible(23)+!control.isvisible(34)+control.hasfocus(1026)+!player.hasmedia</visible>
<align>left</align>
<label>6</label>
<font>font12</font>
</control>
+ <control>
+ <type>label</type>
+ <description>Optional Label1</description>
+ <id>1031</id>
+ <posX>8</posX>
+ <posY>520</posY>
+ <width>950</width>
+ <label>#opt_label1</label>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ </control>
<control>
+ <type>fadelabel</type>
+ <description>Optional Item1</description>
+ <id>1030</id>
+ <posX>50</posX>
+ <posY>520</posY>
+ <width>950</width>
+ <label>#opt_item1</label>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Optional Item3</description>
+ <id>1032</id>
+ <posX>8</posX>
+ <posY>540</posY>
+ <width>950</width>
+ <label>#opt_item3</label>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ </control>
+ <control>
<type>label</type>
<id>2073</id>
<posX>300</posX>
Modified: trunk/plugins/MyFilms/skin/SpinSafe Revolve/MesFilms.xml
===================================================================
--- trunk/plugins/MyFilms/skin/SpinSafe Revolve/MesFilms.xml 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/skin/SpinSafe Revolve/MesFilms.xml 2008-03-26 06:56:24 UTC (rev 1528)
@@ -251,12 +251,12 @@
<width>1300</width>
<height>1000</height>
<showInfoImage>no</showInfoImage>
+ <textXOff>20</textXOff>
<spinPosX>1100</spinPosX>
<spinPoxY>740</spinPoxY>
<posY>250</posY>
<posX>40</posX>
- <thumbAnimation effect="zoom" start="140,140" end="200,200" time="180">focus</thumbAnimation>
- <thumbAnimation effect="zoom" start="200,200" end="140,140" time="180">unfocus</thumbAnimation>
+ <thumbAnimation effect="zoom" end="200,200" time="180">focus</thumbAnimation>
</control>
</control>
<control>
@@ -284,9 +284,9 @@
<type>textboxscrollup</type>
<id>1025</id>
<posX>400</posX>
- <posY>620</posY>
+ <posY>612</posY>
<width>840</width>
- <height>80</height>
+ <height>90</height>
<onleft>6</onleft>
<onright>1026</onright>
<onup>1026</onup>
@@ -495,7 +495,7 @@
<height>440</height>
<visible>!facadeview.filmstrip+player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
<keepaspectratio>yes</keepaspectratio>
- <texture>-</texture>
+ <texture>#selectedthumb</texture>
</control>
<control>
<description>Thumbnail with no video playing</description>
@@ -511,7 +511,7 @@
<width>370</width>
<height>440</height>
<visible>!facadeview.filmstrip+!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
- <texture>-</texture>
+ <texture>#selectedthumb</texture>
</control>
<control>
<description>YearValue</description>
@@ -536,6 +536,39 @@
<label>6</label>
<font>font12</font>
</control>
+ <control>
+ <type>label</type>
+ <description>Optional Label1</description>
+ <id>1031</id>
+ <posX>60</posX>
+ <posY>695</posY>
+ <width>950</width>
+ <label>#opt_label1</label>
+ <font>font10</font>
+ <visible>!control.isvisible(23)+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Optional Item1</description>
+ <id>1030</id>
+ <posX>150</posX>
+ <posY>695</posY>
+ <width>950</width>
+ <label>#opt_item1</label>
+ <font>font10</font>
+ <visible>!control.isvisible(23)+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Optional Item3</description>
+ <id>1032</id>
+ <posX>60</posX>
+ <posY>695</posY>
+ <width>950</width>
+ <label>#opt_item3</label>
+ <font>font10</font>
+ <visible>!control.isvisible(23)+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ </control>
<control>
<description>number items</description>
<type>label</type>
Modified: trunk/plugins/MyFilms/skin/Xface/MesFilms.xml
===================================================================
--- trunk/plugins/MyFilms/skin/Xface/MesFilms.xml 2008-03-26 01:56:06 UTC (rev 1527)
+++ trunk/plugins/MyFilms/skin/Xface/MesFilms.xml 2008-03-26 06:56:24 UTC (rev 1528)
@@ -40,8 +40,8 @@
<id>6</id>
<posX>50</posX>
<posY>130</posY>
- <width>298</width>
- <height>140</height>
+ <width>298</width>
+ <height>140</height>
<layout>StackLayout</layout>
<visible>!Control.HasFocus(1026)</visible>
<animation effect="slide" time="350" start="-300,0">visible</animation>
@@ -168,20 +168,20 @@
<posX>90</posX>
<width>1250</width>
<onup>6</onup>
- <thumbWidth>141</thumbWidth>
- <thumbHeight>180</thumbHeight>
+ <keepaspectratio>yes</keepaspectratio>
+ <thumbHeight>196</thumbHeight>
<thumbPosX>17</thumbPosX>
<thumbPosY>6</thumbPosY>
<imageFolderFocus>Framefocus.png</imageFolderFocus>
<frame>Cover_dvd.png</frame>
<frameFocus>Coverframe_dvd.png</frameFocus>
- <itemWidth>200</itemWidth>
- <itemHeight>215</itemHeight>
- <textureWidth>173</textureWidth>
- <textureHeight>380</textureHeight>
+ <itemWidth>240</itemWidth>
+ <itemHeight>230</itemHeight>
+ <textureWidth>225</textureWidth>
+ <textureHeight>360</textureHeight>
<font>font12</font>
<textXOff>8</textXOff>
- <textYOff>-125</textYOff>
+ <textYOff>-110</textYOff>
<selectedColor>20ffffff</selectedColor>
<textcolor>ffffffff</textcolor>
<background>Coverbig.png</background>
@@ -191,8 +191,7 @@
<showFolder>no</showFolder>
<showBackGround>no</showBackGround>
<showInfoImage>no</showInfoImage>
- <thumbAnimation effect="zoom" start="100,100" end="140,140" time="180">focus</thumbAnimation>
- <thumbAnimation effect="zoom" start="140,140" end="100,100" time="180">unfocus</thumbAnimation>
+ <thumbAnimation effect="zoom" end="140,140" time="180">focus</thumbAnimation>
</control>
</control>
<control>
@@ -201,14 +200,13 @@
<id>1025</id>
<posX>138</posX>
<posY>590</posY>
- <width>760</width>
+ <width>900</width>
<height>110</height>
<onleft>2</onleft>
<onright>800</onright>
<onup>1026</onup>
<ondown>1026</ondown>
<colordiffuse>ffffffff</colordiffuse>
- <textcolor>black</textcolor>
<speed>1</speed>
<label>-</label>
<font>font12</font>
@@ -472,11 +470,42 @@
<id>1022</id>
<posX>120</posX>
<posY>708</posY>
- <visible>no</visible>
<label>6</label>
<font>font12</font>
<visible>!control.isvisible(23)+!control.isvisible(34)+control.hasfocus(1026)+!player.hasmedia</visible>
</control>
-
+ <control>
+ <type>label</type>
+ <description>Optional Label1</description>
+ <id>1031</id>
+ <posX>120</posX>
+ <posY>720</posY>
+ <width>950</width>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <label>#opt_label1</label>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Optional Item1</description>
+ <id>1030</id>
+ <posX>200</posX>
+ <posY>720</posY>
+ <width>950</width>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <label>#opt_item1</label>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Optional Item3</description>
+ <id>1032</id>
+ <posX>120</posX>
+ <posY>745</posY>
+ <width>950</width>
+ <font>font10</font>
+ <visible>!player.hasmedia+!control.isvisible(34)+control.hasfocus(1026)</visible>
+ <label>#opt_item3</label>
+ </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: <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: <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: <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: <ze...@us...> - 2007-04-01 16:24:35
|
Revision: 273
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=273&view=rev
Author: zebons
Date: 2007-04-01 09:24:32 -0700 (Sun, 01 Apr 2007)
Log Message:
-----------
Section for ANT Updating Item in wrong xml file.
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilms.csproj
trunk/plugins/MyFilms/MesFilmsDetail.cs
trunk/plugins/MyFilms/MesFilmsSetup.cs
Modified: trunk/plugins/MyFilms/MesFilms.csproj
===================================================================
--- trunk/plugins/MyFilms/MesFilms.csproj 2007-04-01 16:15:16 UTC (rev 272)
+++ trunk/plugins/MyFilms/MesFilms.csproj 2007-04-01 16:24:32 UTC (rev 273)
@@ -29,9 +29,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Core, Version=1.0.2576.34540, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Core, Version=1.0.2548.1824, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Svn\Core.dll</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Stable\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.2576.34538, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Utils, Version=1.0.2548.1816, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Svn\Utils.dll</HintPath>
+ <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Stable\Utils.DLL</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-04-01 16:15:16 UTC (rev 272)
+++ trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-04-01 16:24:32 UTC (rev 273)
@@ -342,14 +342,14 @@
int ItemID;
dlg.Reset();
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MyFilms.xml"))
{
- StrUpdItem1 = xmlreader.GetValueAsString("MesFilms", "AntUpdItem1", "");
- StrUpdText1 = xmlreader.GetValueAsString("MesFilms", "AntUpdText1", "");
- StrUpdDflT1 = xmlreader.GetValueAsString("MesFilms", "AntUpdDflT1", "");
- StrUpdItem2 = xmlreader.GetValueAsString("MesFilms", "AntUpdItem2", "");
- StrUpdText2 = xmlreader.GetValueAsString("MesFilms", "AntUpdText2", "");
- StrUpdDflT2 = xmlreader.GetValueAsString("MesFilms", "AntUpdDflT2", "");
+ StrUpdItem1 = xmlreader.GetValueAsString(CurrentConfig, "AntUpdItem1", "");
+ StrUpdText1 = xmlreader.GetValueAsString(CurrentConfig, "AntUpdText1", "");
+ StrUpdDflT1 = xmlreader.GetValueAsString(CurrentConfig, "AntUpdDflT1", "");
+ StrUpdItem2 = xmlreader.GetValueAsString(CurrentConfig, "AntUpdItem2", "");
+ StrUpdText2 = xmlreader.GetValueAsString(CurrentConfig, "AntUpdText2", "");
+ StrUpdDflT2 = xmlreader.GetValueAsString(CurrentConfig, "AntUpdDflT2", "");
}
dlg.SetHeading(924); // menu
dlg.Add(GUILocalizeStrings.Get(931));//rating
@@ -358,7 +358,7 @@
boolfile = true;
dlg.Add(GUILocalizeStrings.Get(863));//file
}
- if (!(StrUpdItem1 == "(none)"))
+ if (!(StrUpdItem1 == "(none)"))
if (StrUpdText1.Length > 0)
dlg.Add(StrUpdText1); //Specific Item1 label to update
else
Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-04-01 16:15:16 UTC (rev 272)
+++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-04-01 16:24:32 UTC (rev 273)
@@ -224,6 +224,22 @@
AntTSort.Focus();
return;
}
+ if (AntUpdItem1.Text.Length == 0)
+ AntUpdItem1.Text = "(none)";
+ if (!(AntUpdItem1.Text == "(none)") && (AntUpdText1.Text.Length == 0))
+ {
+ System.Windows.Forms.MessageBox.Show("The Button Label is mandatory with the corresponding Update Field Item !", "Configuration", MessageBoxButtons.OK, MessageBoxIcon.Stop);
+ AntUpdText1.Focus();
+ return;
+ }
+ if (AntUpdItem2.Text.Length == 0)
+ AntUpdItem2.Text = "(none)";
+ if (!(AntUpdItem2.Text == "(none)") && (AntUpdText2.Text.Length == 0))
+ {
+ System.Windows.Forms.MessageBox.Show("The Button Label is mandatory with the corresponding Update Field Item !", "Configuration", MessageBoxButtons.OK, MessageBoxIcon.Stop);
+ AntUpdText2.Focus();
+ return;
+ }
StrDfltSelect = "";
string wAntFilterSign;
if (AntFilterSign1.Text == "#")
@@ -250,19 +266,15 @@
else
StrDfltSelect = "(" + StrDfltSelect + "(" + AntFilterItem2.Text + " " + wAntFilterSign + " '" + AntFilterText2.Text + "' or " + AntFilterItem2.Text + " is null)) AND ";
Verify_Config();
- string currentLanguage = String.Empty;
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
- {
- currentLanguage = xmlreader.GetValueAsString("skin", "language", "English");
- }
- string LanguageDirectory = Config.GetFolder(Config.Dir.Language);
+ //string currentLanguage = String.Empty;
+ //using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
+ //{
+ // currentLanguage = xmlreader.GetValueAsString("skin", "language", "English");
+ //}
+ //string LanguageDirectory = Config.GetFolder(Config.Dir.Language);
if (AntTitle2.Text.Length == 0)
AntTitle2.Text = "(none)";
- if (AntUpdItem1.Text.Length == 0)
- AntUpdItem1.Text = "(none)";
- if (AntUpdItem2.Text.Length == 0)
- AntUpdItem2.Text = "(none)";
if (Config_Dflt.Checked)
{
MyFilms_xmlwriter.SetValue("MyFilms", "Default_Config", Config_Name.Text.ToString());
@@ -323,7 +335,7 @@
Config_Name.Items.Add(w_Config_Name);
Config_Name.Text = w_Config_Name;
// Config_Name.ResetText();
- Refresh_Items(false);
+// Refresh_Items(false);
}
private void butPath_Click(object sender, EventArgs e)
@@ -408,7 +420,6 @@
CatalogType.SelectedIndex = 0;
StrDfltSelect = "";
mydivx.Clear();
- Config_Dflt.Checked = false;
View_Dflt_Item.Items.Clear();
View_Dflt_Item.Items.Add("(none)");
View_Dflt_Item.Items.Add("Year");
@@ -416,6 +427,7 @@
View_Dflt_Item.Items.Add("Country");
if (!all)
return;
+ Config_Dflt.Checked = false;
MesFilmsCat.ResetText();
MesFilmsImg.ResetText();
AntStorage.ResetText();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hap...@us...> - 2007-04-02 21:54:51
|
Revision: 283
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=283&view=rev
Author: happytalk
Date: 2007-04-02 14:54:43 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
Fixed so esc from search goes back to no selection. Modified NewString Left/Right/Mid
Modified Paths:
--------------
trunk/plugins/MyFilms/CString.cs
trunk/plugins/MyFilms/MesFilms.cs
Modified: trunk/plugins/MyFilms/CString.cs
===================================================================
--- trunk/plugins/MyFilms/CString.cs 2007-04-02 21:33:01 UTC (rev 282)
+++ trunk/plugins/MyFilms/CString.cs 2007-04-02 21:54:43 UTC (rev 283)
@@ -47,11 +47,11 @@
/// <summary>Return left hand part of a string</summary>
/// <param name="source">string to split</param>
/// <param name="length">Number of characters to return</param>
- /// <returns>Returns left part of the string OR complete original string if length less than 1</returns>
+ /// <returns>Returns left part of the string OR complete original string if length less than 1 or greater than string length</returns>
public static string Left(string source, int length)
{
if( source == null ) throw new ArgumentNullException("source");
- if (length > 0)
+ if (length > 0 && length < source.Length)
return source.Substring(0, length);
else
return source;
@@ -62,12 +62,10 @@
/// <summary>Returns right part of a string</summary>
/// <param name="source">string to split</param>
/// <param name="length">Number of characters to return</param>
- /// <returns>Returns right part of the string OR complete original string if length less than 1</returns>
+ /// <returns>Returns right part of the string OR complete original string if length less than 1 or greater than string length</returns>
public static string Right(string source, int length)
{
- if (source == null) throw new ArgumentNullException("source");
-
- if (length > 0)
+ if (length > 0 && length < source.Length)
return source.Substring(source.Length - length);
else
return source;
@@ -81,8 +79,7 @@
/// <returns>Returns right part of the string</returns>
public static string Mid(string source, int index)
{
- if (source == null) throw new ArgumentNullException("source");
- return source.Substring(index);
+ return Mid(source, index, 0);
}
@@ -91,12 +88,19 @@
/// <summary>Returns middle part of a string</summary>
/// <param name="source">string to split</param>
/// <param name="index">Position in string to start extract</param>
- /// <param name="length">Number of characters to extract</param>
+ /// <param name="length">Number of characters to extract. If 0 extract all to end</param>
/// <returns>Returns middle part of string</returns>
public static string Mid(string source, int index, int length)
{
if (source == null) throw new ArgumentNullException("source");
- return source.Substring(index, length);
+ if (index >= 0 && index < source.Length)
+ {
+ if (length == 0) length = source.Length;
+ length = Min(length, source.Length - index + 1);
+ return source.Substring(index, length);
+ }
+ else
+ return "";
}
#endregion
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-04-02 21:33:01 UTC (rev 282)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-04-02 21:54:43 UTC (rev 283)
@@ -519,17 +519,10 @@
string SelItem;
if (StrTitleSelect == "")
{
- string WStrTxtSelect ="";
- try
- {
- WStrTxtSelect = StrTxtSelect.Substring(0, 9);
- }
- catch
- { }
- if (WStrTxtSelect == "Selection")
+ if (NewString.Left(StrTxtSelect, 9) == "Selection" || (StrTxtSelect == "" && boolselect)) //original code block refactored
{//jump back to main full list
boolselect = false;
- StrTxtSelect = "";
+ StrSelect = StrTxtSelect = "";
l_index = 0;
GetFilmList();
return true;
@@ -537,18 +530,7 @@
if (StrTxtSelect == "")
{
- if (boolselect)
- {//jump back to main full list
- boolselect = false;
- StrTxtSelect = "";
- l_index = 0;
- GetFilmList();
- }
- else
- {
- StrTxtSelect = "";
- return false;
- }
+ return false;
}
else
{ // Jump back to prev view_display (categorised by year, genre etc)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-04-25 19:33:42
|
Revision: 344
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=344&view=rev
Author: zebons
Date: 2007-04-25 12:33:39 -0700 (Wed, 25 Apr 2007)
Log Message:
-----------
Add Views by Icons/Large Icons
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilms.csproj
trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
trunk/plugins/MyFilms/MesFilmsSetup.cs
trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-04-25 05:00:30 UTC (rev 343)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-04-25 19:33:39 UTC (rev 344)
@@ -33,6 +33,7 @@
using System.IO;
using System.Data;
+using System.Drawing;
using MediaPortal.Dialogs;
using MediaPortal.Player;
@@ -59,6 +60,7 @@
CTRL_BtnViewAs = 3,
CTRL_BtnSearchT = 4,
CTRL_BtnSearchA = 5,
+ CTRL_BtnLayout = 6,
CTRL_TxtSelect = 12,
CTRL_BtnStop = 319,
CTRL_BtnPause = 315,
@@ -72,6 +74,7 @@
CTRL_TxtYear = 1022,
CTRL_TxtGenre = 1024,
CTRL_Texte = 1025,
+ CTRL_Title = 1027,
CTRL_ImgGrStar1 = 1051,
CTRL_ImgGrStar2 = 1052,
CTRL_ImgGrStar3 = 1053,
@@ -86,16 +89,21 @@
CTRL_ImgStar2 = 1062,
CTRL_ImgStar3 = 1063,
CTRL_ImgStar4 = 1064,
- CTRL_ImgStar5 = 1065
+ CTRL_ImgStar5 = 1065,
+ CTRL_NbObjects = 2073
}
[SkinControlAttribute((int)Controls.CTRL_TxtSelect)]
protected GUIFadeLabel TxtSelect = null;
[SkinControlAttribute((int)Controls.CTRL_BtnSrtBy)]
protected GUISortButtonControl BtnSrtBy = null;
[SkinControlAttribute((int)Controls.CTRL_List)]
- protected GUIListControl lsCtlFilm = null;
+ protected GUIFacadeControl facadeView = null;
+ //[SkinControlAttribute((int)Controls.CTRL_List)]
+ //protected GUIListControl lsCtlFilm = null;
[SkinControlAttribute((int)Controls.CTRL_Texte)]
protected GUITextScrollUpControl ScrlLstText = null;
+ [SkinControlAttribute((int)Controls.CTRL_Title)]
+ protected GUIFadeLabel TitleSelect = null;
[SkinControlAttribute((int)Controls.CTRL_TxtYear)]
protected GUILabelControl TxtLstYear = null;
[SkinControlAttribute((int)Controls.CTRL_TxtGenre)]
@@ -104,7 +112,8 @@
protected GUIImage ImgLstFilm = null;
[SkinControlAttribute((int)Controls.CTRL_Image2)]
protected GUIImage ImgLstFilm2 = null;
-
+ public int Layout = 0;
+
int Ctrl_DspImage;
int Ctrl_DspImage2;
bool boolselect = false;
@@ -129,11 +138,13 @@
string StrFileType = null;
string StrPathImg = null;
string StrSortSens = null;
+ int StrLayOut = 0;
public string WStrSort = null;
public string WStrSelect = null;
public string WStrSortSens = null;
public bool boolreturn = false;
public bool boolstorage = false;
+ string wselectedlabel = null;
string StrDfltSelect = null;
string CurrentSortMethod = null;
decimal w_rating = 0;
@@ -330,22 +341,24 @@
//---------------------------------------------------------------------------------------
// Display Informations about List Item
//---------------------------------------------------------------------------------------
- if ((iControl == (int)Controls.CTRL_List) && !(boolselect || (lsCtlFilm.SelectedListItemIndex > -1 && lsCtlFilm.SelectedListItem.IsFolder))) //xxxx
+ if ((iControl == (int)Controls.CTRL_List) && !(boolselect || (facadeView.SelectedListItemIndex > -1 && facadeView.SelectedListItem.IsFolder))) //xxxx
{
- if (lsCtlFilm.SelectedListItemIndex > -1)
+ if (facadeView.SelectedListItemIndex > -1)
{
- affichage_Lstdetail(lsCtlFilm.SelectedListItem.ItemId, true);
+ affichage_Lstdetail(facadeView.SelectedListItem.ItemId, true, facadeView.SelectedListItem.Label);
}
}
else
- if (lsCtlFilm.SelectedListItemIndex > -1 && lsCtlFilm.SelectedListItem.IsFolder)
+ {
+ if (facadeView.SelectedListItemIndex > -1 && facadeView.SelectedListItem.IsFolder)
{
- affichage_Lstdetail(lsCtlFilm.SelectedListItem.ItemId, false);
+ affichage_Lstdetail(facadeView.SelectedListItem.ItemId, false, facadeView.SelectedListItem.Label);
}
else
{
masquage_Lstdetail();
}
+ }
base.OnMessage(messageType);
return true;
@@ -353,17 +366,22 @@
//---------------------------------------------------------------------------------------
// Hide Informations about List Item
//---------------------------------------------------------------------------------------
- if ((dControl == (int)Controls.CTRL_List) && !(boolselect || (lsCtlFilm.SelectedListItemIndex > -1 && lsCtlFilm.SelectedListItem.IsFolder))) //xxxx
+ if ((iControl == 0) && (dControl == (int)Controls.CTRL_List))
{
- if (lsCtlFilm.SelectedListItemIndex > -1)
+ base.OnMessage(messageType);
+ return true;
+ }
+ if ((dControl == (int)Controls.CTRL_List) && !(boolselect || (facadeView.SelectedListItemIndex > -1 && facadeView.SelectedListItem.IsFolder))) //xxxx
+ {
+ if (facadeView.SelectedListItemIndex > -1)
{
- affichage_Lstdetail(lsCtlFilm.SelectedListItem.ItemId,true);
+ affichage_Lstdetail(facadeView.SelectedListItem.ItemId, true, facadeView.SelectedListItem.Label);
}
}
else
- if (lsCtlFilm.SelectedListItemIndex > -1 && lsCtlFilm.SelectedListItem.IsFolder)
+ if (facadeView.SelectedListItemIndex > -1 && facadeView.SelectedListItem.IsFolder)
{
- affichage_Lstdetail(lsCtlFilm.SelectedListItem.ItemId, false);
+ affichage_Lstdetail(facadeView.SelectedListItem.ItemId, false, facadeView.SelectedListItem.Label);
}
else
{
@@ -482,14 +500,39 @@
Selection_type_Video();
return base.OnMessage(messageType);
}
+ if ((iControl == (int)Controls.CTRL_BtnLayout) && !boolselect)
+ // Change Layout View
+ {
+ if (Layout == 1)
+ {
+ GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(417));
+ facadeView.View = GUIFacadeControl.ViewMode.LargeIcons;
+ Layout = 2;
+ }
+ else if (Layout == 2)
+ {
+ GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(101));
+ facadeView.View = GUIFacadeControl.ViewMode.List;
+ Layout = 0;
+ }
+ else
+ {
+ GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(100));
+ facadeView.View = GUIFacadeControl.ViewMode.SmallIcons;
+ Layout = 1;
+ }
+ GetFilmList();
+ return base.OnMessage(messageType);
+ }
+
if (iControl == (int)Controls.CTRL_List)
{
- if (lsCtlFilm.SelectedListItemIndex > -1)
+ if (facadeView.SelectedListItemIndex > -1)
{
- if (!lsCtlFilm.SelectedListItem.IsFolder && !boolselect)
+ if (!facadeView.SelectedListItem.IsFolder && !boolselect)
// New Window for detailed selected item information
{
- //l_index = lsCtlFilm.SelectedListItemIndex;
+ //l_index = facadeView.SelectedListItemIndex;
save_config_values();
mydivx.Clear();
GUIWindowManager.ActivateWindow(ID_MesFilmsDetail);
@@ -497,10 +540,12 @@
else
// View List as selected
{
+ wselectedlabel = facadeView.SelectedListItem.Label;
+ Change_LayOut(Layout);
do
{
if (StrTitleSelect != "") StrTitleSelect += TitleDelim;
- StrTitleSelect += lsCtlFilm.SelectedListItem.Label;
+ StrTitleSelect += wselectedlabel;
} while (GetFilmList() == false); //keep calling while single folders found
}
}
@@ -571,7 +616,7 @@
if (boolselect)
{
- string sLabel = lsCtlFilm.SelectedListItem.Label;
+ string sLabel = wselectedlabel;
if (WStrSort == "Date")
StrSelect = "Date" + " like '" + string.Format("{0:dd/MM/yyyy}",DateTime.Parse(sLabel).ToShortDateString()) + "'";
else
@@ -611,7 +656,7 @@
/// <returns>If returns false means is currently displaying a single folder</returns>
bool GetFilmList<T>(T gSelItem)
{
- int iCnt = 0;
+ int iCnt = 0;
int DelimCnt = 0, DelimCnt2;
GUIListItem item = new GUIListItem();
string sTitle;
@@ -629,8 +674,7 @@
BtnSrtBy.Label = CurrentSortMethod;
if (StrTitleSelect != "") DelimCnt = NewString.PosCount(TitleDelim, StrTitleSelect, false) + 1; //get num .'s in title
- lsCtlFilm.Clear();
-
+ facadeView.Clear();
//----------------------------------------------------------------------------------------
// Load the DataSet.
foreach (DataRow r in LectureDonn\xE9es(StrFilmSelect, StrSort, StrSortSens))
@@ -685,25 +729,32 @@
item.Label2 = r[StrSort1].ToString();
break;
}
- lsCtlFilm.Add(item);
+ if (r["Picture"].ToString().IndexOf(":\\") == -1)
+ item.ThumbnailImage = StrPathImg + "\\" + r["Picture"].ToString();
+ else
+ item.ThumbnailImage = r["Picture"].ToString();
+ //item.OnRetrieveArt += new MediaPortal.GUI.Library.GUIListItem.RetrieveCoverArtHandler(OnRetrieveCoverArt);
+ facadeView.Add(item);
+
if (iSelItem == -2) //set selected item = passed in string?
{
- if (sTitle == SelItem) l_index = lsCtlFilm.Count - 1; //test if this item is one to select
+ if (sTitle == SelItem) l_index = facadeView.Count - 1; //test if this item is one to select
}
}
if (iSelItem >= 0) //-1 = ignore, >=0 = itemID to locate (test every item in case item is from within a folder)
{
- if ((int)(r["Number"]) == iSelItem) l_index = lsCtlFilm.Count - 1; //test if this item is one to select
+ if ((int)(r["Number"]) == iSelItem) l_index = facadeView.Count - 1; //test if this item is one to select
}
sPrevTitle = sTitle;
}
- if ((l_index > lsCtlFilm.Count - 1) || (l_index < 0))
+ if ((l_index > facadeView.Count - 1) || (l_index < 0))
l_index = 0;
- GUIControl.SelectItemControl(GetID, (int)Controls.CTRL_List, (int)l_index);
- GUIPropertyManager.SetProperty("#nbobjects", lsCtlFilm.Count.ToString() + " " + GUILocalizeStrings.Get(127));
- return !(lsCtlFilm.Count == 1 && item.IsFolder); //ret false if single folder found
+
+ GUIControl.SelectItemControl(GetID, (int)Controls.CTRL_List, (int)l_index);
+ GUIPropertyManager.SetProperty("#nbobjects", facadeView.Count.ToString() + " " + GUILocalizeStrings.Get(127));
+ return !(facadeView.Count == 1 && item.IsFolder); //ret false if single folder found
}
@@ -759,7 +810,7 @@
//----------------------------------------------------------------------------------------
// Display Detailed Info (Image, Description, Year, Category)
//----------------------------------------------------------------------------------------
- private void affichage_Lstdetail(int ItemId, bool wrep)//wrep = false display only image
+ private void affichage_Lstdetail(int ItemId, bool wrep, string wlabel)//wrep = false display only image
{
DataRow[] r = LectureDonn\xE9es("Number = " + ItemId.ToString(), "", "");
@@ -818,7 +869,17 @@
}
ScrlLstText.Clear();
ScrlLstText.Label = r[0]["Description"].ToString().Replace('|', ' ');
- GUIControl.ShowControl(GetID, (int)Controls.CTRL_Texte);
+ TitleSelect.Label = wlabel;
+ if (Layout == 0)
+ {
+ GUIControl.ShowControl(GetID, (int)Controls.CTRL_Texte);
+ GUIControl.HideControl(GetID, (int)Controls.CTRL_Title);
+ }
+ else
+ {
+ GUIControl.ShowControl(GetID, (int)Controls.CTRL_Title);
+ GUIControl.HideControl(GetID, (int)Controls.CTRL_Texte);
+ }
TxtLstGenre.Label = r[0]["Category"].ToString();
GUIControl.ShowControl(GetID, (int)Controls.CTRL_TxtGenre);
TxtLstYear.Label = r[0]["Year"].ToString();
@@ -853,7 +914,7 @@
StrSortSens = " DESC";
if (!boolselect)
GetFilmList();
- else
+ else
getSelectFromDivx(StrTitle1.ToString() + " not like ''", WStrSort, StrSortSens, "*", true, "");
return;
}
@@ -956,7 +1017,10 @@
}
dlg.DoModal(GetID);
- if (dlg.SelectedLabel == -1) return;
+ if (dlg.SelectedLabel == -1)
+ {
+ return;
+ }
Change_view(choice_view[dlg.SelectedLabel].ToString());
return;
}
@@ -986,7 +1050,7 @@
boolselect = true;
boolreturn = true;
if (ClearIndex) l_index = 0;
- lsCtlFilm.Clear();
+ facadeView.Clear();
foreach (DataRow enr in LectureDonn\xE9es(WstrSelect, WStrSort, WStrSortSens))
{
@@ -1027,8 +1091,8 @@
item = new GUIListItem();
item.Label = champselect.ToString();
item.Label2 = Wnb_enr.ToString();
- lsCtlFilm.Add(item);
- if (SelItem != "" && item.Label == SelItem) l_index = lsCtlFilm.Count - 1; //test if this item is one to select
+ facadeView.Add(item);
+ if (SelItem != "" && item.Label == SelItem) l_index = facadeView.Count - 1; //test if this item is one to select
}
else
Wnb_enr = 0;
@@ -1042,11 +1106,11 @@
StrSelect = WstrSelect;
StrFilmSelect = "";
- if ((l_index > lsCtlFilm.Count - 1) || (l_index < 0)) //check index within bounds, will be unless xml file heavily edited
+ if ((l_index > facadeView.Count - 1) || (l_index < 0)) //check index within bounds, will be unless xml file heavily edited
l_index = 0;
GUIControl.SelectItemControl(GetID, (int)Controls.CTRL_List, (int)l_index);
- GUIPropertyManager.SetProperty("#nbobjects", lsCtlFilm.Count.ToString() + " " + GUILocalizeStrings.Get(127));
+ GUIPropertyManager.SetProperty("#nbobjects", facadeView.Count.ToString() + " " + GUILocalizeStrings.Get(127));
}
//----------------------------------------------------------------------------------------------
@@ -1076,10 +1140,11 @@
xmlwriter.SetValue(CurrentConfig, "CurrentSortMethod", CurrentSortMethod.ToString());
xmlwriter.SetValue(CurrentConfig, "StrSortSens", StrSortSens.ToString());
xmlwriter.SetValue(CurrentConfig, "Selection", StrTxtSelect);
- xmlwriter.SetValue(CurrentConfig, "IndexItem", (lsCtlFilm.SelectedListItemIndex > -1) ? ((boolselect) ? lsCtlFilm.SelectedListItemIndex.ToString() : lsCtlFilm.SelectedListItem.ItemId.ToString()) : "-1"); //may need to check if there is no item selected and so save -1
+ xmlwriter.SetValue(CurrentConfig, "IndexItem", (facadeView.SelectedListItemIndex > -1) ? ((boolselect) ? facadeView.SelectedListItemIndex.ToString() : facadeView.SelectedListItem.ItemId.ToString()) : "-1"); //may need to check if there is no item selected and so save -1
xmlwriter.SetValueAsBool(CurrentConfig, "boolselect", boolselect);
xmlwriter.SetValue(CurrentConfig, "WStrSort", WStrSort);
xmlwriter.SetValue(CurrentConfig, "Wstar", Wstar);
+ xmlwriter.SetValue(CurrentConfig, "WLayOut", Layout);
switch (StrFileType)
{
case "0":
@@ -1114,6 +1179,8 @@
StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalog", "");
StrFileType = xmlreader.GetValueAsString(CurrentConfig, "CatalogType", "0");
StrPathImg = xmlreader.GetValueAsString(CurrentConfig, "AntPicture", "");
+ StrLayOut = xmlreader.GetValueAsInt(CurrentConfig, "LayOut", 0);
+ StrLayOut = xmlreader.GetValueAsInt(CurrentConfig, "WLayOut", StrLayOut);
switch (StrFileType)
{
case "0":
@@ -1219,6 +1286,8 @@
dlgOk.SetLine(2, "Verify your file with the plugin setup");
dlgOk.DoModal(GetID);
}
+ Layout = StrLayOut;
+ Change_LayOut(Layout);
if (StrSelect == "")
StrSelect = StrTitle1.ToString() + " not like ''";
if (StrSort1.Length == 0)
@@ -1243,7 +1312,7 @@
if (!(LoadDfltSlct))
GetFilmList(l_index);
else
- {
+ {
if ((StrViewDfltItem.Length == 0) || (StrViewDfltItem == "(none)"))
{
StrSelect = StrTitle1.ToString() + " not like ''";
@@ -1286,7 +1355,6 @@
else
BtnSrtBy.IsAscending = false;
GetFilmList(l_index);
-
}
}
@@ -1299,6 +1367,31 @@
}
}
//--------------------------------------------------------------------------------------------
+ // Change LayOut
+ //--------------------------------------------------------------------------------------------
+ private void Change_LayOut(int wLayOut)
+ {
+ switch (wLayOut)
+ {
+ case 1:
+ GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(100));
+ facadeView.View = GUIFacadeControl.ViewMode.SmallIcons;
+ break;
+ case 2:
+ GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(417));
+ facadeView.View = GUIFacadeControl.ViewMode.LargeIcons;
+ break;
+ default:
+ GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(101));
+ facadeView.View = GUIFacadeControl.ViewMode.List;
+ break;
+ }
+ GUIControl.HideControl(GetID, facadeView.GetID);
+ int iControl = facadeView.GetID;
+ GUIControl.ShowControl(GetID, iControl);
+ GUIControl.FocusControl(GetID, iControl);
+ }
+ //--------------------------------------------------------------------------------------------
// Change View Response
//--------------------------------------------------------------------------------------------
private void Change_view(string choice_view)
@@ -1315,6 +1408,7 @@
if (choice_view == "Year")
{
// Change View by Year
+ Change_LayOut(0);
WStrSort = "YEAR";
WStrSortSens = " DESC";
BtnSrtBy.IsAscending = false;
@@ -1325,6 +1419,7 @@
if (choice_view == "Category")
{
// Change View by "Category":
+ Change_LayOut(0);
WStrSort = "CATEGORY";
WStrSortSens = " ASC";
BtnSrtBy.IsAscending = true;
@@ -1334,6 +1429,7 @@
if (choice_view == "Country")
{
// Change View by "Country":
+ Change_LayOut(0);
WStrSort = "COUNTRY";
WStrSortSens = " ASC";
BtnSrtBy.IsAscending = true;
@@ -1359,6 +1455,7 @@
if (choice_view == "View1")
{
// Change View by "View1":
+ Change_LayOut(0);
WStrSort = StrViewItem1; // specific user View1
WStrSortSens = " ASC";
BtnSrtBy.IsAscending = true;
@@ -1371,6 +1468,7 @@
if (choice_view == "View2")
{
// Change View by "View2":
+ Change_LayOut(0);
WStrSort = StrViewItem2;
WStrSortSens = " ASC";
BtnSrtBy.IsAscending = true;
Modified: trunk/plugins/MyFilms/MesFilms.csproj
===================================================================
--- trunk/plugins/MyFilms/MesFilms.csproj 2007-04-25 05:00:30 UTC (rev 343)
+++ trunk/plugins/MyFilms/MesFilms.csproj 2007-04-25 19:33:39 UTC (rev 344)
@@ -29,28 +29,26 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Core, Version=1.0.2576.34540, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Core, Version=0.2.2.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Svn\Core.dll</HintPath>
+ <HintPath>..\..\Mediaportal\Core\bin\Release\Core.dll</HintPath>
</Reference>
- <Reference Include="Databases, Version=1.0.2548.1828, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Databases, Version=0.2.2.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\Mediaportal\Dialogs\bin\Release\Databases.dll</HintPath>
- <Private>False</Private>
+ <HintPath>..\..\Mediaportal\Dialogs\bin\Release\Databases.dll</HintPath>
</Reference>
- <Reference Include="Dialogs, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Dialogs, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\Mediaportal\Dialogs\bin\Release\Dialogs.dll</HintPath>
- <Private>False</Private>
+ <HintPath>..\..\Mediaportal\Dialogs\bin\Release\Dialogs.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="Utils, Version=1.0.2576.34538, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Utils, Version=2.1.2.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Svn\Utils.dll</HintPath>
+ <HintPath>..\..\Mediaportal\Core\bin\Release\Utils.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-04-25 05:00:30 UTC (rev 343)
+++ trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-04-25 19:33:39 UTC (rev 344)
@@ -155,6 +155,8 @@
this.Config_Name = new System.Windows.Forms.ComboBox();
this.label12 = new System.Windows.Forms.Label();
this.groupBox7 = new System.Windows.Forms.GroupBox();
+ this.label14 = new System.Windows.Forms.Label();
+ this.LayOut = new System.Windows.Forms.ComboBox();
this.label13 = new System.Windows.Forms.Label();
this.CatalogType = new System.Windows.Forms.ComboBox();
this.ButSave = new System.Windows.Forms.Button();
@@ -703,7 +705,7 @@
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(69, 13);
this.label10.TabIndex = 34;
- this.label10.Text = "Version 4.1.0";
+ this.label10.Text = "Version 4.2.0";
//
// textBox1
//
@@ -743,6 +745,8 @@
//
// groupBox7
//
+ this.groupBox7.Controls.Add(this.label14);
+ this.groupBox7.Controls.Add(this.LayOut);
this.groupBox7.Controls.Add(this.label13);
this.groupBox7.Controls.Add(this.CatalogType);
this.groupBox7.Controls.Add(this.ButSave);
@@ -776,6 +780,28 @@
this.groupBox7.TabStop = false;
this.groupBox7.Text = "Config Infos";
//
+ // label14
+ //
+ this.label14.AutoSize = true;
+ this.label14.Location = new System.Drawing.Point(597, 130);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(78, 13);
+ this.label14.TabIndex = 44;
+ this.label14.Text = "Default LayOut";
+ //
+ // LayOut
+ //
+ this.LayOut.FormattingEnabled = true;
+ this.LayOut.Items.AddRange(new object[] {
+ "List",
+ "Small Icons",
+ "Large Icons"});
+ this.LayOut.Location = new System.Drawing.Point(681, 127);
+ this.LayOut.Name = "LayOut";
+ this.LayOut.Size = new System.Drawing.Size(112, 21);
+ this.LayOut.TabIndex = 43;
+ this.LayOut.Text = "List";
+ //
// label13
//
this.label13.AutoSize = true;
@@ -962,6 +988,8 @@
private TextBox TitleDelim;
private Label label13;
private ComboBox CatalogType;
+ private Label label14;
+ private ComboBox LayOut;
}
}
\ No newline at end of file
Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-04-25 05:00:30 UTC (rev 343)
+++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-04-25 19:33:39 UTC (rev 344)
@@ -272,7 +272,11 @@
// currentLanguage = xmlreader.GetValueAsString("skin", "language", "English");
//}
//string LanguageDirectory = Config.GetFolder(Config.Dir.Language);
-
+ int WLayOut = 0;
+ if (LayOut.Text == "Small Icons")
+ WLayOut = 1;
+ if (LayOut.Text == "Large Icons")
+ WLayOut = 2;
if (AntTitle2.Text.Length == 0)
AntTitle2.Text = "(none)";
if (Config_Dflt.Checked)
@@ -326,8 +330,7 @@
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "StrSortSens", "");
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "IndexItem", "");
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "TitleDelim", TitleDelim.Text);
-
-
+ MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "LayOut", WLayOut);
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "StrDfltSelect", StrDfltSelect);
string w_Config_Name = Config_Name.Text;
@@ -413,6 +416,13 @@
View_Dflt_Item.Items.Add(AntViewItem1.Text);
if (!(AntViewItem2.Text == "Country") & !(AntViewItem2.Text == "Category") & !(AntViewItem2.Text == "Year") & !(AntViewItem2.Text == "(none)"))
View_Dflt_Item.Items.Add(AntViewItem2.Text);
+ int WLayOut = MyFilms_xmlreader.GetValueAsInt(Config_Name.Text.ToString(), "LayOut", 0);
+ if (WLayOut == 0)
+ LayOut.Text = "List";
+ if (WLayOut == 1)
+ LayOut.Text = "Small Icons";
+ if (WLayOut == 2)
+ LayOut.Text = "Large Icons";
View_Dflt_Item.Items.Remove("");
}
private void Refresh_Items(bool all)
@@ -461,6 +471,7 @@
AntItem2.ResetText();
AntItem3.ResetText();
TitleDelim.ResetText();
+ LayOut.ResetText();
View_Dflt_Item.ResetText();
View_Dflt_Text.ResetText();
}
@@ -528,6 +539,7 @@
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "StrSortSens");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "IndexItem");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "TitleDelim");
+ MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "LayOut");
if ((Config_Name.Text) == MyFilms_xmlreader.GetValueAsString("MyFilms", "Default_Config", ""))
MyFilms_xmlwriter.RemoveEntry("MyFilms", "Default_Config");
Config_Name.Items.Remove(Config_Name.Text);
Modified: trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml
===================================================================
--- trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml 2007-04-25 05:00:30 UTC (rev 343)
+++ trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml 2007-04-25 19:33:39 UTC (rev 344)
@@ -1,6 +1,6 @@
<window>
<id>7986</id>
- <defaultcontrol>1026</defaultcontrol>
+ <defaultcontrol>6</defaultcontrol>
<allowoverlay>yes</allowoverlay>
<controls>
<import>common.time.xml</import>
@@ -55,13 +55,27 @@
</padding>
</mpe>
<control>
- <type>sortbutton</type>
- <id>2</id>
+ <type>button</type>
+ <description>Layout</description>
+ <id>6</id>
<posX>60</posX>
<posY>97</posY>
<onleft>5</onleft>
<onright>1026</onright>
<onup>5</onup>
+ <ondown>2</ondown>
+ <animation>unfocus</animation>
+ <label>101</label>
+ <textcolor>ff000000</textcolor>
+ </control>
+ <control>
+ <type>sortbutton</type>
+ <id>2</id>
+ <posX>60</posX>
+ <posY>129</posY>
+ <onleft>6</onleft>
+ <onright>1026</onright>
+ <onup>6</onup>
<ondown>3</ondown>
<textureAscendingFocused>arrow_round_up_focus.png</textureAscendingFocused>
<font>font13</font>
@@ -84,7 +98,7 @@
<description>Switch view</description>
<id>3</id>
<posX>60</posX>
- <posY>129</posY>
+ <posY>161</posY>
<onleft>2</onleft>
<onright>1026</onright>
<onup>2</onup>
@@ -98,7 +112,7 @@
<description>Search by Films</description>
<id>4</id>
<posX>60</posX>
- <posY>161</posY>
+ <posY>193</posY>
<onleft>3</onleft>
<onright>1026</onright>
<onup>3</onup>
@@ -112,15 +126,16 @@
<description>Search by Actors</description>
<id>5</id>
<posX>60</posX>
- <posY>193</posY>
+ <posY>225</posY>
<onleft>4</onleft>
<onright>1026</onright>
<onup>4</onup>
- <ondown>319</ondown>
+ <ondown>6</ondown>
<animation>unfocus</animation>
<label>137</label>
<textcolor>ff000000</textcolor>
</control>
+
</control>
<control>
<type>fadelabel</type>
@@ -136,69 +151,58 @@
</control>
<control>
<type>group</type>
- <description>composite control consisting of a list control and a thumbnail panel</description>
- <id>1000</id>
- <posX>260</posX>
- <posY>97</posY>
- <width>448</width>
- <height>424</height>
<animation effect="slide" time="400" start="0,-300">WindowOpen</animation>
<animation effect="slide" time="400" end="800,0" >WindowClose</animation>
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
- <mpe>
- <layout>Grid</layout>
- <spring>no</spring>
- <spacing>0</spacing>
- <padding>
- <top>0</top>
- <right>0</right>
- <bottom>0</bottom>
- <left>0</left>
- </padding>
- </mpe>
+ <control>
+ <description>composite control consisting of a list control and a thumbnail panel</description>
+ <type>facadeview</type>
+ <id>1026</id>
<control>
+ <description>Thumbnail Panel</description>
+ <type>thumbnailpanel</type>
+ <scrollOffset>1</scrollOffset>
+ <onleft>6</onleft>
+ <onright>1026</onright>
+ <itemWidth>72</itemWidth>
+ <textureWidth>58</textureWidth>
+ <thumbWidth>44</thumbWidth>
+ <thumbPosX>7</thumbPosX>
+ <textureWidthBig>85</textureWidthBig>
+ <textureHeightBig>116</textureHeightBig>
+ <itemWidthBig>108</itemWidthBig>
+ <itemHeightBig>138</itemHeightBig>
+ <thumbWidthBig>64</thumbWidthBig>
+ <thumbHeightBig>90</thumbHeightBig>
+ <thumbPosXBig>10</thumbPosXBig>
+ </control>
+ <control>
<type>listcontrol</type>
<description>listcontrol</description>
- <id>1026</id>
<posX>260</posX>
<posY>97</posY>
<width>440</width>
<height>354</height>
- <onleft>2</onleft>
- <onright>1000</onright>
- <onup>1026</onup>
- <ondown>1026</ondown>
- <playedColor>ffa0d0ff</playedColor>
+ <onleft>6</onleft>
<font>font13</font>
- <textcolor2>ffffffff</textcolor2>
- <textureDown>page_down_nofocus.png</textureDown>
- <spinPosY>530</spinPosY>
- <remoteColor>ffFFA075</remoteColor>
- <textureHeight>32</textureHeight>
- <spinHeight>27</spinHeight>
- <textureUpFocus>page_up_focus.png</textureUpFocus>
- <textXOff>5</textXOff>
- <textYOff>4</textYOff>
- <spinColor>ffffffff</spinColor>
- <spinWidth>26</spinWidth>
- <shadedColor>20ffffff</shadedColor>
- <textYOff2>4</textYOff2>
- <IconXOff>8</IconXOff>
- <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
- <textureDownFocus>page_down_focus.png</textureDownFocus>
- <textcolor>ffffffff</textcolor>
- <selectedColor>FFF8BC70</selectedColor>
- <image>folder_focus.png</image>
- <IconYOff>8</IconYOff>
- <spinPosX>590</spinPosX>
- <textXOff2>0</textXOff2>
- <suffix>|</suffix>
- <textureUp>page_up_nofocus.png</textureUp>
- <downloadColor>ff80ff80</downloadColor>
- <textcolor3>ffffffff</textcolor3>
- <textureFocus>list_sub_focus.png</textureFocus>
</control>
+ <control>
+ <description>Filmstrip view</description>
+ <type>filmstrip</type>
+ <width>440</width>
+ <height>354</height>
+ <onleft>6</onleft>
+ <backgroundx>354</backgroundx>
+ <backgroundy>99</backgroundy>
+ <backgroundwidth>238</backgroundwidth>
+ <backgroundheight>336</backgroundheight>
+ <InfoImagex>366</InfoImagex>
+ <InfoImagey>118</InfoImagey>
+ <InfoImagewidth>197</InfoImagewidth>
+ <InfoImageheight>274</InfoImageheight>
+ </control>
+ </control>
<control>
<type>textboxscrollup</type>
<description>Biography value</description>
@@ -208,7 +212,7 @@
<width>440</width>
<height>106</height>
<colordiffuse>ffffffff</colordiffuse>
- <onleft>2</onleft>
+ <onleft>6</onleft>
<onright>1026</onright>
<onup>1026</onup>
<ondown>1026</ondown>
@@ -217,12 +221,27 @@
<textcolor>FFFFFFFF</textcolor>
<label>-</label>
</control>
+ <control>
+ <type>fadelabel</type>
+ <description>Title (during Icons)</description>
+ <id>1027</id>
+ <posX>65</posX>
+ <posY>470</posY>
+ <onleft>6</onleft>
+ <onright>1026</onright>
+ <onup>1026</onup>
+ <ondown>1026</ondown>
+ <font>font12</font>
+ <width>175</width>
+ <height>24</height>
+ <label>-</label>
+ </control>
</control>
<control>
<type>image</type>
<id>1065</id>
- <posX>224</posX>
- <posY>350</posY>
+ <posX>219</posX>
+ <posY>370</posY>
<width>36</width>
<height>36</height>
<visible>no</visible>
@@ -232,8 +251,8 @@
<control>
<type>image</type>
<id>1064</id>
- <posX>227</posX>
- <posY>316</posY>
+ <posX>222</posX>
+ <posY>336</posY>
<width>30</width>
<height>30</height>
<visible>no</visible>
@@ -243,8 +262,8 @@
<control>
<type>image</type>
<id>1063</id>
- <posX>230</posX>
- <posY>288</posY>
+ <posX>225</posX>
+ <posY>308</posY>
<width>24</width>
<height>24</height>
<visible>no</visible>
@@ -254,8 +273,8 @@
<control>
<type>image</type>
<id>1062</id>
- <posX>233</posX>
- <posY>266</posY>
+ <posX>228</posX>
+ <posY>286</posY>
<width>18</width>
<height>18</height>
<visible>no</visible>
@@ -265,8 +284,8 @@
<control>
<type>image</type>
<id>1061</id>
- <posX>236</posX>
- <posY>250</posY>
+ <posX>231</posX>
+ <posY>270</posY>
<width>12</width>
<height>12</height>
<visible>no</visible>
@@ -276,8 +295,8 @@
<control>
<type>image</type>
<id>1060</id>
- <posX>224</posX>
- <posY>350</posY>
+ <posX>219</posX>
+ <posY>370</posY>
<width>36</width>
<height>36</height>
<visible>no</visible>
@@ -287,8 +306,8 @@
<control>
<type>image</type>
<id>1059</id>
- <posX>227</posX>
- <posY>316</posY>
+ <posX>222</posX>
+ <posY>336</posY>
<width>30</width>
<height>30</height>
<visible>no</visible>
@@ -298,8 +317,8 @@
<control>
<type>image</type>
<id>1058</id>
- <posX>230</posX>
- <posY>288</posY>
+ <posX>225</posX>
+ <posY>308</posY>
<width>24</width>
<height>24</height>
<visible>no</visible>
@@ -309,8 +328,8 @@
<control>
<type>image</type>
<id>1057</id>
- <posX>233</posX>
- <posY>266</posY>
+ <posX>228</posX>
+ <posY>286</posY>
<width>18</width>
<height>18</height>
<visible>no</visible>
@@ -320,8 +339,8 @@
<control>
<type>image</type>
<id>1056</id>
- <posX>236</posX>
- <posY>250</posY>
+ <posX>231</posX>
+ <posY>270</posY>
<width>12</width>
<height>12</height>
<visible>no</visible>
@@ -331,8 +350,8 @@
<control>
<type>image</type>
<id>1055</id>
- <posX>224</posX>
- <posY>350</posY>
+ <posX>219</posX>
+ <posY>370</posY>
<width>36</width>
<height>36</height>
<visible>no</visible>
@@ -342,8 +361,8 @@
<control>
<type>image</type>
<id>1054</id>
- <posX>227</posX>
- <posY>316</posY>
+ <posX>222</posX>
+ <posY>336</posY>
<width>30</width>
<height>30</height>
<visible>no</visible>
@@ -353,8 +372,8 @@
<control>
<type>image</type>
<id>1053</id>
- <posX>230</posX>
- <posY>288</posY>
+ <posX>225</posX>
+ <posY>308</posY>
<width>24</width>
<height>24</height>
<visible>no</visible>
@@ -364,8 +383,8 @@
<control>
<type>image</type>
<id>1052</id>
- <posX>233</posX>
- <posY>266</posY>
+ <posX>228</posX>
+ <posY>286</posY>
<width>18</width>
<height>18</height>
<visible>no</visible>
@@ -375,8 +394,8 @@
<control>
<type>image</type>
<id>1051</id>
- <posX>236</posX>
- <posY>250</posY>
+ <posX>231</posX>
+ <posY>270</posY>
<width>12</width>
<height>12</height>
<visible>no</visible>
@@ -387,9 +406,9 @@
<type>image</type>
<id>1021</id>
<posX>65</posX>
- <posY>250</posY>
- <width>155</width>
- <height>220</height>
+ <posY>270</posY>
+ <width>145</width>
+ <height>200</height>
<texture>-</texture>
<keepaspectratio>yes</keepaspectratio>
</control>
@@ -424,8 +443,8 @@
<control>
<type>image</type>
<id>1020</id>
- <posX>80</posX>
- <posY>235</posY>
+ <posX>85</posX>
+ <posY>260</posY>
<width>122</width>
<height>160</height>
<texture>-</texture>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hap...@us...> - 2007-04-28 10:49:53
|
Revision: 349
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=349&view=rev
Author: happytalk
Date: 2007-04-28 03:49:51 -0700 (Sat, 28 Apr 2007)
Log Message:
-----------
Fixed bug where gets stuck on paging arrow on small/large icon views.
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilms.csproj
trunk/plugins/MyFilms/MesFilms.csproj.user
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-04-28 00:25:53 UTC (rev 348)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-04-28 10:49:51 UTC (rev 349)
@@ -803,7 +803,7 @@
affichage_rating(0);
GUIControl.HideControl(GetID, (int)Controls.CTRL_Image);
GUIControl.HideControl(GetID, (int)Controls.CTRL_Image2);
- GUIControl.HideControl(GetID, (int)Controls.CTRL_Texte);
+ GUIControl.ClearControl(GetID, (int)Controls.CTRL_Texte); //GUIControl.HideControl(GetID, (int)Controls.CTRL_Texte);
GUIControl.HideControl(GetID, (int)Controls.CTRL_TxtYear);
GUIControl.HideControl(GetID, (int)Controls.CTRL_TxtGenre);
}
@@ -862,7 +862,7 @@
if (!wrep)
{
affichage_rating(0);
- GUIControl.HideControl(GetID, (int)Controls.CTRL_Texte);
+ GUIControl.ClearControl(GetID, (int)Controls.CTRL_Texte); //GUIControl.HideControl(GetID, (int)Controls.CTRL_Texte);
GUIControl.HideControl(GetID, (int)Controls.CTRL_TxtYear);
GUIControl.HideControl(GetID, (int)Controls.CTRL_TxtGenre);
return;
@@ -872,13 +872,13 @@
TitleSelect.Label = wlabel;
if (Layout == 0)
{
- GUIControl.ShowControl(GetID, (int)Controls.CTRL_Texte);
+ //GUIControl.ShowControl(GetID, (int)Controls.CTRL_Texte);
GUIControl.HideControl(GetID, (int)Controls.CTRL_Title);
}
else
{
GUIControl.ShowControl(GetID, (int)Controls.CTRL_Title);
- GUIControl.HideControl(GetID, (int)Controls.CTRL_Texte);
+ GUIControl.ClearControl(GetID, (int)Controls.CTRL_Texte); //GUIControl.HideControl(GetID, (int)Controls.CTRL_Texte);
}
TxtLstGenre.Label = r[0]["Category"].ToString();
GUIControl.ShowControl(GetID, (int)Controls.CTRL_TxtGenre);
Modified: trunk/plugins/MyFilms/MesFilms.csproj
===================================================================
--- trunk/plugins/MyFilms/MesFilms.csproj 2007-04-28 00:25:53 UTC (rev 348)
+++ trunk/plugins/MyFilms/MesFilms.csproj 2007-04-28 10:49:51 UTC (rev 349)
@@ -14,7 +14,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\mediaportal\xbmc\bin\Debug\plugins\windows\</OutputPath>
+ <OutputPath>..\..\mediaportal\xbmc\bin\Debug\plugins\windows\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -23,7 +23,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\mediaportal\xbmc\bin\Release\plugins\windows\</OutputPath>
+ <OutputPath>..\..\..\..\Program Files\MediaPortal\Plugins\Windows\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -32,6 +32,7 @@
<Reference Include="Core, Version=0.2.2.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Mediaportal\Core\bin\Release\Core.dll</HintPath>
+ <Private>False</Private>
</Reference>
<Reference Include="Databases, Version=0.2.2.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
@@ -49,6 +50,7 @@
<Reference Include="Utils, Version=2.1.2.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Mediaportal\Core\bin\Release\Utils.dll</HintPath>
+ <Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/MyFilms/MesFilms.csproj.user
===================================================================
--- trunk/plugins/MyFilms/MesFilms.csproj.user 2007-04-28 00:25:53 UTC (rev 348)
+++ trunk/plugins/MyFilms/MesFilms.csproj.user 2007-04-28 10:49:51 UTC (rev 349)
@@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ReferencePath>D:\devel\vs2005\mediaportal\xbmc\bin\Debug\;D:\devel\vs2005\mediaportal\xbmc\bin\Debug\plugins\windows\</ReferencePath>
+ <ReferencePath>D:\devel\vs2005\mediaportal\xbmc\bin\Debug\;D:\devel\vs2005\mediaportal\xbmc\bin\Debug\plugins\windows\;D:\Program Files\MediaPortal\;D:\Program Files\MediaPortal\Plugins\Windows\</ReferencePath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<StartAction>Program</StartAction>
@@ -8,6 +8,6 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<StartAction>Program</StartAction>
- <StartProgram>D:\devel\vs2005\mediaportal\xbmc\bin\Release\MediaPortal.exe</StartProgram>
+ <StartProgram>D:\Program Files\MediaPortal\MediaPortal.exe</StartProgram>
</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: <ze...@us...> - 2007-04-28 22:10:13
|
Revision: 354
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=354&view=rev
Author: zebons
Date: 2007-04-28 15:10:10 -0700 (Sat, 28 Apr 2007)
Log Message:
-----------
View As Icons and Large icons added.
Modified Paths:
--------------
trunk/plugins/MyFilms/AssemblyInfo.cs
trunk/plugins/MyFilms/MesFilms.cs
Modified: trunk/plugins/MyFilms/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyFilms/AssemblyInfo.cs 2007-04-28 22:09:11 UTC (rev 353)
+++ trunk/plugins/MyFilms/AssemblyInfo.cs 2007-04-28 22:10:10 UTC (rev 354)
@@ -31,5 +31,5 @@
//
// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de révision et de build par défaut
// en utilisant '*', comme indiqué ci-dessous :
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("4.2.0.0")]
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-04-28 22:09:11 UTC (rev 353)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-04-28 22:10:10 UTC (rev 354)
@@ -806,6 +806,7 @@
GUIControl.ClearControl(GetID, (int)Controls.CTRL_Texte); //GUIControl.HideControl(GetID, (int)Controls.CTRL_Texte);
GUIControl.HideControl(GetID, (int)Controls.CTRL_TxtYear);
GUIControl.HideControl(GetID, (int)Controls.CTRL_TxtGenre);
+ GUIControl.HideControl(GetID, (int)Controls.CTRL_Title);
}
//----------------------------------------------------------------------------------------
// Display Detailed Info (Image, Description, Year, Category)
@@ -877,7 +878,10 @@
}
else
{
- GUIControl.ShowControl(GetID, (int)Controls.CTRL_Title);
+ if (g_Player.Playing)
+ GUIControl.HideControl(GetID, (int)Controls.CTRL_Title);
+ else
+ GUIControl.ShowControl(GetID, (int)Controls.CTRL_Title);
GUIControl.ClearControl(GetID, (int)Controls.CTRL_Texte); //GUIControl.HideControl(GetID, (int)Controls.CTRL_Texte);
}
TxtLstGenre.Label = r[0]["Category"].ToString();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-05-06 15:09:48
|
Revision: 381
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=381&view=rev
Author: zebons
Date: 2007-05-06 08:08:52 -0700 (Sun, 06 May 2007)
Log Message:
-----------
Possible to add a password for protecting configuration
Modified Paths:
--------------
trunk/plugins/MyFilms/CatalogConverter.cs
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
trunk/plugins/MyFilms/MesFilmsSetup.cs
Added Paths:
-----------
trunk/plugins/MyFilms/CryptageTexte.cs
Modified: trunk/plugins/MyFilms/CatalogConverter.cs
===================================================================
--- trunk/plugins/MyFilms/CatalogConverter.cs 2007-05-06 12:25:27 UTC (rev 380)
+++ trunk/plugins/MyFilms/CatalogConverter.cs 2007-05-06 15:08:52 UTC (rev 381)
@@ -65,7 +65,14 @@
destXml.WriteStartElement("Movie");
XmlNode nodeID = nodeDVD.SelectSingleNode("ID");
XmlNode nodeMediaType = nodeDVD.SelectSingleNode("MediaTypes/DVD");
- XmlNode nodeNumber = nodeDVD.SelectSingleNode("CollectionNumber");
+ XmlNode nodeNumber = null;
+ try
+ {
+ nodeNumber = nodeDVD.SelectSingleNode("CollectionNumber");
+ }
+ catch
+ {
+ }
XmlNode nodeTitle = nodeDVD.SelectSingleNode("Title");
XmlNode nodeOTitle = nodeDVD.SelectSingleNode("OriginalTitle");
XmlNode nodeNotes = nodeDVD.SelectSingleNode("Notes");
@@ -184,10 +191,10 @@
else
Rating = "0.0";
}
- if (nodeNumber != null && nodeNumber.InnerText != null)
+ if (nodeNumber != null && nodeNumber.InnerText != null && nodeNumber.InnerText.Length > 1)
WriteAntAtribute(destXml,"CollectionNumber",nodeNumber.InnerText);
else
- WriteAntAtribute(destXml, "CollectionNumber", nodeNumber.InnerText);
+ WriteAntAtribute(destXml, "CollectionNumber", "9999");
if (nodeOTitle != null && nodeOTitle.InnerText.Length > 0)
WriteAntAtribute(destXml, "Title", nodeOTitle.InnerText);
else
Added: trunk/plugins/MyFilms/CryptageTexte.cs
===================================================================
--- trunk/plugins/MyFilms/CryptageTexte.cs (rev 0)
+++ trunk/plugins/MyFilms/CryptageTexte.cs 2007-05-06 15:08:52 UTC (rev 381)
@@ -0,0 +1,99 @@
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Security.Cryptography;
+
+
+namespace MesFilms
+{
+ public class Crypto
+ {
+ byte[] Clef = {0xAD, 0x24, 0xFE, 0x58, 0xC5, 0x81, 0x37, 0xB4, 0xF9, 0x97, 0x23, 0xD2, 0x13, 0x86, 0xBB, 0xA7};
+ byte[] Vect = {0x81, 0xFD, 0xC3, 0xBB, 0x0A, 0xE6, 0xFE, 0xB8, 0xD9, 0xC0, 0x0C, 0x92, 0x73, 0xD4, 0x1A, 0xF2};
+
+ RijndaelManaged rj = new RijndaelManaged();
+
+ public Crypto()
+ {
+ // Constructeur : Code ex\xE9cut\xE9 \xE0 chaque cr\xE9ation d'un objet CryptageTexte.Crypto() : aucun !
+ // Ce constructeur est n\xE9cessaire, m\xEAme "vide".
+ }
+
+
+ // ************************ CRYPTER(Textebrut)*******************************
+ /// <summary>
+ /// Fonction de cryptage : elle necessite en argument une cha\xEEne de caract\xE8res,
+ /// et renvoie une cha\xEEne de caract\xE8res crypt\xE9e (cipher-text).
+ /// </summary>
+ /// <param name="string TexteBrut"></param>
+ /// <returns name="string CypherTexte"></returns>
+ // ***************************************************************************
+
+ public string Crypter(string TexteBrut)
+ {
+ if (TexteBrut.Length == 0)
+ return "";
+ MemoryStream CypherTexteMem = new MemoryStream();
+
+ CryptoStream CStream = new CryptoStream(CypherTexteMem,
+ rj.CreateEncryptor(Clef, Vect), CryptoStreamMode.Write);
+
+ byte[] TextebrutByte = new UnicodeEncoding().GetBytes(TexteBrut);
+
+ CStream.Write(TextebrutByte, 0, TextebrutByte.Length);
+ CStream.Close();
+
+ byte[] CypherTexteByte = CypherTexteMem.ToArray();
+
+ CypherTexteMem.Close();
+ string CypherTexte = new UnicodeEncoding().GetString(CypherTexteByte);
+
+ return CypherTexte;
+ }
+
+
+ // ************************ DECRYPTER(Textebrut)*****************************
+ /// <summary>
+ /// Fonction de d\xE9cryptage : elle necessite en argument une cha\xEEne de
+ /// caract\xE8res crypt\xE9s (cipher-text) et renvoie une cha\xEEne de caract\xE8res.
+ /// </summary>
+ /// <param name="string CypherTexte"></param>
+ /// <returns name="string Textebrut"></returns>
+ // ***************************************************************************
+
+ public string Decrypter(string CypherTexte)
+ {
+ if (CypherTexte.Length == 0)
+ return "";
+ MemoryStream CypherTexteMem = new MemoryStream(new UnicodeEncoding().GetBytes(CypherTexte));
+
+ CryptoStream CStream = new CryptoStream(CypherTexteMem, rj.CreateDecryptor(Clef, Vect),CryptoStreamMode.Read);
+
+ MemoryStream TextebrutMem = new MemoryStream();
+
+ do
+ {
+ byte[] buf = new byte[100];
+
+ int BytesLus = CStream.Read(buf,0,100);
+
+ if (0 == BytesLus)
+ break;
+
+ TextebrutMem.Write(buf,0,BytesLus);
+
+ }while(true);
+
+ CStream.Close();
+ CypherTexteMem.Close();
+
+ byte[] TextebrutByte = TextebrutMem.ToArray();
+
+ TextebrutMem.Close();
+
+ string Textebrut = new UnicodeEncoding().GetString(TextebrutByte);
+ return Textebrut;
+ }
+ }
+}
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-05-06 12:25:27 UTC (rev 380)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-05-06 15:08:52 UTC (rev 381)
@@ -279,7 +279,6 @@
{
int dControl = messageType.TargetControlId;
int iControl = messageType.SenderControlId;
-
switch (messageType.Message)
{
case GUIMessage.MessageType.GUI_MSG_WINDOW_INIT:
@@ -304,32 +303,37 @@
}
else
{
- CurrentConfig = xmlreader.GetValueAsString("MyFilms", "Default_Config", "");
NbConfig = xmlreader.GetValueAsInt("MyFilms", "NbConfig", 0);
- if ((CurrentConfig == "") && (NbConfig == 0))
+ if (NbConfig == 0)
{
- StrFileXml = "";
- Fin_Charge_Init(false);
+ GUIDialogOK dlgOk = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
+ dlgOk.SetHeading(3);//my videos
+ dlgOk.SetLine(1, "No Configuration defined");
+ dlgOk.SetLine(2, "Please enter setup first");
+ dlgOk.DoModal(GetID);
+ GUIWindowManager.ShowPreviousWindow();
}
+ bool boolchoice = true;
+ CurrentConfig = xmlreader.GetValueAsString("MyFilms", "Default_Config", "");
+ if (CurrentConfig == "")
+ CurrentConfig = xmlreader.GetValueAsString("MyFilms", "Current_Config", "");
+ if (CurrentConfig == "")
+ {
+ boolchoice = false;
+ CurrentConfig = Choice_Config(); // "" => user esc's dialog on plugin startup so exit plugin unchanged
+ }
+ CurrentConfig = Control_Access_Config(CurrentConfig);
+ if ((CurrentConfig == "") && (NbConfig > 1) && (boolchoice)) //error password ? so if many config => choice config menu
+ CurrentConfig = Choice_Config();
+ if (CurrentConfig == "") //continuing here with CurrentConfig = "" will cause exception in GuiWindowManager.cs so exit plugin
+ GUIWindowManager.ShowPreviousWindow();
else
{
- if (CurrentConfig == "")
- CurrentConfig = xmlreader.GetValueAsString("MyFilms", "Current_Config", "");
- if (CurrentConfig == "")
- {
- 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
- {
+ if (CurrentConfig.Length == 0)
GUIWindowManager.ShowPreviousWindow();
- }
- else
- {
- Load_Config(CurrentConfig, true);
- Fin_Charge_Init(false);
- }
- }
+ Load_Config(CurrentConfig, true);
+ Fin_Charge_Init(false);
+ }
}
}
return true;
@@ -338,6 +342,8 @@
if (CurrentConfig != "") save_config_values();
mydivx.Clear();
mydivx.Dispose();
+ facadeView.Clear();
+ facadeView.FreeResources();
return true; // fall through to call base class?
case GUIMessage.MessageType.GUI_MSG_ITEM_FOCUS_CHANGED:
@@ -983,53 +989,54 @@
//--------------------------------------------------------------------------------------------
private void Selection_type_Video()
{
+
ArrayList choice_view = new ArrayList();
- GUIDialogMenu dlg = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
- if (dlg == null) return;
- dlg.Reset();
- dlg.SetHeading(924); // menu
- dlg.Add(GUILocalizeStrings.Get(342));//videos
- dlg.Add(GUILocalizeStrings.Get(345));//year
- dlg.Add(GUILocalizeStrings.Get(135));//genre
- dlg.Add(GUILocalizeStrings.Get(200026));//pays
+ GUIDialogMenu dlg1 = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
+ if (dlg1 == null) return;
+ dlg1.Reset();
+ dlg1.SetHeading(924); // menu
+ dlg1.Add(GUILocalizeStrings.Get(342));//videos
+ dlg1.Add(GUILocalizeStrings.Get(345));//year
+ dlg1.Add(GUILocalizeStrings.Get(135));//genre
+ dlg1.Add(GUILocalizeStrings.Get(200026));//pays
choice_view.Add("All");
choice_view.Add("Year");
choice_view.Add("Category");
choice_view.Add("Country");
if (!(StrStorage.Length == 0) && !(StrStorage == "(none)"))
{
- dlg.Add(GUILocalizeStrings.Get(154) + " " + GUILocalizeStrings.Get(1951));//storage
+ dlg1.Add(GUILocalizeStrings.Get(154) + " " + GUILocalizeStrings.Get(1951));//storage
choice_view.Add("Storage");
}
if (!(StrViewItem1 == null) && !(StrViewItem1 == "(none)"))
{
choice_view.Add("View1");
if ((StrViewText1 == null) || (StrViewText1.Length == 0))
- dlg.Add(StrViewItem1); // specific user View1
+ dlg1.Add(StrViewItem1); // specific user View1
else
- dlg.Add(StrViewText1); // specific Text for View1
+ dlg1.Add(StrViewText1); // specific Text for View1
}
if (!(StrViewItem2 == null) && !(StrViewItem2 == "(none)"))
{
choice_view.Add("View2");
if ((StrViewText2 == null) || (StrViewText2.Length == 0))
- dlg.Add(StrViewItem2); // specific user View2
+ dlg1.Add(StrViewItem2); // specific user View2
else
- dlg.Add(StrViewText2); // specific Text for View2
+ dlg1.Add(StrViewText2); // specific Text for View2
}
if (NbConfig > 1)
{
- dlg.Add(GUILocalizeStrings.Get(6029) + " " + GUILocalizeStrings.Get(6022)); // Change Config
+ dlg1.Add(GUILocalizeStrings.Get(6029) + " " + GUILocalizeStrings.Get(6022)); // Change Config
choice_view.Add("Config");
}
+ dlg1.DoModal(GetID);
- dlg.DoModal(GetID);
- if (dlg.SelectedLabel == -1)
+ if (dlg1.SelectedLabel == -1)
{
return;
}
- Change_view(choice_view[dlg.SelectedLabel].ToString());
+ Change_view(choice_view[dlg1.SelectedLabel].ToString());
return;
}
@@ -1239,8 +1246,6 @@
//--------------------------------------------------------------------------------------------
private string Choice_Config()
{
- string newConfig = "";
-
GUIDialogMenu dlg = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
if (dlg == null)
{
@@ -1263,11 +1268,38 @@
StrFileXml = "";
return "";
}
+ if (dlg.SelectedLabelText.Length > 0)
+ return dlg.SelectedLabelText;
+ return "";
+ }
+ //--------------------------------------------------------------------------------------------
+ // Control Acces to asked configuration
+ //--------------------------------------------------------------------------------------------
+ private string Control_Access_Config(string configname)
+ {
+ if (configname.Length == 0)
+ return "";
+ string Dwp;
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MyFilms.xml"))
{
- newConfig = xmlreader.GetValueAsString("MyFilms", "ConfigName" + dlg.SelectedLabel, "");
+ Dwp = xmlreader.GetValueAsString(configname, "Dwp", "");
}
- return newConfig;
+
+ if (Dwp.Length == 0)
+ return configname;
+ VirtualKeyboard keyboard = (VirtualKeyboard)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_VIRTUAL_KEYBOARD);
+ if (null == keyboard) return "";
+ keyboard.Reset();
+ keyboard.Text = "";
+ keyboard.Password = true;
+ keyboard.DoModal(GetID);
+ if ((keyboard.IsConfirmed) && (keyboard.Text.Length > 0))
+ {
+ Crypto crypto = new Crypto();
+ if (crypto.Decrypter(Dwp) == keyboard.Text)
+ return configname;
+ }
+ return "";
}
//--------------------------------------------------------------------------------------------
// Initial Windows load. If LoadDfltSlct = true => load default select if any
@@ -1279,6 +1311,16 @@
boolselect = false;
if (!ControlFichierDonn\xE9es())
{
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MyFilms.xml"))
+ {
+ if (CurrentConfig == xmlreader.GetValueAsString("MyFilms", "Current_Config", ""))
+ {
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings("MyFilms.xml"))
+ {
+ xmlwriter.SetValue("MyFilms", "Current_Config", "");
+ }
+ }
+ }
base.OnPreviousWindow();
return; // need to return here as xml file doesn't exist so no point trying to load it
}
@@ -1335,7 +1377,6 @@
}
else
{
- MessageBox.Show(StrViewDfltItem);
if (StrViewDfltText.Length == 0)
{
if (StrViewDfltItem == StrViewItem1)
@@ -1489,6 +1530,8 @@
if (choice_view == "Config")
{
string newConfig = Choice_Config();
+ newConfig = Control_Access_Config(newConfig);
+
if (newConfig != "" && newConfig != CurrentConfig) // if user escapes dialog or bad value leave system unchanged
{
//Change "Config":
Modified: trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-05-06 12:25:27 UTC (rev 380)
+++ trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-05-06 15:08:52 UTC (rev 381)
@@ -165,6 +165,10 @@
this.View_Dflt_Text = new System.Windows.Forms.TextBox();
this.ButDelet = new System.Windows.Forms.Button();
this.Config_Dflt = new System.Windows.Forms.CheckBox();
+ this.Dwp = new System.Windows.Forms.TextBox();
+ this.Rpt_Dwp = new System.Windows.Forms.TextBox();
+ this.label15 = new System.Windows.Forms.Label();
+ this.label16 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
@@ -705,19 +709,19 @@
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(69, 13);
this.label10.TabIndex = 34;
- this.label10.Text = "Version 4.2.0";
+ this.label10.Text = "Version 4.2.2";
//
// textBox1
//
- this.textBox1.Location = new System.Drawing.Point(707, 12);
+ this.textBox1.Location = new System.Drawing.Point(715, 12);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(108, 20);
- this.textBox1.TabIndex = 3;
+ this.textBox1.Size = new System.Drawing.Size(98, 20);
+ this.textBox1.TabIndex = 5;
//
// label11
//
this.label11.AutoSize = true;
- this.label11.Location = new System.Drawing.Point(578, 15);
+ this.label11.Location = new System.Drawing.Point(586, 15);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(123, 13);
this.label11.TabIndex = 36;
@@ -726,9 +730,9 @@
// Config_Name
//
this.Config_Name.FormattingEnabled = true;
- this.Config_Name.Location = new System.Drawing.Point(138, 15);
+ this.Config_Name.Location = new System.Drawing.Point(126, 15);
this.Config_Name.Name = "Config_Name";
- this.Config_Name.Size = new System.Drawing.Size(180, 21);
+ this.Config_Name.Size = new System.Drawing.Size(163, 21);
this.Config_Name.Sorted = true;
this.Config_Name.TabIndex = 1;
this.Config_Name.Leave += new System.EventHandler(this.Config_Name_SelectedIndexChanged);
@@ -737,7 +741,7 @@
// label12
//
this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(32, 19);
+ this.label12.Location = new System.Drawing.Point(20, 19);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(100, 13);
this.label12.TabIndex = 38;
@@ -875,7 +879,7 @@
// Config_Dflt
//
this.Config_Dflt.AutoSize = true;
- this.Config_Dflt.Location = new System.Drawing.Point(333, 18);
+ this.Config_Dflt.Location = new System.Drawing.Point(126, 39);
this.Config_Dflt.Name = "Config_Dflt";
this.Config_Dflt.Size = new System.Drawing.Size(125, 17);
this.Config_Dflt.TabIndex = 2;
@@ -883,11 +887,50 @@
this.Config_Dflt.UseVisualStyleBackColor = true;
this.Config_Dflt.Enter += new System.EventHandler(this.Config_Name_Control);
//
+ // Dwp
+ //
+ this.Dwp.Location = new System.Drawing.Point(372, 15);
+ this.Dwp.Name = "Dwp";
+ this.Dwp.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.Dwp.Size = new System.Drawing.Size(107, 20);
+ this.Dwp.TabIndex = 3;
+ this.Dwp.UseSystemPasswordChar = true;
+ //
+ // Rpt_Dwp
+ //
+ this.Rpt_Dwp.Location = new System.Drawing.Point(372, 37);
+ this.Rpt_Dwp.Name = "Rpt_Dwp";
+ this.Rpt_Dwp.Size = new System.Drawing.Size(107, 20);
+ this.Rpt_Dwp.TabIndex = 4;
+ this.Rpt_Dwp.UseSystemPasswordChar = true;
+ //
+ // label15
+ //
+ this.label15.AutoSize = true;
+ this.label15.Location = new System.Drawing.Point(313, 19);
+ this.label15.Name = "label15";
+ this.label15.Size = new System.Drawing.Size(53, 13);
+ this.label15.TabIndex = 44;
+ this.label15.Text = "Password";
+ //
+ // label16
+ //
+ this.label16.AutoSize = true;
+ this.label16.Location = new System.Drawing.Point(275, 40);
+ this.label16.Name = "label16";
+ this.label16.Size = new System.Drawing.Size(91, 13);
+ this.label16.TabIndex = 45;
+ this.label16.Text = "Repeat Password";
+ //
// MesFilmsSetup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(839, 541);
+ this.Controls.Add(this.label16);
+ this.Controls.Add(this.label15);
+ this.Controls.Add(this.Rpt_Dwp);
+ this.Controls.Add(this.Dwp);
this.Controls.Add(this.Config_Dflt);
this.Controls.Add(this.groupBox7);
this.Controls.Add(this.label12);
@@ -990,6 +1033,10 @@
private ComboBox CatalogType;
private Label label14;
private ComboBox LayOut;
+ private TextBox Dwp;
+ private TextBox Rpt_Dwp;
+ private Label label15;
+ private Label label16;
}
}
\ No newline at end of file
Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-05-06 12:25:27 UTC (rev 380)
+++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-05-06 15:08:52 UTC (rev 381)
@@ -9,6 +9,7 @@
using MediaPortal.GUI.Library;
+
namespace MesFilms
{
public partial class MesFilmsSetup : Form
@@ -22,6 +23,7 @@
private int MesFilms_nb_config = 0;
private string StrDfltSelect = "";
private AntMovieCatalog mydivx = new AntMovieCatalog();
+ private Crypto crypto = new Crypto();
public MesFilmsSetup()
{
@@ -240,6 +242,15 @@
AntUpdText2.Focus();
return;
}
+ if (Dwp.Text.Length > 0)
+ if (Dwp.Text != Rpt_Dwp.Text)
+ {
+ System.Windows.Forms.MessageBox.Show("The two Passwords must be identical !", "Configuration", MessageBoxButtons.OK, MessageBoxIcon.Stop);
+ Dwp.Clear();
+ Rpt_Dwp.Focus();
+ Dwp.Focus();
+ return;
+ }
StrDfltSelect = "";
string wAntFilterSign;
if (AntFilterSign1.Text == "#")
@@ -332,7 +343,7 @@
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "TitleDelim", TitleDelim.Text);
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "LayOut", WLayOut);
MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "StrDfltSelect", StrDfltSelect);
-
+ MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "Dwp", crypto.Crypter(Dwp.Text));
string w_Config_Name = Config_Name.Text;
Config_Name.Items.Remove(Config_Name.Text);
Config_Name.Items.Add(w_Config_Name);
@@ -404,6 +415,8 @@
AntItem2.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "AntItem2", "");
AntItem3.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "AntItem3", "");
TitleDelim.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "TitleDelim", "\\");
+ Dwp.Text = crypto.Decrypter(MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "Dwp", ""));
+ Rpt_Dwp.Text = Dwp.Text;
View_Dflt_Item.Items.Remove(View_Dflt_Item.Text);
View_Dflt_Item.Items.Add(View_Dflt_Item.Text);
View_Dflt_Item.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "ViewDfltItem", "");
@@ -474,6 +487,8 @@
LayOut.ResetText();
View_Dflt_Item.ResetText();
View_Dflt_Text.ResetText();
+ Dwp.ResetText();
+ Rpt_Dwp.ResetText();
}
private void AntViewItem1_SelectedIndexChanged(object sender, EventArgs e)
@@ -540,8 +555,11 @@
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "IndexItem");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "TitleDelim");
MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "LayOut");
+ MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "Dwp");
if ((Config_Name.Text) == MyFilms_xmlreader.GetValueAsString("MyFilms", "Default_Config", ""))
MyFilms_xmlwriter.RemoveEntry("MyFilms", "Default_Config");
+ if ((Config_Name.Text) == MyFilms_xmlreader.GetValueAsString("MyFilms", "Current_Config", ""))
+ MyFilms_xmlwriter.RemoveEntry("MyFilms", "Current_Config");
Config_Name.Items.Remove(Config_Name.Text);
Refresh_Items(true);
Config_Name.ResetText();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-05-10 05:51:42
|
Revision: 394
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=394&view=rev
Author: zebons
Date: 2007-05-09 22:51:39 -0700 (Wed, 09 May 2007)
Log Message:
-----------
Add InfoTips on setup fields or groupBox
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
trunk/plugins/MyFilms/MesFilmsSetup.cs
Modified: trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-05-09 17:30:36 UTC (rev 393)
+++ trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-05-10 05:51:39 UTC (rev 394)
@@ -535,9 +535,9 @@
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(7, 103);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(124, 13);
+ this.label5.Size = new System.Drawing.Size(145, 13);
this.label5.TabIndex = 24;
- this.label5.Text = "Search Path for File read";
+ this.label5.Text = "Paths for Movies File Search ";
//
// AntIdentLabel
//
@@ -709,7 +709,7 @@
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(69, 13);
this.label10.TabIndex = 34;
- this.label10.Text = "Version 4.2.2";
+ this.label10.Text = "Version 4.2.3";
//
// textBox1
//
Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-05-09 17:30:36 UTC (rev 393)
+++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-05-10 05:51:39 UTC (rev 394)
@@ -34,6 +34,31 @@
private void MesFilmsSetup_Load(object sender, EventArgs e)
{
Refresh_Items(true);
+ ToolTip ToolTip1 = new ToolTip();
+ ToolTip1.AutoPopDelay = 15000;
+ ToolTip1.SetToolTip(this.Config_Name, "Enter here a config Name." + "\n" + "You can define many configuration on many (or on the same) database with differents selections." + "\n" + "Some configurations can be protected by a password usefull for children protection " + "\n" + "if you don't want they watch some movies...");
+ ToolTip1.SetToolTip(this.Config_Dflt, "If you select this, that configuration will be loaded each time you enter in the plugin." + "\n" + "If no default config defined and many configs, the configuration to load will be asked the first time." + "\n" + "After, the plugin load the last configuration used if no default defined");
+ ToolTip1.SetToolTip(this.Dwp, "Enter a password here if you want to protect that configuration." + "\n" + "Usefull for children protection if you don't want they watch some movies." + "\n" + "You have to repeat your password");
+ ToolTip1.SetToolTip(this.textBox1, "Name of the plugin displayed in MP." + "\n" + "By default Films, but you can choose a better name");
+ ToolTip1.SetToolTip(this.MesFilmsCat, "Enter here the complete Filename + Path to your AMC XML Database." + "\n" + "You can use the search button to help you");
+ ToolTip1.SetToolTip(this.MesFilmsImg, "Path to find pictures of your Movies" + "\n" + "(by default same path than your XML file)");
+ ToolTip1.SetToolTip(this.CatalogType, "Type of your Catalog : ANT Movie Catalog or DVDProfiler." + "\n" + "In case of DVDProfiler a new Catalog file will be created" + "\n" + "Name CatalogFile_tmp.xml. That new file is fully compatible with AMC...");
+ ToolTip1.SetToolTip(this.AntStorage, "Give here the fied of your AMC Database where you store" + "\n" + "the Movie Filename. Information used for launching Movie." + "\n" + "In that field, you can put either a filename, either many filenames" + "\n" + "separated by a ';' if your movie as many files" + "\n" + "either a playlist file (.m3u) text file with a list of filenames");
+ ToolTip1.SetToolTip(this.PathStorage, "Paths used for searching the file movie for launching. First search is made" + "\n" + "with information stored in 'Ant Item for Storage File Info' field of your DB," + "\n" + "if not found, search is made with those paths and after with amovibles drives" + "\n" + "of your computer. You can defined many paths separated by a ';'");
+ ToolTip1.SetToolTip(this.AntIdentItem, "When launching movies, if the filename is not found," + "\n" + "a popup windows ask you to mount the right media." + "\n" + "You can define here which item of your AMC database" + "\n" + "is usefull for identifying the right media. A label associated" + "\n" + "with that information can be defined below");
+ ToolTip1.SetToolTip(this.AntIdentLabel, "Text associated with the mounting information helping you" + "\n" + "to find the right media for launching movie");
+ ToolTip1.SetToolTip(this.LayOut, "Default View (List, Icons, Larges Icons) used when launching" + "\n" + "for the fist time that configuration ." + "\n" + "After, the last view defined is re-used." + "\n" + "You can change it with the Layout Button when running the plugin");
+ ToolTip1.SetToolTip(this.groupBox5, "Fields of your DB used as Master Title" + "\n" + "(often OriginalTitle or TranslatedTitle) and secondary Title");
+ ToolTip1.SetToolTip(this.TitleDelim, "Classification delimiter Title." + "\n" + "With that you can classify your movie collection" + "\n" + "essentially for series movies. Take a look on the MP forum" + "\n" + "for that use");
+ ToolTip1.SetToolTip(this.groupBox3, "Some views (Genre, Year, Country..) are predefined." + "\n" + "You can define here two extra views for your needings." + "\n" + "You have to enter an item field and a label associated with." + "\n" + "That Text will be displayed in choice View Menu");
+ ToolTip1.SetToolTip(this.groupBox8, "Default View used when you enter in that" + "\n" + "Configuration for the first time. Last view defined in the plugin will be used then." + "\n" + "You have to define an item and eventually a value associated with" + "\n" + "Ex: you define 'Category' as default view Item;" + "\n" + "if you put 'Comedy' as value, all comedies movies'll be displayed;" + "\n" + "if you leave it blank a Category Choice Menu will be proposed");
+ ToolTip1.SetToolTip(this.groupBox2, "You can filter here records you want to see" + "\n" + "with that configuration. You have to define" + "\n" + "items and values associated with for selections." + "\n" + "Ex: exclude Hard movies for a children default configuration" + "\n" + "Hard movies'll be include in another config protected wit a password");
+ ToolTip1.SetToolTip(this.groupBox1, "You can add extra informations on the detailed View." + "\n" + "Two with a label assopciated with and one without." + "\n" + "Try it to see where those extra infos are displayed" + "\n" + "and choose the right place for your needings");
+ ToolTip1.SetToolTip(this.groupBox4, "Some fields are already updatable in the plugin." + "\n" + "You can define here two supplementary fields" + "\n" + "that can be updated. Define Fields and label associated with");
+ ToolTip1.SetToolTip(this.groupBox6, "Some sorts are already defined in the plugin" + "\n" + "(Year, Date, Rating, Name..); You can define add another" + "\n" + "sort for your need. Define Field and label associated with");
+ ToolTip1.SetToolTip(this.ButSave, "Save the Configuration. Controls are made at this time." + "\n" + "For DVDP database type, the temporary is built here" + "\n" + "and after each time the DVDP XML update date will be newer than the generated file one");
+ ToolTip1.SetToolTip(this.ButDelet, "Delete all informations for that configuration." + "\n" + "If that config was the default one, No default config'll be define.");
+ ToolTip1.SetToolTip(this.ButQuit, "No comments...");
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++)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-05-11 21:08:49
|
Revision: 396
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=396&view=rev
Author: zebons
Date: 2007-05-11 14:08:46 -0700 (Fri, 11 May 2007)
Log Message:
-----------
enhance 'selection by' invoiding some movies to be displayed on many views
correct ESC key press after selection. Now returns on Selection Menu
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-05-11 04:37:46 UTC (rev 395)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-05-11 21:08:46 UTC (rev 396)
@@ -270,6 +270,12 @@
Change_LayOut(Layout);
if (GetPrevFilmList()) return;
}
+ if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) && (boolreturn))
+ {
+ boolreturn = false;
+ Change_view(WStrSort);
+ return;
+ }
base.OnAction(actionType);
}
//---------------------------------------------------------------------------------------
@@ -552,6 +558,7 @@
{
wselectedlabel = facadeView.SelectedListItem.Label;
Change_LayOut(Layout);
+ boolreturn = true;
do
{
if (StrTitleSelect != "") StrTitleSelect += TitleDelim;
@@ -689,6 +696,17 @@
// Load the DataSet.
foreach (DataRow r in LectureDonn\xE9es(StrFilmSelect, StrSort, StrSortSens))
{
+ if (boolreturn)//in case of selection by view verify if value correspond excatly to the searched string
+ {
+ string[] split = r[WStrSort].ToString().Split(new Char[] { ',' });
+ foreach (string s in split)
+ {
+ if (s.Trim().ToLower() == wselectedlabel.Trim().ToLower())
+ goto suite;
+ }
+ goto fin;
+ }
+ suite:
sFullTitle = sTitle = r[StrTitle1].ToString();
DelimCnt2 = NewString.PosCount(TitleDelim, sTitle, false);
if (DelimCnt <= DelimCnt2)
@@ -757,6 +775,7 @@
if ((int)(r["Number"]) == iSelItem) l_index = facadeView.Count - 1; //test if this item is one to select
}
sPrevTitle = sTitle;
+ fin: ;
}
if ((l_index > facadeView.Count - 1) || (l_index < 0))
l_index = 0;
@@ -1063,7 +1082,7 @@
Wstar = NewWstar;
BtnSrtBy.Label = GUILocalizeStrings.Get(103);
boolselect = true;
- boolreturn = true;
+// boolreturn = true;
if (ClearIndex) l_index = 0;
facadeView.Clear();
@@ -1157,6 +1176,7 @@
xmlwriter.SetValue(CurrentConfig, "Selection", StrTxtSelect);
xmlwriter.SetValue(CurrentConfig, "IndexItem", (facadeView.SelectedListItemIndex > -1) ? ((boolselect) ? facadeView.SelectedListItemIndex.ToString() : facadeView.SelectedListItem.ItemId.ToString()) : "-1"); //may need to check if there is no item selected and so save -1
xmlwriter.SetValueAsBool(CurrentConfig, "boolselect", boolselect);
+ xmlwriter.SetValueAsBool(CurrentConfig, "boolreturn", boolreturn);
xmlwriter.SetValue(CurrentConfig, "WStrSort", WStrSort);
xmlwriter.SetValue(CurrentConfig, "Wstar", Wstar);
xmlwriter.SetValue(CurrentConfig, "WLayOut", Layout);
@@ -1233,6 +1253,7 @@
StrTxtSelect = xmlreader.GetValueAsString(CurrentConfig, "Selection", "");
l_index = xmlreader.GetValueAsInt(CurrentConfig, "IndexItem", -1);
boolselect = xmlreader.GetValueAsBool(CurrentConfig, "boolselect", false);
+ boolreturn = xmlreader.GetValueAsBool(CurrentConfig, "boolreturn", false);
WStrSort = xmlreader.GetValueAsString(CurrentConfig, "WStrSort", "");
Wstar = xmlreader.GetValueAsString(CurrentConfig, "Wstar", "");
LastID = xmlreader.GetValueAsInt(CurrentConfig, "LastID", -1);
@@ -1446,26 +1467,26 @@
private void Change_view(string choice_view)
{
boolstorage = false;
- if (choice_view == "All")
+ if (choice_view.ToLower() == "all")
{
// Change View All Films
StrSelect = StrTitleSelect = StrTxtSelect = ""; //clear all selects
boolselect = false;
+ boolreturn = false;
GetFilmList();
return;
}
- if (choice_view == "Year")
+ if (choice_view.ToLower() == "year")
{
// Change View by Year
Change_LayOut(0);
WStrSort = "YEAR";
WStrSortSens = " DESC";
BtnSrtBy.IsAscending = false;
- boolreturn = true;
getSelectFromDivx(StrTitle1.ToString() + " not like ''", WStrSort, WStrSortSens, "*", true, "");
return;
}
- if (choice_view == "Category")
+ if (choice_view.ToLower() == "category")
{
// Change View by "Category":
Change_LayOut(0);
@@ -1475,7 +1496,7 @@
getSelectFromDivx(StrTitle1.ToString() + " not like ''", WStrSort, WStrSortSens, "*", true, "");
return;
}
- if (choice_view == "Country")
+ if (choice_view.ToLower() == "country")
{
// Change View by "Country":
Change_LayOut(0);
@@ -1485,7 +1506,7 @@
getSelectFromDivx(StrTitle1.ToString() + " not like ''", WStrSort, WStrSortSens, "*", true, "");
return;
}
- if (choice_view == "Storage")
+ if (choice_view.ToLower() == "storage")
{
// Change View by "Storage":
StrSelect = "((" + StrTitle1.ToString() + " not like '') and (" + StrStorage.ToString() + " not like ''))";
@@ -1501,7 +1522,7 @@
GetFilmList();
return;
}
- if (choice_view == "View1")
+ if (choice_view.ToLower() == "view1")
{
// Change View by "View1":
Change_LayOut(0);
@@ -1514,7 +1535,7 @@
getSelectFromDivx(StrTitle1.ToString() + " not like ''", WStrSort, WStrSortSens, "*", true, "");
return;
}
- if (choice_view == "View2")
+ if (choice_view.ToLower() == "view2")
{
// Change View by "View2":
Change_LayOut(0);
@@ -1527,7 +1548,7 @@
getSelectFromDivx(StrTitle1.ToString() + " not like ''", WStrSort, WStrSortSens, "*", true, "");
return;
}
- if (choice_view == "Config")
+ if (choice_view.ToLower() == "config")
{
string newConfig = Choice_Config();
newConfig = Control_Access_Config(newConfig);
Modified: trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-05-11 04:37:46 UTC (rev 395)
+++ trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-05-11 21:08:46 UTC (rev 396)
@@ -709,7 +709,7 @@
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(69, 13);
this.label10.TabIndex = 34;
- this.label10.Text = "Version 4.2.3";
+ this.label10.Text = "Version 4.2.4";
//
// textBox1
//
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-06-10 08:51:06
|
Revision: 503
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=503&view=rev
Author: zebons
Date: 2007-06-10 01:51:02 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
MyFilms v4.2.5 :
- enhcements for DVDProfiler'DB use (SortTitle, Tags use)
- no need to specify yhe movie filename in the ANT DB if those contain the Title movie Name.
- some mods to skin BT (to be reported to others)
Modified Paths:
--------------
trunk/plugins/MyFilms/AssemblyInfo.cs
trunk/plugins/MyFilms/CatalogConverter.cs
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilmsDetail.cs
trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
trunk/plugins/MyFilms/MesFilmsSetup.cs
trunk/plugins/MyFilms/Properties/AssemblyInfo.cs
trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml
trunk/plugins/MyFilms/skin/BlueTwo/MesFilmsDetail.xml
Modified: trunk/plugins/MyFilms/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyFilms/AssemblyInfo.cs 2007-06-10 08:33:09 UTC (rev 502)
+++ trunk/plugins/MyFilms/AssemblyInfo.cs 2007-06-10 08:51:02 UTC (rev 503)
@@ -31,5 +31,5 @@
//
// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de révision et de build par défaut
// en utilisant '*', comme indiqué ci-dessous :
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("4.2.0.0")]
+[assembly: AssemblyVersion("2.2.2.0")]
+[assembly: AssemblyFileVersion("2.4.0.0")]
Modified: trunk/plugins/MyFilms/CatalogConverter.cs
===================================================================
--- trunk/plugins/MyFilms/CatalogConverter.cs 2007-06-10 08:33:09 UTC (rev 502)
+++ trunk/plugins/MyFilms/CatalogConverter.cs 2007-06-10 08:51:02 UTC (rev 503)
@@ -6,20 +6,21 @@
using MediaPortal.GUI.Library;
using System.Windows.Forms;
using System.Globalization;
+using MediaPortal.Configuration;
+
namespace MesFilms
{
class CatalogConverter
{
public Dictionary<string, string> ProfilerDict;
- public CatalogConverter()
+ public CatalogConverter(string TagField)
{
-
ProfilerDict = new Dictionary<string, string>();
ProfilerDict.Add("Title", "OriginalTitle");
- ProfilerDict.Add("SortTitle", "TranslatedTitle");
- ProfilerDict.Add("SortTitle1", "FormattedTitle");
+ ProfilerDict.Add("TTitle", "TranslatedTitle");
+ ProfilerDict.Add("STitle", "FormattedTitle");
ProfilerDict.Add("CollectionNumber", "Number");
ProfilerDict.Add("Review/ReviewFilm", "Rating");
ProfilerDict.Add("Notes/File", "URL");
@@ -32,9 +33,11 @@
ProfilerDict.Add("Credits1", "Producer");
ProfilerDict.Add("Overview", "Description");
ProfilerDict.Add("Picture", "Picture");
+ ProfilerDict.Add("Tag", TagField);
}
-
- public string ConvertProfiler(string source, string folderimage)
+ public string TagFullName;
+
+ public string ConvertProfiler(string source, string folderimage, bool SortTitle, string TagField)
{
//string destFile = Path.GetTempPath()+@"AntTempFile.xml";
//string destFile = source.Substring(0, source.Length - 4) + "_tmp.xml";
@@ -75,6 +78,7 @@
}
XmlNode nodeTitle = nodeDVD.SelectSingleNode("Title");
XmlNode nodeOTitle = nodeDVD.SelectSingleNode("OriginalTitle");
+ XmlNode nodeSTitle = nodeDVD.SelectSingleNode("SortTitle");
XmlNode nodeNotes = nodeDVD.SelectSingleNode("Notes");
XmlNode nodeYear = nodeDVD.SelectSingleNode("ProductionYear");
XmlNode nodeDuration = nodeDVD.SelectSingleNode("RunningTime");
@@ -101,6 +105,25 @@
if (genre.Length > 0) genre += ", ";
genre += nodeGenre.InnerText;
}
+ if (TagField.Length > 0)
+ {
+ XmlNodeList TagList = nodeDVD.SelectNodes("Tags/Tag");
+ TagFullName = "";
+
+ foreach (XmlNode nodeTag in TagList)
+ {
+ if (nodeTag.Attributes["FullName"] != null && nodeTag.Attributes["FullName"].Value != null)
+ {
+ if (TagFullName.Length > 0) TagFullName += ", ";
+ TagFullName += nodeTag.Attributes["FullName"].Value;
+ }
+ }
+ if (TagField == "Category")
+ {
+ if (genre.Length > 0) genre += ", ";
+ genre += TagFullName;
+ }
+ }
string cast = String.Empty;
XmlNodeList actorsList = nodeDVD.SelectNodes("Actors/Actor");
foreach (XmlNode nodeActor in actorsList)
@@ -199,8 +222,11 @@
WriteAntAtribute(destXml, "Title", nodeOTitle.InnerText);
else
WriteAntAtribute(destXml, "Title", nodeTitle.InnerText);
- WriteAntAtribute(destXml, "SortTitle", nodeTitle.InnerText);
- WriteAntAtribute(destXml, "SortTitle1", nodeTitle.InnerText);
+ WriteAntAtribute(destXml, "TTitle", nodeTitle.InnerText);
+ if (SortTitle)
+ WriteAntAtribute(destXml, "STitle", nodeSTitle.InnerText);
+ else
+ WriteAntAtribute(destXml, "STitle", nodeTitle.InnerText);
WriteAntAtribute(destXml, "Notes/File", File);
WriteAntAtribute(destXml, "Notes/Country", Country);
WriteAntAtribute(destXml, "Review/ReviewFilm", Rating);
@@ -211,6 +237,8 @@
WriteAntAtribute(destXml, "Credits1", Producer);
WriteAntAtribute(destXml, "Actors", cast);
WriteAntAtribute(destXml, "Picture", Image);
+ if ((TagField.Length > 0) && (TagField != "Category") && (TagFullName.Length > 0))
+ WriteAntAtribute(destXml, "Tag", TagFullName);
if (nodeOverview != null && nodeOverview.InnerText != null)
WriteAntAtribute(destXml, "Overview", nodeOverview.InnerText);
else
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-06-10 08:33:09 UTC (rev 502)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-06-10 08:51:02 UTC (rev 503)
@@ -223,7 +223,7 @@
public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
{
string wPluginName = StrPluginName;
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MyFilms.xml"))
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
{
wPluginName = xmlreader.GetValueAsString("MyFilms", "PluginName", "My Films");
}
@@ -265,6 +265,8 @@
{
if (actionType.wID == Action.ActionType.ACTION_PARENT_DIR)
if (GetPrevFilmList()) return;
+
+
if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) && (boolselect))
{
Change_LayOut(Layout);
@@ -276,6 +278,8 @@
Change_view(WStrSort);
return;
}
+ if (actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU)
+ if (GetPrevFilmList()) return;
base.OnAction(actionType);
}
//---------------------------------------------------------------------------------------
@@ -299,7 +303,7 @@
affich_overlay();
else
supprim_overlay();
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MyFilms.xml"))
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
{
if (PreviousWindowId == ID_MesFilmsDetail)
{
@@ -530,6 +534,12 @@
{
GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(101));
facadeView.View = GUIFacadeControl.ViewMode.List;
+ // Layout = 3;
+ //}
+ //else if (Layout == 3)
+ //{
+ // GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(733));
+ // facadeView.View = GUIFacadeControl.ViewMode.Filmstrip;
Layout = 0;
}
else
@@ -763,7 +773,7 @@
item.ThumbnailImage = StrPathImg + "\\" + r["Picture"].ToString();
else
item.ThumbnailImage = r["Picture"].ToString();
-
+ item.OnItemSelected += new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(item_OnItemSelected);
//item.OnRetrieveArt += new MediaPortal.GUI.Library.GUIListItem.RetrieveCoverArtHandler(OnRetrieveCoverArt);
facadeView.Add(item);
@@ -979,6 +989,21 @@
{
supprim_overlay();
}
+ private void item_OnItemSelected(GUIListItem item, GUIControl parent)
+ {
+ GUIFilmstripControl filmstrip = parent as GUIFilmstripControl;
+ if (filmstrip == null) return;
+ if (item.Label == "..")
+ {
+ filmstrip.InfoImageFileName = String.Empty;
+ return;
+ }
+
+ if (item.IsFolder) filmstrip.InfoImageFileName = item.ThumbnailImage;
+ // else filmstrip.InfoImageFileName = MediaPortal.Util.Utils.ConvertToLargeCoverArt(item.ThumbnailImage);
+ else filmstrip.InfoImageFileName = item.ThumbnailImage;
+ }
+
#region Acc\xE8s Donn\xE9es
//-----------------------------------------------------------------------------------------
// Controle de l'existence du fichier ANT XML
@@ -1167,7 +1192,7 @@
//-----------------------------------------------------------------------------------------------
private void save_config_values()
{
- using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings("MyFilms.xml"))
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
{
xmlwriter.SetValue(CurrentConfig, "StrSelect", StrSelect.ToString());
xmlwriter.SetValue(CurrentConfig, "StrActors", StrActors.ToString());
@@ -1201,11 +1226,11 @@
//-----------------------------------------------------------------------------------------------
// Load Config Parameters in MyFilms.xml file (section CurrentConfig)
//-----------------------------------------------------------------------------------------------
- using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings("MyFilms.xml"))
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
{
xmlwriter.SetValue("MyFilms", "Current_Config", CurrentConfig);
}
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MyFilms.xml"))
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
{
StrStorage = xmlreader.GetValueAsString(CurrentConfig, "AntStorage", "");
StrIdentItem = xmlreader.GetValueAsString(CurrentConfig, "AntIdentItem", "");
@@ -1239,8 +1264,12 @@
StrFileXml = destFile;
break;
}
- CatalogConverter cv = new CatalogConverter();
- StrFileXml = cv.ConvertProfiler(StrFileXml, StrPathImg);
+ bool SortTitle = false;
+ if (xmlreader.GetValueAsString(CurrentConfig, "SortTitle", "False") == "True")
+ SortTitle = true;
+ string TagField = xmlreader.GetValueAsString(CurrentConfig, "DVDPTagField", "");
+ CatalogConverter cv = new CatalogConverter(TagField);
+ StrFileXml = cv.ConvertProfiler(StrFileXml, StrPathImg,SortTitle,TagField);
}
else
StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalogTemp", "");
@@ -1286,7 +1315,7 @@
}
dlg.Reset();
dlg.SetHeading(924); // menu
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MyFilms.xml"))
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
{
int MesFilms_nb_config = xmlreader.GetValueAsInt("MyFilms", "NbConfig", -1);
for (int i = 0; i < (int)MesFilms_nb_config; i++)
@@ -1312,7 +1341,7 @@
if (configname.Length == 0)
return "";
string Dwp;
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MyFilms.xml"))
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
{
Dwp = xmlreader.GetValueAsString(configname, "Dwp", "");
}
@@ -1343,11 +1372,11 @@
boolselect = false;
if (!ControlFichierDonn\xE9es())
{
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MyFilms.xml"))
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
{
if (CurrentConfig == xmlreader.GetValueAsString("MyFilms", "Current_Config", ""))
{
- using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings("MyFilms.xml"))
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
{
xmlwriter.SetValue("MyFilms", "Current_Config", "");
}
@@ -1466,12 +1495,16 @@
GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(417));
facadeView.View = GUIFacadeControl.ViewMode.LargeIcons;
break;
+ //case 3:
+ // GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(733));
+ // facadeView.View = GUIFacadeControl.ViewMode.Filmstrip;
+ // break;
default:
GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(101));
facadeView.View = GUIFacadeControl.ViewMode.List;
break;
}
- GUIControl.HideControl(GetID, facadeView.GetID);
+// GUIControl.HideControl(GetID, facadeView.GetID);
int iControl = facadeView.GetID;
GUIControl.ShowControl(GetID, iControl);
GUIControl.FocusControl(GetID, iControl);
@@ -1539,7 +1572,7 @@
GetFilmList();
return;
}
- if (choice_view.ToLower() == "view1")
+ if ((choice_view.ToLower() == "view1") || (choice_view.ToLower() == StrViewItem1.ToLower()))
{
// Change View by "View1":
Change_LayOut(0);
@@ -1552,7 +1585,7 @@
getSelectFromDivx(StrTitle1.ToString() + " not like ''", WStrSort, WStrSortSens, "*", true, "");
return;
}
- if (choice_view.ToLower() == "view2")
+ if ((choice_view.ToLower() == "view2") || (choice_view.ToLower() == StrViewItem2.ToLower()))
{
// Change View by "View2":
Change_LayOut(0);
Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-06-10 08:33:09 UTC (rev 502)
+++ trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-06-10 08:51:02 UTC (rev 503)
@@ -39,7 +39,7 @@
using MediaPortal.GUI.Library;
using SQLite.NET;
using MediaPortal.Configuration;
-
+using Core.Util;
using NewStringLib;
namespace MesFilms
@@ -99,6 +99,8 @@
string Stritem1 = null;
string Stritem2 = null;
string Stritem3 = null;
+ string ItemSearchFile = null;
+ bool SearchFile = false;
string CurrentConfig = null;
string wzone = null;
int StrIndex = 0;
@@ -106,7 +108,6 @@
public SQLiteClient m_db;
string TitleDelim = null;
DataRow[] r; // will hold current recordset to traverse
-
public class IMDBActorMovie
{
public string MovieTitle;
@@ -122,7 +123,7 @@
static VirtualDirectory virtualDirectory = new VirtualDirectory();
static bool m_askBeforePlayingDVDImage = false;
static bool multifile = false;
-
+ public static ArrayList result;
static MesFilmsDetail()
{
playlistPlayer = PlayListPlayer.SingletonPlayer;
@@ -181,7 +182,7 @@
m_directory.SetExtensions(Utils.VideoExtensions);
string TxtSelect;
base.OnMessage(messageType);
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MyFilms.xml"))
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
{
CurrentConfig = xmlreader.GetValueAsString("MyFilms", "Current_Config", "");
StrStorage = xmlreader.GetValueAsString(CurrentConfig, "AntStorage", "");
@@ -207,6 +208,11 @@
StrTitleSelect = xmlreader.GetValueAsString(CurrentConfig, "StrTitleSelect", "");
StrFilmSelect = xmlreader.GetValueAsString(CurrentConfig, "StrFilmSelect", "");
TitleDelim = xmlreader.GetValueAsString(CurrentConfig, "TitleDelim", ".");
+ ItemSearchFile = xmlreader.GetValueAsString(CurrentConfig, "ItemSearchFileName", "");
+ if (xmlreader.GetValueAsString(CurrentConfig, "SearchFileName", "false") == "True")
+ SearchFile = true;
+ else
+ SearchFile = false;
switch (xmlreader.GetValueAsString(CurrentConfig, "CatalogType", "0"))
{
case "0":
@@ -342,7 +348,7 @@
int ItemID;
dlg.Reset();
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MyFilms.xml"))
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
{
StrUpdItem1 = xmlreader.GetValueAsString(CurrentConfig, "AntUpdItem1", "");
StrUpdText1 = xmlreader.GetValueAsString(CurrentConfig, "AntUpdText1", "");
@@ -767,7 +773,7 @@
// val of -1 = don't save, else save value
private void save_config_values(int ID)
{
- using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings("MyFilms.xml"))
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
{
xmlwriter.SetValue(CurrentConfig, "IndexItem", r[StrIndex]["Number"]);
if (ID != -1) xmlwriter.SetValue(CurrentConfig, "LastID", ID);
@@ -787,9 +793,26 @@
string fileName = null;
if (!(StrStorage == null) && !(StrStorage == "(none)") && !(StrStorage == ""))
{
- if (r[select_item][StrStorage].ToString() != "")
+ if (r[select_item][StrStorage].ToString() == "")
+ // recherche nom de fichier par titre du film
+ if ((SearchFile) && (first))
+ {
+ if (ItemSearchFile.Length > 0)
+ {
+ fileName = Search_FileName(r[select_item][ItemSearchFile].ToString(), StrDirStor);
+ if (fileName.Length > 0)
+ {
+ r[StrIndex][StrStorage] = fileName;
+ Update_XML_database(false, StrIndex, StrStorage);
+ }
+ }
+ }
+ else
+ fileName = (string)r[select_item][StrStorage];
+ else
+ fileName = (string)r[select_item][StrStorage];
+ if (fileName.Length > 0)
{
- fileName = (string)r[select_item][StrStorage];
if (VirtualDirectory.IsImageFile(System.IO.Path.GetExtension(fileName)))
{
if (MountImageFile(GetID, fileName))
@@ -814,7 +837,6 @@
return;
}
}
-
if (!first) return;
GUIDialogOK dlgOk = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
dlgOk.SetHeading(3);//my videos
@@ -1047,12 +1069,13 @@
if (!multifile)
{ //case monofile search files belonging same movie (extension cdx or diskx)
string folder = file.Substring(0, file.LastIndexOf(@"\"));
+ file = folder + file.Substring(file.LastIndexOf(@"\") + 1);
ArrayList items = m_directory.GetDirectory(folder.ToString());
for (int i = 0; i < items.Count; ++i)
{
GUIListItem temporaryListItem = (GUIListItem)items[i];
- if (Utils.ShouldStack(temporaryListItem.Path, (string)file) || (temporaryListItem.Path.ToLower() == file.ToLower()))
+ if (Utils.ShouldStack(temporaryListItem.Path.ToLower(), (string)file.ToLower()) || (temporaryListItem.Path.ToLower() == file.ToLower()))
{
if (!(temporaryListItem.Path.ToLower() == file.ToLower()))
idMovie = update_database(temporaryListItem.Path, select_item, idMovie);
@@ -1257,6 +1280,137 @@
}
}
}
+ private string Search_FileName(string filename , string storage)
+ {
+ result = new ArrayList();
+ string file= filename;
+
+ SearchFiles(file, storage, true);
+
+ //si des resultats existent on les affichent
+ if (result.Count != 0)
+ {
+ if (result.Count == 1)
+ return result[0].ToString();
+ string wfile = null;
+ result.Sort();
+ ArrayList wresult = new ArrayList();
+ foreach (String s in result)
+ {
+ if (!Utils.ShouldStack(s, wfile))
+ {
+ wresult.Add(s);
+ wfile = s;
+ }
+ }
+ if (wresult.Count == 1)
+ return wresult[0].ToString();
+ else
+ {
+ // Many files found; ask for the good file
+ GUIDialogMenu dlg = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
+ if (dlg == null) return "";
+ dlg.Reset();
+ dlg.SetHeading(924); // menu
+ foreach (string Moviefile in wresult)
+ dlg.Add(Moviefile);
+ dlg.DoModal(GetID);
+
+ if (dlg.SelectedLabel == -1)
+ return "";
+ return wresult[dlg.SelectedLabel].ToString();
+ }
+ }
+ else
+// No Movie File Found
+ return "";
+
+ }
+ /// <summary>
+ /// Permet de rechercher un fichier dans un dossier et ces sous dossier
+ /// </summary>
+ /// <param name="fileName">le nom du fichier recherch\xE9</param>
+ /// <param name="path">le chemin du r\xE9pertoire dans lequel chercher</param>
+ /// <param name="recur">sp\xE9cifie si la recherche doit \xEAtre recursive</param>
+ public static void SearchFiles(string fileName, string searchrep, bool recur)
+ {
+ System.Text.RegularExpressions.Regex oRegex;
+ oRegex = new System.Text.RegularExpressions.Regex(";");
+ string[] SearchDir = oRegex.Split(searchrep);
+ string file = MediaPortal.Util.Utils.FilterFileName(fileName.ToLower());
+
+ file = file.Replace("-", " ");
+ file = file.Replace("!", " ");
+ file = file.Replace("#", " ");
+ file = file.Replace(";", " ");
+ file = file.Replace("'", " ");
+ file = file.Replace("=", " ");
+ file = file.Replace("&", " ");
+ file = file.Replace("(", " ");
+ file = file.Replace(")", " ");
+ file = file.Replace("@", " ");
+ file = file.Replace("%", " ");
+ file = file.Replace("$", " ");
+ file = file.Replace(":", " ");
+ file = file.Replace("_", " ");
+ file = file.Trim();
+ oRegex = new System.Text.RegularExpressions.Regex(" +");
+
+ file = oRegex.Replace(file, ":");
+ file = file.Replace(":", ".*");
+ file = file.Replace("\xE9", "[e\xE9]");
+ file = file.Replace("\xE8", "[e\xE8]");
+ file = file.Replace("\xEA", "[e\xEA]");
+ file = file.Replace("\xEB", "[e\xEB]");
+ file = file.Replace("\xF4", "[o\xF4]");
+ file = file.Replace("\xF6", "[o\xF6]");
+ file = file.Replace("\xE0", "[a\xE0]");
+ file = file.Replace("\xE2", "[a\xE2]");
+ file = file.Replace("\xE4", "[a\xE4]");
+ file = file.Replace("\xF9", "[u\xF9]");
+ file = file.Replace("\xFB", "[u\xFB]");
+ file = file.Replace("\xFC", "[u\xFC]");
+ file = file.Replace("\xEE", "[i\xEE]");
+ file = file.Replace("\xEF", "[i\xEF]");
+ file = file.Replace("\xE7", "[c\xE7]");
+ oRegex = new System.Text.RegularExpressions.Regex(file);
+ foreach (string path in SearchDir)
+ {
+ DirectoryInfo dirsInf = new DirectoryInfo(path);
+ //On retourne une liste d'informations sur les fichiers contenus dans le r\xE9pertoire
+ FileSystemInfo[] filesInf = dirsInf.GetFileSystemInfos();
+
+ //Si le nom d'un fichier correspond avec le nom du fichier recherch\xE9
+ //on place son path dans la variable globale result.
+ foreach (FileSystemInfo fi in filesInf)
+ {
+ System.Text.RegularExpressions.MatchCollection oMatches = oRegex.Matches(fi.Name.ToLower());
+ foreach (System.Text.RegularExpressions.Match oMatch in oMatches)
+ {
+ if (MediaPortal.Util.Utils.IsVideo(fi.Name))
+ result.Add(fi.Name);
+ else
+ {
+ if (fi.Attributes.ToString() == "Directory")
+ if (System.IO.File.Exists(path + fi.Name + "\\VIDEO_TS\\VIDEO_TS.IFO"))
+ result.Add(path + fi.Name + "\\VIDEO_TS\\VIDEO_TS.IFO");
+
+ }
+ }
+ }
+ //Si le parametre recur vaut true on r\xE9alise une
+ //recherche r\xE9cursive sur tous les sous-r\xE9pertoires
+ if (recur)
+ {
+ foreach (DirectoryInfo dir in dirsInf.GetDirectories())
+ {
+ //On rappelle la m\xE9thode SearchFiles pour tous les sous-r\xE9pertoires
+
+ SearchFiles(fileName, dir.FullName, recur);
+ }
+ }
+ }
+ }
private void update_fieldDB(string champselect, int iidmovie, string field)
{
IMDBMovie movieDetails = new IMDBMovie();
Modified: trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-06-10 08:33:09 UTC (rev 502)
+++ trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-06-10 08:51:02 UTC (rev 503)
@@ -95,289 +95,588 @@
/// </summary>
private void InitializeComponent()
{
- this.label1 = new System.Windows.Forms.Label();
- this.MesFilmsCat = new System.Windows.Forms.TextBox();
- this.ButCat = new System.Windows.Forms.Button();
- this.ButImg = new System.Windows.Forms.Button();
- this.MesFilmsImg = new System.Windows.Forms.TextBox();
- this.label2 = new System.Windows.Forms.Label();
- this.ButQuit = new System.Windows.Forms.Button();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
- this.AntIdentItem = new System.Windows.Forms.ComboBox();
- this.label4 = new System.Windows.Forms.Label();
- this.AntFilterItem1 = new System.Windows.Forms.ComboBox();
- this.AntFilterText1 = new System.Windows.Forms.TextBox();
- this.label6 = new System.Windows.Forms.Label();
- this.AntStorage = new System.Windows.Forms.ComboBox();
- this.AntLabel1 = new System.Windows.Forms.TextBox();
- this.AntItem1 = new System.Windows.Forms.ComboBox();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.AntItem3 = new System.Windows.Forms.ComboBox();
- this.AntLabel2 = new System.Windows.Forms.TextBox();
- this.AntItem2 = new System.Windows.Forms.ComboBox();
- this.label7 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.AntFilterComb = new System.Windows.Forms.ComboBox();
- this.AntFilterSign2 = new System.Windows.Forms.ComboBox();
- this.AntFilterSign1 = new System.Windows.Forms.ComboBox();
- this.AntFilterItem2 = new System.Windows.Forms.ComboBox();
- this.AntFilterText2 = new System.Windows.Forms.TextBox();
- this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.AntViewText2 = new System.Windows.Forms.TextBox();
- this.AntViewText1 = new System.Windows.Forms.TextBox();
- this.AntViewItem2 = new System.Windows.Forms.ComboBox();
- this.AntViewItem1 = new System.Windows.Forms.ComboBox();
+ this.label10 = new System.Windows.Forms.Label();
+ this.textBox1 = new System.Windows.Forms.TextBox();
+ this.label11 = new System.Windows.Forms.Label();
+ this.Config_Name = new System.Windows.Forms.ComboBox();
+ this.label12 = new System.Windows.Forms.Label();
+ this.General = new System.Windows.Forms.TabControl();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.groupBox11 = new System.Windows.Forms.GroupBox();
+ this.label16 = new System.Windows.Forms.Label();
+ this.label15 = new System.Windows.Forms.Label();
+ this.Rpt_Dwp = new System.Windows.Forms.TextBox();
+ this.Dwp = new System.Windows.Forms.TextBox();
+ this.groupBox7 = new System.Windows.Forms.GroupBox();
+ this.AntIdentLabel = new System.Windows.Forms.TextBox();
this.butPath = new System.Windows.Forms.Button();
this.PathStorage = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
- this.AntIdentLabel = new System.Windows.Forms.TextBox();
- this.groupBox4 = new System.Windows.Forms.GroupBox();
- this.AntUpdDflT2 = new System.Windows.Forms.TextBox();
- this.AntUpdDflT1 = new System.Windows.Forms.TextBox();
- this.AntUpdItem2 = new System.Windows.Forms.ComboBox();
- this.AntUpdText2 = new System.Windows.Forms.TextBox();
- this.AntUpdItem1 = new System.Windows.Forms.ComboBox();
- this.AntUpdText1 = new System.Windows.Forms.TextBox();
+ this.label6 = new System.Windows.Forms.Label();
+ this.AntStorage = new System.Windows.Forms.ComboBox();
+ this.ItemSearchFileName = new System.Windows.Forms.ComboBox();
+ this.SearchFileName = new System.Windows.Forms.CheckBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.AntIdentItem = new System.Windows.Forms.ComboBox();
+ this.label13 = new System.Windows.Forms.Label();
+ this.CatalogType = new System.Windows.Forms.ComboBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
+ this.label17 = new System.Windows.Forms.Label();
this.TitleDelim = new System.Windows.Forms.TextBox();
this.label9 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.AntTitle2 = new System.Windows.Forms.ComboBox();
this.AntTitle1 = new System.Windows.Forms.ComboBox();
+ this.ButImg = new System.Windows.Forms.Button();
+ this.MesFilmsImg = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.ButCat = new System.Windows.Forms.Button();
+ this.MesFilmsCat = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.AntSort = new System.Windows.Forms.ComboBox();
this.AntTSort = new System.Windows.Forms.TextBox();
- this.label10 = new System.Windows.Forms.Label();
- this.textBox1 = new System.Windows.Forms.TextBox();
- this.label11 = new System.Windows.Forms.Label();
- this.Config_Name = new System.Windows.Forms.ComboBox();
- this.label12 = new System.Windows.Forms.Label();
- this.groupBox7 = new System.Windows.Forms.GroupBox();
+ this.groupBox4 = new System.Windows.Forms.GroupBox();
+ this.AntUpdDflT2 = new System.Windows.Forms.TextBox();
+ this.AntUpdDflT1 = new System.Windows.Forms.TextBox();
+ this.AntUpdItem2 = new System.Windows.Forms.ComboBox();
+ this.AntUpdText2 = new System.Windows.Forms.TextBox();
+ this.AntUpdItem1 = new System.Windows.Forms.ComboBox();
+ this.AntUpdText1 = new System.Windows.Forms.TextBox();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.AntFilterComb = new System.Windows.Forms.ComboBox();
+ this.AntFilterSign2 = new System.Windows.Forms.ComboBox();
+ this.AntFilterSign1 = new System.Windows.Forms.ComboBox();
+ this.AntFilterItem2 = new System.Windows.Forms.ComboBox();
+ this.AntFilterText2 = new System.Windows.Forms.TextBox();
+ this.AntFilterItem1 = new System.Windows.Forms.ComboBox();
+ this.AntFilterText1 = new System.Windows.Forms.TextBox();
+ this.groupBox8 = new System.Windows.Forms.GroupBox();
this.label14 = new System.Windows.Forms.Label();
this.LayOut = new System.Windows.Forms.ComboBox();
- this.label13 = new System.Windows.Forms.Label();
- this.CatalogType = new System.Windows.Forms.ComboBox();
- this.ButSave = new System.Windows.Forms.Button();
- this.groupBox8 = new System.Windows.Forms.GroupBox();
this.View_Dflt_Item = new System.Windows.Forms.ComboBox();
this.View_Dflt_Text = new System.Windows.Forms.TextBox();
+ this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.AntViewText2 = new System.Windows.Forms.TextBox();
+ this.AntViewText1 = new System.Windows.Forms.TextBox();
+ this.AntViewItem2 = new System.Windows.Forms.ComboBox();
+ this.AntViewItem1 = new System.Windows.Forms.ComboBox();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.AntItem3 = new System.Windows.Forms.ComboBox();
+ this.AntLabel2 = new System.Windows.Forms.TextBox();
+ this.AntItem2 = new System.Windows.Forms.ComboBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.AntLabel1 = new System.Windows.Forms.TextBox();
+ this.AntItem1 = new System.Windows.Forms.ComboBox();
+ this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.groupBox10 = new System.Windows.Forms.GroupBox();
+ this.SortTitle = new System.Windows.Forms.CheckBox();
+ this.groupBox9 = new System.Windows.Forms.GroupBox();
+ this.radioButton2 = new System.Windows.Forms.CheckBox();
+ this.radioButton1 = new System.Windows.Forms.CheckBox();
+ this.DVDPTagField = new System.Windows.Forms.ComboBox();
+ this.ButQuit = new System.Windows.Forms.Button();
this.ButDelet = new System.Windows.Forms.Button();
+ this.ButSave = new System.Windows.Forms.Button();
this.Config_Dflt = new System.Windows.Forms.CheckBox();
- this.Dwp = new System.Windows.Forms.TextBox();
- this.Rpt_Dwp = new System.Windows.Forms.TextBox();
- this.label15 = new System.Windows.Forms.Label();
- this.label16 = new System.Windows.Forms.Label();
- this.groupBox1.SuspendLayout();
- this.groupBox2.SuspendLayout();
- this.groupBox3.SuspendLayout();
- this.groupBox4.SuspendLayout();
+ this.General.SuspendLayout();
+ this.tabPage1.SuspendLayout();
+ this.groupBox11.SuspendLayout();
+ this.groupBox7.SuspendLayout();
this.groupBox5.SuspendLayout();
+ this.tabPage2.SuspendLayout();
this.groupBox6.SuspendLayout();
- this.groupBox7.SuspendLayout();
+ this.groupBox4.SuspendLayout();
+ this.groupBox2.SuspendLayout();
this.groupBox8.SuspendLayout();
+ this.groupBox3.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ this.tabPage3.SuspendLayout();
+ this.groupBox10.SuspendLayout();
+ this.groupBox9.SuspendLayout();
this.SuspendLayout();
//
- // label1
+ // label10
//
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(7, 22);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(93, 13);
- this.label1.TabIndex = 0;
- this.label1.Text = "Catalog File (XML)";
+ this.label10.AutoSize = true;
+ this.label10.Location = new System.Drawing.Point(676, 42);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(69, 13);
+ this.label10.TabIndex = 34;
+ this.label10.Text = "Version 4.2.5";
//
- // MesFilmsCat
+ // textBox1
//
- this.MesFilmsCat.Location = new System.Drawing.Point(157, 19);
- this.MesFilmsCat.Name = "MesFilmsCat";
- this.MesFilmsCat.Size = new System.Drawing.Size(268, 20);
- this.MesFilmsCat.TabIndex = 1;
- this.MesFilmsCat.Enter += new System.EventHandler(this.Config_Name_Control);
+ this.textBox1.Location = new System.Drawing.Point(645, 14);
+ this.textBox1.Name = "textBox1";
+ this.textBox1.Size = new System.Drawing.Size(98, 20);
+ this.textBox1.TabIndex = 5;
//
- // ButCat
+ // label11
//
- this.ButCat.Location = new System.Drawing.Point(431, 16);
- this.ButCat.Name = "ButCat";
- this.ButCat.Size = new System.Drawing.Size(32, 23);
- this.ButCat.TabIndex = 2;
- this.ButCat.Text = "...";
- this.ButCat.UseVisualStyleBackColor = true;
- this.ButCat.Enter += new System.EventHandler(this.Config_Name_Control);
- this.ButCat.Click += new System.EventHandler(this.ButCat_Click);
+ this.label11.AutoSize = true;
+ this.label11.Location = new System.Drawing.Point(516, 17);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(123, 13);
+ this.label11.TabIndex = 36;
+ this.label11.Text = "MP\'s Menu Plugin Name";
//
+ // Config_Name
+ //
+ this.Config_Name.FormattingEnabled = true;
+ this.Config_Name.Location = new System.Drawing.Point(126, 15);
+ this.Config_Name.Name = "Config_Name";
+ this.Config_Name.Size = new System.Drawing.Size(202, 21);
+ this.Config_Name.Sorted = true;
+ this.Config_Name.TabIndex = 1;
+ this.Config_Name.Leave += new System.EventHandler(this.Config_Name_SelectedIndexChanged);
+ this.Config_Name.SelectedIndexChanged += new System.EventHandler(this.Config_Name_SelectedIndexChanged);
+ //
+ // label12
+ //
+ this.label12.AutoSize = true;
+ this.label12.Location = new System.Drawing.Point(20, 19);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(100, 13);
+ this.label12.TabIndex = 38;
+ this.label12.Text = "Configuration Name";
+ //
+ // General
+ //
+ this.General.Controls.Add(this.tabPage1);
+ this.General.Controls.Add(this.tabPage2);
+ this.General.Controls.Add(this.tabPage3);
+ this.General.Location = new System.Drawing.Point(12, 66);
+ this.General.Name = "General";
+ this.General.SelectedIndex = 0;
+ this.General.Size = new System.Drawing.Size(755, 340);
+ this.General.TabIndex = 46;
+ //
+ // tabPage1
+ //
+ this.tabPage1.Controls.Add(this.groupBox11);
+ this.tabPage1.Controls.Add(this.groupBox7);
+ this.tabPage1.Controls.Add(this.label13);
+ this.tabPage1.Controls.Add(this.CatalogType);
+ this.tabPage1.Controls.Add(this.groupBox5);
+ this.tabPage1.Controls.Add(this.ButImg);
+ this.tabPage1.Controls.Add(this.MesFilmsImg);
+ this.tabPage1.Controls.Add(this.label2);
+ this.tabPage1.Controls.Add(this.ButCat);
+ this.tabPage1.Controls.Add(this.MesFilmsCat);
+ this.tabPage1.Controls.Add(this.label1);
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage1.Size = new System.Drawing.Size(747, 314);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "General";
+ this.tabPage1.UseVisualStyleBackColor = true;
+ //
+ // groupBox11
+ //
+ this.groupBox11.Controls.Add(this.label16);
+ this.groupBox11.Controls.Add(this.label15);
+ this.groupBox11.Controls.Add(this.Rpt_Dwp);
+ this.groupBox11.Controls.Add(this.Dwp);
+ this.groupBox11.Location = new System.Drawing.Point(503, 208);
+ this.groupBox11.Name = "groupBox11";
+ this.groupBox11.Size = new System.Drawing.Size(229, 76);
+ this.groupBox11.TabIndex = 75;
+ this.groupBox11.TabStop = false;
+ this.groupBox11.Text = "Security";
+ //
+ // label16
+ //
+ this.label16.AutoSize = true;
+ this.label16.Location = new System.Drawing.Point(6, 46);
+ this.label16.Name = "label16";
+ this.label16.Size = new System.Drawing.Size(91, 13);
+ this.label16.TabIndex = 72;
+ this.label16.Text = "Repeat Password";
+ //
+ // label15
+ //
+ this.label15.AutoSize = true;
+ this.label15.Location = new System.Drawing.Point(44, 25);
+ this.label15.Name = "label15";
+ this.label15.Size = new System.Drawing.Size(53, 13);
+ this.label15.TabIndex = 71;
+ this.label15.Text = "Password";
+ //
+ // Rpt_Dwp
+ //
+ this.Rpt_Dwp.Location = new System.Drawing.Point(103, 43);
+ this.Rpt_Dwp.Name = "Rpt_Dwp";
+ this.Rpt_Dwp.Size = new System.Drawing.Size(112, 20);
+ this.Rpt_Dwp.TabIndex = 70;
+ this.Rpt_Dwp.UseSystemPasswordChar = true;
+ //
+ // Dwp
+ //
+ this.Dwp.Location = new System.Drawing.Point(103, 21);
+ this.Dwp.Name = "Dwp";
+ this.Dwp.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.Dwp.Size = new System.Drawing.Size(112, 20);
+ this.Dwp.TabIndex = 69;
+ this.Dwp.UseSystemPasswordChar = true;
+ //
+ // groupBox7
+ //
+ this.groupBox7.Controls.Add(this.AntIdentLabel);
+ this.groupBox7.Controls.Add(this.butPath);
+ this.groupBox7.Controls.Add(this.PathStorage);
+ this.groupBox7.Controls.Add(this.label5);
+ this.groupBox7.Controls.Add(this.label6);
+ this.groupBox7.Controls.Add(this.AntStorage);
+ this.groupBox7.Controls.Add(this.ItemSearchFileName);
+ this.groupBox7.Controls.Add(this.SearchFileName);
+ this.groupBox7.Controls.Add(this.label4);
+ this.groupBox7.Controls.Add(this.AntIdentItem);
+ this.groupBox7.Location = new System.Drawing.Point(7, 89);
+ this.groupBox7.Name = "groupBox7";
+ this.groupBox7.Size = new System.Drawing.Size(725, 104);
+ this.groupBox7.TabIndex = 74;
+ this.groupBox7.TabStop = false;
+ this.groupBox7.Text = "Play Movie Infos";
+ //
+ // AntIdentLabel
+ //
+ this.AntIdentLabel.Location = new System.Drawing.Point(331, 74);
+ this.AntIdentLabel.Name = "AntIdentLabel";
+ this.AntIdentLabel.Size = new System.Drawing.Size(144, 20);
+ this.AntIdentLabel.TabIndex = 57;
+ //
+ // butPath
+ //
+ this.butPath.Location = new System.Drawing.Point(443, 44);
+ this.butPath.Name = "butPath";
+ this.butPath.Size = new System.Drawing.Size(32, 23);
+ this.butPath.TabIndex = 55;
+ this.butPath.Text = "...";
+ this.butPath.UseVisualStyleBackColor = true;
+ this.butPath.Click += new System.EventHandler(this.butPath_Click);
+ //
+ // PathStorage
+ //
+ this.PathStorage.Location = new System.Drawing.Point(168, 47);
+ this.PathStorage.Name = "PathStorage";
+ this.PathStorage.Size = new System.Drawing.Size(268, 20);
+ this.PathStorage.TabIndex = 54;
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(8, 50);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(145, 13);
+ this.label5.TabIndex = 60;
+ this.label5.Text = "Paths for Movies File Search ";
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(7, 21);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(144, 13);
+ this.label6.TabIndex = 59;
+ this.label6.Text = "Ant Item for Storage File Info";
+ //
+ // AntStorage
+ //
+ this.AntStorage.FormattingEnabled = true;
+ this.AntStorage.Location = new System.Drawing.Point(168, 19);
+ this.AntStorage.Name = "AntStorage";
+ this.AntStorage.Size = new System.Drawing.Size(223, 21);
+ this.AntStorage.TabIndex = 53;
+ //
+ // ItemSearchFileName
+ //
+ this.ItemSearchFileName.FormattingEnabled = true;
+ this.ItemSearchFileName.Items.AddRange(new object[] {
+ "OriginalTitle",
+ "TranslatedTitle",
+ "FormattedTitle"});
+ this.ItemSearchFileName.Location = new System.Drawing.Point(599, 19);
+ this.ItemSearchFileName.Name = "ItemSearchFileName";
+ this.ItemSearchFileName.Size = new System.Drawing.Size(112, 21);
+ this.ItemSearchFileName.TabIndex = 67;
+ //
+ // SearchFileName
+ //
+ this.SearchFileName.AutoSize = true;
+ this.SearchFileName.Location = new System.Drawing.Point(449, 22);
+ this.SearchFileName.Name = "SearchFileName";
+ this.SearchFileName.Size = new System.Drawing.Size(144, 17);
+ this.SearchFileName.TabIndex = 66;
+ this.SearchFileName.Text = "Search by Movie\'s Name";
+ this.SearchFileName.UseVisualStyleBackColor = true;
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(7, 76);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(109, 13);
+ this.label4.TabIndex = 58;
+ this.label4.Text = "Ant Identification Item";
+ //
+ // AntIdentItem
+ //
+ this.AntIdentItem.FormattingEnabled = true;
+ this.AntIdentItem.Location = new System.Drawing.Point(168, 73);
+ this.AntIdentItem.Name = "AntIdentItem";
+ this.AntIdentItem.Size = new System.Drawing.Size(157, 21);
+ this.AntIdentItem.TabIndex = 56;
+ //
+ // label13
+ //
+ this.label13.AutoSize = true;
+ this.label13.Location = new System.Drawing.Point(485, 30);
+ this.label13.Name = "label13";
+ this.label13.Size = new System.Drawing.Size(70, 13);
+ this.label13.TabIndex = 63;
+ this.label13.Text = "Catalog Type";
+ //
+ // CatalogType
+ //
+ this.CatalogType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.CatalogType.FormattingEnabled = true;
+ this.CatalogType.Items.AddRange(new object[] {
+ "Ant Movie Catalog",
+ "DVD Profiler"});
+ this.CatalogType.Location = new System.Drawing.Point(561, 25);
+ this.CatalogType.Name = "CatalogType";
+ this.CatalogType.Size = new System.Drawing.Size(166, 21);
+ this.CatalogType.TabIndex = 62;
+ //
+ // groupBox5
+ //
+ this.groupBox5.Controls.Add(this.label17);
+ this.groupBox5.Controls.Add(this.TitleDelim);
+ this.groupBox5.Controls.Add(this.label9);
+ this.groupBox5.Controls.Add(this.label8);
+ this.groupBox5.Controls.Add(this.AntTitle2);
+ this.groupBox5.Controls.Add(this.AntTitle1);
+ this.groupBox5.Location = new System.Drawing.Point(7, 208);
+ this.groupBox5.Name = "groupBox5";
+ this.groupBox5.Size = new System.Drawing.Size(453, 76);
+ this.groupBox5.TabIndex = 61;
+ this.groupBox5.TabStop = false;
+ this.groupBox5.Text = "Title Order";
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.Location = new System.Drawing.Point(306, 21);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(101, 13);
+ this.label17.TabIndex = 66;
+ this.label17.Text = "Hierarchy Separator";
+ //
+ // TitleDelim
+ //
+ this.TitleDelim.Location = new System.Drawing.Point(413, 17);
+ this.TitleDelim.MaxLength = 1;
+ this.TitleDelim.Name = "TitleDelim";
+ this.TitleDelim.Size = new System.Drawing.Size(20, 20);
+ this.TitleDelim.TabIndex = 20;
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.Location = new System.Drawing.Point(7, 46);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(97, 13);
+ this.label9.TabIndex = 18;
+ this.label9.Text = "Ant SecondaryTitle";
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.Location = new System.Drawing.Point(7, 21);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(81, 13);
+ this.label8.TabIndex = 17;
+ this.label8.Text = "Ant Master Title";
+ //
+ // AntTitle2
+ //
+ this.AntTitle2.FormattingEnabled = true;
+ this.AntTitle2.Location = new System.Drawing.Point(131, 41);
+ this.AntTitle2.Name = "AntTitle2";
+ this.AntTitle2.Size = new System.Drawing.Size(156, 21);
+ this.AntTitle2.TabIndex = 11;
+ //
+ // AntTitle1
+ //
+ this.AntTitle1.FormattingEnabled = true;
+ this.AntTitle1.Items.AddRange(new object[] {
+ "OriginalTitle",
+ "TranslatedTitle",
+ "FormattedTitle"});
+ this.AntTitle1.Location = new System.Drawing.Point(132, 16);
+ this.AntTitle1.Name = "AntTitle1";
+ this.AntTitle1.Size = new System.Drawing.Size(155, 21);
+ this.AntTitle1.TabIndex = 10;
+ //
// ButImg
//
- this.ButImg.Location = new System.Drawing.Point(431, 42);
+ this.ButImg.Location = new System.Drawing.Point(404, 51);
this.ButImg.Name = "ButImg";
this.ButImg.Size = new System.Drawing.Size(32, 23);
- this.ButImg.TabIndex = 4;
+ this.ButImg.TabIndex = 52;
this.ButImg.Text = "...";
this.ButImg.UseVisualStyleBackColor = true;
- this.ButImg.Enter += new System.EventHandler(this.Config_Name_Control);
this.ButImg.Click += new System.EventHandler(this.ButImg_Click);
//
// MesFilmsImg
//
- this.MesFilmsImg.Location = new System.Drawing.Point(157, 45);
+ this.MesFilmsImg.Location = new System.Drawing.Point(164, 53);
this.MesFilmsImg.Name = "MesFilmsImg";
- this.MesFilmsImg.Size = new System.Drawing.Size(268, 20);
- this.MesFilmsImg.TabIndex = 3;
- this.MesFilmsImg.Enter += new System.EventHandler(this.Config_Name_Control);
+ this.MesFilmsImg.Size = new System.Drawing.Size(234, 20);
+ this.MesFilmsImg.TabIndex = 50;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(7, 48);
+ this.label2.Location = new System.Drawing.Point(14, 56);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(100, 13);
- this.label2.TabIndex = 3;
+ this.label2.TabIndex = 51;
this.label2.Text = "Picture Path (IMG) ";
//
- // ButQuit
+ // ButCat
//
- this.ButQuit.Location = new System.Drawing.Point(737, 431);
- this.ButQuit.Name = "ButQuit";
- this.ButQuit.Size = new System.Drawing.Size(64, 31);
- this.ButQuit.TabIndex = 40;
- this.ButQuit.Text = "Quit";
- this.ButQuit.UseVisualStyleBackColor = true;
- this.ButQuit.Click += new System.EventHandler(this.ButQuit_Click);
+ this.ButCat.Location = new System.Drawing.Point(404, 25);
+ this.ButCat.Name = "ButCat";
+ this.ButCat.Size = new System.Drawing.Size(32, 23);
+ this.ButCat.TabIndex = 49;
+ this.ButCat.Text = "...";
+ this.ButCat.UseVisualStyleBackColor = true;
+ this.ButCat.Click += new System.EventHandler(this.ButCat_Click);
//
- // AntIdentItem
+ // MesFilmsCat
//
- this.AntIdentItem.FormattingEnabled = true;
- this.AntIdentItem.Location = new System.Drawing.Point(156, 126);
- this.AntIdentItem.Name = "AntIdentItem";
- this.AntIdentItem.Size = new System.Drawing.Size(157, 21);
- this.AntIdentItem.TabIndex = 8;
- this.AntIdentItem.Enter += new System.EventHandler(this.Config_Name_Control);
+ this.MesFilmsCat.Location = new System.Drawing.Point(164, 27);
+ this.MesFilmsCat.Name = "MesFilmsCat";
+ this.MesFilmsCat.Size = new System.Drawing.Size(234, 20);
+ this.MesFilmsCat.TabIndex = 48;
//
- // label4
+ // label1
//
- this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(6, 129);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(109, 13);
- this.label4.TabIndex = 11;
- this.label4.Text = "Ant Identification Item";
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(1...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X