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] |