You can subscribe to this list here.
2007 |
Jan
(36) |
Feb
(79) |
Mar
(123) |
Apr
(95) |
May
(119) |
Jun
(172) |
Jul
(124) |
Aug
(100) |
Sep
(83) |
Oct
(52) |
Nov
(97) |
Dec
(87) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(131) |
Feb
(80) |
Mar
(163) |
Apr
(178) |
May
(73) |
Jun
(54) |
Jul
(106) |
Aug
(118) |
Sep
(50) |
Oct
(125) |
Nov
(100) |
Dec
(99) |
2009 |
Jan
(104) |
Feb
(99) |
Mar
(68) |
Apr
(81) |
May
(52) |
Jun
(87) |
Jul
(67) |
Aug
(33) |
Sep
(27) |
Oct
(37) |
Nov
(60) |
Dec
(116) |
2010 |
Jan
(82) |
Feb
(79) |
Mar
(38) |
Apr
(50) |
May
(45) |
Jun
(53) |
Jul
(23) |
Aug
(86) |
Sep
(22) |
Oct
(96) |
Nov
(97) |
Dec
(73) |
2011 |
Jan
(24) |
Feb
(45) |
Mar
(28) |
Apr
(31) |
May
(42) |
Jun
(25) |
Jul
|
Aug
(12) |
Sep
(28) |
Oct
(13) |
Nov
(43) |
Dec
(13) |
2012 |
Jan
(62) |
Feb
(28) |
Mar
(6) |
Apr
(16) |
May
(7) |
Jun
|
Jul
(16) |
Aug
(2) |
Sep
(1) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
2013 |
Jan
(5) |
Feb
|
Mar
(34) |
Apr
(9) |
May
(6) |
Jun
(10) |
Jul
(32) |
Aug
(8) |
Sep
(11) |
Oct
(35) |
Nov
(24) |
Dec
(22) |
2014 |
Jan
(44) |
Feb
(9) |
Mar
(9) |
Apr
(15) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(11) |
Sep
(7) |
Oct
(6) |
Nov
(1) |
Dec
(12) |
2015 |
Jan
(33) |
Feb
(19) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
From: <an...@us...> - 2007-05-04 13:30:35
|
Revision: 372 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=372&view=rev Author: and-81 Date: 2007-05-04 06:30:33 -0700 (Fri, 04 May 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IgorPlugUSB/IgorPlugUSB.cs trunk/plugins/IgorPlugUSB/IgorPlugUSB.csproj Added Paths: ----------- trunk/plugins/IgorPlugUSB/Config.Designer.cs trunk/plugins/IgorPlugUSB/Config.cs trunk/plugins/IgorPlugUSB/MappedKeyCode.cs Added: trunk/plugins/IgorPlugUSB/Config.Designer.cs =================================================================== --- trunk/plugins/IgorPlugUSB/Config.Designer.cs (rev 0) +++ trunk/plugins/IgorPlugUSB/Config.Designer.cs 2007-05-04 13:30:33 UTC (rev 372) @@ -0,0 +1,144 @@ +namespace MediaPortal.Plugins +{ + partial class Config + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.buttonMapButtons = new System.Windows.Forms.Button(); + this.buttonOK = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.listViewButtons = new System.Windows.Forms.ListView(); + this.columnHeaderButton = new System.Windows.Forms.ColumnHeader(); + this.columnHeaderCode = new System.Windows.Forms.ColumnHeader(); + this.buttonClearAll = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // buttonMapButtons + // + this.buttonMapButtons.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonMapButtons.Location = new System.Drawing.Point(8, 232); + this.buttonMapButtons.Name = "buttonMapButtons"; + this.buttonMapButtons.Size = new System.Drawing.Size(96, 24); + this.buttonMapButtons.TabIndex = 1; + this.buttonMapButtons.Text = "Map Buttons"; + this.buttonMapButtons.UseVisualStyleBackColor = true; + this.buttonMapButtons.Click += new System.EventHandler(this.buttonMapButtons_Click); + // + // buttonOK + // + this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonOK.Location = new System.Drawing.Point(240, 232); + this.buttonOK.Name = "buttonOK"; + this.buttonOK.Size = new System.Drawing.Size(64, 24); + this.buttonOK.TabIndex = 2; + this.buttonOK.Text = "OK"; + this.buttonOK.UseVisualStyleBackColor = true; + this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click); + // + // buttonCancel + // + this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonCancel.Location = new System.Drawing.Point(312, 232); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(64, 24); + this.buttonCancel.TabIndex = 3; + this.buttonCancel.Text = "Cancel"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + // + // listViewButtons + // + this.listViewButtons.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.listViewButtons.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeaderButton, + this.columnHeaderCode}); + this.listViewButtons.FullRowSelect = true; + this.listViewButtons.GridLines = true; + this.listViewButtons.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; + this.listViewButtons.HideSelection = false; + this.listViewButtons.Location = new System.Drawing.Point(8, 8); + this.listViewButtons.Name = "listViewButtons"; + this.listViewButtons.Size = new System.Drawing.Size(368, 216); + this.listViewButtons.TabIndex = 0; + this.listViewButtons.UseCompatibleStateImageBehavior = false; + this.listViewButtons.View = System.Windows.Forms.View.Details; + // + // columnHeaderButton + // + this.columnHeaderButton.Text = "Button"; + this.columnHeaderButton.Width = 134; + // + // columnHeaderCode + // + this.columnHeaderCode.Text = "Code"; + this.columnHeaderCode.Width = 213; + // + // buttonClearAll + // + this.buttonClearAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonClearAll.Location = new System.Drawing.Point(112, 232); + this.buttonClearAll.Name = "buttonClearAll"; + this.buttonClearAll.Size = new System.Drawing.Size(72, 24); + this.buttonClearAll.TabIndex = 4; + this.buttonClearAll.Text = "Clear All"; + this.buttonClearAll.UseVisualStyleBackColor = true; + this.buttonClearAll.Click += new System.EventHandler(this.buttonClearAll_Click); + // + // Config + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(388, 266); + this.ControlBox = false; + this.Controls.Add(this.buttonClearAll); + this.Controls.Add(this.listViewButtons); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOK); + this.Controls.Add(this.buttonMapButtons); + this.MinimumSize = new System.Drawing.Size(396, 300); + this.Name = "Config"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "IgorPlug Plugin Config"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Config_FormClosing); + this.Load += new System.EventHandler(this.Config_Load); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Button buttonMapButtons; + private System.Windows.Forms.Button buttonOK; + private System.Windows.Forms.Button buttonCancel; + private System.Windows.Forms.ListView listViewButtons; + private System.Windows.Forms.ColumnHeader columnHeaderButton; + private System.Windows.Forms.ColumnHeader columnHeaderCode; + private System.Windows.Forms.Button buttonClearAll; + } +} \ No newline at end of file Added: trunk/plugins/IgorPlugUSB/Config.cs =================================================================== --- trunk/plugins/IgorPlugUSB/Config.cs (rev 0) +++ trunk/plugins/IgorPlugUSB/Config.cs 2007-05-04 13:30:33 UTC (rev 372) @@ -0,0 +1,78 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Threading; +using System.Windows.Forms; +using System.Xml; + +using MediaPortal.Hardware; +using MediaPortal.GUI.Library; +using MediaPortal.InputDevices; + +namespace MediaPortal.Plugins +{ + + public partial class Config : Form + { + + public Config() + { + InitializeComponent(); + } + + private void Config_Load(object sender, EventArgs e) + { + foreach (MappedKeyCode mKC in IgorPlugUSB.KeyCodes) + { + listViewButtons.Items.Add( + new ListViewItem(new string[] { + Enum.GetName(typeof(RemoteButton), mKC.Button), + mKC.KeyCode })); + } + + IgorPlugUSB.ConfigButton = new ConfigButtonPress(ButtonPress); + } + private void Config_FormClosing(object sender, FormClosingEventArgs e) + { + IgorPlugUSB.ConfigButton = null; + } + + private void buttonMapButtons_Click(object sender, EventArgs e) + { + InputMappingForm inputMappingForm = new InputMappingForm(IgorPlugUSB.InputHandler); + inputMappingForm.ShowDialog(); + } + + private void buttonOK_Click(object sender, EventArgs e) + { + IgorPlugUSB.KeyCodes = new List<MappedKeyCode>(); + foreach (ListViewItem item in listViewButtons.Items) + IgorPlugUSB.KeyCodes.Add(new MappedKeyCode(item.SubItems[0].Text, item.SubItems[1].Text)); + + this.DialogResult = DialogResult.OK; + Close(); + } + private void buttonCancel_Click(object sender, EventArgs e) + { + this.DialogResult = DialogResult.Cancel; + Close(); + } + + private void buttonClearAll_Click(object sender, EventArgs e) + { + foreach (ListViewItem item in listViewButtons.Items) + item.SubItems[1].Text = ""; + } + + void ButtonPress(string keyCode) + { + if (listViewButtons.SelectedItems.Count == 1) + listViewButtons.SelectedItems[0].SubItems[1].Text = keyCode; + } + + } + +} Modified: trunk/plugins/IgorPlugUSB/IgorPlugUSB.cs =================================================================== --- trunk/plugins/IgorPlugUSB/IgorPlugUSB.cs 2007-05-04 00:46:15 UTC (rev 371) +++ trunk/plugins/IgorPlugUSB/IgorPlugUSB.cs 2007-05-04 13:30:33 UTC (rev 372) @@ -1,26 +1,39 @@ using System; +using System.Collections.Generic; using System.IO; using System.Runtime.InteropServices; using System.Threading; +using System.Windows.Forms; +using System.Xml; using Microsoft.Win32.SafeHandles; +using MediaPortal.Hardware; using MediaPortal.GUI.Library; using MediaPortal.InputDevices; namespace MediaPortal.Plugins { - public class IgorPlugUSB : IPlugin, ISetupForm, IDisposable + delegate void ConfigButtonPress(string keyCode); + + public class IgorPlugUSB : IPlugin, ISetupForm { + #region Constants + + internal const string RemoteFile = "IgorPlugUSBMap.xml"; + internal const string InputHandler = "IgorPlugUSB"; + + #endregion Constants + #region Variables InputHandler _inputHandler; - Thread _readThread; - bool _disposed = false; + internal static ConfigButtonPress ConfigButton = null; + internal static List<MappedKeyCode> KeyCodes = new List<MappedKeyCode>(); #endregion Variables @@ -51,18 +64,6 @@ #endregion Interop - #region Deconstructor - - ~IgorPlugUSB() - { - // call Dispose with false. Since we're in the - // destructor call, the managed resources will be - // disposed of anyways. - Dispose(false); - } - - #endregion - #region IPlugin Members public void Start() @@ -71,10 +72,9 @@ try { - _inputHandler = new InputHandler("IgorPlugUSB"); + _inputHandler = new InputHandler(InputHandler); - ThreadStart readThreadStart = new ThreadStart(ReadThread); - _readThread = new Thread(readThreadStart); + _readThread = new Thread(new ThreadStart(ReadThread)); _readThread.Start(); } catch (Exception ex) @@ -82,7 +82,6 @@ Log.Error("IgorPlugUSB Plugin: {0}", ex.Message); } } - public void Stop() { Log.Info("IgorPlugUSB Plugin: Stop"); @@ -104,8 +103,16 @@ public void ShowPlugin() { - InputMappingForm inputMappingForm = new InputMappingForm("IgorPlugUSB"); - inputMappingForm.ShowDialog(); + LoadRemote(); + + _readThread = new Thread(new ThreadStart(ReadThread)); + _readThread.Start(); + + Config config = new Config(); + if (config.ShowDialog() == DialogResult.OK) + SaveRemote(); + + _readThread.Abort(); } public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage) @@ -116,36 +123,41 @@ #endregion - #region IDisposable Members + #region Implementation - public void Dispose() + void LoadRemote() { - // dispose of the managed and unmanaged resources - Dispose(true); + XmlDocument doc = new XmlDocument(); + doc.Load(RemoteFile); - // tell the GC that the Finalize process no longer needs - // to be run for this object. - GC.SuppressFinalize(this); + XmlNodeList listButtons = doc.DocumentElement.SelectNodes("remotebutton"); + foreach (XmlNode nodeButton in listButtons) + { + KeyCodes.Add(new MappedKeyCode( + nodeButton.Attributes["button"].Value, + nodeButton.Attributes["code"].Value)); + } } + void SaveRemote() + { + XmlTextWriter writer = new XmlTextWriter(RemoteFile, System.Text.Encoding.UTF8); + writer.Formatting = Formatting.Indented; + writer.Indentation = 1; + writer.IndentChar = (char)9; + writer.WriteStartDocument(true); + writer.WriteStartElement("remote"); // <remote> - #endregion - - #region Implementation - - protected virtual void Dispose(bool disposeManagedResources) - { - // process only if mananged and unmanaged resources have - // not been disposed of. - if (!this._disposed) + foreach (MappedKeyCode mKC in KeyCodes) { - if (disposeManagedResources) - { + writer.WriteStartElement("remotebutton"); // <remotebutton> + writer.WriteAttributeString("button", Enum.GetName(typeof(RemoteButton), mKC.Button)); + writer.WriteAttributeString("code", mKC.KeyCode); + writer.WriteEndElement(); // </remotebutton> + } - } - - // dispose unmanaged resources - this._disposed = true; - } + writer.WriteEndElement(); // </remote> + writer.WriteEndDocument(); + writer.Close(); } void ReadThread() @@ -155,7 +167,8 @@ byte[] deviceBuffer = new byte[256]; int codeLength; int returnCode; - int keyCode; + string keyCode; + int translatedKeyCode; int lastCode = -1; DateTime lastCodeTime = DateTime.Now; @@ -189,16 +202,37 @@ if (codeLength == 0) continue; - keyCode = (int)deviceBuffer[3]; - timeSpan = DateTime.Now - lastCodeTime; + keyCode = String.Empty; + for (int i = 0; i < codeLength; i++) + keyCode += deviceBuffer[i].ToString("X2"); - if (keyCode != lastCode || timeSpan.Milliseconds > 250) + if (ConfigButton != null) { - lastCode = keyCode; - lastCodeTime = DateTime.Now; - _inputHandler.MapAction(keyCode); + ConfigButton(keyCode); + continue; } - + + foreach (MappedKeyCode mKC in KeyCodes) + { + if (mKC.KeyCode == keyCode) + { + translatedKeyCode = (int)mKC.Button; + timeSpan = DateTime.Now - lastCodeTime; + + if (translatedKeyCode != lastCode || timeSpan.Milliseconds > 250) + { + lastCode = translatedKeyCode; + lastCodeTime = DateTime.Now; + + Log.Info("IgorPlugUSB Plugin: Key mapped \"{0}\"", keyCode); + _inputHandler.MapAction(translatedKeyCode); + } + + break; + } + } + + Log.Info("IgorPlugUSB Plugin: Key not mapped \"{0}\"", keyCode); } } catch (ThreadAbortException) Modified: trunk/plugins/IgorPlugUSB/IgorPlugUSB.csproj =================================================================== --- trunk/plugins/IgorPlugUSB/IgorPlugUSB.csproj 2007-05-04 00:46:15 UTC (rev 371) +++ trunk/plugins/IgorPlugUSB/IgorPlugUSB.csproj 2007-05-04 13:30:33 UTC (rev 372) @@ -46,7 +46,14 @@ --> <ItemGroup> <Compile Include="AssemblyInfo.cs" /> + <Compile Include="Config.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="Config.Designer.cs"> + <DependentUpon>Config.cs</DependentUpon> + </Compile> <Compile Include="IgorPlugUSB.cs" /> + <Compile Include="MappedKeyCode.cs" /> </ItemGroup> <ItemGroup> <Reference Include="Core, Version=1.0.2581.1884, Culture=neutral, processorArchitecture=MSIL"> @@ -61,6 +68,7 @@ </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.2581.1867, Culture=neutral, processorArchitecture=MSIL"> @@ -77,4 +85,10 @@ <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> </ItemGroup> + <ItemGroup> + <EmbeddedResource Include="Config.resx"> + <SubType>Designer</SubType> + <DependentUpon>Config.cs</DependentUpon> + </EmbeddedResource> + </ItemGroup> </Project> \ No newline at end of file Added: trunk/plugins/IgorPlugUSB/MappedKeyCode.cs =================================================================== --- trunk/plugins/IgorPlugUSB/MappedKeyCode.cs (rev 0) +++ trunk/plugins/IgorPlugUSB/MappedKeyCode.cs 2007-05-04 13:30:33 UTC (rev 372) @@ -0,0 +1,56 @@ +using System; + +using MediaPortal.Hardware; + +namespace MediaPortal.Plugins +{ + + [CLSCompliant(false)] + public class MappedKeyCode + { + + #region Variables + + public RemoteButton _button; + public string _keyCode; + + #endregion Variables + + #region Properties + + public RemoteButton Button + { + get { return _button; } + set { _button = value; } + } + public string KeyCode + { + get { return _keyCode; } + set { _keyCode = value; } + } + + #endregion Properties + + #region Constructors + + public MappedKeyCode() + : this(RemoteButton.None, String.Empty) + { + } + + public MappedKeyCode(string button, string keyCode) + : this((RemoteButton)Enum.Parse(typeof(RemoteButton), button), keyCode) + { + } + + public MappedKeyCode(RemoteButton button, string keyCode) + { + _button = button; + _keyCode = keyCode; + } + + #endregion Constructors + + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gre...@us...> - 2007-05-04 00:46:25
|
Revision: 371 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=371&view=rev Author: gregmac45 Date: 2007-05-03 17:46:15 -0700 (Thu, 03 May 2007) Log Message: ----------- Added Picasa access Modified Paths: -------------- trunk/plugins/OnlinePhotos/Flickr.cs trunk/plugins/OnlinePhotos/MyClass.cs trunk/plugins/OnlinePhotos/OnlinePhotos.csproj trunk/plugins/OnlinePhotos/OnlinePhotos.sln trunk/plugins/OnlinePhotos/OnlinePhotos.suo Added Paths: ----------- trunk/plugins/OnlinePhotos/Picasa.cs trunk/plugins/OnlinePhotos/google-sharp/ trunk/plugins/OnlinePhotos/google-sharp/AssemblyInfo.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google/ trunk/plugins/OnlinePhotos/google-sharp/Mono.Google/Authentication.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google/CaptchaException.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google/GoogleConnection.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google/GoogleService.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google/MultipartRequest.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google/NoCheckCertificatePolicy.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google.Picasa/ trunk/plugins/OnlinePhotos/google-sharp/Mono.Google.Picasa/AlbumAccess.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google.Picasa/CreateAlbumException.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google.Picasa/DeleteAlbumException.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google.Picasa/GDataApi.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google.Picasa/PicasaAlbum.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google.Picasa/PicasaAlbumCollection.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google.Picasa/PicasaPicture.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google.Picasa/PicasaPictureCollection.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google.Picasa/PicasaWeb.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google.Picasa/UploadPictureException.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google.Picasa/UploadProgressEventArgs.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google.Picasa/UploadProgressEventHandler.cs trunk/plugins/OnlinePhotos/google-sharp/Mono.Google.Picasa/XmlUtil.cs trunk/plugins/OnlinePhotos/google-sharp/PicasaNet.csproj Modified: trunk/plugins/OnlinePhotos/Flickr.cs =================================================================== --- trunk/plugins/OnlinePhotos/Flickr.cs 2007-05-03 08:25:35 UTC (rev 370) +++ trunk/plugins/OnlinePhotos/Flickr.cs 2007-05-04 00:46:15 UTC (rev 371) @@ -46,6 +46,16 @@ } + public static List<MyPhoto> getUserFavoritePhotos(String username){ + List<MyPhoto> myPhotoList = new List<MyPhoto>(); + String userID = getUserId(username); + if (userID == String.Empty) + { + return myPhotoList; + } + Photos userPhotos = _flickr.FavoritesGetPublicList(userID); + return loadMyPhotoList(userPhotos); + } public static List<MyAlbum> getUserPhotoSets(String username) { List<MyAlbum> myPhotoSets = new List<MyAlbum>(); @@ -71,7 +81,7 @@ { MyAlbum album = new MyAlbum(); album.id = set.PhotosetId; - album.title = set.Title; + album.Title = set.Title; album.coverThumbnailUrl = set.PhotosetThumbnailUrl; album.photoCollection = loadMyPhotoList(set.PhotoCollection); return album; @@ -98,7 +108,7 @@ { group = new MyAlbum(); group.id = result.GroupId; - group.title = result.GroupName; + group.Title = result.GroupName; groups.Add(group); } return groups; Modified: trunk/plugins/OnlinePhotos/MyClass.cs =================================================================== --- trunk/plugins/OnlinePhotos/MyClass.cs 2007-05-03 08:25:35 UTC (rev 370) +++ trunk/plugins/OnlinePhotos/MyClass.cs 2007-05-04 00:46:15 UTC (rev 371) @@ -16,497 +16,597 @@ using System.Xml; using System.Net; using System.Web; +using System.IO; using System.ComponentModel; namespace OnlinePhotos { - public class MyPhoto - { - private String title; - public String Title - { - get - { - return title; - } - set - { - title = value; - ThumbName = Utils.GetFilename(Utils.GetThumb(value)); - } - } - public String id; - public String thumbnailUrl; - public String largeUrl; - public String mediumUrl; - public String smallUrl; - public String ThumbName; - } - public class MyAlbum - { - public string id; - public string title; - public string coverThumbnailUrl; - public List<MyPhoto> photoCollection = new List<MyPhoto>(); - } + public class MyPhoto + { + private String title; + public String Title + { + get + { + return title; + } + set + { + title = value; + + } + } + public String id; + public String thumbnailUrl; + public String largeUrl; + public String mediumUrl; + public String smallUrl; + private String thumbName; + public String ThumbName{ + get{ + if(String.IsNullOrEmpty(thumbName)){ + thumbName = Utils.GetFilename(Utils.GetThumb(title))+id; + } + return thumbName; + } + } + } + public class MyAlbum + { + public string id; + private string title; + public string coverThumbnailUrl; + private String thumbName; + public List<MyPhoto> photoCollection = new List<MyPhoto>(); + public String Title + { + get + { + return title; + } + set + { + title = value; + //ThumbName = "alb"+Utils.GetFilename(Utils.GetThumb(value)); + } + } + public String ThumbName{ + get{ + if(String.IsNullOrEmpty(thumbName)){ + thumbName = Utils.GetFilename(Utils.GetThumb(title))+id; + } + return thumbName; + } + } + } - /// <summary> - /// Description of MyClass. - /// </summary> - public class MyOnlinePhotos : GUIWindow, ISetupForm - { - [SkinControlAttribute(2)] - protected GUIButtonControl btnViewAs = null; - [SkinControlAttribute(3)] - protected GUIButtonControl btnSlide = null; - [SkinControlAttribute(50)] - protected GUIFacadeControl facadeView = null; - private State _CurrentState = State.home; - protected View currentView = View.List; - protected List<MyPhoto> CurrentPhotoList; - protected List<MyAlbum> CurrentAlbumList; - protected bool _imagesDone = true; - public enum State - { - home = 0, - categories = 1, - videos = 2 - } - public enum View - { - List = 0, - Icons = 1, - LargeIcons = 2, - FilmStrip = 3 - } + /// <summary> + /// Description of MyClass. + /// </summary> + public class MyOnlinePhotos : GUIWindow, ISetupForm + { + [SkinControlAttribute(2)] + protected GUIButtonControl btnViewAs = null; + [SkinControlAttribute(3)] + protected GUIButtonControl btnSlide = null; + [SkinControlAttribute(50)] + protected GUIFacadeControl facadeView = null; + private State _CurrentState = State.home; + protected View currentView = View.List; + protected List<MyPhoto> CurrentPhotoList; + protected List<MyAlbum> CurrentAlbumList; + protected MyAlbum CurrentAlbum; + protected bool _imagesDone = true; + protected bool _stopImgDownload = false; + public enum State + { + home = 0, + albums = 1, + photos = 2, + album_photos = 3 + } + public enum View + { + List = 0, + Icons = 1, + LargeIcons = 2, + FilmStrip = 3 + } - public string PluginName() - { + public string PluginName() + { - return "Online Photos"; + return "Online Photos"; - } + } - // Returns the description of the plugin is shown in the plugin menu + // Returns the description of the plugin is shown in the plugin menu - public string Description() - { + public string Description() + { - return "Flickr and Google Photo Plugin"; + return "Flickr and Google Photo Plugin"; - } + } - // Returns the author of the plugin which is shown in the plugin menu + // Returns the author of the plugin which is shown in the plugin menu - public string Author() - { + public string Author() + { - return "GregMac45"; + return "GregMac45"; - } + } - // show the setup dialog + // show the setup dialog - public void ShowPlugin() - { + public void ShowPlugin() + { - //MessageBox.Show("Nothing to configure, this is just an example"); + //MessageBox.Show("Nothing to configure, this is just an example"); - } + } - // Indicates whether plugin can be enabled/disabled + // Indicates whether plugin can be enabled/disabled - public bool CanEnable() - { + public bool CanEnable() + { - return true; + return true; - } + } - // get ID of windowplugin belonging to this setup + // get ID of windowplugin belonging to this setup - public int GetWindowId() - { + public int GetWindowId() + { - return GetID; + return GetID; - } + } - // Indicates if plugin is enabled by default; + // Indicates if plugin is enabled by default; - public bool DefaultEnabled() - { + public bool DefaultEnabled() + { - return true; + return true; - } + } - // indicates if a plugin has its own setup screen + // indicates if a plugin has its own setup screen - public bool HasSetup() - { + public bool HasSetup() + { - return false; + return false; - } - public override int GetID - { - get - { - return 5757; - } - set - { - } - } + } + public override int GetID + { + get + { + return 5757; + } + set + { + } + } - public override bool Init() - { - LoadSettings(); - return Load(GUIGraphicsContext.Skin + @"\myonlinephotos.xml"); + public override bool Init() + { + LoadSettings(); + return Load(GUIGraphicsContext.Skin + @"\myonlinephotos.xml"); - } - public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage) - { - strButtonText = PluginName(); + } + public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage) + { + strButtonText = PluginName(); - strButtonImage = String.Empty; + strButtonImage = String.Empty; - strButtonImageFocus = String.Empty; + strButtonImageFocus = String.Empty; - strPictureImage = String.Empty; + strPictureImage = String.Empty; - return true; - } - public bool ShowDefaultHome() - { - return true; - } - protected override void OnPageLoad() - { - if (_CurrentState == State.home) - { - //_log.Info("onPageLoad state home"); - GUIPropertyManager.SetProperty("#header.label", "Online Photos"); - DisplayHome(); - //DisplaySites(); - } - else if (_CurrentState == State.categories) - { - DisplayCurrentPhotos(); - } - currentView = View.Icons; - ChangeFacadeView(); - - - base.OnPageLoad(); - } - public override void OnAction(Action action) - { - if (action.wID == Action.ActionType.ACTION_PREVIOUS_MENU) - { - if (_CurrentState == State.videos) - { - //DisplayCategories(); - //_CurrentState = State.categories; - //return; - } - else if (_CurrentState == State.categories) - { - DisplayHome(); - _CurrentState = State.home; - return; - } - } - base.OnAction(action); - } - protected override void OnPageDestroy(int new_windowId) - { + return true; + } + public bool ShowDefaultHome() + { + return true; + } + protected override void OnPageLoad() + { + if (_CurrentState == State.home) + { + //_log.Info("onPageLoad state home"); + GUIPropertyManager.SetProperty("#header.label", "Online Photos"); + DisplayHome(); + //DisplaySites(); + } + else if (_CurrentState == State.photos) + { + DisplayCurrentPhotos(false); + } + currentView = View.Icons; + ChangeFacadeView(); + + + base.OnPageLoad(); + } + public override void OnAction(Action action) + { + if (action.wID == Action.ActionType.ACTION_PREVIOUS_MENU) + { + if (_CurrentState == State.album_photos) + { + DisplayCurrentAlbums(); + _CurrentState = State.albums; + return; + } + else if (_CurrentState == State.albums || _CurrentState == State.photos) + { + DisplayHome(); + _CurrentState = State.home; + return; + } + _stopImgDownload = true; + + } + base.OnAction(action); + } + protected override void OnPageDestroy(int new_windowId) + { - base.OnPageDestroy(new_windowId); - } - - protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType) - { - if (control == btnViewAs) - { - ChangeFacadeView(); - } - else if (control == btnSlide) - { - OnSlideShow(); - } - else if (control == facadeView) - { - String SelectedSiteId = facadeView.SelectedListItem.Path; - switch (SelectedSiteId) - { - case "1": - DisplayInterestingFlickrPhotos(); - _CurrentState = State.categories; - break; - case "2": - DisplayRecentFlickrPhotos(); - _CurrentState = State.categories; - break; - case "3": - string q = ""; - if (GetUserInputString(ref q)) - { + base.OnPageDestroy(new_windowId); + } + + protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType) + { + if (control == btnViewAs) + { + ChangeFacadeView(); + } + else if (control == btnSlide) + { + OnSlideShow(); + } + else if (control == facadeView && _CurrentState == State.home) + { + String SelectedSiteId = facadeView.SelectedListItem.Path; + switch (SelectedSiteId) + { + case "1": + DisplayInterestingFlickrPhotos(); + _CurrentState = State.photos; + break; + case "2": + DisplayRecentFlickrPhotos(); + _CurrentState = State.photos; + break; + case "3": + string q = ""; + if (GetUserInputString(ref q)) + { - DisplayFlickrPhotosWithTags(q); - _CurrentState = State.categories; - - } - break; - case "4": - string text = ""; - if (GetUserInputString(ref text)) - { + DisplayFlickrPhotosWithTags(q); + _CurrentState = State.photos; + + } + break; + case "4": + string text = ""; + if (GetUserInputString(ref text)) + { - DisplayFlickrPhotosWithText(text); - _CurrentState = State.categories; + DisplayFlickrPhotosWithText(text); + _CurrentState = State.photos; - } - break; - case "5": - DisplayFlickrUserPhotos("gregmac45"); - _CurrentState = State.categories; + } + break; + case "5": + DisplayFlickrUserPhotos("gregmac45"); + _CurrentState = State.photos; - - break; - case "6": - string gtext = ""; - if (GetUserInputString(ref gtext)) - { + + break; + case "6": + string gtext = ""; + if (GetUserInputString(ref gtext)) + { + DisplayFlickrGroupsWithText(gtext); + _CurrentState = State.photos; + } + break; + case "7": + DisplayFlickrUserFavoritePhotos("gregmac45"); + _CurrentState = State.photos; + break; + case "8": + DisplayPicasaAlbums("gregmac45"); + _CurrentState = State.albums; + break; + } + } + else if (control == facadeView && _CurrentState == State.albums) + { + _stopImgDownload = true; + CurrentAlbum = CurrentAlbumList[facadeView.SelectedListItemIndex]; + DisplayAlbumPhotos(); + + _CurrentState = State.album_photos; + } + else if (control == facadeView && (_CurrentState == State.photos || _CurrentState== State.album_photos)) + { + OnShowPicture(facadeView.SelectedListItem.ThumbnailImage); + } + } + public void DisplayInterestingFlickrPhotos() + { + CurrentPhotoList = + MyFlickr.getInterestingPhotos(); + DisplayCurrentPhotos(); + } + public void DisplayRecentFlickrPhotos() + { + CurrentPhotoList = MyFlickr.getRecentPhotos(); + DisplayCurrentPhotos(); + } + public void DisplayFlickrPhotosWithTags(String tags) + { + CurrentPhotoList = MyFlickr.getPhotosByTag(tags); + DisplayCurrentPhotos(); + } + public void DisplayFlickrPhotosWithText(String text) + { + CurrentPhotoList = MyFlickr.getPhotosByText(text); + DisplayCurrentPhotos(); + } + public void DisplayFlickrGroupsWithText(String text) + { + CurrentAlbumList = MyFlickr.getGroupsByText(text); + DisplayCurrentAlbums(); + } + public void DisplayFlickrUserPhotos(String user) + { + CurrentPhotoList = MyFlickr.getUserPhotos(user); + DisplayCurrentPhotos(); + } + public void DisplayFlickrUserFavoritePhotos(String user) + { + CurrentPhotoList = MyFlickr.getUserFavoritePhotos(user); + DisplayCurrentPhotos(); + } + public void DisplayPicasaAlbums(String user) + { + CurrentAlbumList = MyPicasa.getUserAlbums(user); + DisplayCurrentAlbums(); + } + private bool GetUserInputString(ref string sString) + { + VirtualKeyboard keyBoard = (VirtualKeyboard)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_VIRTUAL_KEYBOARD); + keyBoard.Reset(); + keyBoard.IsSearchKeyboard = true; + keyBoard.Text = sString; + keyBoard.DoModal(GetID); // show it... + if (keyBoard.IsConfirmed) sString = keyBoard.Text; + return keyBoard.IsConfirmed; + } + public void DisplayCurrentPhotos(){ + DisplayCurrentPhotos(true); + } + public void DisplayCurrentPhotos(bool refresh) + { + facadeView.Clear(); + GUIListItem item; + int i = 0; + List<String> ImageList = new List<string>(); + foreach (MyPhoto photo in CurrentPhotoList) + { + item = new GUIListItem(photo.Title); + item.Path = photo.mediumUrl; + item.ItemId = i; + item.OnItemSelected += new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(item_OnItemSelected); + if(refresh){ + item.RetrieveArt = false; + item.OnRetrieveArt += new MediaPortal.GUI.Library.GUIListItem.RetrieveCoverArtHandler(OnRetrieveCoverArt); + + + ImageList.Add(photo.mediumUrl); + Log.Info("setting photo to url " + photo.mediumUrl); + }else{ + item.RetrieveArt = true; + item.OnRetrieveArt += new MediaPortal.GUI.Library.GUIListItem.RetrieveCoverArtHandler(OnRetrieveCoverArt); + } + facadeView.Add(item); + //GUIWindowManager.Process(); + i++; - DisplayFlickrGroupsWithText(gtext); - _CurrentState = State.categories; + } + if(refresh){ + BackgroundWorker worker = new BackgroundWorker(); - } - break; - } - } - } - public void DisplayInterestingFlickrPhotos() - { - CurrentPhotoList = - MyFlickr.getInterestingPhotos(); - DisplayCurrentPhotos(); - } - public void DisplayRecentFlickrPhotos() - { - CurrentPhotoList = MyFlickr.getRecentPhotos(); - DisplayCurrentPhotos(); - } - public void DisplayFlickrPhotosWithTags(String tags) - { - CurrentPhotoList = MyFlickr.getPhotosByTag(tags); - DisplayCurrentPhotos(); - } - public void DisplayFlickrPhotosWithText(String text) - { - CurrentPhotoList = MyFlickr.getPhotosByText(text); - DisplayCurrentPhotos(); - } - public void DisplayFlickrGroupsWithText(String text) - { - CurrentAlbumList = MyFlickr.getGroupsByText(text); - DisplayCurrentAlbums(); - } - public void DisplayFlickrUserPhotos(String user) - { - CurrentPhotoList = MyFlickr.getUserPhotos(user); - DisplayCurrentPhotos(); - } + worker.DoWork += new DoWorkEventHandler(downloadImages); + worker.RunWorkerAsync(ImageList); - private bool GetUserInputString(ref string sString) - { - VirtualKeyboard keyBoard = (VirtualKeyboard)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_VIRTUAL_KEYBOARD); - keyBoard.Reset(); - keyBoard.IsSearchKeyboard = true; - keyBoard.Text = sString; - keyBoard.DoModal(GetID); // show it... - if (keyBoard.IsConfirmed) sString = keyBoard.Text; - return keyBoard.IsConfirmed; - } - - public void DisplayCurrentPhotos() - { - facadeView.Clear(); - GUIListItem item; - int i = 0; - List<String> ImageList = new List<string>(); - foreach (MyPhoto photo in CurrentPhotoList) - { - item = new GUIListItem(photo.Title); - item.Path = photo.mediumUrl; - item.ItemId = i; - item.RetrieveArt = false; - item.OnRetrieveArt += new MediaPortal.GUI.Library.GUIListItem.RetrieveCoverArtHandler(OnRetrieveCoverArt); - item.OnItemSelected += new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(item_OnItemSelected); - ImageList.Add(photo.mediumUrl); - Log.Info("setting photo to url " + photo.mediumUrl); - facadeView.Add(item); - GUIWindowManager.Process(); - i++; + using (WaitCursor cursor = new WaitCursor()) + { + while (_imagesDone == false) + { + GUIWindowManager.Process(); + } + } + } - } - BackgroundWorker worker = new BackgroundWorker(); + } + public void DisplayCurrentAlbums() + { + facadeView.Clear(); + GUIListItem item; + int i = 0; + List<String> ImageList = new List<string>(); + foreach (MyAlbum album in CurrentAlbumList) + { + item = new GUIListItem(album.Title); + item.Path = album.id; + item.ItemId = i; + //item.IsFolder = true; + item.RetrieveArt = false; + item.OnRetrieveArt += new MediaPortal.GUI.Library.GUIListItem.RetrieveCoverArtHandler(OnRetrieveCoverArt); + item.OnItemSelected += new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(item_OnItemSelected); + ImageList.Add(album.coverThumbnailUrl); + Log.Info("album thumbnail for {0} is {1}",album.Title,album.coverThumbnailUrl); + facadeView.Add(item); + GUIWindowManager.Process(); + i++; - worker.DoWork += new DoWorkEventHandler(downloadImages); - worker.RunWorkerAsync(ImageList); + } + BackgroundWorker worker = new BackgroundWorker(); - using (WaitCursor cursor = new WaitCursor()) - { - while (_imagesDone == false) - { - GUIWindowManager.Process(); - } - } + worker.DoWork += new DoWorkEventHandler(downloadImages); + worker.RunWorkerAsync(ImageList); - } - public void DisplayCurrentAlbums() - { - facadeView.Clear(); - GUIListItem item; - int i = 0; - List<String> ImageList = new List<string>(); - foreach (MyAlbum album in CurrentAlbumList) - { - item = new GUIListItem(album.title); - item.Path = album.id; - item.ItemId = i; - item.RetrieveArt = false; - item.OnRetrieveArt += new MediaPortal.GUI.Library.GUIListItem.RetrieveCoverArtHandler(OnRetrieveCoverArt); - item.OnItemSelected += new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(item_OnItemSelected); - ImageList.Add(album.coverThumbnailUrl); - facadeView.Add(item); - GUIWindowManager.Process(); - i++; + using (WaitCursor cursor = new WaitCursor()) + { + while (_imagesDone == false) + { + GUIWindowManager.Process(); + } + } + } + private void DisplayAlbumPhotos(){ + CurrentPhotoList = MyPicasa.getAlbumPhotos(CurrentAlbum.id); + DisplayCurrentPhotos(); + } + private String GetThumbnail(String lsUrl) + { + string lsThumb = MediaPortal.Util.Utils.GetThumb(lsUrl); + lsThumb = System.IO.Path.GetFileName(lsThumb); + string lsThumbsDir = "C:\\Temp\\"; + if (System.IO.Directory.Exists(lsThumbsDir) == false) + { + System.IO.Directory.CreateDirectory(lsThumbsDir); + } + lsThumb = lsThumbsDir + lsThumb; + //Log.Info(lsThumb); + if (System.IO.File.Exists(lsThumb) == false) + { + String lsFilename = System.IO.Path.GetFileName(lsThumb); + //moLog.Info("Filename will be {0}", lsFilename); + MediaPortal.Util.Utils.DownLoadImage(lsUrl, lsThumb); + } + if (System.IO.File.Exists(lsThumb)) + { + //facadeView[liIdx].IconImageBig = lsThumb; + return lsThumb; + } + else + { + return ""; + //facadeView[liIdx].IconImageBig = ""; + } + } + public void downloadImages(object sender, DoWorkEventArgs e) + { + _imagesDone = false; + _stopImgDownload = false; + List<String> imageList = (List<String>)e.Argument; + WebClient client = new WebClient(); + int i=0; + String imageLocation; + foreach (String url in imageList) + { + if(_stopImgDownload){ + break; + } + if(inPhotoState() ){ + imageLocation = "C:\\Temp\\" + CurrentPhotoList[i].ThumbName + ".jpg"; + }else{ + imageLocation = "C:\\Temp\\" + CurrentAlbumList[i].ThumbName + ".jpg"; + } + if(System.IO.File.Exists(imageLocation) == false){ + client.DownloadFile(url, imageLocation); + } + facadeView[i].RetrieveArt = true; + facadeView[i].RefreshCoverArt(); + i++; + + + } + _imagesDone = true; + } + public bool inPhotoState(){ + return _CurrentState == State.album_photos || _CurrentState == State.photos; + } + void OnRetrieveCoverArt(GUIListItem item) + { + if(inPhotoState() ){ + item.ThumbnailImage = "C:\\Temp\\" + CurrentPhotoList[item.ItemId].ThumbName + ".jpg"; + }else{ + item.ThumbnailImage = "C:\\Temp\\" + CurrentAlbumList[item.ItemId].ThumbName + ".jpg"; + } + } - } - BackgroundWorker worker = new BackgroundWorker(); + private void item_OnItemSelected(GUIListItem item, GUIControl parent) + { + GUIFilmstripControl filmstrip = parent as GUIFilmstripControl; + if (filmstrip == null) + return; + filmstrip.InfoImageFileName = item.ThumbnailImage; + } - worker.DoWork += new DoWorkEventHandler(downloadImages); - worker.RunWorkerAsync(ImageList); + private void ChangeFacadeView() + { + + + switch (currentView) + { + case View.List: + currentView = View.Icons; + facadeView.View = GUIFacadeControl.ViewMode.SmallIcons; + break; + case View.Icons: + currentView = View.LargeIcons; + facadeView.View = GUIFacadeControl.ViewMode.LargeIcons; + break; + case View.LargeIcons: + currentView = View.FilmStrip; + facadeView.View = GUIFacadeControl.ViewMode.Filmstrip; + break; + case View.FilmStrip: + currentView = View.List; + facadeView.View = GUIFacadeControl.ViewMode.List; + break; + } + GUIControl.FocusControl(GetID, facadeView.GetID); - using (WaitCursor cursor = new WaitCursor()) - { - while (_imagesDone == false) - { - GUIWindowManager.Process(); - } - } - } - private String GetThumbnail(String lsUrl) - { - string lsThumb = MediaPortal.Util.Utils.GetThumb(lsUrl); - lsThumb = System.IO.Path.GetFileName(lsThumb); - string lsThumbsDir = "C:\\Temp\\"; - if (System.IO.Directory.Exists(lsThumbsDir) == false) - { - System.IO.Directory.CreateDirectory(lsThumbsDir); - } - lsThumb = lsThumbsDir + lsThumb; - //Log.Info(lsThumb); - if (System.IO.File.Exists(lsThumb) == false) - { - String lsFilename = System.IO.Path.GetFileName(lsThumb); - //moLog.Info("Filename will be {0}", lsFilename); - MediaPortal.Util.Utils.DownLoadImage(lsUrl, lsThumb); - } - if (System.IO.File.Exists(lsThumb)) - { - //facadeView[liIdx].IconImageBig = lsThumb; - return lsThumb; - } - else - { - return ""; - //facadeView[liIdx].IconImageBig = ""; - } - } - public void downloadImages(object sender, DoWorkEventArgs e) - { - _imagesDone = false; - List<String> imageList = (List<String>)e.Argument; - WebClient client = new WebClient(); - int i=0; - foreach (String url in imageList) - { - client.DownloadFile(url, "C:\\Temp\\" + CurrentPhotoList[i].ThumbName + ".jpg"); - facadeView[i].RetrieveArt = true; - facadeView[i].RefreshCoverArt(); - i++; - } - _imagesDone = true; - } - void OnRetrieveCoverArt(GUIListItem item) - { - item.ThumbnailImage = "C:\\Temp\\" + CurrentPhotoList[item.ItemId].ThumbName + ".jpg"; - } + string strLine = String.Empty; + View view = currentView; + switch (view) + { + case View.List: + strLine = GUILocalizeStrings.Get(101); + break; + case View.Icons: + strLine = GUILocalizeStrings.Get(100); + break; + case View.LargeIcons: + strLine = GUILocalizeStrings.Get(417); + break; + case View.FilmStrip: + strLine = GUILocalizeStrings.Get(733); + break; + } + GUIControl.SetControlLabel(GetID, btnViewAs.GetID, strLine); - private void item_OnItemSelected(GUIListItem item, GUIControl parent) - { - GUIFilmstripControl filmstrip = parent as GUIFilmstripControl; - if (filmstrip == null) - return; - filmstrip.InfoImageFileName = item.ThumbnailImage; - } - - private void ChangeFacadeView() - { - - - switch (currentView) - { - case View.List: - currentView = View.Icons; - facadeView.View = GUIFacadeControl.ViewMode.SmallIcons; - break; - case View.Icons: - currentView = View.LargeIcons; - facadeView.View = GUIFacadeControl.ViewMode.LargeIcons; - break; - case View.LargeIcons: - currentView = View.FilmStrip; - facadeView.View = GUIFacadeControl.ViewMode.Filmstrip; - break; - case View.FilmStrip: - currentView = View.List; - facadeView.View = GUIFacadeControl.ViewMode.List; - break; - } - GUIControl.FocusControl(GetID, facadeView.GetID); - - string strLine = String.Empty; - View view = currentView; - switch (view) - { - case View.List: - strLine = GUILocalizeStrings.Get(101); - break; - case View.Icons: - strLine = GUILocalizeStrings.Get(100); - break; - case View.LargeIcons: - strLine = GUILocalizeStrings.Get(417); - break; - case View.FilmStrip: - strLine = GUILocalizeStrings.Get(733); - break; - } - GUIControl.SetControlLabel(GetID, btnViewAs.GetID, strLine); - - } - private void LoadSettings() - { - XmlDocument doc = new XmlDocument(); - try - { - doc.Load("OnlinePhotoSettings.xml"); - /* + } + private void LoadSettings() + { + XmlDocument doc = new XmlDocument(); + try + { + doc.Load("OnlinePhotoSettings.xml"); + /* XmlNode filter = doc.SelectSingleNode("//settings/filter"); String lsFilter = filter.InnerText; msFilterArray = lsFilter.Split(new char[] { ',' }); @@ -575,130 +675,175 @@ } moSiteList.Add(loSite.id, loSite); } - * */ - } + * */ + } - catch (Exception e) - { - //moLog.Error(e); - Log.Error(e); - } - } - private void DisplayHome() - { - //facadeView.Clear(); - GUIControl.ClearControl(GetID, facadeView.GetID); + catch (Exception e) + { + //moLog.Error(e); + Log.Error(e); + } + } + private void DisplayHome() + { + //facadeView.Clear(); + GUIControl.ClearControl(GetID, facadeView.GetID); - GUIListItem loListItem; - //foreach (Site loSite in moSiteList.Values) - //{ - loListItem = new GUIListItem("Flickr - Interesting Photos"); - loListItem.Path = "1"; - loListItem.IsFolder = true; - MediaPortal.Util.Utils.SetDefaultIcons(loListItem); - facadeView.Add(loListItem); - - loListItem = new GUIListItem("Flickr - Recent Photos"); - loListItem.Path = "2"; - loListItem.IsFolder = true; - MediaPortal.Util.Utils.SetDefaultIcons(loListItem); - facadeView.Add(loListItem); + GUIListItem loListItem; + //foreach (Site loSite in moSiteList.Values) + //{ + loListItem = new GUIListItem("Flickr - Interesting Photos"); + loListItem.Path = "1"; + loListItem.IsFolder = true; + MediaPortal.Util.Utils.SetDefaultIcons(loListItem); + facadeView.Add(loListItem); + + loListItem = new GUIListItem("Flickr - Recent Photos"); + loListItem.Path = "2"; + loListItem.IsFolder = true; + MediaPortal.Util.Utils.SetDefaultIcons(loListItem); + facadeView.Add(loListItem); - loListItem = new GUIListItem("Flickr - Search by tag"); - loListItem.Path = "3"; - loListItem.IsFolder = true; - MediaPortal.Util.Utils.SetDefaultIcons(loListItem); - facadeView.Add(loListItem); - - loListItem = new GUIListItem("Flickr - Search by text"); - loListItem.Path = "4"; - loListItem.IsFolder = true; - MediaPortal.Util.Utils.SetDefaultIcons(loListItem); - facadeView.Add(loListItem); + loListItem = new GUIListItem("Flickr - Search by tag"); + loListItem.Path = "3"; + loListItem.IsFolder = true; + MediaPortal.Util.Utils.SetDefaultIcons(loListItem); + facadeView.Add(loListItem); + + loListItem = new GUIListItem("Flickr - Search by text"); + loListItem.Path = "4"; + loListItem.IsFolder = true; + MediaPortal.Util.Utils.SetDefaultIcons(loListItem); + facadeView.Add(loListItem); - loListItem = new GUIListItem("Flickr - My Photos"); - loListItem.Path = "5"; - loListItem.IsFolder = true; - MediaPortal.Util.Utils.SetDefaultIcons(loListItem); - facadeView.Add(loListItem); + loListItem = new GUIListItem("Flickr - My Photos"); + loListItem.Path = "5"; + loListItem.IsFolder = true; + MediaPortal.Util.Utils.SetDefaultIcons(loListItem); + facadeView.Add(loListItem); - loListItem = new GUIListItem("Flickr - Search Groups"); - loListItem.Path = "6"; - loListItem.IsFolder = true; - MediaPortal.Util.Utils.SetDefaultIcons(loListItem); - facadeView.Add(loListItem); - //} - //GUIPropertyManager.SetProperty("#itemcount", facadeView.Count-1 + ""); - } - private void LoadFlickrCategories() - { - GUIControl.ClearControl(GetID, facadeView.GetID); + loListItem = new GUIListItem("Flickr - My Favorites"); + loListItem.Path = "7"; + loListItem.IsFolder = true; + MediaPortal.Util.Utils.SetDefaultIcons(loListItem); + facadeView.Add(loListItem); + + loListItem = new GUIListItem("Flickr - Search Groups"); + loListItem.Path = "6"; + loListItem.IsFolder = true; + MediaPortal.Util.Utils.SetDefaultIcons(loListItem); + facadeView.Add(loListItem); + + loListItem = new GUIListItem("Picasa - My Photos"); + loListItem.Path = "8"; + loListItem.IsFolder = true; + MediaPortal.Util.Utils.SetDefaultIcons(loListItem); + facadeView.Add(loListItem); + + //} + //GUIPropertyManager.SetProperty("#itemcount", facadeView.Count-1 + ""); + } + private void LoadFlickrCategories() + { + GUIControl.ClearControl(GetID, facadeView.GetID); - GUIListItem loListItem; - loListItem = new GUIListItem(".."); - loListItem.IsFolder = true; - MediaPortal.Util.Utils.SetDefaultIcons(loListItem); - facadeView.Add(loListItem); + GUIListItem loListItem; + loListItem = new GUIListItem(".."); + loListItem.IsFolder = true; + MediaPortal.Util.Utils.SetDefaultIcons(loListItem); + facadeView.Add(loListItem); - loListItem = new GUIListItem("Interesting Photos"); - loListItem.Path = "1"; - loListItem.IsFolder = true; - MediaPortal.Util.Utils.SetDefaultIcons(loListItem); - facadeView.Add(loListItem); + loListItem = new GUIListItem("Interesting Photos"); + loListItem.Path = "1"; + loListItem.IsFolder = true; + MediaPortal.Util.Utils.SetDefaultIcons(loListItem); + facadeView.Add(loListItem); - loListItem = new GUIListItem("Recent Photos"); - loListItem.Path = "2"; - loListItem.IsFolder = true; - MediaPortal.Util.Utils.SetDefaultIcons(loListItem); - facadeView.Add(loListItem); + loListItem = new GUIListItem("Recent Photos"); + loListItem.Path = "2"; + loListItem.IsFolder = true; + MediaPortal.Util.Utils.SetDefaultIcons(loListItem); + facadeView.Add(loListItem); - loListItem = new GUIListItem("My Photos"); - loListItem.Path = "3"; - loListItem.IsFolder = true; - MediaPortal.Util.Utils.SetDefaultIcons(loListItem); - facadeView.Add(loListItem); + loListItem = new GUIListItem("My Photos"); + loListItem.Path = "3"; + loListItem.IsFolder = true; + MediaPortal.Util.Utils.SetDefaultIcons(loListItem); + facadeView.Add(loListItem); - } - void OnSlideShow() - { - OnSlideShow(0); - } - - void OnSlideShow(int iStartItem) - { + } + void OnSlideShow() + { + OnSlideShow(0); + } + + void OnSlideShow(int iStartItem) + { - GUISlideShow SlideShow = (GUISlideShow)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_SLIDESHOW); - if (SlideShow == null) - return; + GUISlideShow SlideShow = (GUISlideShow)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_SLIDESHOW); + if (SlideShow == null) + return; - SlideShow.Reset(); + SlideShow.Reset(); - if ((iStartItem < 0) || (iStartItem > CurrentPhotoList.Count)) - iStartItem = 0; - int i = iStartItem; - do - { - GUIListItem item = facadeView[i]; - if (!item.IsFolder && !item.IsRemote) - { - SlideShow.Add(facadeView[i].ThumbnailImage); - } + if ((iStartItem < 0) || (iStartItem > CurrentPhotoList.Count)) + iStartItem = 0; + int i = iStartItem; + do + { + GUIListItem item = facadeView[i]; + if (!item.IsFolder && !item.IsRemote) + { + SlideShow.Add(facadeView[i].ThumbnailImage); + } - i++; - if (i >= CurrentPhotoList.Count) - { - i = 0; - } - } - while (i != iStartItem); + i++; + if (i >= CurrentPhotoList.Count) + { + i = 0; + } + } + while (i != iStartItem); - if (SlideShow.Count > 0) - { - SlideShow.StartSlideShow(); - GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_SLIDESHOW); - } - } - } -} \ No newline at end of file + if (SlideShow.Count > 0) + { + SlideShow.StartSlideShow(); + GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_SLIDESHOW); + } + } + void OnShowPicture(string strFile) + { + GUISlideShow SlideShow = (GUISlideShow)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_SLIDESHOW); + if (SlideShow == null) + return; + + + SlideShow.Reset(); + SlideShow.Add(strFile); + + GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_SLIDESHOW); + // SlideShow.Select(strFile); + + } + public void TestSlideShow(String user){ + List<MyPhoto> photoList = MyFlickr.getInterestingPhotos(); + GUISlideShow SlideShow = (GUISlideShow)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_SLIDESHOW); + if (SlideShow == null) + return; + + SlideShow.Reset(); + + foreach(MyPhoto photo in photoList){ + SlideShow.Add(photo.mediumUrl); + } + + if (SlideShow.Count > 0) + { + SlideShow.StartSlideShow(); + GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_SLIDESHOW); + } + } + } +} Modified: trunk/plugins/OnlinePhotos/OnlinePhotos.csproj =================================================================== --- trunk/plugins/OnlinePhotos/OnlinePhotos.csproj 2007-05-03 08:25:35 UTC (rev 370) +++ trunk/plugins/OnlinePhotos/OnlinePhotos.csproj 2007-05-04 00:46:15 UTC (rev 371) @@ -6,13 +6,18 @@ <OutputType>Library</OutputType> <RootNamespace>OnlinePhotos</RootNamespace> <AssemblyName>OnlinePhotos</AssemblyName> + <AllowUnsafeBlocks>False</AllowUnsafeBlocks> + <NoStdLib>False</NoStdLib> + <WarningLevel>4</WarningLevel> + <TreatWarningsAsErrors>false</TreatWarningsAsErrors> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> - <OutputPath>bin\Debug\</OutputPath> - <DebugSymbols>True</DebugSymbols> + <OutputPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Plugins\Windows\</OutputPath> + <DebugSymbols>true</DebugSymbols> <DebugType>Full</DebugType> <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> <DefineConstants>DEBUG;TRACE</DefineConstants> + <Optimize>False</Optimize> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> <OutputPath>..\..\..\Program Files\Team MediaPortal\MediaPortal\Plugins\Windows\</OutputPath> @@ -21,6 +26,13 @@ <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> <DefineConstants>TRACE</DefineConstants> </PropertyGroup> + <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' "> + <RegisterForComInterop>False</RegisterForComInterop> + <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies> + <BaseAddress>4194304</BaseAddress> + <PlatformTarget>AnyCPU</PlatformTarget> + <FileAlignment>4096</FileAlignment> + </PropertyGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> <ItemGroup> <Reference Include="Core"> @@ -29,7 +41,7 @@ <Private>False</Private> </Reference> <Reference Include="Databases"> - <HintPath>..\..\MediaPortal\Databases\bin\Release\Databases.DLL</HintPath> + <HintPath>..\..\Mediaportal\Databases\bin\Release\Databases.DLL</HintPath> <SpecificVersion>False</SpecificVersion> <Private>False</Private> </Reference> @@ -59,5 +71,12 @@ <Compile Include="AssemblyInfo.cs" /> <Compile Include="Flickr.cs" /> <Compile Include="MyClass.cs" /> + <Compile Include="Picasa.cs" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="google-sharp\PicasaNet.csproj"> + <Project>{7B1FD153-0301-41F0-87EA-FB862148D6C9}</Project> + <Name>PicasaNet</Name> + </ProjectReference> + </ItemGroup> </Project> \ No newline at end of file Modified: trunk/plugins/OnlinePhotos/OnlinePhotos.sln =================================================================== --- trunk/plugins/OnlinePhotos/OnlinePhotos.sln 2007-05-03 08:25:35 UTC (rev 370) +++ trunk/plugins/OnlinePhotos/OnlinePhotos.sln 2007-05-04 00:46:15 UTC (rev 371) @@ -6,6 +6,8 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestRunner", "..\TestRunner\TestRunner.csproj", "{1EE2BACD-3C01-495E-A06E-F739D649A1ED}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PicasaNet", "google-sharp\PicasaNet.csproj", "{7B1FD153-0301-41F0-87EA-FB862148D6C9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -20,5 +22,17 @@ {1EE2BACD-3C01-495E-A06E-F739D649A1ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1EE2BACD-3C01-495E-A06E-F739D649A1ED}.Release|Any CPU.Build.0 = Release|Any CPU {1EE2BACD-3C01-495E-A06E-F739D649A1ED}.Release|Any CPU.ActiveCfg = Release|Any CPU + E4238A46-225D-4827-A429-849098A94F8A.Debug|Any CPU.Build.0 = Debug|Any CPU + E4238A46-225D-4827-A429-849098A94F8A.Debug|Any CPU.ActiveCfg = Debug|Any CPU + E4238A46-225D-4827-A429-849098A94F8A.Release|Any CPU.Build.0 = Release|Any CPU + E4238A46-225D-4827-A429-849098A94F8A.Release|Any CPU.ActiveCfg = Release|Any CPU + 83DEF1F5-4D7D-40CB-A997-D390B372FF71.Debug|Any CPU.Build.0 = Debug|Any CPU + 83DEF1F5-4D7D-40CB-A997-D390B372FF71.Debug|Any CPU.ActiveCfg = Debug|Any CPU + 83DEF1F5-4D7D-40CB-A997-D390B372FF71.Release|Any CPU.Build.0 = Release|Any CPU + 83DEF1F5-4D7D-40CB-A997-D390B372FF71.Release|Any CPU.ActiveCfg = Release|Any CPU + {7B1FD153-0301-41F0-87EA-FB862148D6C9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7B1FD153-0301-41F0-87EA-FB862148D6C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7B1FD153-0301-41F0-87EA-FB862148D6C9}.Release|Any CPU.Build.0 = Release|Any CPU + {7B1FD153-0301-41F0-87EA-FB862148D6C9}.Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection EndGlobal Modified: trunk/plugins/OnlinePhotos/OnlinePhotos.suo =================================================================== (Binary files differ) Added: trunk/plugins/OnlinePhotos/Picasa.cs =================================================================== --- trunk/plugins/OnlinePhotos/Picasa.cs (rev 0) +++ trunk/plugins/OnlinePhotos/Picasa.cs 2007-05-04 00:46:15 UTC (rev 371) @@ -0,0 +1,75 @@ +/* + * Created by SharpDevelop. + * User: GZamor1 + * Date: 5/3/2007 + * Time: 2:11 PM + * + * To change this template use Tools | Options | Coding | Edit Standard Headers. + */ + +using System; +using Mono.Google; +using Mono.Google.Picasa; +using System.Collections.Generic; +namespace OnlinePhotos +{ + /// <summary> + /// Description of Picasa. + /// </summary> + public class MyPicasa + { + private static PicasaAlbumCollection _albumCollection; + + public static List<MyAlbum> getUserAlbums(String user){ + List<MyAlbum> MyAlbumList = new List<MyAlbum>(); + GoogleConnection conn = new GoogleConnection (GoogleService.Picasa); + //conn.Authenticate("gregandsamira","53025302"); + PicasaWeb picasa = new PicasaWeb(conn,user); + _albumCollection = picasa.GetAlbums(); + foreach(PicasaAlbum album in _albumCollection.AllValues){ + MyAlbumList.Add(loadPhotoAlbum(album)); + } + return MyAlbumList; + } + public static List<MyPhoto> getAlbumPhotos(String id){ + List<MyPhoto> photoList = new List<MyPhoto>(); + if(_albumCollection==null){ + return photoList; + } + return loadMyPhotoList(_albumCollection[id].GetPictures()); + } + private static MyAlbum loadPhotoAlbum(PicasaAlbum picasaAlbum) + { + MyAlbum myAlbum = new MyAlbum(); + myAlbum.id = picasaAlbum.UniqueID; + myAlbum.Title = picasaAlbum.Title; + myAlbum.coverThumbnailUrl = picasaAlbum.Thumbnail; + //myAlbum.photoCollection = loadMyPhotoList(picasaAlbum.GetPictures()); + return myAlbum; + + } + private static List<MyPhoto> loadMyPhotoList(PicasaPictureCollection photos) + { + List<MyPhoto> myPhotoList = new List<MyPhoto>(); + if(photos == null || photos.Count ==0){ + return myPhotoList; + } + MyPhoto myPhoto; + foreach (PicasaPicture photo in photos.AllValues) + { + myPhoto = new MyPhoto(); + myPhoto.id = photo.UniqueID; + myPhoto.Title = photo.Title; + myPhoto.largeUrl = photo.ImageURL; + myPhoto.mediumUrl = photo.ImageURL; + myPhoto.smallUrl = photo.ImageURL; + myPhoto.thumbnailUrl = photo.ThumbnailURL; + myPhotoList.Add(myPhoto); + //photo.; + } + + return myPhotoList; + + } + } +} Added: trunk/plugins/OnlinePhotos/google-sharp/AssemblyInfo.cs =================================================================== --- trunk/plugins/OnlinePhotos/google-sharp/AssemblyInfo.cs (rev 0) +++ trunk/plugins/OnlinePhotos/google-sharp/AssemblyInfo.cs 2007-05-04 00:46:15 UTC (rev 371) @@ -0,0 +1,31 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// Information about this assembly is defined by the following +// attributes. +// +// change them to the information which is associated with the assembly +// you compile. + +[assembly: AssemblyTitle("PicasaNet")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("PicasaNet")] +[assembly: AssemblyCopyright("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// This sets the default COM visibility of types in the assembly to invisible. +// If you need to expose a type to COM, use [ComVisible(true)] on that type. +[assembly: ComVisible(false)] + +// The assembly version has following format : +// +// Major.Minor.Build.Revision +// +// You can specify all values by your own or you can build default build and revision +// numbers with the '*' character (the default): + +[assembly: AssemblyVersion("1.0.*")] Added: trunk/plugins/OnlinePhotos/google-sharp/Mono.Google/Authentication.cs =================================================================== --- trunk/plugins/OnlinePhotos/google-sharp/Mono.Google/Authentication.cs (rev 0) +++ trunk/plugins/OnlinePhotos/google-sharp/Mono.Google/Authentication.cs 2007-05-04 00:46:15 UTC (rev 371) @@ -0,0 +1,158 @@ +// +// Mono.Google.Authentication.cs: +// +// Authors: +// Gonzalo Paniagua Javier (go...@xi...) +// Stephane Delcroix (ste...@de...) +// +// (C) Copyright 2006 Novell, Inc. (http://www.novell.com) +// (C) Copyright 2007 S. Delcroix +// + +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// Check the Google Authentication Page at http://code.google.com/apis/accounts/AuthForInstalledApps.html +// + +using System; +using System.IO; +using System.Net; +using System.Text; +using System.Web; + +namespace Mono.Google { + class Authentication { + static string client_login_url = "https://www.google.com/accounts/ClientLogin"; + + public static string GetAuthorization (GoogleConnection conn, string email, string password, + GoogleService service, string token, string captcha) + { + if (email == null || email == String.Empty || password == null || password == String.Empty) + return null; + + email = HttpUtility.UrlEncode (email); + password = HttpUtility.UrlEncode (password); + string appname = HttpUtility.UrlEncode (conn.ApplicationName); + string service_code = service.ServiceCode; + + StringBuilder content = new StringBuilder (); + content.Append ("accountType=HOSTED_OR_GOOGLE"); + content.AppendFormat ("&Email={0}", email); + content.AppendFormat ("&Passwd={0}", password); + content.AppendFormat ("&email={0}", email); + content.AppendFormat ("&service={0}", service_code); + content.AppendFormat ("&source={0}", appname); + + if (token != null) { + content.AppendFormat ("&logintoken={0}", token); + content.AppendFormat ("&logincaptcha={0}", captcha); + } + byte [] bytes = Encoding.UTF8.GetBytes (content.ToString ()); + + HttpWebRequest request = (HttpWebRequest) WebRequest.Create (client_login_url); + request.Method = "POST"; + request.ContentType = "application/x-www-form-urlencoded"; + request.ContentLength = bytes.Length; + + Stream output = request.GetRequestStream (); + output.Write (bytes, 0, bytes.Length); + output.Close (); + + HttpWebResponse response = null; + try { + response = (HttpWebResponse) request.GetResponse (); + } catch (WebException wexc) { + response = wexc.Response as HttpWebResponse; + if (response == null) + throw; + ThrowOnError (response); + throw; // if the method above does not throw, we do + } + + //string sid = null; + //string lsid = null; + string auth = null; + + using (Stream stream = response.GetResponseStream ()) { + StreamReader sr = new StreamReader (stream, Encoding.UTF8); + string s; + while ((s = sr.ReadLine ()) != null) { + if (s.StartsWith ("Auth=")) + auth = s.Substring (5); + //else if (s.StartsWith ("LSID=")) + // lsid = s.Substring (5); + //else if (s.StartsWith ("SID=")) + // sid = s.Substring (4); + } + } + response.Close (); + + return auth; + } + + static void ThrowOnError (HttpWebResponse response) + { + if (response.StatusCode != HttpStatusCode.Forbidden) + return; + + string url = null; + string token = null; + string captcha_url = null; + string code = null; + using (StreamReader reader = new StreamReader (response.GetResponseStream ())) { + string str; + while ((str = reader.ReadLine ()) != null) { + if (str.StartsWith ("Url=")) { + url = str.Substring (4); + } else if (str.StartsWith ("Error=")) { + /* These are the values for Error + None, + BadAuthentication, + NotVerified, + TermsNotAgreed, + CaptchaRequired, + Unknown, + AccountDeleted, + AccountDisabled, + ServiceUnavailable + */ + code = str.Substring (6); + } else if (str.StartsWith ("CaptchaToken=")) { + token = str.Substring (13); + } else if (str.StartsWith ("CaptchaUrl=")) { + captcha_url = str.Substring (11); + } + } + } + if (code == "CaptchaRequired" && token != null && captcha_url != null) { + if (url != null) { + Uri uri = new Uri (url); + captcha_url = new Uri (uri, captcha_url).ToString (); + } else if (!captcha_url.StartsWith ("https://")) { + captcha_url = "https://www.google.com/accounts/" + captcha_url; + } + throw new CaptchaException (url, token, captcha_url); + } + + throw new UnauthorizedAccessException (String.Format ("Access to '{0}' is denied ({1})", url, code)); + } + } +} + Added: trunk/plugins/OnlinePhotos/google-sharp/Mono.Google/CaptchaException.cs =================================================================== --- trunk/plugins/OnlinePhotos/google-sharp/Mono.Google/CaptchaException.cs (rev 0) +++ trunk/plugins/OnlinePhotos/google-sharp/Mono.Google/CaptchaException.cs 2007-05-04 00:46:15 UTC (rev 371) @@ -0,0 +1,87 @@ +// +// Mono.Google.CaptchaException +// +// Authors: +// Gonzalo Paniagua Javier (go...@no...) +// +// Copyright (c) 2006 Novell, Inc. (http://www.novell.com) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +using System; +using System.Runtime.Serialization; + +namespace Mono.Google { + [Serializable] + public class CaptchaException : UnauthorizedAccessException, ISerializable + { + public static string UnlockCaptchaURL = "https://www.google.com/accounts/DisplayUnlockCaptcha"; + string url; + string token; + string captcha_url; + + public CaptchaException () + { + } + + public CaptchaException (string url, string token, string captcha_url) + {... [truncated message content] |
From: <soa...@us...> - 2007-05-03 08:25:36
|
Revision: 370 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=370&view=rev Author: soapskyway Date: 2007-05-03 01:25:35 -0700 (Thu, 03 May 2007) Log Message: ----------- Removed Visible property because of unwanted effects. Modified Paths: -------------- trunk/plugins/VideoLAN/VideoLanPlugin.cs Modified: trunk/plugins/VideoLAN/VideoLanPlugin.cs =================================================================== --- trunk/plugins/VideoLAN/VideoLanPlugin.cs 2007-05-02 09:36:55 UTC (rev 369) +++ trunk/plugins/VideoLAN/VideoLanPlugin.cs 2007-05-03 08:25:35 UTC (rev 370) @@ -683,7 +683,7 @@ } } - public override bool Visible + /*public override bool Visible { get { @@ -703,7 +703,7 @@ vlcControl.Visible = value; } } - } + }*/ } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <soa...@us...> - 2007-05-02 09:37:51
|
Revision: 369 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=369&view=rev Author: soapskyway Date: 2007-05-02 02:36:55 -0700 (Wed, 02 May 2007) Log Message: ----------- Fixed small problem with new configuration form. Changed the order of the initialization, so that it is positioned before it is visible. Added support for the Visible property. Modified Paths: -------------- trunk/plugins/VideoLAN/VideoLanPlugin.cs Modified: trunk/plugins/VideoLAN/VideoLanPlugin.cs =================================================================== --- trunk/plugins/VideoLAN/VideoLanPlugin.cs 2007-05-01 15:59:15 UTC (rev 368) +++ trunk/plugins/VideoLAN/VideoLanPlugin.cs 2007-05-02 09:36:55 UTC (rev 369) @@ -130,7 +130,7 @@ { vlcControl = VlcUserControl.Instance; vlcControl.Enabled = false; - vlcControl.Visible = true; + vlcControl.Visible = false; GUIGraphicsContext.form.Controls.Add(vlcControl); } @@ -167,17 +167,17 @@ vlcControl.Stop(); vlcControl.ClearPlayList(); - + SetWindows(); + vlcControl.Visible = true; System.Threading.Thread.Sleep(1000); //wait for vlc strange playlist problem - vlcControl.AddToPlayList(strFile, null, (string[]) options.ToArray()); + vlcControl.AddToPlayList(strFile, null, (string[])options.ToArray(typeof(String))); vlcControl.Play(); GUIGraphicsContext.form.Focus(); Player_playEvent(); - SetWindows(); UpdateStatus(); return true; @@ -682,6 +682,28 @@ return deinterlace.ToLowerInvariant(); } } + + public override bool Visible + { + get + { + if (vlcControl != null) + { + return vlcControl.Visible; + } + else + { + return false; + } + } + set + { + if (vlcControl != null) + { + vlcControl.Visible = value; + } + } + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2007-05-01 15:59:20
|
Revision: 368 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=368&view=rev Author: saamand Date: 2007-05-01 08:59:15 -0700 (Tue, 01 May 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs trunk/plugins/MyLyrics/LyricsEngine/Setup.cs trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_test.cs trunk/plugins/MyLyrics/MyLyrics.suo Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs =================================================================== (Binary files differ) Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-05-01 14:40:37 UTC (rev 367) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-05-01 15:59:15 UTC (rev 368) @@ -33,7 +33,6 @@ ManualResetEvent m_EventStopped_LyricController; private string[] lyricsSites; - internal static bool ALLOW_ALL_TO_SEARCH; public LyricsController(ILyricForm mainForm, ManualResetEvent eventStopThread, @@ -46,29 +45,22 @@ noOfLyricsFound = 0; noOfLyricsNotFound = 0; - ALLOW_ALL_TO_SEARCH = allowAllToSearch; ArrayList easySitesArrayList = new ArrayList(); // If search all, then include all - if (allowAllToSearch) + foreach (string site in lyricSites) { - this.lyricsSites = lyricSites; - } - else - { - foreach (string site in lyricSites) + if (Setup.IsMember(site)) { - if (Setup.IsMember(site)) - { - easySitesArrayList.Add(site); - } + easySitesArrayList.Add(site); } - this.lyricsSites = (string[])easySitesArrayList.ToArray(typeof(string)); } + this.lyricsSites = (string[])easySitesArrayList.ToArray(typeof(string)); + LyricSearch.LyricsSites = lyricsSites; - + m_EventStop_LyricController = eventStopThread; m_EventStopped_LyricController = new ManualResetEvent(false); @@ -172,7 +164,7 @@ m_Form.UpdateStatus = new Object[] { noOfLyricsToSearch, noOfLyricsSearched, noOfLyricsFound, noOfLyricsNotFound }; - if ((noOfLyricsSearched >= noOfLyricsToSearch) && ALLOW_ALL_TO_SEARCH == false) + if ((noOfLyricsSearched >= noOfLyricsToSearch)) { FinishThread(artist, title, "All songs have been searched!", site); } Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs 2007-05-01 14:40:37 UTC (rev 367) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs 2007-05-01 15:59:15 UTC (rev 368) @@ -4,6 +4,7 @@ using System.IO; using System.Diagnostics; using System.Net; +using System.Threading; namespace LyricsEngine.LyricSites { @@ -17,7 +18,7 @@ get { return lyric; } } - public EvilLabs(string artist, string title) + public EvilLabs(string artist, string title, ManualResetEvent m_EventStop_SiteSearches) { if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.ElapsedTimeString() + "EvilLabs(" + artist + ", " + title + ")"); @@ -37,7 +38,14 @@ while (complete == false) { - System.Threading.Thread.Sleep(100); + if (m_EventStop_SiteSearches.WaitOne(1, true)) + { + complete = true; + } + else + { + System.Threading.Thread.Sleep(100); + } } } @@ -98,8 +106,8 @@ { reply.Close(); } + complete = true; } - complete = true; } } } Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs 2007-05-01 14:40:37 UTC (rev 367) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs 2007-05-01 15:59:15 UTC (rev 368) @@ -4,20 +4,21 @@ using System.IO; using System.Diagnostics; using System.Net; +using System.Threading; namespace LyricsEngine.LyricSites { class HotLyrics { string lyric = ""; - bool complete; + private bool complete; public string Lyric { get { return lyric; } } - public HotLyrics(string artist, string title) + public HotLyrics(string artist, string title, ManualResetEvent m_EventStop_SiteSearches) { if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.ElapsedTimeString() + "SeekLyrics(" + artist + ", " + title + ")"); @@ -101,7 +102,14 @@ while (complete == false) { - System.Threading.Thread.Sleep(100); + if (m_EventStop_SiteSearches.WaitOne(1, true)) + { + complete = true; + } + else + { + System.Threading.Thread.Sleep(100); + } } } @@ -189,8 +197,8 @@ { reply.Close(); } + complete = true; } - complete = true; } } } Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs 2007-05-01 14:40:37 UTC (rev 367) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs 2007-05-01 15:59:15 UTC (rev 368) @@ -4,6 +4,7 @@ using System.IO; using System.Diagnostics; using System.Net; +using System.Threading; namespace LyricsEngine.LyricSites { @@ -17,7 +18,7 @@ get { return lyric; } } - public Lyrics007(string artist, string title) + public Lyrics007(string artist, string title, ManualResetEvent m_EventStop_SiteSearches) { if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.ElapsedTimeString() + "Lyrics007(" + artist + ", " + title + ")"); @@ -40,7 +41,14 @@ while (complete == false) { - System.Threading.Thread.Sleep(100); + if (m_EventStop_SiteSearches.WaitOne(1, true)) + { + complete = true; + } + else + { + System.Threading.Thread.Sleep(100); + } } } @@ -135,8 +143,8 @@ { reply.Close(); } + complete = true; } - complete = true; } } } Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2007-05-01 14:40:37 UTC (rev 367) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2007-05-01 15:59:15 UTC (rev 368) @@ -4,6 +4,7 @@ using System.IO; using System.Diagnostics; using System.Net; +using System.Threading; namespace LyricsEngine.LyricSites { @@ -17,7 +18,7 @@ get { return lyric; } } - public LyricsOnDemand(string artist, string title) + public LyricsOnDemand(string artist, string title, ManualResetEvent m_EventStop_SiteSearches) { if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.ElapsedTimeString() + "LyricsOnDemand(" + artist + ", " + title + ")"); @@ -70,7 +71,14 @@ while (complete == false) { - System.Threading.Thread.Sleep(100); + if (m_EventStop_SiteSearches.WaitOne(1, true)) + { + complete = true; + } + else + { + System.Threading.Thread.Sleep(100); + } } } @@ -160,8 +168,8 @@ { reply.Close(); } + complete = true; } - complete = true; } } } Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs 2007-05-01 14:40:37 UTC (rev 367) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs 2007-05-01 15:59:15 UTC (rev 368) @@ -4,6 +4,7 @@ using System.IO; using System.Diagnostics; using System.Net; +using System.Threading; namespace LyricsEngine.LyricSites { @@ -17,7 +18,7 @@ get { return lyric; } } - public SeekLyrics(string artist, string title) + public SeekLyrics(string artist, string title, ManualResetEvent m_EventStop_SiteSearches) { if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.ElapsedTimeString() + "SeekLyrics(" + artist + ", " + title + ")"); @@ -75,7 +76,14 @@ while (complete == false) { - System.Threading.Thread.Sleep(100); + if (m_EventStop_SiteSearches.WaitOne(1, true)) + { + complete = true; + } + else + { + System.Threading.Thread.Sleep(100); + } } } @@ -174,8 +182,8 @@ { reply.Close(); } + complete = true; } - complete = true; } } } Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs 2007-05-01 14:40:37 UTC (rev 367) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs 2007-05-01 15:59:15 UTC (rev 368) @@ -47,7 +47,7 @@ else { // if we don't allow this pause of 2 sec the webservice behaves in a strange maneur - Thread.Sleep(1500); + Thread.Sleep(2000); } ++noOfTries; } Modified: trunk/plugins/MyLyrics/LyricsEngine/Setup.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/Setup.cs 2007-05-01 14:40:37 UTC (rev 367) +++ trunk/plugins/MyLyrics/LyricsEngine/Setup.cs 2007-05-01 15:59:15 UTC (rev 368) @@ -6,14 +6,14 @@ { public static class Setup { - public static string[] BatchSearchSites = new string[4] + public static string[] BatchSearchSites = new string[6] { "LyricWiki", "Lyrics007", "LyricsOnDemand", - "HotLyrics"/*, + "HotLyrics", "EvilLabs", - "SeekLyrics"*/ + "SeekLyrics" }; Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-05-01 14:40:37 UTC (rev 367) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-05-01 15:59:15 UTC (rev 368) @@ -610,6 +610,10 @@ if (m_SearchOnlyMarkedSongs == false) { + + //System.IO.Directory.SetCurrentDirectory(@"C:\Program Files\Team MediaPortal\MediaPortal"); + //string test = System.IO.Directory.GetCurrentDirectory(); + MusicDatabase dbs = new MusicDatabase(); dbs.GetArtists(ref artists); Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_test.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_test.cs 2007-05-01 14:40:37 UTC (rev 367) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_test.cs 2007-05-01 15:59:15 UTC (rev 368) @@ -15,7 +15,7 @@ static void Main() { //Config.Dir.Config = @"C:\Program Files\Team MediaPortal\MediaPortal"; - System.IO.Directory.SetCurrentDirectory(@"C:\Program Files\Team MediaPortal\MediaPortal"); + System.IO.Directory.SetCurrentDirectory(@"C:\Documents and Settings\Administrator\My Documents\Visual Studio 2005\Projects\MP-plugins\MyLyrics\My Lyrics\bin\Debug"); System.Windows.Forms.Application.Run(new MyLyricsSetup()); //System.Windows.Forms.Application.Run(new MySeriaTest()); } Modified: trunk/plugins/MyLyrics/MyLyrics.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mis...@us...> - 2007-05-01 14:41:22
|
Revision: 367 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=367&view=rev Author: misterd_sf Date: 2007-05-01 07:40:37 -0700 (Tue, 01 May 2007) Log Message: ----------- Small Bugfix in argument handling of streams Modified Paths: -------------- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-05-01 12:34:23 UTC (rev 366) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-05-01 14:40:37 UTC (rev 367) @@ -705,7 +705,7 @@ Log.Info("MPlayer: StremFilename: " + file); arguments.Append(extensionSettings[protocol].Arguments); if (extensionSettings.ContainsKey(System.IO.Path.GetExtension(fileName))) { - arguments.Append(extensionSettings[System.IO.Path.GetExtension(fileName)]); + arguments.Append(extensionSettings[System.IO.Path.GetExtension(fileName)].Arguments); isVideo = extensionSettings[System.IO.Path.GetExtension(fileName)].PlayMode == PlayMode.Video; } else { isVideo = true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ze...@us...> - 2007-05-01 12:34:26
|
Revision: 366 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=366&view=rev Author: zebons Date: 2007-05-01 05:34:23 -0700 (Tue, 01 May 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/MyFilms/MesFilms.cs Modified: trunk/plugins/MyFilms/MesFilms.cs =================================================================== --- trunk/plugins/MyFilms/MesFilms.cs 2007-04-30 21:00:23 UTC (rev 365) +++ trunk/plugins/MyFilms/MesFilms.cs 2007-05-01 12:34:23 UTC (rev 366) @@ -263,10 +263,6 @@ //--------------------------------------------------------------------------------------- public override void OnAction(Action actionType) { - //if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) || (actionType.wID == Action.ActionType.ACTION_PARENT_DIR)) - //{ - // if (GetPrevFilmList() || (actionType.wID != Action.ActionType.ACTION_PREVIOUS_MENU)) return; - //} if (actionType.wID == Action.ActionType.ACTION_PARENT_DIR) if (GetPrevFilmList()) return; if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) && (boolselect)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2007-04-30 21:00:57
|
Revision: 365 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=365&view=rev Author: saamand Date: 2007-04-30 14:00:23 -0700 (Mon, 30 Apr 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/MyLyrics/MyLyrics.suo Removed Paths: ------------- trunk/plugins/MyLyrics/My Lyrics/MyLyricsUtil.cs Deleted: trunk/plugins/MyLyrics/My Lyrics/MyLyricsUtil.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyricsUtil.cs 2007-04-30 20:05:26 UTC (rev 364) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsUtil.cs 2007-04-30 21:00:23 UTC (rev 365) @@ -1,75 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -using LyricsEngine; - -namespace MyLyrics -{ - internal class MyLyricsUtil - { - internal const string MARK = "(no lyric attached)"; - - internal const int LYRIC_NOT_FOUND = -1; - internal const int LYRIC_MARKED = 0; - internal const int LYRIC_FOUND = 1; - - internal static int isTrackInLyricsDatabase(LyricsDatabase lyricDB, string artist, string title) - { - string lyricText = ""; - try - { - string capatalizedArtist = LyricUtil.capatalizeString(artist); - string capatalizedTitle = LyricUtil.capatalizeString(title); - - lyricText = lyricDB[CorrectKeyFormat(capatalizedArtist, capatalizedTitle)].Lyrics; - } - catch - { - return LYRIC_NOT_FOUND; - } - - if (lyricText.Equals(MARK)) - { - return LYRIC_MARKED; - } - else - { - return LYRIC_FOUND; - } - } - - internal static int isTrackInLyricsMarkedDatabase(LyricsDatabase lyricMarkedDB, string artist, string title) - { - string lyricsText = ""; - try - { - lyricsText = lyricMarkedDB[MyLyricsUtil.CorrectKeyFormat(LyricUtil.capatalizeString(artist), LyricUtil.capatalizeString(title))].Lyrics; - } - catch{ - return LYRIC_NOT_FOUND; - } - return LYRIC_MARKED; - } - - - public static string LookUpLyricInDatabase(LyricsDatabase lyricDB, string artist, string title) - { - string lyricText = ""; - try - { - lyricText = lyricDB[CorrectKeyFormat(LyricUtil.capatalizeString(artist), LyricUtil.capatalizeString(title))].Lyrics; - return lyricText.Replace("\n", "\r\n"); - } - catch - { - return lyricText; - } - } - - public static string CorrectKeyFormat(string artist, string title) - { - return artist + "-" + title; - } - } -} Modified: trunk/plugins/MyLyrics/MyLyrics.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <du...@us...> - 2007-04-30 20:05:33
|
Revision: 364 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=364&view=rev Author: dukus Date: 2007-04-30 13:05:26 -0700 (Mon, 30 Apr 2007) Log Message: ----------- Final group support added Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/GroupForm.Designer.cs trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.Designer.cs trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs Modified: trunk/plugins/mpinstaler/MPInstaler/GroupForm.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/GroupForm.Designer.cs 2007-04-30 19:53:23 UTC (rev 363) +++ trunk/plugins/mpinstaler/MPInstaler/GroupForm.Designer.cs 2007-04-30 20:05:26 UTC (rev 364) @@ -46,6 +46,8 @@ this.button3 = new System.Windows.Forms.Button(); this.button4 = new System.Windows.Forms.Button(); this.button5 = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); @@ -78,6 +80,8 @@ // // tabPage2 // + this.tabPage2.Controls.Add(this.label2); + this.tabPage2.Controls.Add(this.label1); this.tabPage2.Controls.Add(this.button3); this.tabPage2.Controls.Add(this.button2); this.tabPage2.Controls.Add(this.listView3); @@ -154,9 +158,9 @@ // this.listView2.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeader3}); - this.listView2.Location = new System.Drawing.Point(6, 33); + this.listView2.Location = new System.Drawing.Point(6, 49); this.listView2.Name = "listView2"; - this.listView2.Size = new System.Drawing.Size(170, 170); + this.listView2.Size = new System.Drawing.Size(170, 154); this.listView2.TabIndex = 1; this.listView2.UseCompatibleStateImageBehavior = false; this.listView2.View = System.Windows.Forms.View.Details; @@ -165,9 +169,9 @@ // this.listView3.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeader4}); - this.listView3.Location = new System.Drawing.Point(270, 33); + this.listView3.Location = new System.Drawing.Point(270, 49); this.listView3.Name = "listView3"; - this.listView3.Size = new System.Drawing.Size(200, 169); + this.listView3.Size = new System.Drawing.Size(200, 153); this.listView3.TabIndex = 2; this.listView3.UseCompatibleStateImageBehavior = false; this.listView3.View = System.Windows.Forms.View.Details; @@ -221,6 +225,24 @@ this.button5.Text = "Remove"; this.button5.UseVisualStyleBackColor = true; // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(267, 30); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(69, 13); + this.label1.TabIndex = 5; + this.label1.Text = "Files in group"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(6, 30); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(69, 13); + this.label2.TabIndex = 6; + this.label2.Text = "Avaiable files"; + // // GroupForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -235,6 +257,7 @@ this.tabPage1.ResumeLayout(false); this.tabPage1.PerformLayout(); this.tabPage2.ResumeLayout(false); + this.tabPage2.PerformLayout(); this.ResumeLayout(false); } @@ -259,5 +282,7 @@ private System.Windows.Forms.Button button3; private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button5; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs 2007-04-30 19:53:23 UTC (rev 363) +++ trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs 2007-04-30 20:05:26 UTC (rev 364) @@ -187,6 +187,18 @@ } } + public bool FindFileInGroupState(MPIFileList fl) + { + if (SetupGroups.Count < 1) + return true; + for(int i=0;i<SetupGroups.Count;i++) + { + if (FindFileInGroup(SetupGroups[i].Id, fl.FileNameShort) && SetupGroups[i].Checked) + return true; + } + return false; + } + public void Clear() { FileList.Clear(); @@ -891,10 +903,12 @@ { string _id; string _name; + bool _checked; public GroupString(string wid,string wname) { Id = wid; Name = wname; + Checked = false; } public string Id { @@ -907,6 +921,12 @@ set { _name = value; } } + public bool Checked + { + get { return _checked; } + set { _checked = value; } + } + } public class GroupStringMapping Modified: trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-04-30 19:53:23 UTC (rev 363) +++ trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-04-30 20:05:26 UTC (rev 364) @@ -106,22 +106,28 @@ bool test_file(MPIFileList fl, ZipEntry ze) { + if (_intalerStruct.FindFileInGroupState(fl)) + { if (fl.Type == MPinstalerStruct.SKIN_TYPE || fl.Type == MPinstalerStruct.SKIN_MEDIA_TYPE) { - if (Path.GetFileName(ze.Name) == Path.GetFileName(fl.FileName) - && ze.Name.Contains(@"\" + fl.SubType + @"\") && InstallableSkinList.Contains(fl.SubType)) - { - return true; - } - else return false; + if (Path.GetFileName(ze.Name) == Path.GetFileName(fl.FileName) + && ze.Name.Contains(@"\" + fl.SubType + @"\") && InstallableSkinList.Contains(fl.SubType)) + { + return true; + } + else return false; } else { - if (Path.GetFileName(ze.Name) == Path.GetFileName(fl.FileName)) - return true; - else return false; + if (Path.GetFileName(ze.Name) == Path.GetFileName(fl.FileName)) + return true; + else return false; } + } + else + return false; } + public void installLanguage(ListBox lb) { MPLanguageHelper mpih = new MPLanguageHelper(); Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.Designer.cs 2007-04-30 19:53:23 UTC (rev 363) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.Designer.cs 2007-04-30 20:05:26 UTC (rev 364) @@ -28,186 +28,198 @@ /// </summary> private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(wizard_1)); - this.panel1 = new System.Windows.Forms.Panel(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.listBox1 = new System.Windows.Forms.ListBox(); - this.progressBar2 = new System.Windows.Forms.ProgressBar(); - this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.label2 = new System.Windows.Forms.Label(); - this.title_label = new System.Windows.Forms.Label(); - this.richTextBox1 = new System.Windows.Forms.RichTextBox(); - this.panel2 = new System.Windows.Forms.Panel(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.button_back = new System.Windows.Forms.Button(); - this.button_next = new System.Windows.Forms.Button(); - this.button_cancel = new System.Windows.Forms.Button(); - this.skinlister = new System.Windows.Forms.CheckedListBox(); - this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); - this.panel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.SuspendLayout(); - // - // panel1 - // - this.panel1.BackColor = System.Drawing.Color.White; - this.panel1.Controls.Add(this.pictureBox2); - this.panel1.Controls.Add(this.listBox1); - this.panel1.Controls.Add(this.progressBar2); - this.panel1.Controls.Add(this.progressBar1); - this.panel1.Controls.Add(this.label2); - this.panel1.Controls.Add(this.title_label); - this.panel1.Controls.Add(this.richTextBox1); - this.panel1.Controls.Add(this.skinlister); - this.panel1.Location = new System.Drawing.Point(165, 0); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(334, 298); - this.panel1.TabIndex = 0; - // - // pictureBox2 - // - this.pictureBox2.BackColor = System.Drawing.Color.Transparent; - this.pictureBox2.Location = new System.Drawing.Point(267, 4); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(64, 64); - this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox2.TabIndex = 6; - this.pictureBox2.TabStop = false; - this.pictureBox2.Visible = false; - // - // listBox1 - // - this.listBox1.FormattingEnabled = true; - this.listBox1.HorizontalScrollbar = true; - this.listBox1.Location = new System.Drawing.Point(14, 174); - this.listBox1.Name = "listBox1"; - this.listBox1.Size = new System.Drawing.Size(308, 108); - this.listBox1.TabIndex = 5; - // - // progressBar2 - // - this.progressBar2.Location = new System.Drawing.Point(14, 143); - this.progressBar2.Name = "progressBar2"; - this.progressBar2.Size = new System.Drawing.Size(308, 14); - this.progressBar2.TabIndex = 4; - // - // progressBar1 - // - this.progressBar1.Location = new System.Drawing.Point(14, 123); - this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(308, 14); - this.progressBar1.TabIndex = 3; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(9, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(35, 13); - this.label2.TabIndex = 2; - this.label2.Text = "label2"; - // - // title_label - // - this.title_label.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.title_label.Location = new System.Drawing.Point(9, 9); - this.title_label.Name = "title_label"; - this.title_label.Size = new System.Drawing.Size(252, 30); - this.title_label.TabIndex = 1; - this.title_label.Text = "label1"; - // - // richTextBox1 - // - this.richTextBox1.BackColor = System.Drawing.SystemColors.ActiveCaptionText; - this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.richTextBox1.Location = new System.Drawing.Point(3, 74); - this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.ReadOnly = true; - this.richTextBox1.Size = new System.Drawing.Size(331, 224); - this.richTextBox1.TabIndex = 0; - this.richTextBox1.Text = ""; - // - // panel2 - // - this.panel2.Controls.Add(this.pictureBox1); - this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(168, 298); - this.panel2.TabIndex = 1; - // - // pictureBox1 - // - this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(0, 0); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(168, 298); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox1.TabIndex = 5; - this.pictureBox1.TabStop = false; - // - // button_back - // - this.button_back.Location = new System.Drawing.Point(223, 314); - this.button_back.Name = "button_back"; - this.button_back.Size = new System.Drawing.Size(75, 23); - this.button_back.TabIndex = 2; - this.button_back.Text = "< Back"; - this.button_back.UseVisualStyleBackColor = true; - this.button_back.Click += new System.EventHandler(this.button_back_Click); - // - // button_next - // - this.button_next.Location = new System.Drawing.Point(304, 314); - this.button_next.Name = "button_next"; - this.button_next.Size = new System.Drawing.Size(75, 23); - this.button_next.TabIndex = 3; - this.button_next.Text = "Next >"; - this.button_next.UseVisualStyleBackColor = true; - this.button_next.Click += new System.EventHandler(this.button_next_Click); - // - // button_cancel - // - this.button_cancel.Location = new System.Drawing.Point(399, 314); - this.button_cancel.Name = "button_cancel"; - this.button_cancel.Size = new System.Drawing.Size(75, 23); - this.button_cancel.TabIndex = 4; - this.button_cancel.Text = "Cancel"; - this.button_cancel.UseVisualStyleBackColor = true; - this.button_cancel.Click += new System.EventHandler(this.button_cancel_Click); - // - // skinlister - // - this.skinlister.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.skinlister.FormattingEnabled = true; - this.skinlister.Location = new System.Drawing.Point(14, 74); - this.skinlister.Name = "skinlister"; - this.skinlister.Size = new System.Drawing.Size(247, 210); - this.skinlister.TabIndex = 7; - // - // wizard_1 - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(499, 358); - this.Controls.Add(this.button_cancel); - this.Controls.Add(this.button_next); - this.Controls.Add(this.button_back); - this.Controls.Add(this.panel2); - this.Controls.Add(this.panel1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "wizard_1"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "wizard_1"; - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); - this.panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.ResumeLayout(false); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(wizard_1)); + this.panel1 = new System.Windows.Forms.Panel(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.listBox1 = new System.Windows.Forms.ListBox(); + this.progressBar2 = new System.Windows.Forms.ProgressBar(); + this.progressBar1 = new System.Windows.Forms.ProgressBar(); + this.label2 = new System.Windows.Forms.Label(); + this.title_label = new System.Windows.Forms.Label(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.skinlister = new System.Windows.Forms.CheckedListBox(); + this.Customize_list = new System.Windows.Forms.CheckedListBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.button_back = new System.Windows.Forms.Button(); + this.button_next = new System.Windows.Forms.Button(); + this.button_cancel = new System.Windows.Forms.Button(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.pictureBox2); + this.panel1.Controls.Add(this.listBox1); + this.panel1.Controls.Add(this.progressBar2); + this.panel1.Controls.Add(this.progressBar1); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.title_label); + this.panel1.Controls.Add(this.richTextBox1); + this.panel1.Controls.Add(this.skinlister); + this.panel1.Controls.Add(this.Customize_list); + this.panel1.Location = new System.Drawing.Point(165, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(334, 298); + this.panel1.TabIndex = 0; + // + // pictureBox2 + // + this.pictureBox2.BackColor = System.Drawing.Color.Transparent; + this.pictureBox2.Location = new System.Drawing.Point(267, 4); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(64, 64); + this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox2.TabIndex = 6; + this.pictureBox2.TabStop = false; + this.pictureBox2.Visible = false; + // + // listBox1 + // + this.listBox1.FormattingEnabled = true; + this.listBox1.HorizontalScrollbar = true; + this.listBox1.Location = new System.Drawing.Point(14, 174); + this.listBox1.Name = "listBox1"; + this.listBox1.Size = new System.Drawing.Size(308, 108); + this.listBox1.TabIndex = 5; + // + // progressBar2 + // + this.progressBar2.Location = new System.Drawing.Point(14, 143); + this.progressBar2.Name = "progressBar2"; + this.progressBar2.Size = new System.Drawing.Size(308, 14); + this.progressBar2.TabIndex = 4; + // + // progressBar1 + // + this.progressBar1.Location = new System.Drawing.Point(14, 123); + this.progressBar1.Name = "progressBar1"; + this.progressBar1.Size = new System.Drawing.Size(308, 14); + this.progressBar1.TabIndex = 3; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(9, 49); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(35, 13); + this.label2.TabIndex = 2; + this.label2.Text = "label2"; + // + // title_label + // + this.title_label.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.title_label.Location = new System.Drawing.Point(9, 9); + this.title_label.Name = "title_label"; + this.title_label.Size = new System.Drawing.Size(252, 30); + this.title_label.TabIndex = 1; + this.title_label.Text = "label1"; + // + // richTextBox1 + // + this.richTextBox1.BackColor = System.Drawing.SystemColors.ActiveCaptionText; + this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.richTextBox1.Location = new System.Drawing.Point(3, 74); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.ReadOnly = true; + this.richTextBox1.Size = new System.Drawing.Size(331, 224); + this.richTextBox1.TabIndex = 0; + this.richTextBox1.Text = ""; + // + // skinlister + // + this.skinlister.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.skinlister.FormattingEnabled = true; + this.skinlister.Location = new System.Drawing.Point(14, 74); + this.skinlister.Name = "skinlister"; + this.skinlister.Size = new System.Drawing.Size(247, 210); + this.skinlister.TabIndex = 7; + // + // Customize_list + // + this.Customize_list.CheckOnClick = true; + this.Customize_list.FormattingEnabled = true; + this.Customize_list.Location = new System.Drawing.Point(14, 98); + this.Customize_list.Name = "Customize_list"; + this.Customize_list.Size = new System.Drawing.Size(308, 139); + this.Customize_list.TabIndex = 8; + this.Customize_list.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.Customize_list_ItemCheck); + // + // panel2 + // + this.panel2.Controls.Add(this.pictureBox1); + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(168, 298); + this.panel2.TabIndex = 1; + // + // pictureBox1 + // + this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Location = new System.Drawing.Point(0, 0); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(168, 298); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox1.TabIndex = 5; + this.pictureBox1.TabStop = false; + // + // button_back + // + this.button_back.Location = new System.Drawing.Point(223, 314); + this.button_back.Name = "button_back"; + this.button_back.Size = new System.Drawing.Size(75, 23); + this.button_back.TabIndex = 2; + this.button_back.Text = "< Back"; + this.button_back.UseVisualStyleBackColor = true; + this.button_back.Click += new System.EventHandler(this.button_back_Click); + // + // button_next + // + this.button_next.Location = new System.Drawing.Point(304, 314); + this.button_next.Name = "button_next"; + this.button_next.Size = new System.Drawing.Size(75, 23); + this.button_next.TabIndex = 3; + this.button_next.Text = "Next >"; + this.button_next.UseVisualStyleBackColor = true; + this.button_next.Click += new System.EventHandler(this.button_next_Click); + // + // button_cancel + // + this.button_cancel.Location = new System.Drawing.Point(399, 314); + this.button_cancel.Name = "button_cancel"; + this.button_cancel.Size = new System.Drawing.Size(75, 23); + this.button_cancel.TabIndex = 4; + this.button_cancel.Text = "Cancel"; + this.button_cancel.UseVisualStyleBackColor = true; + this.button_cancel.Click += new System.EventHandler(this.button_cancel_Click); + // + // wizard_1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(499, 358); + this.Controls.Add(this.button_cancel); + this.Controls.Add(this.button_next); + this.Controls.Add(this.button_back); + this.Controls.Add(this.panel2); + this.Controls.Add(this.panel1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "wizard_1"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "wizard_1"; + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); } @@ -227,5 +239,6 @@ private System.Windows.Forms.ListBox listBox1; private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.CheckedListBox skinlister; + private System.Windows.Forms.CheckedListBox Customize_list; } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs 2007-04-30 19:53:23 UTC (rev 363) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs 2007-04-30 20:05:26 UTC (rev 364) @@ -9,367 +9,424 @@ namespace MPInstaler { - public partial class wizard_1 : Form + public partial class wizard_1 : Form + { + public int step = 0; + public MPpackageStruct package; + MPInstallHelper inst = new MPInstallHelper(); + List<ActionInfo> actions = new List<ActionInfo>(); + bool update = false; + bool working = false; + public wizard_1() { - public int step = 0; - public MPpackageStruct package; - MPInstallHelper inst = new MPInstallHelper(); - List<ActionInfo> actions = new List<ActionInfo>(); - bool update = false; - public wizard_1() - { - package = new MPpackageStruct(); - InitializeComponent(); - } - public void starStep() - { - inst.LoadFromFile(); - if (inst.IndexOf(package) < 0) - nextStep(1); - else - if (MessageBox.Show("Extension already installed. Do you want continue ?", "", MessageBoxButtons.YesNo) == DialogResult.Yes) - nextStep(1); - } - public void StartUpdate() - { - update = true; - inst.LoadFromFile(); - nextStep(1); - //if (!this.Visible) this.Show(); - //this.Text = "MediaPortal extension instaler"; - //skinlister.Items.Clear(); - //foreach (string sk in package.SkinList) - //{ - // skinlister.Items.Add(sk, true); - //} - //if (package._intalerStruct.Logo != null) - //{ - // pictureBox2.Visible = true; - // pictureBox2.Image = package._intalerStruct.Logo; - //} - //else - //{ - // pictureBox2.Visible = false; - //} - //for (int i = 0; i < skinlister.Items.Count; i++) - //{ - // if (skinlister.GetItemChecked(i)) - // package.InstallableSkinList.Add(skinlister.Items[i].ToString()); - //} - //label2.Visible = true; - //progressBar1.Visible = true; - //progressBar2.Visible = true; - //listBox1.Visible = true; ; - //title_label.Text = package._intalerStruct.Name; - //label2.Text = "Instaling ..."; - //button_next.Visible = false; - //button_back.Visible = true; - //richTextBox1.Text = ""; - //richTextBox1.Visible = false; - //step = 7; - //install(); - } + package = new MPpackageStruct(); + InitializeComponent(); + } + public void starStep() + { + inst.LoadFromFile(); + if (inst.IndexOf(package) < 0) + nextStep(1); + else + if (MessageBox.Show("Extension already installed. Do you want continue ?", "", MessageBoxButtons.YesNo) == DialogResult.Yes) + nextStep(1); + } + public void StartUpdate() + { + update = true; + inst.LoadFromFile(); + nextStep(1); + //if (!this.Visible) this.Show(); + //this.Text = "MediaPortal extension instaler"; + //skinlister.Items.Clear(); + //foreach (string sk in package.SkinList) + //{ + // skinlister.Items.Add(sk, true); + //} + //if (package._intalerStruct.Logo != null) + //{ + // pictureBox2.Visible = true; + // pictureBox2.Image = package._intalerStruct.Logo; + //} + //else + //{ + // pictureBox2.Visible = false; + //} + //for (int i = 0; i < skinlister.Items.Count; i++) + //{ + // if (skinlister.GetItemChecked(i)) + // package.InstallableSkinList.Add(skinlister.Items[i].ToString()); + //} + //label2.Visible = true; + //progressBar1.Visible = true; + //progressBar2.Visible = true; + //listBox1.Visible = true; ; + //title_label.Text = package._intalerStruct.Name; + //label2.Text = "Instaling ..."; + //button_next.Visible = false; + //button_back.Visible = true; + //richTextBox1.Text = ""; + //richTextBox1.Visible = false; + //step = 7; + //install(); + } - public void nextStep(int m) - { - step+=m; - test_next_step(m); - switch (step) + public void nextStep(int m) + { + step += m; + test_next_step(m); + switch (step) + { + case 1: + { + this.Text = "MediaPortal extension instaler"; + skinlister.Items.Clear(); + Customize_list.Visible = false; + button_back.Visible = false; + progressBar1.Visible = false; + progressBar2.Visible = false; + skinlister.Visible = false; + listBox1.Items.Clear(); + listBox1.Visible = false; + label2.Visible = false; + title_label.Text = package._intalerStruct.Name; + button_next.Text = "Next"; + richTextBox1.Visible = true; + if (package._intalerStruct.Logo != null) { - case 1: - { - this.Text = "MediaPortal extension instaler"; - skinlister.Items.Clear(); - button_back.Visible = false; - progressBar1.Visible = false; - progressBar2.Visible = false; - skinlister.Visible = false; - listBox1.Items.Clear(); - listBox1.Visible = false; - label2.Visible = false; - title_label.Text = package._intalerStruct.Name; - button_next.Text = "Next"; - richTextBox1.Visible = true; - if (package._intalerStruct.Logo != null) - { - pictureBox2.Visible = true; - pictureBox2.Image = package._intalerStruct.Logo; - } - else - { - pictureBox2.Visible = false; - } - richTextBox1.Text = String.Format(" Name : {0} \n\n Author : {1} \n\n Version : {2} \n\n Description :\n {3} \n", package._intalerStruct.Name, package._intalerStruct.Author, package._intalerStruct.Version, package._intalerStruct.Description); - if (!this.Visible) this.ShowDialog(); - break; - } - case 2: - { - label2.Visible = true; - progressBar1.Visible = false; - progressBar2.Visible = false; - skinlister.Visible = false; - listBox1.Visible = false; - label2.Text = "License Agreement"; - button_next.Text = "I Agree"; - button_back.Visible = true; - richTextBox1.Visible = true; - richTextBox1.Text = package.txt_EULA; - break; - } - case 3: - { - label2.Visible = true; - progressBar1.Visible = false; - progressBar2.Visible = false; - skinlister.Visible = false; - listBox1.Visible = false; - label2.Text = "Change log"; - button_next.Text = "Next"; - button_back.Visible = true; - richTextBox1.Visible = true; - richTextBox1.Text = package.txt_log; - break; - } - case 4: - { - progressBar1.Visible = false; - progressBar2.Visible = false; - skinlister.Visible = false; - listBox1.Visible = false; - label2.Visible = true; - label2.Text = "Read me"; - button_back.Visible = true; - richTextBox1.Visible = true; - richTextBox1.Text = package.txt_readme; - break; - } - case 5: - { - progressBar1.Visible = false; - progressBar2.Visible = false; - skinlister.Visible = true; - listBox1.Visible = false; - label2.Visible = true; - label2.Text = "Select skin"; - button_next.Text = "Next"; - button_back.Visible = true; - richTextBox1.Visible = false; - skinlister.Items.Clear(); - foreach (string sk in package.SkinList) - { - skinlister.Items.Add(sk, true); - } - break; - } - case 6: - { - progressBar1.Visible = false; - progressBar2.Visible = false; - skinlister.Visible = false; - listBox1.Visible = false; - label2.Visible = true; - label2.Text = "Instaling ..."; - button_next.Text = "Next"; - button_back.Visible = true; - richTextBox1.Visible = true; - richTextBox1.Text = String.Format("Intall paths : \n"); - foreach (Config.Dir option in Enum.GetValues(typeof(Config.Dir))) - { - richTextBox1.Text += String.Format("{0} - {1}\n", option, Config.GetFolder(option)); - } - break; - } - case 7: - { - if (!this.Visible) this.ShowDialog(); - for (int i = 0; i < skinlister.Items.Count; i++) - { - if (skinlister.GetItemChecked(i)) - package.InstallableSkinList.Add(skinlister.Items[i].ToString()); - } - label2.Visible = true; - progressBar1.Visible = true; - progressBar2.Visible = true; - listBox1.Visible = true; ; - label2.Text = "Instaling ..."; - button_next.Visible = false; - button_back.Visible = true; - richTextBox1.Text = ""; - richTextBox1.Visible = false; - install(); - break; - } - + pictureBox2.Visible = true; + pictureBox2.Image = package._intalerStruct.Logo; } - } - - private void install() - { - button_next.Visible = false; - button_back.Visible = false; - button_cancel.Enabled = false; - if (progressBar1 != null) + else { - progressBar1.Minimum = 0; - progressBar1.Maximum = package._intalerStruct.FileList.Count; + pictureBox2.Visible = false; } - for (int i = 0; i < package._intalerStruct.FileList.Count; i++) + richTextBox1.Text = String.Format(" Name : {0} \n\n Author : {1} \n\n Version : {2} \n\n Description :\n {3} \n", package._intalerStruct.Name, package._intalerStruct.Author, package._intalerStruct.Version, package._intalerStruct.Description); + if (!this.Visible) this.ShowDialog(); + break; + } + case 2: + { + label2.Visible = true; + progressBar1.Visible = false; + progressBar2.Visible = false; + skinlister.Visible = false; + listBox1.Visible = false; + Customize_list.Visible = false; + label2.Text = "License Agreement"; + button_next.Text = "I Agree"; + button_back.Visible = true; + richTextBox1.Visible = true; + richTextBox1.Text = package.txt_EULA; + break; + } + case 3: + { + label2.Visible = true; + progressBar1.Visible = false; + progressBar2.Visible = false; + skinlister.Visible = false; + listBox1.Visible = false; + Customize_list.Visible = false; + label2.Text = "Change log"; + button_next.Text = "Next"; + button_back.Visible = true; + richTextBox1.Visible = true; + richTextBox1.Text = package.txt_log; + break; + } + case 4: + { + progressBar1.Visible = false; + progressBar2.Visible = false; + skinlister.Visible = false; + listBox1.Visible = false; + Customize_list.Visible = false; + label2.Visible = true; + label2.Text = "Read me"; + button_back.Visible = true; + richTextBox1.Visible = true; + richTextBox1.Text = package.txt_readme; + break; + } + case 5: + { + progressBar1.Visible = false; + progressBar2.Visible = false; + skinlister.Visible = true; + listBox1.Visible = false; + label2.Visible = true; + Customize_list.Visible = false; + label2.Text = "Select skin"; + button_next.Text = "Next"; + button_back.Visible = true; + richTextBox1.Visible = false; + skinlister.Items.Clear(); + foreach (string sk in package.SkinList) { - package.instal_file(progressBar2,listBox1,(MPIFileList) package._intalerStruct.FileList[i]); - progressBar1.Value++; - this.Refresh(); - this.Update(); + skinlister.Items.Add(sk, true); } - package.installLanguage(listBox1); - button_next.Visible = false; - button_cancel.Enabled = true; - inst.Add(package); - inst.SaveToFile(); - label2.Text = "Done ..."; - ActionInfo ac = package._intalerStruct.FindAction("POSTSETUP"); - if (ac != null) + break; + } + case 6: + { + progressBar1.Visible = false; + progressBar2.Visible = false; + skinlister.Visible = true; + listBox1.Visible = false; + label2.Visible = true; + skinlister.Visible = false; + Customize_list.Visible = true; + label2.Text = "Customize setup"; + button_next.Text = "Next"; + button_back.Visible = true; + richTextBox1.Visible = false; + Customize_list.Visible = true; + Customize_list.Items.Clear(); + foreach (GroupString gs in package._intalerStruct.SetupGroups) { - actions.Add(ac); - listBox1.Visible = false; - skinlister.Items.Clear(); - skinlister.Visible = true; - progressBar1.Visible = false; - progressBar2.Visible = false; - skinlister.Items.Add(ac.ToString()); + Customize_list.Items.Add(gs.Name, !package._intalerStruct.ProiectProperties.SingleGroupSelect); } - button_cancel.Text = "Finish"; - } - - private void test_next_step(int m) - { - switch (step) + if (package._intalerStruct.ProiectProperties.SingleGroupSelect && package._intalerStruct.SetupGroups.Count > 0) + Customize_list.SetItemChecked(0, true); + break; + } + case 7: + { + progressBar1.Visible = false; + progressBar2.Visible = false; + skinlister.Visible = false; + listBox1.Visible = false; + Customize_list.Visible = false; + label2.Visible = true; + label2.Text = "Instaling ..."; + button_next.Text = "Next"; + button_back.Visible = true; + richTextBox1.Visible = true; + richTextBox1.Text = String.Format("Intall paths : \n"); + foreach (Config.Dir option in Enum.GetValues(typeof(Config.Dir))) { - case 1: - break; - case 2: - if (update) step = 6; - if (String.IsNullOrEmpty(package.txt_EULA)) - { - step+=m; - test_next_step(m); - } - break; - case 3: - if (String.IsNullOrEmpty(package.txt_log)) - { - step+=m; - test_next_step(m); - } - break; - case 4: - if (String.IsNullOrEmpty(package.txt_readme)) - { - step+=m; - test_next_step(m); - } - break; - case 5: - if (!package.containsSkin) - { - step += m; - test_next_step(m); - } - break; - default: - break; + richTextBox1.Text += String.Format("{0} - {1}\n", option, Config.GetFolder(option)); } - } - - private void button_next_Click(object sender, EventArgs e) - { - nextStep(1); - } - - private void button_cancel_Click(object sender, EventArgs e) - { - if (step == 7) + break; + } + case 8: + { + if (!this.Visible) this.ShowDialog(); + for (int i = 0; i < skinlister.Items.Count; i++) { - foreach (ActionInfo ac in actions) - { - int i=skinlister.Items.IndexOf(ac.ToString()); - if (skinlister.GetSelected(i)) - ac.ExecuteAction(package._intalerStruct); - } - - this.Close(); + if (skinlister.GetItemChecked(i)) + package.InstallableSkinList.Add(skinlister.Items[i].ToString()); } - else + for (int i = 0; i < Customize_list.Items.Count; i++) { - this.Close(); + package._intalerStruct.SetupGroups[i].Checked = Customize_list.GetItemChecked(i); } - } + label2.Visible = true; + Customize_list.Visible = false; + progressBar1.Visible = true; + progressBar2.Visible = true; + listBox1.Visible = true; ; + label2.Text = "Instaling ..."; + button_next.Visible = false; + button_back.Visible = true; + richTextBox1.Text = ""; + richTextBox1.Visible = false; + install(); + break; + } - private void button_back_Click(object sender, EventArgs e) + } + } + + private void install() + { + button_next.Visible = false; + button_back.Visible = false; + button_cancel.Enabled = false; + if (progressBar1 != null) + { + progressBar1.Minimum = 0; + progressBar1.Maximum = package._intalerStruct.FileList.Count; + } + for (int i = 0; i < package._intalerStruct.FileList.Count; i++) + { + package.instal_file(progressBar2, listBox1, (MPIFileList)package._intalerStruct.FileList[i]); + progressBar1.Value++; + this.Refresh(); + this.Update(); + } + package.installLanguage(listBox1); + button_next.Visible = false; + button_cancel.Enabled = true; + inst.Add(package); + inst.SaveToFile(); + label2.Text = "Done ..."; + ActionInfo ac = package._intalerStruct.FindAction("POSTSETUP"); + if (ac != null) + { + actions.Add(ac); + listBox1.Visible = false; + skinlister.Items.Clear(); + skinlister.Visible = true; + progressBar1.Visible = false; + progressBar2.Visible = false; + skinlister.Items.Add(ac.ToString()); + } + button_cancel.Text = "Finish"; + } + + private void test_next_step(int m) + { + switch (step) + { + case 1: + break; + case 2: + if (update) step = 7; + if (String.IsNullOrEmpty(package.txt_EULA)) + { + step += m; + test_next_step(m); + } + break; + case 3: + if (String.IsNullOrEmpty(package.txt_log)) + { + step += m; + test_next_step(m); + } + break; + case 4: + if (String.IsNullOrEmpty(package.txt_readme)) + { + step += m; + test_next_step(m); + } + break; + case 5: + if (!package.containsSkin) + { + step += m; + test_next_step(m); + } + break; + case 6: + if (package._intalerStruct.SetupGroups.Count < 1) + { + step += m; + test_next_step(m); + } + break; + default: + break; + } + } + + private void button_next_Click(object sender, EventArgs e) + { + nextStep(1); + } + + private void button_cancel_Click(object sender, EventArgs e) + { + if (step == 8) + { + foreach (ActionInfo ac in actions) { - nextStep(-1); + int i = skinlister.Items.IndexOf(ac.ToString()); + if (skinlister.GetSelected(i)) + ac.ExecuteAction(package._intalerStruct); } - internal void uninstall(string tit) + this.Close(); + } + else + { + this.Close(); + } + } + + private void button_back_Click(object sender, EventArgs e) + { + nextStep(-1); + } + + internal void uninstall(string tit) + { + inst.LoadFromFile(); + int index = -1; + int ind = -1; + foreach (MPpackageStruct p in inst.lst) + { + ind++; + if (p._intalerStruct.Name.Trim() == tit.Trim()) { - inst.LoadFromFile(); - int index = -1; - int ind=-1; - foreach (MPpackageStruct p in inst.lst) + index = ind; + break; + } + } + if (index > -1) + if (((MPpackageStruct)inst.lst[index])._intalerStruct.Uninstall.Count > 0) + { + if (MessageBox.Show("Uninstalling extension." + tit + "\nDo you want continue ?", "", MessageBoxButtons.YesNo) == DialogResult.Yes) + { + if (!this.Visible) this.Show(); + MPpackageStruct p = (MPpackageStruct)inst.lst[index]; + label2.Visible = true; + progressBar1.Visible = true; + progressBar2.Visible = false; + listBox1.Visible = true; + this.Text = "Uninstalling " + p._intalerStruct.Name; + title_label.Text = p._intalerStruct.Name; + label2.Text = "Uninstalling ..."; + button_next.Visible = false; + button_back.Visible = false; + richTextBox1.Text = ""; + richTextBox1.Visible = false; + progressBar1.Maximum = p._intalerStruct.Uninstall.Count; + for (int i = 0; i < p._intalerStruct.Uninstall.Count; i++) { - ind++; - if (p._intalerStruct.Name.Trim() == tit.Trim()) + UninstallInfo u = (UninstallInfo)p._intalerStruct.Uninstall[i]; + progressBar1.Value++; + progressBar1.Update(); + progressBar1.Refresh(); + if (System.IO.File.Exists(u.Path)) + { + if (System.IO.File.GetCreationTime(u.Path) == u.Date) { - index = ind; - break; + System.IO.File.Delete(u.Path); + listBox1.Items.Add(u.Path); } + else + listBox1.Items.Add("File date changed :" + u.Path); + } + else listBox1.Items.Add("File not found :" + u.Path); } - if (index > -1) - if (((MPpackageStruct)inst.lst[index])._intalerStruct.Uninstall.Count>0) - { - if (MessageBox.Show("Uninstalling extension." + tit + "\nDo you want continue ?", "", MessageBoxButtons.YesNo) == DialogResult.Yes) - { - if (!this.Visible) this.Show(); - MPpackageStruct p = (MPpackageStruct)inst.lst[index]; - label2.Visible = true; - progressBar1.Visible = true; - progressBar2.Visible = false; - listBox1.Visible = true; - this.Text = "Uninstalling "+p._intalerStruct.Name; - title_label.Text = p._intalerStruct.Name; - label2.Text = "Uninstalling ..."; - button_next.Visible = false; - button_back.Visible = false; - richTextBox1.Text = ""; - richTextBox1.Visible = false; - progressBar1.Maximum = p._intalerStruct.Uninstall.Count; - for (int i = 0; i < p._intalerStruct.Uninstall.Count; i++) - { - UninstallInfo u = (UninstallInfo)p._intalerStruct.Uninstall[i]; - progressBar1.Value++; - progressBar1.Update(); - progressBar1.Refresh(); - if (System.IO.File.Exists(u.Path)) - { - if (System.IO.File.GetCreationTime(u.Path) == u.Date) - { - System.IO.File.Delete(u.Path); - listBox1.Items.Add(u.Path); - }else - listBox1.Items.Add("File date changed :"+u.Path); - } - else listBox1.Items.Add("File not found :"+u.Path); - } - inst.lst.RemoveAt(index); - inst.SaveToFile(); - } - } - else - MessageBox.Show("Uninstall information not found !"); - else - MessageBox.Show("Uninstall information not found !"); + inst.lst.RemoveAt(index); + inst.SaveToFile(); + } + } + else + MessageBox.Show("Uninstall information not found !"); + else + MessageBox.Show("Uninstall information not found !"); - button_cancel.Text = "Finish"; - } + button_cancel.Text = "Finish"; } + + private void Customize_list_ItemCheck(object sender, ItemCheckEventArgs e) + { + if (working) return; + working = true; + if (package._intalerStruct.ProiectProperties.SingleGroupSelect) + { + for (int i = 0; i < Customize_list.Items.Count; i++) + Customize_list.SetItemChecked(i, false); + } + Customize_list.SetItemChecked(e.Index, true); + working = false; + } + + } } \ 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: <sa...@us...> - 2007-04-30 19:53:24
|
Revision: 363 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=363&view=rev Author: saamand Date: 2007-04-30 12:53:23 -0700 (Mon, 30 Apr 2007) Log Message: ----------- Removed Paths: ------------- trunk/plugins/MyLyrics/My Lyrics/LyricsDatabase/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2007-04-30 19:51:43
|
Revision: 362 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=362&view=rev Author: saamand Date: 2007-04-30 12:51:41 -0700 (Mon, 30 Apr 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/MyLyrics/MyLyrics.suo Modified: trunk/plugins/MyLyrics/MyLyrics.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2007-04-30 19:49:35
|
Revision: 361 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=361&view=rev Author: saamand Date: 2007-04-30 12:49:34 -0700 (Mon, 30 Apr 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs trunk/plugins/MyLyrics/MyLyrics.suo Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-04-30 18:55:03 UTC (rev 360) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-04-30 19:49:34 UTC (rev 361) @@ -5,12 +5,13 @@ <ProductVersion>8.0.50727</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{BBB2DAE2-0D83-4B4B-85B6-D1B5A7E10039}</ProjectGuid> - <OutputType>WinExe</OutputType> + <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>MyLyrics</RootNamespace> <AssemblyName>MyLyrics</AssemblyName> <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent> - <StartupObject>MyLyrics.MyLyricsSetup_test</StartupObject> + <StartupObject> + </StartupObject> <SignAssembly>false</SignAssembly> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-04-30 18:55:03 UTC (rev 360) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-04-30 19:49:34 UTC (rev 361) @@ -450,6 +450,9 @@ m_LyricText = lyricStrings; m_artist = artist; m_track = track; + + --m_SongsToSearch; + lbSongsToSearch2.Text = m_SongsToSearch.ToString(); m_SongsWithLyric += 1; m_LyricsFound += 1; @@ -481,6 +484,9 @@ { m_LyricsNotFound += 1; + --m_SongsToSearch; + lbSongsToSearch2.Text = m_SongsToSearch.ToString(); + lbLyricsNotFound2.Text = m_LyricsNotFound.ToString(); string capArtist = LyricUtil.CapatalizeString(artist); @@ -641,7 +647,7 @@ { m_DisregardedSongs += 1; } - else if ((m_DisregardSongWithLyricInTag && ((tag = MediaPortal.TagReader.TagReader.ReadTag(song.FileName)) != null) && tag.Lyrics.Length == 0)) + else if ((m_DisregardSongWithLyricInTag == false && ((tag = MediaPortal.TagReader.TagReader.ReadTag(song.FileName)) != null) && tag.Lyrics.Length > 0)) { m_SongsWithLyric += 1; Modified: trunk/plugins/MyLyrics/MyLyrics.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2007-04-30 18:55:06
|
Revision: 360 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=360&view=rev Author: saamand Date: 2007-04-30 11:55:03 -0700 (Mon, 30 Apr 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsDatabase/LyricsDatabase.cs trunk/plugins/MyLyrics/LyricsEngine/LyricsDatabase/LyricsItem.cs trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs trunk/plugins/MyLyrics/My Lyrics/Convert/ConvertFromXMLtoLyricsDatabase.cs trunk/plugins/MyLyrics/My Lyrics/DatabaseUtil.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_SearchTitleDialog.cs trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-04-30 18:53:08 UTC (rev 359) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-04-30 18:55:03 UTC (rev 360) @@ -112,8 +112,8 @@ public void Dispose() { - m_EventStop_LyricController.Close(); - m_EventStopped_LyricController.Close(); + //m_EventStop_LyricController.Close(); + //m_EventStopped_LyricController.Close(); // clean-up operations may be placed here for (int i = 0; i < threadList.Count; i++) Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsDatabase/LyricsDatabase.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsDatabase/LyricsDatabase.cs 2007-04-30 18:53:08 UTC (rev 359) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsDatabase/LyricsDatabase.cs 2007-04-30 18:55:03 UTC (rev 360) @@ -3,7 +3,7 @@ using System.Text; using System.Runtime.Serialization; -namespace LyricsEngine.Database +namespace MyLyrics { [Serializable] public class LyricsDatabase : IDictionary<string, LyricsItem>, ISerializable Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsDatabase/LyricsItem.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/LyricsDatabase/LyricsItem.cs 2007-04-30 18:53:08 UTC (rev 359) +++ trunk/plugins/MyLyrics/LyricsEngine/LyricsDatabase/LyricsItem.cs 2007-04-30 18:55:03 UTC (rev 360) @@ -3,7 +3,7 @@ using System.Text; using System.Runtime.Serialization; -namespace LyricsEngine.Database +namespace MyLyrics { [Serializable] public class LyricsItem Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2007-04-30 18:53:08 UTC (rev 359) +++ trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2007-04-30 18:55:03 UTC (rev 360) @@ -26,7 +26,7 @@ // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.20")] +[assembly: AssemblyVersion("0.21")] // // In order to sign your assembly you must specify a key to use. Refer to the Modified: trunk/plugins/MyLyrics/My Lyrics/Convert/ConvertFromXMLtoLyricsDatabase.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/Convert/ConvertFromXMLtoLyricsDatabase.cs 2007-04-30 18:53:08 UTC (rev 359) +++ trunk/plugins/MyLyrics/My Lyrics/Convert/ConvertFromXMLtoLyricsDatabase.cs 2007-04-30 18:55:03 UTC (rev 360) @@ -4,8 +4,6 @@ using System.IO; using System.Xml; -using LyricsEngine.Database; - namespace MyLyrics { class ConvertFromXMLtoLyricsDatabase Modified: trunk/plugins/MyLyrics/My Lyrics/DatabaseUtil.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/DatabaseUtil.cs 2007-04-30 18:53:08 UTC (rev 359) +++ trunk/plugins/MyLyrics/My Lyrics/DatabaseUtil.cs 2007-04-30 18:55:03 UTC (rev 360) @@ -5,7 +5,6 @@ using System.Runtime.Serialization.Formatters.Binary; using LyricsEngine; -using LyricsEngine.Database; namespace MyLyrics { Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-04-30 18:53:08 UTC (rev 359) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-04-30 18:55:03 UTC (rev 360) @@ -11,7 +11,6 @@ using System.Timers; using LyricsEngine; -using LyricsEngine.Database; using LyricsEngine.LRC; using MediaPortal.GUI.Library; @@ -341,17 +340,28 @@ m_sitesToSearch = (string[])sitesToSearch.ToArray(typeof(string)); // Deserialize lyrics and marked database, and save references in LyricsDB - string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsDBName); - FileStream fs = new FileStream(path, FileMode.Open); - BinaryFormatter bf = new BinaryFormatter(); - LyricsDB = (LyricsDatabase)bf.Deserialize(fs); - fs.Close(); + try + { + string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsDBName); + FileStream fs = new FileStream(path, FileMode.Open); + BinaryFormatter bf = new BinaryFormatter(); + LyricsDB = (LyricsDatabase)bf.Deserialize(fs); + fs.Close(); - path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsMarkedDBName); - fs = new FileStream(path, FileMode.Open); - LyricsMarkedDB = (LyricsDatabase)bf.Deserialize(fs); - fs.Close(); - + path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsMarkedDBName); + fs = new FileStream(path, FileMode.Open); + LyricsMarkedDB = (LyricsDatabase)bf.Deserialize(fs); + fs.Close(); + } + catch + { + GUIDialogOK dlg = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK); + dlg.SetHeading("No lyric database found"); + dlg.SetLine(1, "Please run the MyLyrics configuration"); + dlg.SetLine(2, "before running the plugin."); + dlg.SetLine(3, String.Empty); + dlg.DoModal(GUIWindowManager.ActiveWindow); + } } void SaveSettings() Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-04-30 18:53:08 UTC (rev 359) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-04-30 18:55:03 UTC (rev 360) @@ -5,13 +5,12 @@ <ProductVersion>8.0.50727</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{BBB2DAE2-0D83-4B4B-85B6-D1B5A7E10039}</ProjectGuid> - <OutputType>Library</OutputType> + <OutputType>WinExe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>MyLyrics</RootNamespace> <AssemblyName>MyLyrics</AssemblyName> <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent> - <StartupObject> - </StartupObject> + <StartupObject>MyLyrics.MyLyricsSetup_test</StartupObject> <SignAssembly>false</SignAssembly> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -46,10 +45,6 @@ <SpecificVersion>False</SpecificVersion> <HintPath>..\..\..\..\..\..\..\..\Program Files\Team Mediaportal\MediaPortal\Plugins\Windows\Dialogs.DLL</HintPath> </Reference> - <Reference Include="LyricsEngine, Version=0.13.0.0, Culture=neutral, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\LyricsEngine\bin\Debug\LyricsEngine.dll</HintPath> - </Reference> <Reference Include="System" /> <Reference Include="System.Data" /> <Reference Include="System.Drawing" /> @@ -128,6 +123,12 @@ <ItemGroup> <Content Include="Changelog.txt" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\LyricsEngine\LyricsEngine.csproj"> + <Project>{B0760CE8-086F-4301-9091-C9BE54F261FD}</Project> + <Name>LyricsEngine</Name> + </ProjectReference> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs 2007-04-30 18:53:08 UTC (rev 359) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs 2007-04-30 18:55:03 UTC (rev 360) @@ -2,8 +2,6 @@ using System.Collections.Generic; using System.Text; -using LyricsEngine.Database; - namespace MyLyrics { class MyLyricsSettings Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-04-30 18:53:08 UTC (rev 359) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-04-30 18:55:03 UTC (rev 360) @@ -23,7 +23,6 @@ using MediaPortal.Profile; using LyricsEngine; -using LyricsEngine.Database; namespace MyLyrics { @@ -835,9 +834,6 @@ private void MyLyricsSetup_FormClosing(object sender, FormClosingEventArgs e) { - - - LyricDiagnostics.Dispose(); } Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs 2007-04-30 18:53:08 UTC (rev 359) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs 2007-04-30 18:55:03 UTC (rev 360) @@ -22,7 +22,6 @@ using LyricsEngine; using LyricsEngine.LRC; -using LyricsEngine.Database; namespace MyLyrics Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_SearchTitleDialog.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_SearchTitleDialog.cs 2007-04-30 18:53:08 UTC (rev 359) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_SearchTitleDialog.cs 2007-04-30 18:55:03 UTC (rev 360) @@ -8,7 +8,6 @@ using System.Threading; using LyricsEngine; -using LyricsEngine.Database; namespace MyLyrics { Modified: trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2007-04-30 18:53:08 UTC (rev 359) +++ trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2007-04-30 18:55:03 UTC (rev 360) @@ -31,5 +31,5 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.20")] -[assembly: AssemblyFileVersion("0.20")] +[assembly: AssemblyVersion("0.21")] +[assembly: AssemblyFileVersion("0.21")] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2007-04-30 18:53:14
|
Revision: 359 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=359&view=rev Author: saamand Date: 2007-04-30 11:53:08 -0700 (Mon, 30 Apr 2007) Log Message: ----------- Removed Paths: ------------- trunk/plugins/MyLyrics/LyricsEngine/GetGoogleSearchResult.cs Deleted: trunk/plugins/MyLyrics/LyricsEngine/GetGoogleSearchResult.cs =================================================================== --- trunk/plugins/MyLyrics/LyricsEngine/GetGoogleSearchResult.cs 2007-04-30 12:39:13 UTC (rev 358) +++ trunk/plugins/MyLyrics/LyricsEngine/GetGoogleSearchResult.cs 2007-04-30 18:53:08 UTC (rev 359) @@ -1,112 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Runtime.Remoting.Messaging; -using System.Threading; -using System.Diagnostics; - -namespace LyricsEngine -{ - class GetGoogleSearchResult : IDisposable - { - private LyricSearch_GoogleSites m_LyricSearh; - GetGoogleSearchResultsDelegate delSearch; - IAsyncResult ar; - public static bool Abort = false; - - // Constructor - public GetGoogleSearchResult(LyricSiteInfo siteInfo, LyricSearch_GoogleSites lyricSearch2) - { - Thread.Sleep(1000); - - this.m_LyricSearh = lyricSearch2; - - Google.GoogleSearchService s = new Google.GoogleSearchService(); - Google.GoogleSearchResult searchResult = new Google.GoogleSearchResult(); - - delSearch = new GetGoogleSearchResultsDelegate(GetGoogleSearchResults); - - string[] artistWords = siteInfo.artist.Split(' '); - - string m_lastUsedLicenseKey = m_LyricSearh.GoogleLicenseKey; - - ar = delSearch.BeginInvoke(m_lastUsedLicenseKey, ((!m_LyricSearh.TestedAll) ? "intitle:" + siteInfo.artistWithDoubleQuotes : "intitle:" + artistWords[artistWords.Length - 1]) + " " + "intitle:" + siteInfo.trackWithDoubleQuotes + " " + "intitle:" + siteInfo.extra + " " + siteInfo.siteNameToSearch + " " + "site:" + siteInfo.siteWWW, - 0, siteInfo.noOfHitsUsed, false, "", false, "", "", "", new AsyncCallback(getGoogleSearchResultsCallBack), siteInfo); - - if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + "GetGoogleSearchResult(" + siteInfo.artist + ", " + siteInfo.track + ", " + siteInfo.siteName + ")"); - } - - public delegate Google.GoogleSearchResult GetGoogleSearchResultsDelegate(string key, string q, int start, int maxResults, bool filter, string restrict, bool safe, string lr, string ie, string oe); - - private Google.GoogleSearchResult GetGoogleSearchResults(string key, string q, int start, int maxResults, bool filter, string restrict, bool safe, string lr, string ie, string oe) - { - - //Thread.CurrentThread.Name = q; - try - { - Google.GoogleSearchService s = new Google.GoogleSearchService(); - return s.doGoogleSearch(key, q, start, maxResults, filter, restrict, safe, lr, ie, oe); - } - catch (System.Net.WebException) - { - return null; - } - catch (System.Web.Services.Protocols.SoapException soapException) - { - //System.Windows.Forms.MessageBox.Show(soapException.ToString()); - m_LyricSearh.stopThreadAndContinue(soapException); - return null; - } - } - - public void Dispose() - { - try - { - ar = null; - //Google.GoogleSearchResult searchResult = delSearch.EndInvoke - delSearch = null; - } - catch (Exception) - { - } - System.Console.WriteLine("*****************************"); - } - - private void getGoogleSearchResultsCallBack(IAsyncResult ar) - { - if (!Abort) - { - AsyncResult result = (AsyncResult)ar; - - // grab the delegate - GetGoogleSearchResultsDelegate del = - (GetGoogleSearchResultsDelegate)result.AsyncDelegate; - - LyricSiteInfo siteInfo = (LyricSiteInfo)ar.AsyncState; - - if (LyricDiagnostics.TraceSource != null) LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + "getGoogleSearchResultsCallBack(" + siteInfo.artist + ", " + siteInfo.track + ", " + siteInfo.siteName + ")"); - - Google.GoogleSearchResult searchResult = null; - - // call EndInvoke on the delegate to get all the information about our method call - try - { - searchResult = del.EndInvoke(ar); - - if (searchResult != null) - { - m_LyricSearh.validateSearchResult(searchResult.resultElements, siteInfo); - } - else - { - m_LyricSearh.validateSearchResult(null, siteInfo); - } - } - catch (Exception) - { - } - } - } - } -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <du...@us...> - 2007-04-30 12:39:19
|
Revision: 358 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=358&view=rev Author: dukus Date: 2007-04-30 05:39:13 -0700 (Mon, 30 Apr 2007) Log Message: ----------- Grouping interface in editor Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/Form1.cs trunk/plugins/mpinstaler/MPInstaler/GroupForm.Designer.cs trunk/plugins/mpinstaler/MPInstaler/GroupForm.cs trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs trunk/plugins/mpinstaler/MPInstaler/properties.cs Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-04-30 08:01:48 UTC (rev 357) +++ trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-04-30 12:39:13 UTC (rev 358) @@ -580,6 +580,7 @@ private void setupGroupsToolStripMenuItem_Click(object sender, EventArgs e) { GroupForm dlg = new GroupForm(); + dlg._struct = this._struct; dlg.ShowDialog(); } } Modified: trunk/plugins/mpinstaler/MPInstaler/GroupForm.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/GroupForm.Designer.cs 2007-04-30 08:01:48 UTC (rev 357) +++ trunk/plugins/mpinstaler/MPInstaler/GroupForm.Designer.cs 2007-04-30 12:39:13 UTC (rev 358) @@ -32,7 +32,23 @@ this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.button1 = new System.Windows.Forms.Button(); + this.listView1 = new System.Windows.Forms.ListView(); + this.columnHeader1 = new System.Windows.Forms.ColumnHeader(); + this.columnHeader2 = new System.Windows.Forms.ColumnHeader(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.listView2 = new System.Windows.Forms.ListView(); + this.listView3 = new System.Windows.Forms.ListView(); + this.columnHeader3 = new System.Windows.Forms.ColumnHeader(); + this.columnHeader4 = new System.Windows.Forms.ColumnHeader(); + this.button2 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.button4 = new System.Windows.Forms.Button(); + this.button5 = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.tabPage2.SuspendLayout(); this.SuspendLayout(); // // tabControl1 @@ -47,23 +63,34 @@ // // tabPage1 // + this.tabPage1.Controls.Add(this.button5); + this.tabPage1.Controls.Add(this.button4); + this.tabPage1.Controls.Add(this.textBox2); + this.tabPage1.Controls.Add(this.textBox1); + this.tabPage1.Controls.Add(this.listView1); 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(477, 209); this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "tabPage1"; + this.tabPage1.Text = "Groups"; this.tabPage1.UseVisualStyleBackColor = true; // // tabPage2 // + this.tabPage2.Controls.Add(this.button3); + this.tabPage2.Controls.Add(this.button2); + this.tabPage2.Controls.Add(this.listView3); + this.tabPage2.Controls.Add(this.listView2); + this.tabPage2.Controls.Add(this.comboBox1); 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(477, 209); this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "tabPage2"; + this.tabPage2.Text = "Groups mapping"; this.tabPage2.UseVisualStyleBackColor = true; + this.tabPage2.Enter += new System.EventHandler(this.tabPage2_Enter); // // button1 // @@ -75,6 +102,125 @@ this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // + // listView1 + // + this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader1, + this.columnHeader2}); + this.listView1.FullRowSelect = true; + this.listView1.Location = new System.Drawing.Point(6, 6); + this.listView1.Name = "listView1"; + this.listView1.Size = new System.Drawing.Size(465, 135); + this.listView1.TabIndex = 0; + this.listView1.UseCompatibleStateImageBehavior = false; + this.listView1.View = System.Windows.Forms.View.Details; + this.listView1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listView1_MouseDoubleClick); + this.listView1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.listView1_MouseClick); + // + // columnHeader1 + // + this.columnHeader1.Text = "id"; + // + // columnHeader2 + // + this.columnHeader2.Text = "Name"; + this.columnHeader2.Width = 372; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(6, 147); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(53, 20); + this.textBox1.TabIndex = 1; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(65, 147); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(406, 20); + this.textBox2.TabIndex = 2; + // + // comboBox1 + // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Location = new System.Drawing.Point(6, 6); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(465, 21); + this.comboBox1.TabIndex = 0; + this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); + // + // listView2 + // + this.listView2.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader3}); + this.listView2.Location = new System.Drawing.Point(6, 33); + this.listView2.Name = "listView2"; + this.listView2.Size = new System.Drawing.Size(170, 170); + this.listView2.TabIndex = 1; + this.listView2.UseCompatibleStateImageBehavior = false; + this.listView2.View = System.Windows.Forms.View.Details; + // + // listView3 + // + this.listView3.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader4}); + this.listView3.Location = new System.Drawing.Point(270, 33); + this.listView3.Name = "listView3"; + this.listView3.Size = new System.Drawing.Size(200, 169); + this.listView3.TabIndex = 2; + this.listView3.UseCompatibleStateImageBehavior = false; + this.listView3.View = System.Windows.Forms.View.Details; + // + // columnHeader3 + // + this.columnHeader3.Text = "File name"; + this.columnHeader3.Width = 162; + // + // columnHeader4 + // + this.columnHeader4.Text = "Filename"; + this.columnHeader4.Width = 191; + // + // button2 + // + this.button2.Location = new System.Drawing.Point(196, 85); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(49, 21); + this.button2.TabIndex = 3; + this.button2.Text = "->"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // button3 + // + this.button3.Location = new System.Drawing.Point(196, 124); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(49, 22); + this.button3.TabIndex = 4; + this.button3.Text = "<-"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click); + // + // button4 + // + this.button4.Location = new System.Drawing.Point(315, 173); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(75, 23); + this.button4.TabIndex = 3; + this.button4.Text = "Add"; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.button4_Click); + // + // button5 + // + this.button5.Location = new System.Drawing.Point(396, 173); + this.button5.Name = "button5"; + this.button5.Size = new System.Drawing.Size(75, 23); + this.button5.TabIndex = 4; + this.button5.Text = "Remove"; + this.button5.UseVisualStyleBackColor = true; + // // GroupForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -84,7 +230,11 @@ this.Controls.Add(this.tabControl1); this.Name = "GroupForm"; this.Text = "GroupForm"; + this.Load += new System.EventHandler(this.GroupForm_Load); this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage1.PerformLayout(); + this.tabPage2.ResumeLayout(false); this.ResumeLayout(false); } @@ -95,5 +245,19 @@ private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.Button button1; + private System.Windows.Forms.ListView listView1; + private System.Windows.Forms.ColumnHeader columnHeader1; + private System.Windows.Forms.ColumnHeader columnHeader2; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.ListView listView3; + private System.Windows.Forms.ColumnHeader columnHeader4; + private System.Windows.Forms.ListView listView2; + private System.Windows.Forms.ColumnHeader columnHeader3; + private System.Windows.Forms.Button button4; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.Button button5; } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/GroupForm.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/GroupForm.cs 2007-04-30 08:01:48 UTC (rev 357) +++ trunk/plugins/mpinstaler/MPInstaler/GroupForm.cs 2007-04-30 12:39:13 UTC (rev 358) @@ -10,6 +10,7 @@ { public partial class GroupForm : Form { + public MPinstalerStruct _struct; public GroupForm() { InitializeComponent(); @@ -17,7 +18,118 @@ private void button1_Click(object sender, EventArgs e) { + _struct.SetupGroups.Clear(); + for (int i = 0; i < listView1.Items.Count; i++) + { + _struct.SetupGroups.Add(new GroupString(listView1.Items[i].SubItems[0].Text, listView1.Items[i].SubItems[1].Text)); + } this.Close(); } + + private void button4_Click(object sender, EventArgs e) + { + update_listview1(textBox1.Text, textBox2.Text); + } + + private void update_listview1(string wid, string wval) + { + for (int i = 0; i < listView1.Items.Count; i++) + { + if (wid == listView1.Items[i].SubItems[0].Text) + { + listView1.Items.RemoveAt(i); + break; + } + } + ListViewItem item1 = new ListViewItem(wid, 0); + item1.SubItems.Add(wval); + listView1.Items.AddRange(new ListViewItem[] { item1 }); + listView1.Sort(); + } + + private void listView1_MouseClick(object sender, MouseEventArgs e) + { + if (listView1.SelectedItems.Count > 0) + { + textBox1.Text = listView1.SelectedItems[0].SubItems[0].Text; + textBox2.Text = listView1.SelectedItems[0].SubItems[1].Text; + } + } + + private void listView1_MouseDoubleClick(object sender, MouseEventArgs e) + { + if (listView1.SelectedItems.Count > 0) + { + textBox1.Text = listView1.SelectedItems[0].SubItems[0].Text; + textBox2.Text = listView1.SelectedItems[0].SubItems[1].Text; + listView1.Items.Remove(listView1.SelectedItems[0]); + } + + } + + private void GroupForm_Load(object sender, EventArgs e) + { + listView1.Items.Clear(); + foreach (GroupString gs in _struct.SetupGroups) + { + update_listview1(gs.Id, gs.Name); + } + } + + private void tabPage2_Enter(object sender, EventArgs e) + { + comboBox1.Items.Clear(); + for (int i = 0; i < listView1.Items.Count; i++) + { + comboBox1.Items.Add(listView1.Items[i].SubItems[0].Text); + } + } + + private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) + { + listView2.Items.Clear(); + listView3.Items.Clear(); + foreach (MPIFileList fl in _struct.FileList) + { + if (_struct.FindFileInGroup(comboBox1.Text, fl.FileNameShort)) + listView3.Items.Add(fl.FileNameShort); + else + listView2.Items.Add(fl.FileNameShort); + } + } + + private void button2_Click(object sender, EventArgs e) + { + for (int i=0; i < listView2.SelectedItems.Count; i++) + { + listView3.Items.Add(listView2.SelectedItems[i].Text); + listView2.Items.Remove(listView2.SelectedItems[i]); + } + update_data(); + } + + private void button3_Click(object sender, EventArgs e) + { + for (int i = 0; i < listView3.SelectedItems.Count; i++) + { + listView2.Items.Add(listView3.SelectedItems[i].Text); + listView3.Items.Remove(listView3.SelectedItems[i]); + } + update_data(); + } + + private void update_data() + { + for (int i = 0; i < _struct.SetupGroupsMappig.Count; i++) + { + if (_struct.SetupGroupsMappig[i].Id==comboBox1.Text) + _struct.SetupGroupsMappig.RemoveAt(i); + } + + for (int i = 0; i < listView3.Items.Count; i++) + { + _struct.SetupGroupsMappig.Add(new GroupStringMapping(comboBox1.Text, listView3.Items[i].Text)); + } + } } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs 2007-04-30 08:01:48 UTC (rev 357) +++ trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs 2007-04-30 12:39:13 UTC (rev 358) @@ -50,13 +50,18 @@ public ArrayList FileList = new ArrayList(); public List<LanguageString> Language; public List<ActionInfo> Actions; - + public List<GroupString> SetupGroups; + public List<GroupStringMapping> SetupGroupsMappig; + public MPinstalerStruct() { Language = new List<LanguageString>(); Actions = new List<ActionInfo>(); ProiectProperties = new ProiectPropertiesClass(); + SetupGroups = new List<GroupString>(); + SetupGroupsMappig = new List<GroupStringMapping>(); } + public string UpdateURL { get { return _update; } @@ -159,12 +164,36 @@ Actions.Add(a); } } + + public void AddSetupGroupMapping(GroupStringMapping a) + { + int idx = -1; + for (int i = 0; i < SetupGroupsMappig.Count; i++) + { + if (SetupGroupsMappig[i].Id==a.Id && SetupGroupsMappig[i].FileName==a.FileName) + { + idx = i; + break; + } + } + if (idx > -1) + { + SetupGroupsMappig[idx].Id = a.Id; + SetupGroupsMappig[idx].FileName = a.FileName; + } + else + { + SetupGroupsMappig.Add(a); + } + } public void Clear() { FileList.Clear(); Language.Clear(); Actions.Clear(); + SetupGroups.Clear(); + SetupGroupsMappig.Clear(); ProiectProperties.Clear(); BuildFileName = string.Empty; ProiectdFileName = string.Empty; @@ -232,6 +261,24 @@ writer.WriteEndElement(); } writer.WriteEndElement(); + writer.WriteStartElement("SetupGroups"); + foreach (GroupString gs in SetupGroups) + { + writer.WriteStartElement("SetupGroup"); + writer.WriteAttributeString("Id", gs.Id); + writer.WriteAttributeString("Name", gs.Name); + writer.WriteEndElement(); + } + writer.WriteEndElement(); + writer.WriteStartElement("SetupGroupMappings"); + foreach (GroupStringMapping gs in SetupGroupsMappig) + { + writer.WriteStartElement("SetupGroupMapping"); + writer.WriteAttributeString("Id", gs.Id); + writer.WriteAttributeString("FileName", gs.FileName); + writer.WriteEndElement(); + } + writer.WriteEndElement(); writer.WriteStartElement("Option"); writer.WriteElementString("BuildFileName", this.BuildFileName); writer.WriteElementString("ProiectFileName", Path.GetFullPath(this.ProiectdFileName)); @@ -360,6 +407,18 @@ Convert.ToInt32(actionnode.Attributes["Id"].Value), actionnode.Attributes["Command"].Value)); } + XmlNodeList groupList = ver.SelectNodes("SetupGroups/SetupGroup"); + foreach (XmlNode groupnode in groupList) + { + SetupGroups.Add(new GroupString(groupnode.Attributes["Id"].Value, + groupnode.Attributes["Name"].Value)); + } + XmlNodeList groupmapList = ver.SelectNodes("SetupGroupMappings/SetupGroupMapping"); + foreach (XmlNode groupnode in groupmapList) + { + SetupGroupsMappig.Add(new GroupStringMapping(groupnode.Attributes["Id"].Value, + groupnode.Attributes["FileName"].Value)); + } XmlNode nodeoption = ver.SelectSingleNode("Option"); this.BuildFileName = nodeoption.SelectSingleNode("BuildFileName").InnerText; this.Name = nodeoption.SelectSingleNode("ProiectName").InnerText; @@ -421,9 +480,22 @@ } return fs; } + + public bool FindFileInGroup(string group,string file) + { - public string GetZipEntry(MPIFileList flst) + for (int i = 0; i < SetupGroupsMappig.Count; i++) { + if (SetupGroupsMappig[i].FileName==file && SetupGroupsMappig[i].Id==group) + { + return true; + } + } + return false; + } + + public string GetZipEntry(MPIFileList flst) + { string ret = string.Empty; if (flst.Type == PLUGIN_TYPE) { @@ -814,4 +886,48 @@ return x_ret; } } + + public class GroupString + { + string _id; + string _name; + public GroupString(string wid,string wname) + { + Id = wid; + Name = wname; + } + public string Id + { + get { return _id; } + set { _id = value; } + } + public string Name + { + get { return _name; } + set { _name = value; } + } + + } + + public class GroupStringMapping + { + string _id; + string _filename; + public GroupStringMapping(string wid, string wname) + { + Id = wid; + FileName = wname; + } + public string Id + { + get { return _id; } + set { _id = value; } + } + public string FileName + { + get { return _filename; } + set { _filename = value; } + } + + } } Modified: trunk/plugins/mpinstaler/MPInstaler/properties.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/properties.cs 2007-04-30 08:01:48 UTC (rev 357) +++ trunk/plugins/mpinstaler/MPInstaler/properties.cs 2007-04-30 12:39:13 UTC (rev 358) @@ -13,6 +13,7 @@ private string forumurl; private string weburl; private DateTime creationdate; + private bool singlegroupselect; public ProiectPropertiesClass() { @@ -79,13 +80,25 @@ } } + public bool SingleGroupSelect + { + set + { + singlegroupselect = value; + } + get + { + return singlegroupselect; + } + } public void Save(XmlWriter writer) { writer.WriteElementString("MPMaxVersion", MPMaxVersion); writer.WriteElementString("MPMinVersion", MPMinVersion); writer.WriteElementString("ForumURL", ForumURL); writer.WriteElementString("WebURL", WebURL); - writer.WriteElementString("CreationDate", CreationDate.ToString("F", new CultureInfo("en-US"))); + writer.WriteElementString("CreationDate", CreationDate.ToString("F", new CultureInfo("en-US"))); + writer.WriteElementString("SingleGroupSelect", SingleGroupSelect.ToString()); } public void Load(XmlNode basenode) @@ -108,6 +121,11 @@ node = basenode.SelectSingleNode("CreationDate"); if (node != null && node.InnerText != null) DateTime.TryParse(node.InnerText,out creationdate); + node = basenode.SelectSingleNode("SingleGroupSelect"); + if (node != null && node.InnerText != null) + if (node.InnerText == "True") + SingleGroupSelect = true; + else SingleGroupSelect = false; } @@ -119,7 +137,8 @@ MPMinVersion = String.Empty; ForumURL = String.Empty; WebURL = String.Empty; - CreationDate = DateTime.Today; + CreationDate = DateTime.Today; + SingleGroupSelect = false; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <du...@us...> - 2007-04-30 08:01:52
|
Revision: 357 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=357&view=rev Author: dukus Date: 2007-04-30 01:01:48 -0700 (Mon, 30 Apr 2007) Log Message: ----------- Manual upload support Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/Build dialog.Designer.cs trunk/plugins/mpinstaler/MPInstaler/Build dialog.cs Modified: trunk/plugins/mpinstaler/MPInstaler/Build dialog.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Build dialog.Designer.cs 2007-04-29 17:15:59 UTC (rev 356) +++ trunk/plugins/mpinstaler/MPInstaler/Build dialog.Designer.cs 2007-04-30 08:01:48 UTC (rev 357) @@ -28,179 +28,192 @@ /// </summary> private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Build_dialog)); - this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.button1 = new System.Windows.Forms.Button(); - this.button2 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.listBox1 = new System.Windows.Forms.ListBox(); - this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.button4 = new System.Windows.Forms.Button(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // saveFileDialog1 - // - this.saveFileDialog1.DefaultExt = "mpi"; - this.saveFileDialog1.Filter = "MPI files|*.mpi|ZIP files|*.zip|All files|*.*"; - // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(12, 23); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(334, 20); - this.textBox1.TabIndex = 0; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(9, 7); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(58, 13); - this.label1.TabIndex = 1; - this.label1.Text = "File name :"; - // - // button1 - // - this.button1.Location = new System.Drawing.Point(354, 20); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(27, 23); - this.button1.TabIndex = 2; - this.button1.Text = "..."; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // button2 - // - this.button2.Location = new System.Drawing.Point(12, 220); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(75, 23); - this.button2.TabIndex = 3; - this.button2.Text = "Build"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click); - // - // button3 - // - this.button3.Location = new System.Drawing.Point(306, 220); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(75, 23); - this.button3.TabIndex = 4; - this.button3.Text = "Close"; - this.button3.UseVisualStyleBackColor = true; - this.button3.Click += new System.EventHandler(this.button3_Click); - // - // listBox1 - // - this.listBox1.FormattingEnabled = true; - this.listBox1.HorizontalScrollbar = true; - this.listBox1.Location = new System.Drawing.Point(12, 54); - this.listBox1.Name = "listBox1"; - this.listBox1.Size = new System.Drawing.Size(369, 134); - this.listBox1.TabIndex = 5; - // - // progressBar1 - // - this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.progressBar1.Location = new System.Drawing.Point(12, 198); - this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(369, 16); - this.progressBar1.TabIndex = 6; - // - // button4 - // - this.button4.Location = new System.Drawing.Point(147, 220); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(95, 23); - this.button4.TabIndex = 7; - this.button4.Text = "Build && Upload"; - this.button4.UseVisualStyleBackColor = true; - this.button4.Click += new System.EventHandler(this.button4_Click); - // - // textBox2 - // - this.textBox2.Location = new System.Drawing.Point(403, 54); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(249, 20); - this.textBox2.TabIndex = 8; - this.textBox2.Text = "ftp://ftp.extra.hu/wwwroot/upload"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(400, 38); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(41, 13); - this.label2.TabIndex = 9; - this.label2.Text = "Server "; - // - // textBox3 - // - this.textBox3.Location = new System.Drawing.Point(403, 97); - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(249, 20); - this.textBox3.TabIndex = 10; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(400, 81); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(58, 13); - this.label3.TabIndex = 11; - this.label3.Text = "User name"; - // - // textBox4 - // - this.textBox4.Location = new System.Drawing.Point(403, 138); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(249, 20); - this.textBox4.TabIndex = 12; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(400, 122); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(53, 13); - this.label4.TabIndex = 13; - this.label4.Text = "Password"; - // - // Build_dialog - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(677, 255); - this.Controls.Add(this.label4); - this.Controls.Add(this.textBox4); - this.Controls.Add(this.label3); - this.Controls.Add(this.textBox3); - this.Controls.Add(this.label2); - this.Controls.Add(this.textBox2); - this.Controls.Add(this.button4); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.listBox1); - this.Controls.Add(this.button3); - this.Controls.Add(this.button2); - this.Controls.Add(this.button1); - this.Controls.Add(this.label1); - this.Controls.Add(this.textBox1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "Build_dialog"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Build"; - this.Load += new System.EventHandler(this.Build_dialog_Load); - this.ResumeLayout(false); - this.PerformLayout(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Build_dialog)); + this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.button1 = new System.Windows.Forms.Button(); + this.button2 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.listBox1 = new System.Windows.Forms.ListBox(); + this.progressBar1 = new System.Windows.Forms.ProgressBar(); + this.button4 = new System.Windows.Forms.Button(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.textBox4 = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.SuspendLayout(); + // + // saveFileDialog1 + // + this.saveFileDialog1.DefaultExt = "mpi"; + this.saveFileDialog1.Filter = "MPI files|*.mpi|ZIP files|*.zip|All files|*.*"; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(12, 23); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(334, 20); + this.textBox1.TabIndex = 0; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(9, 7); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(58, 13); + this.label1.TabIndex = 1; + this.label1.Text = "File name :"; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(354, 20); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(27, 23); + this.button1.TabIndex = 2; + this.button1.Text = "..."; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // button2 + // + this.button2.Location = new System.Drawing.Point(12, 220); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(75, 23); + this.button2.TabIndex = 3; + this.button2.Text = "Build"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // button3 + // + this.button3.Location = new System.Drawing.Point(306, 220); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(75, 23); + this.button3.TabIndex = 4; + this.button3.Text = "Close"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click); + // + // listBox1 + // + this.listBox1.FormattingEnabled = true; + this.listBox1.HorizontalScrollbar = true; + this.listBox1.Location = new System.Drawing.Point(12, 54); + this.listBox1.Name = "listBox1"; + this.listBox1.Size = new System.Drawing.Size(369, 134); + this.listBox1.TabIndex = 5; + // + // progressBar1 + // + this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.progressBar1.Location = new System.Drawing.Point(12, 198); + this.progressBar1.Name = "progressBar1"; + this.progressBar1.Size = new System.Drawing.Size(369, 16); + this.progressBar1.TabIndex = 6; + // + // button4 + // + this.button4.Location = new System.Drawing.Point(147, 220); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(95, 23); + this.button4.TabIndex = 7; + this.button4.Text = "Build && Upload"; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.button4_Click); + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(403, 54); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(249, 20); + this.textBox2.TabIndex = 8; + this.textBox2.Text = "ftp://ftp.extra.hu/wwwroot/upload"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(400, 38); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(41, 13); + this.label2.TabIndex = 9; + this.label2.Text = "Server "; + // + // textBox3 + // + this.textBox3.Location = new System.Drawing.Point(403, 122); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(249, 20); + this.textBox3.TabIndex = 10; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(400, 106); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(58, 13); + this.label3.TabIndex = 11; + this.label3.Text = "User name"; + // + // textBox4 + // + this.textBox4.Location = new System.Drawing.Point(403, 163); + this.textBox4.Name = "textBox4"; + this.textBox4.Size = new System.Drawing.Size(249, 20); + this.textBox4.TabIndex = 12; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(400, 147); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(53, 13); + this.label4.TabIndex = 13; + this.label4.Text = "Password"; + // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Location = new System.Drawing.Point(403, 80); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(74, 17); + this.checkBox1.TabIndex = 14; + this.checkBox1.Text = "Local disc"; + this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); + // + // Build_dialog + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(677, 255); + this.Controls.Add(this.checkBox1); + this.Controls.Add(this.label4); + this.Controls.Add(this.textBox4); + this.Controls.Add(this.label3); + this.Controls.Add(this.textBox3); + this.Controls.Add(this.label2); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.button4); + this.Controls.Add(this.progressBar1); + this.Controls.Add(this.listBox1); + this.Controls.Add(this.button3); + this.Controls.Add(this.button2); + this.Controls.Add(this.button1); + this.Controls.Add(this.label1); + this.Controls.Add(this.textBox1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "Build_dialog"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Build"; + this.Load += new System.EventHandler(this.Build_dialog_Load); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -221,5 +234,6 @@ private System.Windows.Forms.Label label3; private System.Windows.Forms.TextBox textBox4; private System.Windows.Forms.Label label4; + private System.Windows.Forms.CheckBox checkBox1; } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/Build dialog.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Build dialog.cs 2007-04-29 17:15:59 UTC (rev 356) +++ trunk/plugins/mpinstaler/MPInstaler/Build dialog.cs 2007-04-30 08:01:48 UTC (rev 357) @@ -68,66 +68,103 @@ this.Cursor = Cursors.WaitCursor; if (!String.IsNullOrEmpty(textBox1.Text)) { + if (checkBox1.Checked) + { _struct.BuildFileName = textBox1.Text; _struct.BuilFile(listBox1, progressBar1); + listBox1.SelectedIndex = listBox1.Items.Count - 1; + listBox1.Refresh(); + listBox1.Update(); + string tempfile = Path.GetDirectoryName(textBox1.Text) + @"\" + Path.GetFileNameWithoutExtension(textBox1.Text) + ".xml"; + MPInstallHelper temp_mpih = new MPInstallHelper(); + MPpackageStruct pk = new MPpackageStruct(); + pk.LoadFromFile(textBox1.Text); + temp_mpih.Add(pk); + temp_mpih.FileName = tempfile; + temp_mpih.SaveToFile(); + listBox1.Items.Add("Config file created !"); + listBox1.Refresh(); + listBox1.Update(); + } + else + { + _struct.BuildFileName = textBox1.Text; + _struct.BuilFile(listBox1, progressBar1); listBox1.Items.Add("Upload begin..."); listBox1.SelectedIndex = listBox1.Items.Count - 1; listBox1.Refresh(); listBox1.Update(); if (download_form.FtpUpload(textBox1.Text, textBox2.Text, textBox3.Text, textBox4.Text)) { - listBox1.Items.Add("Upload done."); + listBox1.Items.Add("Upload done."); + listBox1.Refresh(); + listBox1.Update(); + if (true) + { + string tempfile = Path.GetTempPath() + @"\" + Path.GetFileNameWithoutExtension(textBox1.Text) + ".xml"; + string configfile = textBox2.Text + "/" + Path.GetFileNameWithoutExtension(textBox1.Text) + ".xml"; + MPInstallHelper temp_mpih = new MPInstallHelper(); + MPpackageStruct pk = new MPpackageStruct(); + pk.LoadFromFile(textBox1.Text); + temp_mpih.Add(pk); + temp_mpih.FileName = tempfile; + temp_mpih.SaveToFile(); + download_form.FtpUpload(tempfile, textBox2.Text, textBox3.Text, textBox4.Text); + listBox1.Items.Add("List file uploaded !"); listBox1.Refresh(); listBox1.Update(); - if (true) + } + else + { + string tempfile = Path.GetTempPath() + @"\MPExtensionFileList.xml"; + string configfile = textBox2.Text + "/MPExtensionFileList.xml"; + if (download_form.FtpDownload(configfile, tempfile, textBox3.Text, textBox4.Text)) { - string tempfile = Path.GetTempPath() + @"\"+Path.GetFileNameWithoutExtension(textBox1.Text)+".xml"; - string configfile = textBox2.Text + "/" + Path.GetFileNameWithoutExtension(textBox1.Text) + ".xml"; - MPInstallHelper temp_mpih = new MPInstallHelper(); - MPpackageStruct pk = new MPpackageStruct(); - pk.LoadFromFile(textBox1.Text); - temp_mpih.Add(pk); - temp_mpih.FileName = tempfile; - temp_mpih.SaveToFile(); - download_form.FtpUpload(tempfile, textBox2.Text, textBox3.Text, textBox4.Text); - listBox1.Items.Add("List file uploaded !"); - listBox1.Refresh(); - listBox1.Update(); + listBox1.Items.Add("List file downloaded !"); + listBox1.SelectedIndex = listBox1.Items.Count - 1; + listBox1.Refresh(); + listBox1.Update(); + MPInstallHelper temp_mpih = new MPInstallHelper(); + temp_mpih.LoadFromFile(tempfile); + MPpackageStruct pk = new MPpackageStruct(); + pk.LoadFromFile(textBox1.Text); + temp_mpih.Add(pk); + temp_mpih.SaveToFile(); + download_form.FtpRenam(configfile, "MPExtensionFileList_old.xml", textBox3.Text, textBox4.Text); + listBox1.Items.Add("List file renamed !"); + listBox1.Refresh(); + listBox1.Update(); + download_form.FtpUpload(tempfile, textBox2.Text, textBox3.Text, textBox4.Text); + listBox1.Items.Add("List file uploaded !"); + listBox1.Refresh(); + listBox1.Update(); } - else - { - string tempfile = Path.GetTempPath() + @"\MPExtensionFileList.xml"; - string configfile = textBox2.Text + "/MPExtensionFileList.xml"; - if (download_form.FtpDownload(configfile, tempfile, textBox3.Text, textBox4.Text)) - { - listBox1.Items.Add("List file downloaded !"); - listBox1.SelectedIndex = listBox1.Items.Count - 1; - listBox1.Refresh(); - listBox1.Update(); - MPInstallHelper temp_mpih = new MPInstallHelper(); - temp_mpih.LoadFromFile(tempfile); - MPpackageStruct pk = new MPpackageStruct(); - pk.LoadFromFile(textBox1.Text); - temp_mpih.Add(pk); - temp_mpih.SaveToFile(); - download_form.FtpRenam(configfile, "MPExtensionFileList_old.xml", textBox3.Text, textBox4.Text); - listBox1.Items.Add("List file renamed !"); - listBox1.Refresh(); - listBox1.Update(); - download_form.FtpUpload(tempfile, textBox2.Text, textBox3.Text, textBox4.Text); - listBox1.Items.Add("List file uploaded !"); - listBox1.Refresh(); - listBox1.Update(); - } - } + } } + } } else { - MessageBox.Show("File name is mandatory !", "Stop"); - textBox1.Focus(); + MessageBox.Show("File name is mandatory !", "Stop"); + textBox1.Focus(); } this.Cursor = Cursors.Arrow; } + + private void checkBox1_CheckedChanged(object sender, EventArgs e) + { + if (checkBox1.Checked) + { + textBox2.Enabled = false; + textBox3.Enabled = false; + textBox4.Enabled = false; + } + else + { + textBox2.Enabled = true; + textBox3.Enabled = true; + textBox4.Enabled = true; + } + } } } \ 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-29 17:16:04
|
Revision: 356 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=356&view=rev Author: zebons Date: 2007-04-29 10:15:59 -0700 (Sun, 29 Apr 2007) Log Message: ----------- Mode List during search by actors Modified Paths: -------------- trunk/plugins/MyFilms/MesFilms.cs Modified: trunk/plugins/MyFilms/MesFilms.cs =================================================================== --- trunk/plugins/MyFilms/MesFilms.cs 2007-04-29 08:03:56 UTC (rev 355) +++ trunk/plugins/MyFilms/MesFilms.cs 2007-04-29 17:15:59 UTC (rev 356) @@ -263,9 +263,16 @@ //--------------------------------------------------------------------------------------- public override void OnAction(Action actionType) { - if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) || (actionType.wID == Action.ActionType.ACTION_PARENT_DIR)) + //if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) || (actionType.wID == Action.ActionType.ACTION_PARENT_DIR)) + //{ + // if (GetPrevFilmList() || (actionType.wID != Action.ActionType.ACTION_PREVIOUS_MENU)) return; + //} + if (actionType.wID == Action.ActionType.ACTION_PARENT_DIR) + if (GetPrevFilmList()) return; + if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) && (boolselect)) { - if (GetPrevFilmList() || (actionType.wID != Action.ActionType.ACTION_PREVIOUS_MENU)) return; + Change_LayOut(Layout); + if (GetPrevFilmList()) return; } base.OnAction(actionType); } @@ -433,6 +440,7 @@ { if (control_searchText(keyboard.Text)) { + Change_LayOut(0); WStrSort = "ACTORS"; WStrSortSens = " ASC"; BtnSrtBy.IsAscending = true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <du...@us...> - 2007-04-29 08:04:00
|
Revision: 355 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=355&view=rev Author: dukus Date: 2007-04-29 01:03:56 -0700 (Sun, 29 Apr 2007) Log Message: ----------- Missing files added (UpdateChecker) Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs trunk/plugins/mpinstaler/MPInstaler/Form1.cs trunk/plugins/mpinstaler/MPInstaler/MPInstaler.csproj Added Paths: ----------- trunk/plugins/mpinstaler/MPInstaler/GroupForm.Designer.cs trunk/plugins/mpinstaler/MPInstaler/GroupForm.cs trunk/plugins/mpinstaler/MPInstaler/GroupForm.resx trunk/plugins/mpinstaler/MPInstaler/UpdateChecker.Designer.cs trunk/plugins/mpinstaler/MPInstaler/UpdateChecker.cs trunk/plugins/mpinstaler/MPInstaler/UpdateChecker.resx Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs 2007-04-28 22:10:10 UTC (rev 354) +++ trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs 2007-04-29 08:03:56 UTC (rev 355) @@ -866,6 +866,7 @@ this.setupGroupsToolStripMenuItem.Name = "setupGroupsToolStripMenuItem"; this.setupGroupsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.setupGroupsToolStripMenuItem.Text = "Setup Groups"; + this.setupGroupsToolStripMenuItem.Click += new System.EventHandler(this.setupGroupsToolStripMenuItem_Click); // // propertyGrid2 // Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-04-28 22:10:10 UTC (rev 354) +++ trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-04-29 08:03:56 UTC (rev 355) @@ -576,5 +576,11 @@ { bossview.SelectedItems[0].SubItems[5].Text = ((FilePropertiesClass)propertyGrid2.SelectedObject).ToString(); } + + private void setupGroupsToolStripMenuItem_Click(object sender, EventArgs e) + { + GroupForm dlg = new GroupForm(); + dlg.ShowDialog(); + } } } \ No newline at end of file Added: trunk/plugins/mpinstaler/MPInstaler/GroupForm.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/GroupForm.Designer.cs (rev 0) +++ trunk/plugins/mpinstaler/MPInstaler/GroupForm.Designer.cs 2007-04-29 08:03:56 UTC (rev 355) @@ -0,0 +1,99 @@ +namespace MPInstaler +{ + partial class GroupForm + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.button1 = new System.Windows.Forms.Button(); + this.tabControl1.SuspendLayout(); + this.SuspendLayout(); + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Location = new System.Drawing.Point(4, 5); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(485, 235); + this.tabControl1.TabIndex = 0; + // + // tabPage1 + // + 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(477, 209); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "tabPage1"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // tabPage2 + // + 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(477, 209); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "tabPage2"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(406, 257); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 1; + this.button1.Text = "Close"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // GroupForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(493, 292); + this.Controls.Add(this.button1); + this.Controls.Add(this.tabControl1); + this.Name = "GroupForm"; + this.Text = "GroupForm"; + this.tabControl1.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.Button button1; + } +} \ No newline at end of file Added: trunk/plugins/mpinstaler/MPInstaler/GroupForm.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/GroupForm.cs (rev 0) +++ trunk/plugins/mpinstaler/MPInstaler/GroupForm.cs 2007-04-29 08:03:56 UTC (rev 355) @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace MPInstaler +{ + public partial class GroupForm : Form + { + public GroupForm() + { + InitializeComponent(); + } + + private void button1_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} \ No newline at end of file Added: trunk/plugins/mpinstaler/MPInstaler/GroupForm.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/GroupForm.resx (rev 0) +++ trunk/plugins/mpinstaler/MPInstaler/GroupForm.resx 2007-04-29 08:03:56 UTC (rev 355) @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/MPInstaler.csproj =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/MPInstaler.csproj 2007-04-28 22:10:10 UTC (rev 354) +++ trunk/plugins/mpinstaler/MPInstaler/MPInstaler.csproj 2007-04-29 08:03:56 UTC (rev 355) @@ -81,6 +81,12 @@ <Compile Include="download_form.Designer.cs"> <DependentUpon>download_form.cs</DependentUpon> </Compile> + <Compile Include="GroupForm.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="GroupForm.Designer.cs"> + <DependentUpon>GroupForm.cs</DependentUpon> + </Compile> <Compile Include="MPinstalerStruct.cs" /> <Compile Include="Form1.cs"> <SubType>Form</SubType> @@ -122,6 +128,10 @@ <SubType>Designer</SubType> <DependentUpon>Form1.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="GroupForm.resx"> + <SubType>Designer</SubType> + <DependentUpon>GroupForm.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="Language dialog.resx"> <SubType>Designer</SubType> <DependentUpon>Language dialog.cs</DependentUpon> Added: trunk/plugins/mpinstaler/MPInstaler/UpdateChecker.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/UpdateChecker.Designer.cs (rev 0) +++ trunk/plugins/mpinstaler/MPInstaler/UpdateChecker.Designer.cs 2007-04-29 08:03:56 UTC (rev 355) @@ -0,0 +1,119 @@ +namespace MPInstaler +{ + partial class UpdateChecker + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UpdateChecker)); + this.listView1 = new System.Windows.Forms.ListView(); + this.button1 = new System.Windows.Forms.Button(); + this.columnHeader1 = new System.Windows.Forms.ColumnHeader(); + this.columnHeader2 = new System.Windows.Forms.ColumnHeader(); + this.imageList1 = new System.Windows.Forms.ImageList(this.components); + this.button2 = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // listView1 + // + this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader1, + this.columnHeader2}); + this.listView1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.listView1.FullRowSelect = true; + this.listView1.GridLines = true; + this.listView1.Location = new System.Drawing.Point(-1, -1); + this.listView1.Name = "listView1"; + this.listView1.Size = new System.Drawing.Size(339, 213); + this.listView1.SmallImageList = this.imageList1; + this.listView1.TabIndex = 0; + this.listView1.UseCompatibleStateImageBehavior = false; + this.listView1.View = System.Windows.Forms.View.Details; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(251, 231); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 1; + this.button1.Text = "Close"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // columnHeader1 + // + this.columnHeader1.Text = "Name"; + this.columnHeader1.Width = 227; + // + // columnHeader2 + // + this.columnHeader2.Text = "Version"; + this.columnHeader2.Width = 102; + // + // imageList1 + // + this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); + this.imageList1.TransparentColor = System.Drawing.Color.Transparent; + this.imageList1.Images.SetKeyName(0, "application.ico"); + // + // button2 + // + this.button2.Location = new System.Drawing.Point(12, 231); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(75, 23); + this.button2.TabIndex = 2; + this.button2.Text = "Update"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // UpdateChecker + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(338, 266); + this.Controls.Add(this.button2); + this.Controls.Add(this.button1); + this.Controls.Add(this.listView1); + this.MaximizeBox = false; + this.Name = "UpdateChecker"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Udaptes"; + this.Shown += new System.EventHandler(this.UpdateChecker_Shown); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.ListView listView1; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.ColumnHeader columnHeader1; + private System.Windows.Forms.ColumnHeader columnHeader2; + private System.Windows.Forms.ImageList imageList1; + private System.Windows.Forms.Button button2; + } +} \ No newline at end of file Added: trunk/plugins/mpinstaler/MPInstaler/UpdateChecker.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/UpdateChecker.cs (rev 0) +++ trunk/plugins/mpinstaler/MPInstaler/UpdateChecker.cs 2007-04-29 08:03:56 UTC (rev 355) @@ -0,0 +1,101 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.IO; +using System.Windows.Forms; + +namespace MPInstaler +{ + public partial class UpdateChecker : Form + { + MPInstallHelper lst = new MPInstallHelper(); + MPInstallHelper lst_online = new MPInstallHelper(); + private string remoteFile="http://dukus.extra.hu/MPExtensionFileList.xml"; + public UpdateChecker() + { + InitializeComponent(); + lst.LoadFromFile(); + } + + private void button1_Click(object sender, EventArgs e) + { + this.Close(); + } + public void Check() + { + this.ShowDialog(); + } + + private void UpdateChecker_Shown(object sender, EventArgs e) + { + string file_name = "MPExtensionFileList.xml"; + string temp_file = Path.GetFullPath(Environment.GetEnvironmentVariable("TEMP")) + @"\" + file_name; + download_form dw = new download_form(remoteFile, temp_file); + dw.Text = "Download files list ..."; + dw.ShowDialog(); + if (File.Exists(temp_file)) + { + lst_online.LoadFromFile(temp_file); + lst_online.Compare(lst); + LoadToListview(lst_online, listView1); + } + + } + + public void LoadToListview(MPInstallHelper mpih, ListView lv) + { + lv.Items.Clear(); + for (int i = 0; i < mpih.lst.Count; i++) + { + MPpackageStruct pk = (MPpackageStruct)mpih.lst[i]; + if (pk.isUpdated) + { + ListViewItem item1 = new ListViewItem(pk._intalerStruct.Name, 0); + if (pk._intalerStruct.Logo != null) + { + imageList1.Images.Add(pk._intalerStruct.Logo); + item1.ImageIndex = imageList1.Images.Count - 1; + } + item1.ToolTipText = pk._intalerStruct.Description; + //item1.SubItems.Add(pk._intalerStruct.Author); + item1.SubItems.Add(pk._intalerStruct.Version); + //item1.SubItems.Add(Path.GetFileName(pk.FileName)); + //item1.SubItems.Add(pk._intalerStruct.Group); + lv.Items.AddRange(new ListViewItem[] { item1 }); + } + } + } + + private void button2_Click(object sender, EventArgs e) + { + foreach (ListViewItem it in listView1.Items) + { + MPpackageStruct pk = lst.Find(it.SubItems[0].Text); + if (pk != null) + { + string file_name = pk.FileName; + string temp_file = Path.GetFullPath(Environment.GetEnvironmentVariable("TEMP")) + @"\" + file_name; + download_form dw1 = new download_form(pk._intalerStruct.UpdateURL + "/" + file_name, temp_file); + dw1.Text = pk._intalerStruct.UpdateURL + "/" + pk.FileName + "/" + pk._intalerStruct.Version; + dw1.ShowDialog(); + if (File.Exists(temp_file)) + { + wizard_1 wiz = new wizard_1(); + wiz.package.LoadFromFile(temp_file); + if (wiz.package.isValid) + { + //wiz.nextStep(6); + wiz.StartUpdate(); + } + else + MessageBox.Show("Invalid package !"); + } + } + } + this.Close(); + } + } +} \ No newline at end of file Added: trunk/plugins/mpinstaler/MPInstaler/UpdateChecker.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/UpdateChecker.resx (rev 0) +++ trunk/plugins/mpinstaler/MPInstaler/UpdateChecker.resx 2007-04-29 08:03:56 UTC (rev 355) @@ -0,0 +1,257 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>17, 17</value> + </metadata> + <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64"> + <value> + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACS + HQAAAk1TRnQBSQFMAwEBAAEFAQABBAEAASABAAEgAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABgAMA + ASADAAEBAQABIAYAAUAqAAEDASEBagH/AQQBJwF7Af8BBAErAYgB/wEFATEBmQH/AQUBMgGfAf8BBQE4 + AbAB/wEFAToBtgH/AQYBOgG2Af8BBgE6AbYB/wEGAToBtgH/AQYBOgG2Af8BBgE6AbYB/wEGAToBtgH/ + AQYBOgG2Af8BBQE2AaoB/wEFATIBnwH/AQUBMAGWAf8BBAErAYgB/wEEASUBdQH/AQMBIAFnAf//AKEA + AQUBLwGTAf8BCAE7AbYB/wENAUEBuAH/AREBRQG7Af8BFgFJAb8B/wEaAU4BwwH/AR8BUgHHAf8BJAFX + AcoB/wEoAVwBzgH/AS0BYQHRAf8BMgFlAdQB/wE2AWoB1wH/AToBbgHaAf8BPQFxAdwB/wFAAXQB3gH/ + AUQBdwHgAf8BRQF4AeEB/wFGAXkB4gH/AUYBegHiAf8BRQF5AeEB/wFDAXYB4AH/AUABcwHeAf8BOwFv + AdoB/wE2AWkB1gH/AS4BYgHRAf8BJQFZAcsB/wEPAUMBvAH/AQUBLgGQAf//AI0AAQUBMAGWAf8BDAE+ + AbMB/wEXAUkBtwH/ARsBTQG8Af8BHgFRAcEB/wEhAVQBxQH/ASQBWAHJAf8BJwFbAc0B/wEqAV4BzwH/ + AS4BYQHRAf8BMQFkAdMB/wE0AWcB1QH/ATcBagHXAf8BOgFuAdoB/wE9AXAB3AH/AUABdAHeAf8BQwF3 + AeAB/wFGAXoB4gH/AUoBfQHkAf8BTQGAAeYB/wFQAYIB6QH/AVMBhQHrAf8BVgGIAe0B/wFZAYsB7wH/ + AVwBjgHxAf8BXwGSAfMB/wFiAZQB9QH/AWIBlAH1Af8BKQFcAc4B/wEEAS8BkwH//wCJAAEHAToBswH/ + ARMBRQGwAf8BFwFJAbUB/wEaAUwBugH/AR4BUAG/Af8BIQFTAcMB/wEkAVcByAH/AScBWwHMAf8BKgFe + Ac8B/wEtAWEB0QH/ATABZAHTAf8BNAFnAdUB/wE3AWoB1wH/AToBbQHZAf8BPQFwAdwB/wFAAXMB3gH/ + AUMBdwHgAf8BRgF5AeIB/wFJAX0B5AH/AUwBgAHmAf8BUAGCAegB/wFTAYUB6gH/AVYBiAHsAf8BWQGL + Ae8B/wFcAY4B8QH/AV8BkQHzAf8BYgGUAfUB/wFlAZcB9wH/AWQBlgH2Af8BEQFFAb4B//8AiQABCgE8 + Aa8B/wETAUQBrgH/ARcBSAGzAf8BGgFMAbgB/wEdAU8BvQH/ASABUwHBAf8BIwFWAcYB/wEnAVoBygH/ + ASoBXQHOAf8BLQFgAdAB/wEwAWQB0wH/ATMBZwHVAf8BNgFqAdcB/wE5AW0B2QH/ATwBcAHbAf8BPwFz + Ad0B/wFDAXYB3wH/AUYBeQHhAf8BSQF8AeQB/wFMAX8B5gH/AU8BgQHoAf8BUgGEAeoB/wFVAYcB7AH/ + AVgBigHuAf8BWwGNAfAB/wFeAZAB8gH/AWABkwH0Af8BYgGUAfUB/wFjAZUB9gH/ASoBXgHOAf//AIkA + AQsBPQGsAf8BEwFDAawB/wEWAUcBsQH/ARoBSwG2Af8BHQFOAbsB/wEgAVIBvwH/ASMBVQHEAf8BJgFZ + AcgB/wEpAV0BzQH/ASwBYAHQAf8BLwFjAdIB/wEzAWYB1AH/ATYBaQHWAf8BOQFsAdkB/wE8AW8B2wH/ + AT8BcgHdAf8BQgF1Ad8B/wFFAXgB4QH/AUgBewHjAf8BSwF+AeUB/wFOAYEB5wH/AVEBgwHpAf8BVAGG + AesB/wFXAYkB7QH/AVkBjAHvAf8BXAGOAfEB/wFeAZAB8gH/AWABkgHzAf8BYAGTAfQB/wEzAWcB1QH/ + /wCFAAEEASQBcgH/AQwBPAGpAf8BEgFCAakB/wEVAUYBrwH/ARgBSgG0Af8BHAFNAbkB/wEfAVEBvQH/ + ASIBVQHCAf8BJQFYAcYB/wEoAVsBywH/ASwBXwHPAf8BLwFiAdIB/wEyAWUB1AH/ATUBaAHWAf8BOAFr + AdgB/wE7AW4B2gH/AT4BcQHcAf8BOgFuAd4B/wEsAWQB2wH/AT4BdQHfAf8BMgFsAd8B/wFEAXoB5wH/ + AV8BjgHrAf8BQwF6AeoB/wFVAYcB7AH/AVgBigHuAf8BWgGMAe8B/wFcAY4B8QH/AV0BjwHxAf8BXQGQ + AfIB/wE6AW4B2gH/AQQBJAFyAf//AIEAAQQBKQGCAf8BEAE/AacB/wERAUEBpwH/ARQBRQGsAf8BGAFJ + AbIB/wEbAUwBtwH/AR8BUAG7Af8BIgFUAcAB/wElAVcBxAH/ASgBWwHJAf8BKwFeAc0B/wEuAWEB0QH/ + ATEBZAHTAf8BNAFnAdUB/wE3AWoB1wH/AToBbQHZAf8BPQFwAdsB/wExAWcB3gH/AvwG/wF4AZwB7gH/ + AeQB6wH9Bf8BVQGGAesB/wFNAYEB6wH/AVUBiAHsAf8BVwGKAe4B/wFZAYsB7wH/AVoBjAHvAf8BWgGN + AfAB/wFAAXQB3gH/AQQBKQGCAf//AIEAAQQBLQGNAf8BOQFgAbMB/wEqAVQBrgH/ARUBRAGqAf8BFwFH + Aa8B/wEaAUsBtAH/AR4BTwG5Af8BIQFSAb4B/wEkAVYBwgH/AScBWQHHAf8BKgFdAcsB/wEtAWABzwH/ + ATABYwHSAf8BMwFmAdUB/wE2AWkB1wH/ATkBbAHZAf8BNQFqAdsB/wETAVQB1wP/Af4F/wH9Af4B/Qn/ + AYsBrgHyAf8BLwFsAeYB/wFHAX4B6wH/AVUBhwHsAf8BVgGIAe0B/wFXAYkB7QH/AVgBigHuAf8BRQF4 + AeEB/wEEAS0BjgH//wCBAAEFATIBnwH/AUgBawG1Af8BRQFpAbYB/wE0AV0BtAH/ARABQgGtAf8BGQFK + AbIB/wEcAU0BtwH/ASABUQG7Af8BIwFUAcAB/wEmAVgBxAH/ASkBWwHJAf8BLAFfAc0B/wEvAWIB0QH/ + ATEBZQHUAf8BNQFoAdYB/wEtAWUB1wH/ATgBaQHdAf8BZQGLAecF/wFSAYIB4wH/AR4BWwHbAf8BHwFd + Ad0B/wGJAakB7wn/AWkBlgHsAf8BTgGEAeoB/wFTAYYB6wH/AVQBhwHsAf8BVQGHAewB/wFIAXsB4wH/ + AQUBMgGfAf//AIEAAQYBNAGkAf8BXgF8AbsB/wFMAW8BtwH/AUYBawG4Af8BOAFiAbUB/wESAUMBrwH/ + ARsBTAG0Af8BHgFPAbkB/wEiAVMBvgH/ASUBVgHCAf8BKAFaAcYB/wEqAV0BygH/AS0BYAHOAf8BMAFk + AdIB/wEzAWcB1QH/ASUBXAHSAf8B2wHlAfUF/wG/AdIB9QH/ASEBXAHYAf8BQwF3AeAB/wFGAXkB4QH/ + ASABXgHfAf8C/gH9Af8B5AHqAfwB/wFTAYcB6gH/AU8BggHoAf8BUQGDAekB/wFRAYQB6gH/AVIBhAHq + Af8BSgF9AeQB/wEFATQBpQH//wCBAAEKATwBtQH/AXEBigHCAf8BVAF1AbkB/wFNAXABuQH/AU4BbwG+ + Af8BLgFZAbUB/wEWAUYBsQH/AR0BTgG2Af8BIAFRAbsB/wEjAVUBwAH/ASABUAHEAf8BEQFJAcIB/wEf + AVUBygH/ASMBWAHQAf8BMQFlAdMB/wEcAVcB1gH/AYMBowHmBf8BrwHHAe8B/wEiAV0B2QH/AUEBdQHe + Af8BRAF3AeAB/wEjAV4B2wH/AfQB+AH9Af8BSgF/AeoB/wE3AXAB5QH/AU0BgAHmAf8BTgGBAecB/wFO + AYEB6AH/AU8BgQHoAf8BSgF+AeUB/wEFAToBtgH//wCBAAENAT8BtQH/AYMBmQHIAf8BWgF5AboB/wFV + AXUBugH/AU8BcgG7Af8BTwFyAb8B/wEQAUUBsAH/ARsBTAG0Af8BHgFQAbgB/wEiAVMBvQH/AQ8BRgG7 + Af8ByAHUAfEF/wEBATsBwQH/AQwBSQHJAf8BZAGJAd8B/wFUAYEB3gH/ASIBXQHUBf8BHAFXAdYB/wEl + AV0B2QH/ASMBXgHaAf8BQAF2AeIF/wHUAeEB9AH/AT4BdAHjAf8BSgF9AeQB/wFLAX4B5QH/AUwBfwHm + Af8BTAF/AeYB/wFKAX4B5QH/AQYBOgG1Af//AIEAARABQQG1Af8BlAGmAc4B/wFhAX4BuwH/AVwBewG7 + Af8BVgF3AbwB/wFXAXoBwAH/AS8BVQG0Af8BBgE7AasB/wEjAVIBuQH/AQEBMgGsAf8BAQElAa4B/wHd + AeIB9AX/AdMB3AHyAf8BjwGpAeMJ/wF0AZYB4Qn/AaIBugHuAf8BsAHEAe8N/wEzAWsB4gH/AUcBegHi + Af8BSAF7AeMB/wFJAXwB4wH/AUkBfAHkAf8BSQF8AeQB/wEGAToBtgH//wCBAAETAUQBtgH/AaMBswHU + Af8BaAGCAbwB/wFjAYABvQH/AV0BfAG9Af8BWgF7Ab0B/wFDAWoBugH/AQ4BPwGqBf8B3wHlAfUB/wHh + AeUB9Bn/ASoBYAHQBf8BiAGrAesD/wH+Bf8BngG3Ae0B/wEQAVIB1wH/ATABaAHfAf8BOwFvAd8B/wFE + AXgB4AH/AUUBeAHhAf8BRgF5AeEB/wFGAXkB4gH/AUYBeQHiAf8BBgE6AbYB//8AgQABFQFFAbcB/wGy + Ab8B2gH/AW4BhwG8Af8BagGEAb4B/wFkAYEBvgH/AV4BfQG/Af8BXwF+AcIB/wEUAUQBrA3/AZYBrgHg + Af8BGgFMAb4B/wEBATgBvAH/AT8BbAHPAf8B4wHnAfgF/wHJAdcB9AH/AZIBrQHrAf8BOgFuAdcB/wE8 + AW4B2AH/Ae0B8wH9Af8BUAF8AeEB/wEzAWkB2wH/AT8BcwHdAf8BQAF0Ad4B/wFBAXUB3wH/AUIBdgHf + Af8BQwF2AeAB/wFDAXcB4AH/AUMBdwHgAf8BBwE7AbYB//8AgQABFQFFAbcB/wHAAcsB4QH/AXUBjAG+ + Af8BcAGJAb8B/wFrAYYBvwH/AWUBgQHAAf8BZgGEAcAB/wEBASoBmQH/AZIBqAHXBf8BbQGLAdEB/wEB + ATcBrQH/ARoBTgG/Af8BIgFTAcIB/wEZAVABwQH/AQEBPQHDAf8B5wHvAfoJ/wHiAeoB9wH/ARkBUwHP + Af8BJQFfAdcB/wEsAWQB2QH/ATsBbgHaAf8BPAFwAdsB/wE9AXEB3AH/AT8BcgHdAf8BPwFzAd0B/wFA + AXMB3gH/AUABdAHeAf8BQAF0Ad4B/wEGAToBtgH//wCBAAEUAUQBtwH/Ac0B1gHmAf8BfgGTAcAB/wF3 + AY4BvwH/AXIBiwHBAf8BbAGHAcEB/wFlAYIBvgH/ATgBYwGxCf8BAQEmAaIB/wEWAVABtwH/ASEBUgG7 + Af8BJAFVAb8B/wEnAVgBwwH/ARkBTwHCAf8BTAF2AdMJ/wEtAWIB1AH/ASoBYAHVAf8BNQFoAdYB/wE3 + AWoB1wH/ATgBbAHYAf8BOQFtAdkB/wE7AW4B2gH/ATwBbwHbAf8BPAFwAdsB/wE9AXAB3AH/AT0BcQHc + Af8BPQFxAdwB/wEGAToBtgH//wCBAAERAUIBtgH/AdgB3gHrAf8BhgGaAcQB/wF+AZMBwQH/AXgBkAHB + Af8BaQGFAb0B/wGzAcQB4Qn/Ac0B1gHtAf8BAQErAaIB/wEcAU0BtAH/AR8BUAG4Af8BIgFTAbwB/wEk + AVYBwAH/ASABVQHEAf8BEAFLAcQF/wG4AckB7wH/AQIBQQHJAf8BLQFfAdIB/wEyAWYB1AH/ATQBZwHV + Af8BNQFpAdYB/wE3AWoB1wH/ATgBawHYAf8BOQFsAdkB/wE5AW0B2QH/AToBbgHaAf8BOgFuAdoB/wE5 + AWwB2QH/AQYBOgG1Af//AIEAAQwBPwG1Af8B3wHkAe8B/wGRAaMByQH/AYUBmgHEAf8BfwGUAcIB/wFz + AY0BwgH/AZsBrgHUAf8B+QH4Af0F/wL1AfoB/wEBASIBmwH/ARoBSwGwAf8BHQFOAbUB/wEfAVEBuQH/ + ASIBUwG9Af8BGAFNAcEB/wEwAWAByAn/AWMBhwHeAf8BHgFUAdEB/wEwAWMB0wH/ATEBZQHTAf8BMwFm + AdUB/wE0AWcB1QH/ATUBaAHWAf8BNgFpAdcB/wE3AWoB1wH/ATcBawHYAf8BOAFrAdgB/wE0AWgB1gH/ + AQUBOQG2Af//AIEAAQYBNAGhAf8B4wHoAfEB/wGcAa0BzgH/AY4BoAHHAf8BhgGaAcUB/wGAAZUBwwH/ + AXIBigHAAf8BUAFyAbUB/wHIAdIB6AX/ASsBVAGuAf8BAQE2AaUB/wEbAUsBsQH/AR0BTgG1Af8BFgFN + AbkB/wEBATQBsQH/AbkBxQHsDf8BFAFNAcgB/wEtAWEB0QH/AS8BYgHSAf8BMAFkAdMB/wExAWUB0wH/ + ATIBZgHUAf8BMwFnAdUB/wE0AWcB1QH/ATQBaAHWAf8BNQFoAdYB/wEvAWMB0gH/AQUBMwGiAf//AIEA + AQUBMgGfAf8B3gHkAfAB/wGpAbcB0wH/AZYBpwHKAf8BjgGhAcgB/wGGAZoBxQH/AYEBlgHFAf8BZwGE + Ab4B/wG3AcYB4wn/ATQBWwG0Af8BAQEhAZsB/wEBASsBogH/AQEBLQGqAf8BlAGrAd4F/wGVAa0B4wH/ + ATgBaAHLAf8BXQGCAdUB/wEaAU8BxgH/ASoBXgHOAf8BLAFgAdAB/wEtAWEB0QH/AS4BYgHSAf8BLwFj + AdIB/wEwAWQB0wH/ATEBZAHTAf8BMQFlAdMB/wEyAWUB1AH/ASoBXgHPAf8BBQEyAZ8B//8AgQABBAEs + AYsB/wHUAdwB7wH/AbYBwgHZAf8BngGuAc4B/wGWAagBywH/AY4BoQHIAf8BhgGbAcYB/wF9AZMBwxX/ + AeQB7QH0Df8BAQEfAasB/wERAUgBvQH/AR0BUQHFAf8BJgFZAcgB/wEoAVsBywH/ASkBXQHOAf8BKgFe + Ac8B/wErAV8B0AH/ASwBYAHQAf8BLQFhAdEB/wEuAWIB0QH/AS4BYgHSAf8BLwFiAdIB/wElAVkBywH/ + AQQBLAGLAf//AIEAAQQBKQGAAf8BxAHPAeoB/wHDAc0B3wH/AaYBtQHRAf8BngGuAc4B/wGXAagBywH/ + AY8BogHIAf8BfQGSAb4B/wGjAbMB1QH/AV8BfgG8Af8BAQENAYUB/wHrAfAB9Qn/AakBuwHhCf8BYQGC + Ac4B/wEZAUwBvQH/ASIBVAHBAf8BJAFWAcUB/wElAVgByAH/ASYBWgHLAf8BKAFbAc0B/wEpAVwBzgH/ + ASoBXQHOAf8BKgFeAc8B/wErAV8BzwH/ASsBXwHQAf8BLAFgAdAB/wEgAVMBxwH/AQQBKQGAAf//AIEA + AQMBIwFvAf8BrgG+AeQB/wHPAdcB5QH/Aa4BuwHVAf8BpgG1AdEB/wGfAa8BzwH/AZcBqAHMAf8BjwGi + AckB/wGHAZwBxwH/AYQBmwHGAf8BbQGHAcQB/wHQAdwB7QX/ATEBWwGwAf8BAQESAZUB/wEFATsBqQH/ + AakBuAHhAf8BAgE4Aa0B/wENAUQBswH/ARkBSwG9Af8BGgFNAcEB/wEcAVUBxAH/ASQBVwHHAf8BJQFY + AcoB/wEmAVoBzAH/AScBWgHMAf8BKAFbAc0B/wEoAVwBzQH/ASkBXAHNAf8BKQFcAc4B/wEbAU4BxAH/ + AQQBIwFvAf//AIUAAZYBqwHdAf8B2gHgAesB/wG3AcIB2AH/Aa8BvAHVAf8BpwG1AdIB/wGfAa8BzwH/ + AZcBqQHMAf8BjwGiAcoB/wGHAZwBxwH/AX4BmAHGAf8BfwGXAc0B/wGnAbYB1wH/AXIBjQHIAf8BYgGC + AcEB/wFYAXsBwwH/AU4BeAHEAf8BUAF1AcUB/wFSAXgBxQH/AU0BcwHGAf8BSAFxAcYB/wE+AWsByQH/ + ATYBZAHJAf8BMQFhAcsB/wEsAV4BywH/AScBWgHLAf8BJQFYAcsB/wElAVkBywH/ASYBWQHMAf8BJgFa + AcwB/wEWAUkBwAH//wCJAAF8AZYB1gH/AeQB6AHwAf8BvwHJAdwB/wG3AcMB2QH/Aa8BvAHVAf8BpwG2 + AdIB/wGfAa8BzwH/AZgBqQHNAf8BkAGiAcoB/wGIAZwByAH/AYEBlwHHAf8BeQGUAcgB/wF3AZABxwH/ + AXMBiwHGAf8BbQGHAcYB/wFjAYIBxwH/AV0BfwHHAf8BVwF7AccB/wFRAXYBxwH/AUsBcgHIAf8BRQFu + AcgB/wE/AWoByQH/ATkBZgHKAf8BMwFiAcoB/wEsAV0BywH/ASYBWQHKAf8BIwFWAckB/wEjAVcBygH/ + ASMBVwHKAf8BEQFFAb0B//8AiQABXQF+Ac0B/wHtAfAB9QH/AccB0AHgAf8BvwHJAd0B/wG3AcMB2QH/ + Aa8BvAHWAf8BpwG2AdMB/wGgAbAB0AH/AZgBqQHNAf8BkAGjAcsB/wGIAZ0ByAH/AYEBlwHGAf8BfAGT + AccB/wF2AZAByAH/AXABiwHHAf8BagGHAccB/wFjAYIBxwH/AV0BfwHHAf8BVgF6AccB/wFQAXYBxwH/ + AUoBcQHIAf8BRAFtAcgB/wE+AWkByQH/ATcBZAHJAf8BMQFgAcoB/wEqAVsBygH/ASQBVwHJAf8BIAFU + AcgB/wEgAVQByAH/AQwBQAG6Af//AIkAARwBSwG7Af8B8AHyAfgB/wHTAdkB5gH/AcgB0AHhAf8BwAHK + Ad0B/wG4AcMB2gH/AbABvQHWAf8BqAG2AdMB/wGgAbAB0AH/AZgBqgHOAf8BkAGjAcsB/wGIAZ0ByQH/ + AYEBlwHGAf8BegGSAcYB/wF1AY8BxwH/AXABiwHHAf8BaQGGAccB/wFjAYIBxwH/AVwBfgHHAf8BVgF6 + AccB/wFQAXUBxwH/AUkBcAHHAf8BQwFsAcgB/wE8AWgByAH/ATYBYwHIAf8BLwFeAckB/wEoAVoByAH/ + ASIBVAHHAf8BGwFPAcQB/wEGATkBswH//wCJAAEDASYBeAH/AVsBfQHOAf8B8AHyAfkB/wHlAekB8QH/ + AdcB3QHpAf8BywHTAeMB/wG+AckB3QH/AbEBvgHYAf8BqAG3AdQB/wGgAbAB0QH/AZkBqgHOAf8BkQGk + AcwB/wGIAZ0ByQH/AYEBlwHHAf8BeQGRAcUB/wFzAYwBxQH/AW4BiQHGAf8BaQGGAccB/wFiAYEBxwH/ + AVsBfQHGAf8BVQF5AcYB/wFPAXQBxgH/AUgBbwHHAf8BQgFqAccB/wE7AWYBxwH/ATQBYQHIAf8BLQFd + AcgB/wEjAVQBxQH/AQsBPwG5Af8BAwEiAW0B//8AjQABBAEmAXgB/wEZAUkBugH/AVUBeAHMAf8BdAGQ + AdUB/wGOAaUB3AH/AaUBuAHjAf8BuwHJAeoB/wHJAdQB7AH/Ac4B1wHtAf8B0QHZAesB/wHQAdgB6QH/ + AcsB1AHnAf8BwQHMAeMB/wG3AcQB3wH/AawBuwHbAf8BnwGwAdcB/wGRAaYB0wH/AYIBmgHQAf8BcQGN + AcwB/wFfAYAByQH/AUwBcgHFAf8BOQFjAcIB/wEuAVoBwAH/ASMBUgG+Af8BGgFLAb0B/wESAUQBugH/ + AQcBOwG2Af8BAwEjAXAB//8ApQABBAElAXUB/wEEASsBiAH/AQUBMAGWAf8BBQEyAZ8B/wEFATcBrQH/ + AQYBOgG2Af8BBQE6AbYB/wEIATsBtgH/AQkBPAG2Af8BCQE8AbYB/wEHAToBtgH/AQUBOgG2Af8BBgE6 + AbYB/wEFATUBpwH/AQUBMgGfAf8BBQEuAZAB/wEEASoBhQH/AQQBJAFyAf//AJ0AAUIBTQE+BwABPgMA + ASgDAAGAAwABIAMAAQEBAAEBBgABAhYAA/8BAAH8AgABPwwAAcACAAEDDAABgAIAAQEMAAGAAgABAQwA + AYACAAEBDAABgAIAAQH/AD0AAYACAAEBDAABgAIAAQEMAAGAAgABAQwAAYACAAEBDAABgAIAAQEMAAHA + AgABAwwAAf4CAAF/DAAL +</value> + </data> +</root> \ 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-04-28 22:09:13
|
Revision: 353 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=353&view=rev Author: zebons Date: 2007-04-28 15:09:11 -0700 (Sat, 28 Apr 2007) Log Message: ----------- Removed file/folder Removed Paths: ------------- trunk/plugins/MyFilms/MesFilms.csproj Deleted: trunk/plugins/MyFilms/MesFilms.csproj =================================================================== --- trunk/plugins/MyFilms/MesFilms.csproj 2007-04-28 22:08:52 UTC (rev 352) +++ trunk/plugins/MyFilms/MesFilms.csproj 2007-04-28 22:09:11 UTC (rev 353) @@ -1,107 +0,0 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>8.0.50727</ProductVersion> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{20BCDBE0-0812-4235-9330-40B8E570DAE1}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>MesFilms</RootNamespace> - <AssemblyName>MesFilms</AssemblyName> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>..\..\mediaportal\xbmc\bin\Debug\plugins\windows\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <UseVSHostingProcess>false</UseVSHostingProcess> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>..\..\..\..\Program Files\MediaPortal\Plugins\Windows\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <ItemGroup> - <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> - <HintPath>..\..\Mediaportal\Dialogs\bin\Release\Databases.dll</HintPath> - </Reference> - <Reference Include="Dialogs, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86"> - <SpecificVersion>False</SpecificVersion> - <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=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> - <Compile Include="AntMovieCatalog.cs"> - <DependentUpon>AntMovieCatalog.xsd</DependentUpon> - </Compile> - <Compile Include="AntMovieCatalog.Designer.cs"> - <AutoGen>True</AutoGen> - <DesignTime>True</DesignTime> - <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" /> - <Compile Include="MesFilmsSetup.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="MesFilmsSetup.designer.cs"> - <DependentUpon>MesFilmsSetup.cs</DependentUpon> - </Compile> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="MesFilmsSetup.resx"> - <DependentUpon>MesFilmsSetup.cs</DependentUpon> - <SubType>Designer</SubType> - </EmbeddedResource> - </ItemGroup> - <ItemGroup> - <None Include="AntMovieCatalog.xsc"> - <DependentUpon>AntMovieCatalog.xsd</DependentUpon> - </None> - <None Include="AntMovieCatalog.xsd"> - <SubType>Designer</SubType> - <Generator>MSDataSetGenerator</Generator> - <LastGenOutput>AntMovieCatalog.Designer.cs</LastGenOutput> - </None> - <None Include="AntMovieCatalog.xss"> - <DependentUpon>AntMovieCatalog.xsd</DependentUpon> - </None> - </ItemGroup> - <ItemGroup> - <Folder Include="Properties\" /> - </ItemGroup> - <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> -</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:08:54
|
Revision: 352 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=352&view=rev Author: zebons Date: 2007-04-28 15:08:52 -0700 (Sat, 28 Apr 2007) Log Message: ----------- Removed file/folder Removed Paths: ------------- trunk/plugins/MyFilms/MesFilms.csproj.user Deleted: trunk/plugins/MyFilms/MesFilms.csproj.user =================================================================== --- trunk/plugins/MyFilms/MesFilms.csproj.user 2007-04-28 21:02:49 UTC (rev 351) +++ trunk/plugins/MyFilms/MesFilms.csproj.user 2007-04-28 22:08:52 UTC (rev 352) @@ -1,13 +0,0 @@ -<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\;D:\Program Files\MediaPortal\;D:\Program Files\MediaPortal\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:\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: <du...@us...> - 2007-04-28 21:02:52
|
Revision: 351 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=351&view=rev Author: dukus Date: 2007-04-28 14:02:49 -0700 (Sat, 28 Apr 2007) Log Message: ----------- new file properties Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs trunk/plugins/mpinstaler/MPInstaler/Form1.cs trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs trunk/plugins/mpinstaler/MPInstaler/properties.cs Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs 2007-04-28 16:56:41 UTC (rev 350) +++ trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs 2007-04-28 21:02:49 UTC (rev 351) @@ -28,116 +28,118 @@ /// </summary> private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openProiectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.sToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveProiectAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.buildToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.addToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.windowPluginToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.windowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.procesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.subtitleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tagReadersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.externalPlayersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.skinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.componentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mediaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.soundsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.animationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tetrisToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.languageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.textToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.textToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.otherToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.customizationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.postSetupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.bossview = new System.Windows.Forms.ListView(); - this.columnHeader1 = new System.Windows.Forms.ColumnHeader(); - this.columnHeader2 = new System.Windows.Forms.ColumnHeader(); - this.columnHeader3 = new System.Windows.Forms.ColumnHeader(); - this.columnHeader4 = new System.Windows.Forms.ColumnHeader(); - this.columnHeader5 = new System.Windows.Forms.ColumnHeader(); - this.columnHeader6 = new System.Windows.Forms.ColumnHeader(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.toolStripComboBox1 = new System.Windows.Forms.ToolStripMenuItem(); - this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); - this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); - this.tabPage_Skin = new System.Windows.Forms.TabPage(); - this.label6 = new System.Windows.Forms.Label(); - this.skint_comboBox1 = new System.Windows.Forms.ComboBox(); - this.tabPage_Plugin = new System.Windows.Forms.TabPage(); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage_Text = new System.Windows.Forms.TabPage(); - this.textt_comboBox1 = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); - this.tabPage_Advanced = new System.Windows.Forms.TabPage(); - this.propertyGrid1 = new System.Windows.Forms.PropertyGrid(); - this.button_browse = new System.Windows.Forms.Button(); - this.label11 = new System.Windows.Forms.Label(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.tabPage_Proiect = new System.Windows.Forms.TabPage(); - this.proiectt_textBox6 = new System.Windows.Forms.TextBox(); - this.label10 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.proiectt_textBox5 = new System.Windows.Forms.TextBox(); - this.proiectt_textBox4 = new System.Windows.Forms.TextBox(); - this.label5 = new System.Windows.Forms.Label(); - this.proiectt_textBox3 = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.proiectt_textBox2 = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.proiectt_textBox1 = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.tabPage_Thumbs = new System.Windows.Forms.TabPage(); - this.thumbst_comboBox1 = new System.Windows.Forms.ComboBox(); - this.label7 = new System.Windows.Forms.Label(); - this.tabPage_Other = new System.Windows.Forms.TabPage(); - this.othert_comboBox1 = new System.Windows.Forms.ComboBox(); - this.label8 = new System.Windows.Forms.Label(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.newToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer(); - this.menuStrip1.SuspendLayout(); - this.contextMenuStrip1.SuspendLayout(); - this.tabPage_Skin.SuspendLayout(); - this.tabControl1.SuspendLayout(); - this.tabPage_Text.SuspendLayout(); - this.tabPage_Advanced.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.tabPage_Proiect.SuspendLayout(); - this.tabPage_Thumbs.SuspendLayout(); - this.tabPage_Other.SuspendLayout(); - this.toolStrip1.SuspendLayout(); - this.toolStripContainer1.SuspendLayout(); - this.SuspendLayout(); - // - // menuStrip1 - // - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openProiectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.sToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveProiectAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.buildToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.addToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.windowPluginToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.windowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.procesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.subtitleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tagReadersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.externalPlayersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.skinToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.componentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mediaToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.soundsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.animationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tetrisToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.languageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.textToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.textToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.otherToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.customizationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.postSetupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bossview = new System.Windows.Forms.ListView(); + this.columnHeader1 = new System.Windows.Forms.ColumnHeader(); + this.columnHeader2 = new System.Windows.Forms.ColumnHeader(); + this.columnHeader3 = new System.Windows.Forms.ColumnHeader(); + this.columnHeader4 = new System.Windows.Forms.ColumnHeader(); + this.columnHeader5 = new System.Windows.Forms.ColumnHeader(); + this.columnHeader6 = new System.Windows.Forms.ColumnHeader(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.toolStripComboBox1 = new System.Windows.Forms.ToolStripMenuItem(); + this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); + this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); + this.tabPage_Skin = new System.Windows.Forms.TabPage(); + this.label6 = new System.Windows.Forms.Label(); + this.skint_comboBox1 = new System.Windows.Forms.ComboBox(); + this.tabPage_Plugin = new System.Windows.Forms.TabPage(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage_Text = new System.Windows.Forms.TabPage(); + this.textt_comboBox1 = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.tabPage_Advanced = new System.Windows.Forms.TabPage(); + this.propertyGrid1 = new System.Windows.Forms.PropertyGrid(); + this.button_browse = new System.Windows.Forms.Button(); + this.label11 = new System.Windows.Forms.Label(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.tabPage_Proiect = new System.Windows.Forms.TabPage(); + this.proiectt_textBox6 = new System.Windows.Forms.ComboBox(); + this.label10 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.proiectt_textBox5 = new System.Windows.Forms.TextBox(); + this.proiectt_textBox4 = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.proiectt_textBox3 = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.proiectt_textBox2 = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.proiectt_textBox1 = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.tabPage_Thumbs = new System.Windows.Forms.TabPage(); + this.thumbst_comboBox1 = new System.Windows.Forms.ComboBox(); + this.label7 = new System.Windows.Forms.Label(); + this.tabPage_Other = new System.Windows.Forms.TabPage(); + this.othert_comboBox1 = new System.Windows.Forms.ComboBox(); + this.label8 = new System.Windows.Forms.Label(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.newToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer(); + this.setupGroupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.propertyGrid2 = new System.Windows.Forms.PropertyGrid(); + this.menuStrip1.SuspendLayout(); + this.contextMenuStrip1.SuspendLayout(); + this.tabPage_Skin.SuspendLayout(); + this.tabControl1.SuspendLayout(); + this.tabPage_Text.SuspendLayout(); + this.tabPage_Advanced.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.tabPage_Proiect.SuspendLayout(); + this.tabPage_Thumbs.SuspendLayout(); + this.tabPage_Other.SuspendLayout(); + this.toolStrip1.SuspendLayout(); + this.toolStripContainer1.SuspendLayout(); + this.SuspendLayout(); + // + // menuStrip1 + // + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.addToolStripMenuItem, this.customizationToolStripMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(675, 24); - this.menuStrip1.TabIndex = 1; - this.menuStrip1.Text = "menuStrip1"; - // - // fileToolStripMenuItem - // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(675, 24); + this.menuStrip1.TabIndex = 1; + this.menuStrip1.Text = "menuStrip1"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.newToolStripMenuItem, this.openProiectToolStripMenuItem, this.sToolStripMenuItem, @@ -147,73 +149,73 @@ this.optionsToolStripMenuItem, this.toolStripSeparator2, this.exitToolStripMenuItem}); - this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); - this.fileToolStripMenuItem.Text = "File"; - // - // newToolStripMenuItem - // - this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(168, 22); - this.newToolStripMenuItem.Text = "New Proiect"; - this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); - // - // openProiectToolStripMenuItem - // - this.openProiectToolStripMenuItem.Name = "openProiectToolStripMenuItem"; - this.openProiectToolStripMenuItem.Size = new System.Drawing.Size(168, 22); - this.openProiectToolStripMenuItem.Text = "Open Proiect .."; - this.openProiectToolStripMenuItem.Click += new System.EventHandler(this.openProiectToolStripMenuItem_Click); - // - // sToolStripMenuItem - // - this.sToolStripMenuItem.Name = "sToolStripMenuItem"; - this.sToolStripMenuItem.Size = new System.Drawing.Size(168, 22); - this.sToolStripMenuItem.Text = "Save Proiect"; - this.sToolStripMenuItem.Click += new System.EventHandler(this.sToolStripMenuItem_Click); - // - // saveProiectAsToolStripMenuItem - // - this.saveProiectAsToolStripMenuItem.Name = "saveProiectAsToolStripMenuItem"; - this.saveProiectAsToolStripMenuItem.Size = new System.Drawing.Size(168, 22); - this.saveProiectAsToolStripMenuItem.Text = "Save Proiect As.."; - this.saveProiectAsToolStripMenuItem.Click += new System.EventHandler(this.saveProiectAsToolStripMenuItem_Click); - // - // buildToolStripMenuItem - // - this.buildToolStripMenuItem.Name = "buildToolStripMenuItem"; - this.buildToolStripMenuItem.Size = new System.Drawing.Size(168, 22); - this.buildToolStripMenuItem.Text = "Build"; - this.buildToolStripMenuItem.Click += new System.EventHandler(this.buildToolStripMenuItem_Click); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(165, 6); - // - // optionsToolStripMenuItem - // - this.optionsToolStripMenuItem.Enabled = false; - this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(168, 22); - this.optionsToolStripMenuItem.Text = "Options"; - this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(165, 6); - // - // exitToolStripMenuItem - // - this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(168, 22); - this.exitToolStripMenuItem.Text = "Exit"; - this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); - // - // addToolStripMenuItem - // - this.addToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.fileToolStripMenuItem.Text = "File"; + // + // newToolStripMenuItem + // + this.newToolStripMenuItem.Name = "newToolStripMenuItem"; + this.newToolStripMenuItem.Size = new System.Drawing.Size(168, 22); + this.newToolStripMenuItem.Text = "New Proiect"; + this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); + // + // openProiectToolStripMenuItem + // + this.openProiectToolStripMenuItem.Name = "openProiectToolStripMenuItem"; + this.openProiectToolStripMenuItem.Size = new System.Drawing.Size(168, 22); + this.openProiectToolStripMenuItem.Text = "Open Proiect .."; + this.openProiectToolStripMenuItem.Click += new System.EventHandler(this.openProiectToolStripMenuItem_Click); + // + // sToolStripMenuItem + // + this.sToolStripMenuItem.Name = "sToolStripMenuItem"; + this.sToolStripMenuItem.Size = new System.Drawing.Size(168, 22); + this.sToolStripMenuItem.Text = "Save Proiect"; + this.sToolStripMenuItem.Click += new System.EventHandler(this.sToolStripMenuItem_Click); + // + // saveProiectAsToolStripMenuItem + // + this.saveProiectAsToolStripMenuItem.Name = "saveProiectAsToolStripMenuItem"; + this.saveProiectAsToolStripMenuItem.Size = new System.Drawing.Size(168, 22); + this.saveProiectAsToolStripMenuItem.Text = "Save Proiect As.."; + this.saveProiectAsToolStripMenuItem.Click += new System.EventHandler(this.saveProiectAsToolStripMenuItem_Click); + // + // buildToolStripMenuItem + // + this.buildToolStripMenuItem.Name = "buildToolStripMenuItem"; + this.buildToolStripMenuItem.Size = new System.Drawing.Size(168, 22); + this.buildToolStripMenuItem.Text = "Build"; + this.buildToolStripMenuItem.Click += new System.EventHandler(this.buildToolStripMenuItem_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(165, 6); + // + // optionsToolStripMenuItem + // + this.optionsToolStripMenuItem.Enabled = false; + this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(168, 22); + this.optionsToolStripMenuItem.Text = "Options"; + this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(165, 6); + // + // exitToolStripMenuItem + // + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + this.exitToolStripMenuItem.Size = new System.Drawing.Size(168, 22); + this.exitToolStripMenuItem.Text = "Exit"; + this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // + // addToolStripMenuItem + // + this.addToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.windowPluginToolStripMenuItem, this.skinToolStripMenuItem, this.languageToolStripMenuItem, @@ -221,517 +223,532 @@ this.settingsToolStripMenuItem, this.textToolStripMenuItem1, this.otherToolStripMenuItem}); - this.addToolStripMenuItem.Name = "addToolStripMenuItem"; - this.addToolStripMenuItem.Size = new System.Drawing.Size(38, 20); - this.addToolStripMenuItem.Text = "Add"; - // - // windowPluginToolStripMenuItem - // - this.windowPluginToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.addToolStripMenuItem.Name = "addToolStripMenuItem"; + this.addToolStripMenuItem.Size = new System.Drawing.Size(38, 20); + this.addToolStripMenuItem.Text = "Add"; + // + // windowPluginToolStripMenuItem + // + this.windowPluginToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.windowToolStripMenuItem, this.procesToolStripMenuItem, this.subtitleToolStripMenuItem, this.tagReadersToolStripMenuItem, this.externalPlayersToolStripMenuItem}); - this.windowPluginToolStripMenuItem.Name = "windowPluginToolStripMenuItem"; - this.windowPluginToolStripMenuItem.Size = new System.Drawing.Size(132, 22); - this.windowPluginToolStripMenuItem.Text = "Plugin"; - // - // windowToolStripMenuItem - // - this.windowToolStripMenuItem.Name = "windowToolStripMenuItem"; - this.windowToolStripMenuItem.Size = new System.Drawing.Size(160, 22); - this.windowToolStripMenuItem.Text = "Window"; - this.windowToolStripMenuItem.Click += new System.EventHandler(this.windowToolStripMenuItem_Click); - // - // procesToolStripMenuItem - // - this.procesToolStripMenuItem.Name = "procesToolStripMenuItem"; - this.procesToolStripMenuItem.Size = new System.Drawing.Size(160, 22); - this.procesToolStripMenuItem.Text = "Process"; - this.procesToolStripMenuItem.Click += new System.EventHandler(this.procesToolStripMenuItem_Click); - // - // subtitleToolStripMenuItem - // - this.subtitleToolStripMenuItem.Name = "subtitleToolStripMenuItem"; - this.subtitleToolStripMenuItem.Size = new System.Drawing.Size(160, 22); - this.subtitleToolStripMenuItem.Text = "Subtitle"; - this.subtitleToolStripMenuItem.Click += new System.EventHandler(this.subtitleToolStripMenuItem_Click); - // - // tagReadersToolStripMenuItem - // - this.tagReadersToolStripMenuItem.Name = "tagReadersToolStripMenuItem"; - this.tagReadersToolStripMenuItem.Size = new System.Drawing.Size(160, 22); - this.tagReadersToolStripMenuItem.Text = "TagReaders"; - this.tagReadersToolStripMenuItem.Click += new System.EventHandler(this.tagReadersToolStripMenuItem_Click); - // - // externalPlayersToolStripMenuItem - // - this.externalPlayersToolStripMenuItem.Name = "externalPlayersToolStripMenuItem"; - this.externalPlayersToolStripMenuItem.Size = new System.Drawing.Size(160, 22); - this.externalPlayersToolStripMenuItem.Text = "ExternalPlayers"; - this.externalPlayersToolStripMenuItem.Click += new System.EventHandler(this.externalPlayersToolStripMenuItem_Click); - // - // skinToolStripMenuItem - // - this.skinToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.windowPluginToolStripMenuItem.Name = "windowPluginToolStripMenuItem"; + this.windowPluginToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.windowPluginToolStripMenuItem.Text = "Plugin"; + // + // windowToolStripMenuItem + // + this.windowToolStripMenuItem.Name = "windowToolStripMenuItem"; + this.windowToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.windowToolStripMenuItem.Text = "Window"; + this.windowToolStripMenuItem.Click += new System.EventHandler(this.windowToolStripMenuItem_Click); + // + // procesToolStripMenuItem + // + this.procesToolStripMenuItem.Name = "procesToolStripMenuItem"; + this.procesToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.procesToolStripMenuItem.Text = "Process"; + this.procesToolStripMenuItem.Click += new System.EventHandler(this.procesToolStripMenuItem_Click); + // + // subtitleToolStripMenuItem + // + this.subtitleToolStripMenuItem.Name = "subtitleToolStripMenuItem"; + this.subtitleToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.subtitleToolStripMenuItem.Text = "Subtitle"; + this.subtitleToolStripMenuItem.Click += new System.EventHandler(this.subtitleToolStripMenuItem_Click); + // + // tagReadersToolStripMenuItem + // + this.tagReadersToolStripMenuItem.Name = "tagReadersToolStripMenuItem"; + this.tagReadersToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.tagReadersToolStripMenuItem.Text = "TagReaders"; + this.tagReadersToolStripMenuItem.Click += new System.EventHandler(this.tagReadersToolStripMenuItem_Click); + // + // externalPlayersToolStripMenuItem + // + this.externalPlayersToolStripMenuItem.Name = "externalPlayersToolStripMenuItem"; + this.externalPlayersToolStripMenuItem.Size = new System.Drawing.Size(160, 22); + this.externalPlayersToolStripMenuItem.Text = "ExternalPlayers"; + this.externalPlayersToolStripMenuItem.Click += new System.EventHandler(this.externalPlayersToolStripMenuItem_Click); + // + // skinToolStripMenuItem + // + this.skinToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.componentToolStripMenuItem, this.mediaToolStripMenuItem, this.soundsToolStripMenuItem, this.animationsToolStripMenuItem, this.tetrisToolStripMenuItem}); - this.skinToolStripMenuItem.Name = "skinToolStripMenuItem"; - this.skinToolStripMenuItem.Size = new System.Drawing.Size(132, 22); - this.skinToolStripMenuItem.Text = "Skin"; - // - // componentToolStripMenuItem - // - this.componentToolStripMenuItem.Name = "componentToolStripMenuItem"; - this.componentToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.componentToolStripMenuItem.Text = "Component"; - this.componentToolStripMenuItem.Click += new System.EventHandler(this.componentToolStripMenuItem_Click); - // - // mediaToolStripMenuItem - // - this.mediaToolStripMenuItem.Name = "mediaToolStripMenuItem"; - this.mediaToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.mediaToolStripMenuItem.Text = "Media"; - this.mediaToolStripMenuItem.Click += new System.EventHandler(this.mediaToolStripMenuItem_Click); - // - // soundsToolStripMenuItem - // - this.soundsToolStripMenuItem.Name = "soundsToolStripMenuItem"; - this.soundsToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.soundsToolStripMenuItem.Text = "Sounds"; - this.soundsToolStripMenuItem.Click += new System.EventHandler(this.soundsToolStripMenuItem_Click); - // - // animationsToolStripMenuItem - // - this.animationsToolStripMenuItem.Name = "animationsToolStripMenuItem"; - this.animationsToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.animationsToolStripMenuItem.Text = "Animations"; - this.animationsToolStripMenuItem.Click += new System.EventHandler(this.animationsToolStripMenuItem_Click); - // - // tetrisToolStripMenuItem - // - this.tetrisToolStripMenuItem.Name = "tetrisToolStripMenuItem"; - this.tetrisToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.tetrisToolStripMenuItem.Text = "Tetris"; - this.tetrisToolStripMenuItem.Click += new System.EventHandler(this.tetrisToolStripMenuItem_Click); - // - // languageToolStripMenuItem - // - this.languageToolStripMenuItem.Name = "languageToolStripMenuItem"; - this.languageToolStripMenuItem.Size = new System.Drawing.Size(132, 22); - this.languageToolStripMenuItem.Text = "Language"; - this.languageToolStripMenuItem.Click += new System.EventHandler(this.languageToolStripMenuItem_Click); - // - // textToolStripMenuItem - // - this.textToolStripMenuItem.Name = "textToolStripMenuItem"; - this.textToolStripMenuItem.Size = new System.Drawing.Size(132, 22); - this.textToolStripMenuItem.Text = "Text"; - this.textToolStripMenuItem.Click += new System.EventHandler(this.textToolStripMenuItem_Click); - // - // settingsToolStripMenuItem - // - this.settingsToolStripMenuItem.Enabled = false; - this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - this.settingsToolStripMenuItem.Size = new System.Drawing.Size(132, 22); - this.settingsToolStripMenuItem.Text = "Settings"; - // - // textToolStripMenuItem1 - // - this.textToolStripMenuItem1.Name = "textToolStripMenuItem1"; - this.textToolStripMenuItem1.Size = new System.Drawing.Size(132, 22); - this.textToolStripMenuItem1.Text = "Thumbs"; - this.textToolStripMenuItem1.Click += new System.EventHandler(this.textToolStripMenuItem1_Click); - // - // otherToolStripMenuItem - // - this.otherToolStripMenuItem.Name = "otherToolStripMenuItem"; - this.otherToolStripMenuItem.Size = new System.Drawing.Size(132, 22); - this.otherToolStripMenuItem.Text = "Other"; - this.otherToolStripMenuItem.Click += new System.EventHandler(this.otherToolStripMenuItem_Click); - // - // customizationToolStripMenuItem - // - this.customizationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.postSetupToolStripMenuItem}); - this.customizationToolStripMenuItem.Name = "customizationToolStripMenuItem"; - this.customizationToolStripMenuItem.Size = new System.Drawing.Size(47, 20); - this.customizationToolStripMenuItem.Text = "Setup"; - // - // postSetupToolStripMenuItem - // - this.postSetupToolStripMenuItem.Name = "postSetupToolStripMenuItem"; - this.postSetupToolStripMenuItem.Size = new System.Drawing.Size(137, 22); - this.postSetupToolStripMenuItem.Text = "Post Setup"; - this.postSetupToolStripMenuItem.Click += new System.EventHandler(this.postSetupToolStripMenuItem_Click); - // - // bossview - // - this.bossview.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.bossview.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.skinToolStripMenuItem.Name = "skinToolStripMenuItem"; + this.skinToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.skinToolStripMenuItem.Text = "Skin"; + // + // componentToolStripMenuItem + // + this.componentToolStripMenuItem.Name = "componentToolStripMenuItem"; + this.componentToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.componentToolStripMenuItem.Text = "Component"; + this.componentToolStripMenuItem.Click += new System.EventHandler(this.componentToolStripMenuItem_Click); + // + // mediaToolStripMenuItem + // + this.mediaToolStripMenuItem.Name = "mediaToolStripMenuItem"; + this.mediaToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.mediaToolStripMenuItem.Text = "Media"; + this.mediaToolStripMenuItem.Click += new System.EventHandler(this.mediaToolStripMenuItem_Click); + // + // soundsToolStripMenuItem + // + this.soundsToolStripMenuItem.Name = "soundsToolStripMenuItem"; + this.soundsToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.soundsToolStripMenuItem.Text = "Sounds"; + this.soundsToolStripMenuItem.Click += new System.EventHandler(this.soundsToolStripMenuItem_Click); + // + // animationsToolStripMenuItem + // + this.animationsToolStripMenuItem.Name = "animationsToolStripMenuItem"; + this.animationsToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.animationsToolStripMenuItem.Text = "Animations"; + this.animationsToolStripMenuItem.Click += new System.EventHandler(this.animationsToolStripMenuItem_Click); + // + // tetrisToolStripMenuItem + // + this.tetrisToolStripMenuItem.Name = "tetrisToolStripMenuItem"; + this.tetrisToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.tetrisToolStripMenuItem.Text = "Tetris"; + this.tetrisToolStripMenuItem.Click += new System.EventHandler(this.tetrisToolStripMenuItem_Click); + // + // languageToolStripMenuItem + // + this.languageToolStripMenuItem.Name = "languageToolStripMenuItem"; + this.languageToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.languageToolStripMenuItem.Text = "Language"; + this.languageToolStripMenuItem.Click += new System.EventHandler(this.languageToolStripMenuItem_Click); + // + // textToolStripMenuItem + // + this.textToolStripMenuItem.Name = "textToolStripMenuItem"; + this.textToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.textToolStripMenuItem.Text = "Text"; + this.textToolStripMenuItem.Click += new System.EventHandler(this.textToolStripMenuItem_Click); + // + // settingsToolStripMenuItem + // + this.settingsToolStripMenuItem.Enabled = false; + this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.settingsToolStripMenuItem.Text = "Settings"; + // + // textToolStripMenuItem1 + // + this.textToolStripMenuItem1.Name = "textToolStripMenuItem1"; + this.textToolStripMenuItem1.Size = new System.Drawing.Size(132, 22); + this.textToolStripMenuItem1.Text = "Thumbs"; + this.textToolStripMenuItem1.Click += new System.EventHandler(this.textToolStripMenuItem1_Click); + // + // otherToolStripMenuItem + // + this.otherToolStripMenuItem.Name = "otherToolStripMenuItem"; + this.otherToolStripMenuItem.Size = new System.Drawing.Size(132, 22); + this.otherToolStripMenuItem.Text = "Other"; + this.otherToolStripMenuItem.Click += new System.EventHandler(this.otherToolStripMenuItem_Click); + // + // customizationToolStripMenuItem + // + this.customizationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.postSetupToolStripMenuItem, + this.setupGroupsToolStripMenuItem}); + this.customizationToolStripMenuItem.Name = "customizationToolStripMenuItem"; + this.customizationToolStripMenuItem.Size = new System.Drawing.Size(47, 20); + this.customizationToolStripMenuItem.Text = "Setup"; + // + // postSetupToolStripMenuItem + // + this.postSetupToolStripMenuItem.Name = "postSetupToolStripMenuItem"; + this.postSetupToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.postSetupToolStripMenuItem.Text = "Post Setup"; + this.postSetupToolStripMenuItem.Click += new System.EventHandler(this.postSetupToolStripMenuItem_Click); + // + // bossview + // + this.bossview.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.bossview.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeader1, this.columnHeader2, this.columnHeader3, this.columnHeader4, this.columnHeader5, this.columnHeader6}); - this.bossview.ContextMenuStrip = this.contextMenuStrip1; - this.bossview.FullRowSelect = true; - this.bossview.GridLines = true; - this.bossview.HideSelection = false; - this.bossview.Location = new System.Drawing.Point(12, 52); - this.bossview.Name = "bossview"; - this.bossview.Size = new System.Drawing.Size(651, 215); - this.bossview.Sorting = System.Windows.Forms.SortOrder.Ascending; - this.bossview.TabIndex = 2; - this.bossview.UseCompatibleStateImageBehavior = false; - this.bossview.View = System.Windows.Forms.View.Details; - this.bossview.SelectedIndexChanged += new System.EventHandler(this.bossview_SelectedIndexChanged); - this.bossview.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.bossview_ColumnClick); - // - // columnHeader1 - // - this.columnHeader1.Text = "File"; - this.columnHeader1.Width = 116; - // - // columnHeader2 - // - this.columnHeader2.Text = "Type"; - this.columnHeader2.Width = 115; - // - // columnHeader3 - // - this.columnHeader3.Text = "Subtype"; - this.columnHeader3.Width = 108; - // - // columnHeader4 - // - this.columnHeader4.Text = "Source"; - this.columnHeader4.Width = 170; - // - // columnHeader5 - // - this.columnHeader5.Text = "Id"; - // - // columnHeader6 - // - this.columnHeader6.Text = "Options"; - this.columnHeader6.Width = 89; - // - // contextMenuStrip1 - // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bossview.ContextMenuStrip = this.contextMenuStrip1; + this.bossview.FullRowSelect = true; + this.bossview.GridLines = true; + this.bossview.HideSelection = false; + this.bossview.Location = new System.Drawing.Point(12, 52); + this.bossview.Name = "bossview"; + this.bossview.Size = new System.Drawing.Size(651, 182); + this.bossview.Sorting = System.Windows.Forms.SortOrder.Ascending; + this.bossview.TabIndex = 2; + this.bossview.UseCompatibleStateImageBehavior = false; + this.bossview.View = System.Windows.Forms.View.Details; + this.bossview.SelectedIndexChanged += new System.EventHandler(this.bossview_SelectedIndexChanged); + this.bossview.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.bossview_ColumnClick); + // + // columnHeader1 + // + this.columnHeader1.Text = "File"; + this.columnHeader1.Width = 116; + // + // columnHeader2 + // + this.columnHeader2.Text = "Type"; + this.columnHeader2.Width = 115; + // + // columnHeader3 + // + this.columnHeader3.Text = "Subtype"; + this.columnHeader3.Width = 108; + // + // columnHeader4 + // + this.columnHeader4.Text = "Source"; + this.columnHeader4.Width = 170; + // + // columnHeader5 + // + this.columnHeader5.Text = "Id"; + // + // columnHeader6 + // + this.columnHeader6.Text = "Options"; + this.columnHeader6.Width = 89; + // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripComboBox1}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(125, 26); - // - // toolStripComboBox1 - // - this.toolStripComboBox1.Name = "toolStripComboBox1"; - this.toolStripComboBox1.Size = new System.Drawing.Size(124, 22); - this.toolStripComboBox1.Text = "Remove"; - this.toolStripComboBox1.Click += new System.EventHandler(this.toolStripComboBox1_Click); - // - // openFileDialog1 - // - this.openFileDialog1.Filter = "\"Dll files|*.dll|All files|*.*\""; - // - // saveFileDialog1 - // - this.saveFileDialog1.CreatePrompt = true; - this.saveFileDialog1.DefaultExt = "xml"; - this.saveFileDialog1.Filter = "Proiect files (*.xmp)|*.xmp|All files |*.*"; - // - // tabPage_Skin - // - this.tabPage_Skin.Controls.Add(this.label6); - this.tabPage_Skin.Controls.Add(this.skint_comboBox1); - this.tabPage_Skin.Location = new System.Drawing.Point(4, 22); - this.tabPage_Skin.Name = "tabPage_Skin"; - this.tabPage_Skin.Padding = new System.Windows.Forms.Padding(3); - this.tabPage_Skin.Size = new System.Drawing.Size(643, 120); - this.tabPage_Skin.TabIndex = 1; - this.tabPage_Skin.Text = "Skin Properties"; - this.tabPage_Skin.UseVisualStyleBackColor = true; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(6, 14); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(34, 13); - this.label6.TabIndex = 1; - this.label6.Text = "Skin :"; - // - // skint_comboBox1 - // - this.skint_comboBox1.FormattingEnabled = true; - this.skint_comboBox1.Location = new System.Drawing.Point(6, 30); - this.skint_comboBox1.Name = "skint_comboBox1"; - this.skint_comboBox1.Size = new System.Drawing.Size(141, 21); - this.skint_comboBox1.TabIndex = 0; - this.skint_comboBox1.TextChanged += new System.EventHandler(this.tab_skin_change); - // - // tabPage_Plugin - // - this.tabPage_Plugin.Location = new System.Drawing.Point(4, 22); - this.tabPage_Plugin.Name = "tabPage_Plugin"; - this.tabPage_Plugin.Padding = new System.Windows.Forms.Padding(3); - this.tabPage_Plugin.Size = new System.Drawing.Size(643, 120); - this.tabPage_Plugin.TabIndex = 0; - this.tabPage_Plugin.Text = "Plugin Properties"; - this.tabPage_Plugin.UseVisualStyleBackColor = true; - // - // tabControl1 - // - this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.tabControl1.Controls.Add(this.tabPage_Plugin); - this.tabControl1.Controls.Add(this.tabPage_Skin); - this.tabControl1.Controls.Add(this.tabPage_Text); - this.tabControl1.Controls.Add(this.tabPage_Advanced); - this.tabControl1.Controls.Add(this.tabPage_Proiect); - this.tabControl1.Controls.Add(this.tabPage_Thumbs); - this.tabControl1.Controls.Add(this.tabPage_Other); - this.tabControl1.Location = new System.Drawing.Point(12, 273); - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(651, 146); - this.tabControl1.TabIndex = 3; - // - // tabPage_Text - // - this.tabPage_Text.Controls.Add(this.textt_comboBox1); - this.tabPage_Text.Controls.Add(this.label1); - this.tabPage_Text.Location = new System.Drawing.Point(4, 22); - this.tabPage_Text.Name = "tabPage_Text"; - this.tabPage_Text.Size = new System.Drawing.Size(643, 120); - this.tabPage_Text.TabIndex = 2; - this.tabPage_Text.Text = "Text Properties"; - this.tabPage_Text.UseVisualStyleBackColor = true; - // - // textt_comboBox1 - // - this.textt_comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.textt_comboBox1.FormattingEnabled = true; - this.textt_comboBox1.Items.AddRange(new object[] { + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 26); + // + // toolStripComboBox1 + // + this.toolStripComboBox1.Name = "toolStripComboBox1"; + this.toolStripComboBox1.Size = new System.Drawing.Size(124, 22); + this.toolStripComboBox1.Text = "Remove"; + this.toolStripComboBox1.Click += new System.EventHandler(this.toolStripComboBox1_Click); + // + // openFileDialog1 + // + this.openFileDialog1.Filter = "\"Dll files|*.dll|All files|*.*\""; + // + // saveFileDialog1 + // + this.saveFileDialog1.CreatePrompt = true; + this.saveFileDialog1.DefaultExt = "xml"; + this.saveFileDialog1.Filter = "Proiect files (*.xmp)|*.xmp|All files |*.*"; + // + // tabPage_Skin + // + this.tabPage_Skin.Controls.Add(this.label6); + this.tabPage_Skin.Controls.Add(this.skint_comboBox1); + this.tabPage_Skin.Location = new System.Drawing.Point(4, 22); + this.tabPage_Skin.Name = "tabPage_Skin"; + this.tabPage_Skin.Padding = new System.Windows.Forms.Padding(3); + this.tabPage_Skin.Size = new System.Drawing.Size(643, 153); + this.tabPage_Skin.TabIndex = 1; + this.tabPage_Skin.Text = "Skin Properties"; + this.tabPage_Skin.UseVisualStyleBackColor = true; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(6, 14); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(34, 13); + this.label6.TabIndex = 1; + this.label6.Text = "Skin :"; + // + // skint_comboBox1 + // + this.skint_comboBox1.FormattingEnabled = true; + this.skint_comboBox1.Location = new System.Drawing.Point(6, 30); + this.skint_comboBox1.Name = "skint_comboBox1"; + this.skint_comboBox1.Size = new System.Drawing.Size(141, 21); + this.skint_comboBox1.TabIndex = 0; + this.skint_comboBox1.TextChanged += new System.EventHandler(this.tab_skin_change); + // + // tabPage_Plugin + // + this.tabPage_Plugin.Location = new System.Drawing.Point(4, 22); + this.tabPage_Plugin.Name = "tabPage_Plugin"; + this.tabPage_Plugin.Padding = new System.Windows.Forms.Padding(3); + this.tabPage_Plugin.Size = new System.Drawing.Size(643, 153); + this.tabPage_Plugin.TabIndex = 0; + this.tabPage_Plugin.Text = "Plugin Properties"; + this.tabPage_Plugin.UseVisualStyleBackColor = true; + // + // tabControl1 + // + this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tabControl1.Controls.Add(this.tabPage_Plugin); + this.tabControl1.Controls.Add(this.tabPage_Skin); + this.tabControl1.Controls.Add(this.tabPage_Text); + this.tabControl1.Controls.Add(this.tabPage_Advanced); + this.tabControl1.Controls.Add(this.tabPage_Proiect); + this.tabControl1.Controls.Add(this.tabPage_Thumbs); + this.tabControl1.Controls.Add(this.tabPage_Other); + this.tabControl1.Location = new System.Drawing.Point(12, 240); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(651, 179); + this.tabControl1.TabIndex = 3; + // + // tabPage_Text + // + this.tabPage_Text.Controls.Add(this.textt_comboBox1); + this.tabPage_Text.Controls.Add(this.label1); + this.tabPage_Text.Location = new System.Drawing.Point(4, 22); + this.tabPage_Text.Name = "tabPage_Text"; + this.tabPage_Text.Size = new System.Drawing.Size(643, 120); + this.tabPage_Text.TabIndex = 2; + this.tabPage_Text.Text = "Text Properties"; + this.tabPage_Text.UseVisualStyleBackColor = true; + // + // textt_comboBox1 + // + this.textt_comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.textt_comboBox1.FormattingEnabled = true; + this.textt_comboBox1.Items.AddRange(new object[] { "LOG", "EULA", "READ ME"}); - this.textt_comboBox1.Location = new System.Drawing.Point(6, 28); - this.textt_comboBox1.Name = "textt_comboBox1"; - this.textt_comboBox1.Size = new System.Drawing.Size(111, 21); - this.textt_comboBox1.TabIndex = 1; - this.textt_comboBox1.TextChanged += new System.EventHandler(this.tab_text_change); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(3, 12); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(34, 13); - this.label1.TabIndex = 0; - this.label1.Text = "Type:"; - // - // tabPage_Advanced - // - this.tabPage_Advanced.Controls.Add(this.propertyGrid1); - this.tabPage_Advanced.Controls.Add(this.button_browse); - this.tabPage_Advanced.Controls.Add(this.label11); - this.tabPage_Advanced.Controls.Add(this.pictureBox1); - this.tabPage_Advanced.Location = new System.Drawing.Point(4, 22); - this.tabPage_Advanced.Name = "tabPage_Advanced"; - this.tabPage_Advanced.Size = new System.Drawing.Size(643, 120); - this.tabPage_Advanced.TabIndex = 3; - this.tabPage_Advanced.Text = "Advanced Properties"; - this.tabPage_Advanced.UseVisualStyleBackColor = true; - // - // propertyGrid1 - // - this.propertyGrid1.CommandsVisibleIfAvailable = false; - this.propertyGrid1.Location = new System.Drawing.Point(342, 3); - this.propertyGrid1.Name = "propertyGrid1"; - this.propertyGrid1.PropertySort = System.Windows.Forms.PropertySort.NoSort; - this.propertyGrid1.Size = new System.Drawing.Size(301, 114); - this.propertyGrid1.TabIndex = 3; - this.propertyGrid1.ToolbarVisible = false; - // - // button_browse - // - this.button_browse.Location = new System.Drawing.Point(0, 94); - this.button_browse.Name = "button_browse"; - this.button_browse.Size = new System.Drawing.Size(67, 23); - this.button_browse.TabIndex = 2; - this.button_browse.Text = "Browse..."; - this.button_browse.UseVisualStyleBackColor = true; - this.button_browse.Click += new System.EventHandler(this.button_browse_Click); - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(3, 10); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(37, 13); - this.label11.TabIndex = 1; - this.label11.Text = "Logo :"; - // - // pictureBox1 - // - this.pictureBox1.Location = new System.Drawing.Point(3, 26); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(64, 64); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox1.TabIndex = 0; - this.pictureBox1.TabStop = false; - this.pictureBox1.LoadCompleted += new System.ComponentModel.AsyncCompletedEventHandler(this.pictureBox1_LoadCompleted); - // - // tabPage_Proiect - // - this.tabPage_Proiect.Controls.Add(this.proiectt_textBox6); - this.tabPage_Proiect.Controls.Add(this.label10); - this.tabPage_Proiect.Controls.Add(this.label9); - this.tabPage_Proiect.Controls.Add(this.proiectt_textBox5); - this.tabPage_Proiect.Controls.Add(this.proiectt_textBox4); - this.tabPage_Proiect.Controls.Add(this.label5); - this.tabPage_Proiect.Controls.Add(this.proiectt_textBox3); - this.tabPage_Proiect.Controls.Add(this.label4); - this.tabPage_Proiect.Controls.Add(this.proiectt_textBox2); - this.tabPage_Proiect.Controls.Add(this.label3); - this.tabPage_Proiect.Controls.Add(this.proiectt_textBox1); - this.tabPage_Proiect.Controls.Add(this.label2); - this.tabPage_Proiect.Location = new System.Drawing.Point(4, 22); - this.tabPage_Proiect.Name = "tabPage_Proiect"; - this.tabPage_Proiect.Size = new System.Drawing.Size(643, 120); - this.tabPage_Proiect.TabIndex = 4; - this.tabPage_Proiect.Text = "Proiect Properties"; - this.tabPage_Proiect.UseVisualStyleBackColor = true; - // - // proiectt_textBox6 - // - this.proiectt_textBox6.Location = new System.Drawing.Point(224, 85); - this.proiectt_textBox6.Name = "proiectt_textBox6"; - this.proiectt_textBox6.Size = new System.Drawing.Size(168, 20); - this.proiectt_textBox6.TabIndex = 11; - this.proiectt_textBox6.TextChanged += new System.EventHandler(this.proiectt_textBox1_TextChanged); - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(176, 92); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(42, 13); - this.label10.TabIndex = 10; - th... [truncated message content] |
From: <fa...@us...> - 2007-04-28 16:56:43
|
Revision: 350 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=350&view=rev Author: falkyre Date: 2007-04-28 09:56:41 -0700 (Sat, 28 Apr 2007) Log Message: ----------- Skins can now handle translation (Zebons patch) GUI Plugin can be named Updated skins for MePo and Blue Two/ShowTimesGUI.xml Modified Paths: -------------- trunk/plugins/MyShowTimes/MediaPortal ShowTimes Plugins Suite.doc trunk/plugins/MyShowTimes/ShowTimesGUI/ShowTimesGUI.cs trunk/plugins/MyShowTimes/ShowTimesGUI/skin/Blue Two/ShowTimesGUI.xml trunk/plugins/MyShowTimes/ShowTimesGUI/skin/MePo Wide/ShowTimesGUI.xml Modified: trunk/plugins/MyShowTimes/MediaPortal ShowTimes Plugins Suite.doc =================================================================== (Binary files differ) Modified: trunk/plugins/MyShowTimes/ShowTimesGUI/ShowTimesGUI.cs =================================================================== --- trunk/plugins/MyShowTimes/ShowTimesGUI/ShowTimesGUI.cs 2007-04-28 10:49:51 UTC (rev 349) +++ trunk/plugins/MyShowTimes/ShowTimesGUI/ShowTimesGUI.cs 2007-04-28 16:56:41 UTC (rev 350) @@ -356,7 +356,9 @@ TheaterInfo.GetTheaters(); MovieInfo.GetAllMovies(); - + GUIControl.DisableControl(GetID, DirectorCtrl.GetID); + GUIControl.DisableControl(GetID, PlotLabel.GetID); + GUIControl.DisableControl(GetID, plotarea.GetID); //HideMovieControls(); //if (theaterDatesShown && getShowTimes && showMoviesForTheater) @@ -445,16 +447,18 @@ GUIControl.EnableControl(GetID, buttonOne.GetID); GUIControl.EnableControl(GetID, btnMovieTheaters.GetID); - GUIControl.SetControlLabel(GetID, btnMovieTheaters.GetID, "Show Theaters"); + GUIControl.SetControlLabel(GetID, btnMovieTheaters.GetID, GUILocalizeStrings.Get(71119922)); GUIControl.ShowControl(GetID, facadeView.GetID); + facadeView.Disabled = false; + facadeView.Focusable = true; ShowListView(MovieInfo.Movies, true); - GUIControl.SetControlLabel(GetID, buttonOne.GetID, "View:Big Icons"); + GUIControl.SetControlLabel(GetID, buttonOne.GetID, GUILocalizeStrings.Get(417)); if (!String.IsNullOrEmpty(GUIPropertyManager.GetProperty("#showtimes_nextupdate"))) GUIControl.SetControlLabel(GetID, NextRefreshLabel.GetID, GUIPropertyManager.GetProperty("#showtimes_nextupdate")); else - GUIControl.SetControlLabel(GetID, NextRefreshLabel.GetID, "Next ShowTimes Refresh\n" + PluginSettings.NextPoll.ToLongDateString() + "\n@" + PluginSettings.NextPoll.ToShortTimeString()); + GUIControl.SetControlLabel(GetID, NextRefreshLabel.GetID, GUILocalizeStrings.Get(71119925) + "\n" + PluginSettings.NextPoll.ToLongDateString() + "\n@" + PluginSettings.NextPoll.ToShortTimeString()); facadeView.View = GUIFacadeControl.ViewMode.SmallIcons; mapSettings.ViewAs = 1; @@ -645,6 +649,8 @@ { //Hide facadeView GUIControl.HideControl(GetID, facadeView.GetID); + facadeView.Disabled = true; + facadeView.Focusable = false; //Hide the Movie Theater name if (!showMoviesForTheater) @@ -652,7 +658,7 @@ //Disable View button GUIControl.DisableControl(GetID, buttonOne.GetID); - GUIControl.SetControlLabel(GetID, btnMovieTheaters.GetID, "Show All Movies"); + GUIControl.SetControlLabel(GetID, btnMovieTheaters.GetID, GUILocalizeStrings.Get(71119921)); //Get Filename of currently selected item string posterFileName = MovieInfo.GetPosterImage(selectedMovieName); @@ -663,10 +669,10 @@ poster.SetFileName(posterFileName); //Get Rating - GUIControl.SetControlLabel(GetID,RatingCtrl.GetID,"Rating: " + MovieInfo.GetRating(selectedMovieName)); + GUIControl.SetControlLabel(GetID, RatingCtrl.GetID, GUILocalizeStrings.Get(205) + " " + MovieInfo.GetRating(selectedMovieName)); //Get Runtime - GUIControl.SetControlLabel(GetID, RunTimeCtrl.GetID, "Runtime: " + MovieInfo.GetRunTime(selectedMovieName)); + GUIControl.SetControlLabel(GetID, RunTimeCtrl.GetID, GUILocalizeStrings.Get(299) + " " + MovieInfo.GetRunTime(selectedMovieName)); //Get the Genre GUIControl.SetControlLabel(GetID, GenreCtrl.GetID, MovieInfo.GetGenre(selectedMovieName)); @@ -679,7 +685,10 @@ if (playtrailer.Equals("No")) GUIControl.DisableControl(GetID, btnPlayTrailer.GetID); else + { GUIControl.EnableControl(GetID, btnPlayTrailer.GetID); + GUIControl.FocusControl(GetID, btnPlayTrailer.GetID); + } //Get the Actors GUIControl.SetControlLabel(GetID, StarringCtrl.GetID, MovieInfo.GetActors(selectedMovieName)); @@ -688,7 +697,7 @@ GUIControl.SetControlLabel(GetID, DirectorCtrl.GetID, MovieInfo.GetDirector(selectedMovieName)); //Get the IMDB - GUIControl.SetControlLabel(GetID, IMDBCtrl.GetID, "IMDB Rating: " + MovieInfo.GetIMDBRating(selectedMovieName)); + GUIControl.SetControlLabel(GetID, IMDBCtrl.GetID, GUILocalizeStrings.Get(204) + " " + MovieInfo.GetIMDBRating(selectedMovieName)); //Get the Plot GUIControl.SetControlLabel(GetID, plotarea.GetID, MovieInfo.GetPlot(selectedMovieName)); @@ -742,8 +751,8 @@ Log.Debug("Getting movies for {0} on date {1}", selectedTheaterName, selectedMovieDate); TheaterInfo.GetMoviesByTheater(selectedTheaterName,selectedMovieDate); - - GUIControl.SetControlLabel(GetID, buttonOne.GetID, "View:Big Icons"); + + GUIControl.SetControlLabel(GetID, buttonOne.GetID, GUILocalizeStrings.Get(417)); facadeView.View = GUIFacadeControl.ViewMode.SmallIcons; mapSettings.ViewAs = 1; @@ -797,7 +806,7 @@ //GUIControl.EnableControl(GetID, buttonOne.GetID); - GUIControl.SetControlLabel(GetID, btnMovieTheaters.GetID, "Show All Movies"); + GUIControl.SetControlLabel(GetID, btnMovieTheaters.GetID, GUILocalizeStrings.Get(71119921)); theaterDatesShown = true; //movOrTheater = true; @@ -833,6 +842,8 @@ GUIControl.HideControl(GetID, btnNextMovie.GetID); GUIControl.HideControl(GetID, btnPreviousMovie.GetID); GUIControl.HideControl(GetID, SelectedTheaterCtrl.GetID); + facadeView.Focusable = true; + facadeView.Disabled = false; } private void ShowMovieControls() @@ -855,6 +866,9 @@ GUIControl.ShowControl(GetID, btnPlayTrailer.GetID); GUIControl.ShowControl(GetID, btnNextMovie.GetID); GUIControl.ShowControl(GetID, btnPreviousMovie.GetID); + facadeView.Focusable = false; + facadeView.Disabled = true; + GUIControl.FocusControl(GetID, btnNextMovie.GetID); } @@ -862,19 +876,19 @@ { if (mapSettings.ViewAs == 1) { - GUIControl.SetControlLabel(GetID, buttonOne.GetID, "View:List"); + GUIControl.SetControlLabel(GetID, buttonOne.GetID, GUILocalizeStrings.Get(101)); facadeView.View = GUIFacadeControl.ViewMode.LargeIcons; mapSettings.ViewAs = 2; } else if (mapSettings.ViewAs == 2) { - GUIControl.SetControlLabel(GetID, buttonOne.GetID, "View:Small Icons"); + GUIControl.SetControlLabel(GetID, buttonOne.GetID, GUILocalizeStrings.Get(100)); facadeView.View = GUIFacadeControl.ViewMode.List; mapSettings.ViewAs = 0; } else { - GUIControl.SetControlLabel(GetID, buttonOne.GetID, "View:Big Icons"); + GUIControl.SetControlLabel(GetID, buttonOne.GetID, GUILocalizeStrings.Get(417)); facadeView.View = GUIFacadeControl.ViewMode.SmallIcons; mapSettings.ViewAs = 1; } @@ -891,7 +905,7 @@ if (movOrTheater) { facadeView.View = GUIFacadeControl.ViewMode.List; - GUIControl.SetControlLabel(GetID, btnMovieTheaters.GetID, "Show All Movies"); + GUIControl.SetControlLabel(GetID, btnMovieTheaters.GetID, GUILocalizeStrings.Get(71119921)); GUIControl.DisableControl(GetID, btnMovieTheaters.GetID); GUIControl.DisableControl(GetID, buttonOne.GetID); GUIControl.DisableControl(GetID, btnShowTimes.GetID); @@ -912,25 +926,25 @@ GUIControl.EnableControl(GetID, buttonOne.GetID); GUIControl.EnableControl(GetID, btnShowTimes.GetID); - GUIControl.SetControlLabel(GetID, btnMovieTheaters.GetID, "Show Theaters"); + GUIControl.SetControlLabel(GetID, btnMovieTheaters.GetID, GUILocalizeStrings.Get(71119922)); if (mapSettings.ViewAs == 5) mapSettings.ViewAs = 1; if (mapSettings.ViewAs == 0) { - GUIControl.SetControlLabel(GetID, buttonOne.GetID, "View:Small Icons"); + GUIControl.SetControlLabel(GetID, buttonOne.GetID, GUILocalizeStrings.Get(101)); facadeView.View = GUIFacadeControl.ViewMode.List; mapSettings.ViewAs = 0; } else if (mapSettings.ViewAs == 1) { - GUIControl.SetControlLabel(GetID, buttonOne.GetID, "View:Big Icons"); + GUIControl.SetControlLabel(GetID, buttonOne.GetID, GUILocalizeStrings.Get(417)); facadeView.View = GUIFacadeControl.ViewMode.SmallIcons; mapSettings.ViewAs = 1; } else { - GUIControl.SetControlLabel(GetID, buttonOne.GetID, "View:List"); + GUIControl.SetControlLabel(GetID, buttonOne.GetID, GUILocalizeStrings.Get(101)); facadeView.View = GUIFacadeControl.ViewMode.LargeIcons; mapSettings.ViewAs = 2; } @@ -1184,7 +1198,7 @@ //Store in case exit out to Home GUIPropertyManager.SetProperty("#st_title", selectedMovieName); - GUIControl.SetControlLabel(GetID, buttonOne.GetID, "View:Small Icons"); + GUIControl.SetControlLabel(GetID, buttonOne.GetID, GUILocalizeStrings.Get(100)); facadeView.View = GUIFacadeControl.ViewMode.List; //mapSettings.ViewAs = 0; @@ -1196,6 +1210,8 @@ GUIControl.ShowControl(GetID, SelectedTheaterCtrl.GetID); GUIControl.ShowControl(GetID, facadeView.GetID); + facadeView.Disabled = false; + facadeView.Focusable = true; GUIControl.FocusControl(GetID, facadeView.GetID); showMoviesForTheater = false; //movOrTheater = true; Modified: trunk/plugins/MyShowTimes/ShowTimesGUI/skin/Blue Two/ShowTimesGUI.xml =================================================================== --- trunk/plugins/MyShowTimes/ShowTimesGUI/skin/Blue Two/ShowTimesGUI.xml 2007-04-28 10:49:51 UTC (rev 349) +++ trunk/plugins/MyShowTimes/ShowTimesGUI/skin/Blue Two/ShowTimesGUI.xml 2007-04-28 16:56:41 UTC (rev 350) @@ -2,7 +2,7 @@ <id>7111992</id> <defaultcontrol>2</defaultcontrol> <allowoverlay>yes</allowoverlay> - <define>#header.label:7111992</define> + <define>#header.label:</define> <define>#header.image:movie_info.png</define> <define>#header.hover:hover_my trailers.png</define> <controls> @@ -25,10 +25,10 @@ <type>image</type> <description>movie border</description> <id>0</id> - <posX>200</posX> - <posY>114</posY> - <width>220</width> - <height>284</height> + <posX>220</posX> + <posY>120</posY> + <width>200</width> + <height>264</height> <texture>playback_background.png</texture> <visible>no</visible> </control> @@ -36,10 +36,10 @@ <type>image</type> <description>movie poster</description> <id>24</id> - <posX>215</posX> - <posY>136</posY> - <width>185</width> - <height>230</height> + <posX>235</posX> + <posY>142</posY> + <width>165</width> + <height>210</height> <texture>background.png</texture> <visible>no</visible> </control> @@ -49,11 +49,11 @@ <id>2</id> <posX>26</posX> <posY>136</posY> - <label>View:Big Icons</label> - <width>150</width> + <label>417</label> + <width>180</width> <visible>no</visible> <onup>43</onup> - <ondown>3</ondown> + <ondown>3</ondown> </control> <control> <type>button</type> @@ -61,11 +61,12 @@ <id>3</id> <posX>26</posX> <posY>166</posY> - <label>Show Theaters</label> - <width>150</width> + <label>71119922</label> + <width>180</width> <visible>no</visible> <onup>2</onup> - <ondown>40</ondown> + <ondown>40</ondown> + <onleft>2</onleft> </control> <control> <type>button</type> @@ -73,11 +74,12 @@ <id>40</id> <posX>26</posX> <posY>196</posY> - <label>Get ShowTimes</label> - <width>150</width> + <label>71119924</label> + <width>180</width> <visible>no</visible> <onup>3</onup> - <ondown>41</ondown> + <ondown>41</ondown> + <onleft>3</onleft> </control> <control> <type>button</type> @@ -85,11 +87,12 @@ <id>41</id> <posX>26</posX> <posY>226</posY> - <label>Play Trailer</label> - <width>150</width> + <label>71119923</label> + <width>180</width> <visible>no</visible> <onup>40</onup> - <ondown>42</ondown> + <ondown>42</ondown> + <onleft>40</onleft> </control> <control> <type>button</type> @@ -97,11 +100,12 @@ <id>42</id> <posX>26</posX> <posY>256</posY> - <label>Next Movie</label> - <width>150</width> + <label>209</label> + <width>180</width> <visible>no</visible> <onup>41</onup> - <ondown>43</ondown> + <ondown>43</ondown> + <onleft>41</onleft> </control> <control> <type>button</type> @@ -109,11 +113,12 @@ <id>43</id> <posX>26</posX> <posY>286</posY> - <label>Previous Movie</label> - <width>150</width> + <label>210</label> + <width>180</width> <visible>no</visible> <onup>42</onup> - <ondown>2</ondown> + <ondown>2</ondown> + <onleft>42</onleft> </control> <control> <type>label</type> @@ -152,7 +157,7 @@ <posX>420</posX> <posY>199</posY> <visible>no</visible> - <label>Starring:</label> + <label>344</label> <font>font14</font> </control> <control> @@ -172,7 +177,7 @@ <posX>420</posX> <posY>174</posY> <visible>no</visible> - <label>Genre:</label> + <label>174</label> <font>font14</font> </control> <control> @@ -219,7 +224,7 @@ <posX>420</posX> <posY>290</posY> <visible>no</visible> - <label>Directed By:</label> + <label>199</label> <font>font14</font> </control> <control> Modified: trunk/plugins/MyShowTimes/ShowTimesGUI/skin/MePo Wide/ShowTimesGUI.xml =================================================================== --- trunk/plugins/MyShowTimes/ShowTimesGUI/skin/MePo Wide/ShowTimesGUI.xml 2007-04-28 10:49:51 UTC (rev 349) +++ trunk/plugins/MyShowTimes/ShowTimesGUI/skin/MePo Wide/ShowTimesGUI.xml 2007-04-28 16:56:41 UTC (rev 350) @@ -49,7 +49,7 @@ <id>2</id> <posX>56</posX> <posY>136</posY> - <label>View:Big Icons</label> + <label>417</label> <width>240</width> <height>42</height> <onup>43</onup> @@ -61,7 +61,7 @@ <id>3</id> <posX>56</posX> <posY>184</posY> - <label>Show Theaters</label> + <label>71119922</label> <width>240</width> <height>42</height> <onup>2</onup> @@ -73,7 +73,7 @@ <id>40</id> <posX>56</posX> <posY>230</posY> - <label>Get ShowTimes</label> + <label>71119924</label> <width>240</width> <height>42</height> <visible>no</visible> @@ -86,7 +86,7 @@ <id>41</id> <posX>56</posX> <posY>280</posY> - <label>Play Trailer</label> + <label>71119923</label> <width>240</width> <height>42</height> <visible>no</visible> @@ -99,7 +99,7 @@ <id>42</id> <posX>56</posX> <posY>330</posY> - <label>Next Movie</label> + <label>209</label> <width>240</width> <height>42</height> <visible>no</visible> @@ -112,7 +112,7 @@ <id>43</id> <posX>56</posX> <posY>380</posY> - <label>Previous Movie</label> + <label>210</label> <width>240</width> <height>42</height> <visible>no</visible> @@ -156,7 +156,7 @@ <posX>816</posX> <posY>256</posY> <visible>no</visible> - <label>Starring:</label> + <label>344</label> <font>font16</font> </control> <control> @@ -176,7 +176,7 @@ <posX>816</posX> <posY>216</posY> <visible>no</visible> - <label>Genre:</label> + <label>174</label> <font>font16</font> </control> <control> @@ -225,7 +225,7 @@ <posX>816</posX> <posY>420</posY> <visible>no</visible> - <label>Directed By:</label> + <label>199</label> <font>font16</font> </control> <control> 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: <gre...@us...> - 2007-04-28 00:26:06
|
Revision: 348 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=348&view=rev Author: gregmac45 Date: 2007-04-27 17:25:53 -0700 (Fri, 27 Apr 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/OnlinePhotos/Flickr.cs trunk/plugins/OnlinePhotos/MyClass.cs Modified: trunk/plugins/OnlinePhotos/Flickr.cs =================================================================== --- trunk/plugins/OnlinePhotos/Flickr.cs 2007-04-27 16:26:25 UTC (rev 347) +++ trunk/plugins/OnlinePhotos/Flickr.cs 2007-04-28 00:25:53 UTC (rev 348) @@ -46,6 +46,70 @@ } + public static List<MyAlbum> getUserPhotoSets(String username) + { + List<MyAlbum> myPhotoSets = new List<MyAlbum>(); + String userID = getUserId(username); + if (userID == String.Empty) + { + return myPhotoSets; + } + //_flickr.Photo + Photosets sets = _flickr.PhotosetsGetList(userID); + + + foreach (Photoset set in sets.PhotosetCollection) + { + myPhotoSets.Add(loadPhotoSet(set)); + } + //set. + return myPhotoSets; + + + } + public static MyAlbum loadPhotoSet(Photoset set) + { + MyAlbum album = new MyAlbum(); + album.id = set.PhotosetId; + album.title = set.Title; + album.coverThumbnailUrl = set.PhotosetThumbnailUrl; + album.photoCollection = loadMyPhotoList(set.PhotoCollection); + return album; + + } + public static List<MyPhoto> getPhotoSetPhotos(String photoSetId) + { + Photo[] userPhotosArray = _flickr.PhotosetsGetPhotos(photoSetId); + Photos userPhotos = new Photos(); + foreach (Photo photo in userPhotosArray) + { + userPhotos.PhotoCollection.Add(photo); + } + return loadMyPhotoList(userPhotos); + + + } + public static List<MyAlbum> getGroupsByText(String text) + { + GroupSearchResults results = _flickr.GroupsSearch(text); + List<MyAlbum> groups = new List<MyAlbum>(); + MyAlbum group ; + foreach (GroupSearchResult result in results.Groups) + { + group = new MyAlbum(); + group.id = result.GroupId; + group.title = result.GroupName; + groups.Add(group); + } + return groups; + //result. + } + public static void getGroupPhotos(String groupId){ + //brasil-brazil + _flickr.GroupPoolGetPhotos(groupId); + } + + public static List<MyPhoto> getInterestingPhotos(){ PhotoSearchExtras extras = new PhotoSearchExtras(); Photos photos = _flickr.InterestingnessGetList(extras,50,1); @@ -68,6 +132,15 @@ Photos photos = _flickr.PhotosSearchText(text); return loadMyPhotoList(photos); } + private static List<MyPhoto> loadMyPhotoList(Photo[] photoArray) + { + Photos photos = new Photos(); + foreach(Photo photo in photoArray) + { + photos.PhotoCollection.Add(photo); + } + return loadMyPhotoList(photos); + } private static List<MyPhoto> loadMyPhotoList(Photos photos) { List<MyPhoto> myPhotoList = new List<MyPhoto>(); Modified: trunk/plugins/OnlinePhotos/MyClass.cs =================================================================== --- trunk/plugins/OnlinePhotos/MyClass.cs 2007-04-27 16:26:25 UTC (rev 347) +++ trunk/plugins/OnlinePhotos/MyClass.cs 2007-04-28 00:25:53 UTC (rev 348) @@ -42,6 +42,13 @@ public String smallUrl; public String ThumbName; } + public class MyAlbum + { + public string id; + public string title; + public string coverThumbnailUrl; + public List<MyPhoto> photoCollection = new List<MyPhoto>(); + } /// <summary> /// Description of MyClass. @@ -57,6 +64,7 @@ private State _CurrentState = State.home; protected View currentView = View.List; protected List<MyPhoto> CurrentPhotoList; + protected List<MyAlbum> CurrentAlbumList; protected bool _imagesDone = true; public enum State { @@ -261,6 +269,22 @@ } break; + case "5": + DisplayFlickrUserPhotos("gregmac45"); + _CurrentState = State.categories; + + + break; + case "6": + string gtext = ""; + if (GetUserInputString(ref gtext)) + { + + DisplayFlickrGroupsWithText(gtext); + _CurrentState = State.categories; + + } + break; } } } @@ -285,6 +309,17 @@ CurrentPhotoList = MyFlickr.getPhotosByText(text); DisplayCurrentPhotos(); } + public void DisplayFlickrGroupsWithText(String text) + { + CurrentAlbumList = MyFlickr.getGroupsByText(text); + DisplayCurrentAlbums(); + } + public void DisplayFlickrUserPhotos(String user) + { + CurrentPhotoList = MyFlickr.getUserPhotos(user); + DisplayCurrentPhotos(); + } + private bool GetUserInputString(ref string sString) { VirtualKeyboard keyBoard = (VirtualKeyboard)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_VIRTUAL_KEYBOARD); @@ -295,6 +330,7 @@ if (keyBoard.IsConfirmed) sString = keyBoard.Text; return keyBoard.IsConfirmed; } + public void DisplayCurrentPhotos() { facadeView.Clear(); @@ -330,6 +366,39 @@ } } + public void DisplayCurrentAlbums() + { + facadeView.Clear(); + GUIListItem item; + int i = 0; + List<String> ImageList = new List<string>(); + foreach (MyAlbum album in CurrentAlbumList) + { + item = new GUIListItem(album.title); + item.Path = album.id; + item.ItemId = i; + item.RetrieveArt = false; + item.OnRetrieveArt += new MediaPortal.GUI.Library.GUIListItem.RetrieveCoverArtHandler(OnRetrieveCoverArt); + item.OnItemSelected += new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(item_OnItemSelected); + ImageList.Add(album.coverThumbnailUrl); + facadeView.Add(item); + GUIWindowManager.Process(); + i++; + + } + BackgroundWorker worker = new BackgroundWorker(); + + worker.DoWork += new DoWorkEventHandler(downloadImages); + worker.RunWorkerAsync(ImageList); + + using (WaitCursor cursor = new WaitCursor()) + { + while (_imagesDone == false) + { + GUIWindowManager.Process(); + } + } + } private String GetThumbnail(String lsUrl) { string lsThumb = MediaPortal.Util.Utils.GetThumb(lsUrl); @@ -547,8 +616,18 @@ loListItem.IsFolder = true; MediaPortal.Util.Utils.SetDefaultIcons(loListItem); facadeView.Add(loListItem); - + loListItem = new GUIListItem("Flickr - My Photos"); + loListItem.Path = "5"; + loListItem.IsFolder = true; + MediaPortal.Util.Utils.SetDefaultIcons(loListItem); + facadeView.Add(loListItem); + + loListItem = new GUIListItem("Flickr - Search Groups"); + loListItem.Path = "6"; + loListItem.IsFolder = true; + MediaPortal.Util.Utils.SetDefaultIcons(loListItem); + facadeView.Add(loListItem); //} //GUIPropertyManager.SetProperty("#itemcount", facadeView.Count-1 + ""); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |