diff --git a/mediaportal/MPE/MpeCore/ActionConditionEnum.cs b/mediaportal/MPE/MpeCore/ActionConditionEnum.cs new file mode 100644 index 00000000000..f48061d889a --- /dev/null +++ b/mediaportal/MPE/MpeCore/ActionConditionEnum.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace MpeCore +{ + public enum ActionConditionEnum + { + None = 0, + PlatformTarget_x86 = 1, + PlatformTarget_x64 = 2 + } +} diff --git a/mediaportal/MPE/MpeCore/Classes/ActionItem.cs b/mediaportal/MPE/MpeCore/Classes/ActionItem.cs index 5de094921a6..e689a710492 100644 --- a/mediaportal/MPE/MpeCore/Classes/ActionItem.cs +++ b/mediaportal/MPE/MpeCore/Classes/ActionItem.cs @@ -49,6 +49,7 @@ public ActionItem(string actionType) Params = new SectionParamCollection(); ConditionGroup = string.Empty; ExecuteLocation = ActionExecuteLocationEnum.AfterPanelShow; + Condition = ActionConditionEnum.None; } [XmlAttribute] @@ -62,6 +63,9 @@ public ActionItem(string actionType) [XmlAttribute] public string ConditionGroup { get; set; } + [XmlAttribute] + public ActionConditionEnum Condition { get; set; } + public ActionExecuteLocationEnum ExecuteLocation { get; set; } public override string ToString() diff --git a/mediaportal/MPE/MpeCore/Classes/ActionType/ExtensionInstaller.cs b/mediaportal/MPE/MpeCore/Classes/ActionType/ExtensionInstaller.cs index cc67e1b0584..1e150efca72 100644 --- a/mediaportal/MPE/MpeCore/Classes/ActionType/ExtensionInstaller.cs +++ b/mediaportal/MPE/MpeCore/Classes/ActionType/ExtensionInstaller.cs @@ -160,9 +160,9 @@ public ValidationResponse Validate(PackageClass packageClass, ActionItem actionI if (!string.IsNullOrEmpty(actionItem.Params[Const_Loc].Value) && !File.Exists(actionItem.Params[Const_Loc].Value)) return new ValidationResponse() { Valid = false, Message = "File not found " + actionItem.Params[Const_Loc].Value}; - if (!string.IsNullOrEmpty(actionItem.Params[Const_Guid].Value) && MpeInstaller.KnownExtensions.Get(actionItem.Params[Const_Guid].Value, ApplicationSettings.Instance.PlatformCompatibilityCheck) == null) + if (!string.IsNullOrEmpty(actionItem.Params[Const_Guid].Value) && MpeInstaller.KnownExtensions.Get(actionItem.Params[Const_Guid].Value, false) == null) return new ValidationResponse() - { Valid = false, Message = "Extension with Id " + actionItem.Params[Const_Loc].Value + " unknown" }; + { Valid = false, Message = "Extension with Id " + actionItem.Params[Const_Guid].Value + " unknown" }; if (!string.IsNullOrEmpty(actionItem.ConditionGroup) && packageClass.Groups[actionItem.ConditionGroup] == null) return new ValidationResponse() { Valid = false, Message = actionItem.Name + " condition group not found " + actionItem.ConditionGroup }; diff --git a/mediaportal/MPE/MpeCore/Classes/ActionType/InstallFiles.cs b/mediaportal/MPE/MpeCore/Classes/ActionType/InstallFiles.cs index 30a5db66d9b..56fcb5304d4 100644 --- a/mediaportal/MPE/MpeCore/Classes/ActionType/InstallFiles.cs +++ b/mediaportal/MPE/MpeCore/Classes/ActionType/InstallFiles.cs @@ -55,7 +55,7 @@ public SectionParamCollection GetDefaultParams() public SectionResponseEnum Execute(PackageClass packageClass, ActionItem actionItem) { packageClass.FileInstalled += packageClass_FileInstalled; - packageClass.Install(); + packageClass.Install(actionItem.ConditionGroup); packageClass.FileInstalled -= packageClass_FileInstalled; return SectionResponseEnum.Ok; } diff --git a/mediaportal/MPE/MpeCore/Classes/DependencyItem.cs b/mediaportal/MPE/MpeCore/Classes/DependencyItem.cs index 9dad4c936df..10bf14ed294 100644 --- a/mediaportal/MPE/MpeCore/Classes/DependencyItem.cs +++ b/mediaportal/MPE/MpeCore/Classes/DependencyItem.cs @@ -38,6 +38,7 @@ public DependencyItem() WarnOnly = true; Message = string.Empty; Name = string.Empty; + Condition = ActionConditionEnum.None; } public DependencyItem(string type) @@ -47,6 +48,7 @@ public DependencyItem(string type) WarnOnly = true; Message = string.Empty; Name = string.Empty; + Condition = ActionConditionEnum.None; } public string Type { get; set; } @@ -138,6 +140,8 @@ public string Name set { _name = value; } } + public ActionConditionEnum Condition { get; set; } + public override string ToString() { return string.Format("{0}{1} ({2})-({3})", diff --git a/mediaportal/MPE/MpeCore/Classes/SectionItem.cs b/mediaportal/MPE/MpeCore/Classes/SectionItem.cs index 6756ab9332a..bdd2f99385e 100644 --- a/mediaportal/MPE/MpeCore/Classes/SectionItem.cs +++ b/mediaportal/MPE/MpeCore/Classes/SectionItem.cs @@ -34,6 +34,7 @@ public SectionItem() ConditionGroup = string.Empty; Actions = new ActionItemCollection(); WizardButtonsEnum = Classes.WizardButtonsEnum.BackNextCancel; + Condition = ActionConditionEnum.None; } //public SectionItem(SectionItem obj) @@ -60,6 +61,9 @@ public SectionItem() [XmlAttribute] public string ConditionGroup { get; set; } + [XmlAttribute] + public ActionConditionEnum Condition { get; set; } + public WizardButtonsEnum WizardButtonsEnum { get; set; } public override string ToString() diff --git a/mediaportal/MPE/MpeCore/Classes/SectionPanel/Base.cs b/mediaportal/MPE/MpeCore/Classes/SectionPanel/Base.cs index 997de842f38..a0547020b5a 100644 --- a/mediaportal/MPE/MpeCore/Classes/SectionPanel/Base.cs +++ b/mediaportal/MPE/MpeCore/Classes/SectionPanel/Base.cs @@ -36,6 +36,8 @@ public static SectionResponseEnum ActionExecute(PackageClass packageClass, Secti continue; if (!string.IsNullOrEmpty(list.ConditionGroup) && !packageClass.Groups[list.ConditionGroup].Checked) continue; + if (!Util.IsConditionSatisfied(list.Condition)) + continue; responseEnum = MpeInstaller.ActionProviders[list.ActionType].Execute(packageClass, list); if (responseEnum != SectionResponseEnum.Ok) { diff --git a/mediaportal/MPE/MpeCore/Classes/SectionPanel/InstallSection.cs b/mediaportal/MPE/MpeCore/Classes/SectionPanel/InstallSection.cs index 3f9e1ba3478..1f04d480c9a 100644 --- a/mediaportal/MPE/MpeCore/Classes/SectionPanel/InstallSection.cs +++ b/mediaportal/MPE/MpeCore/Classes/SectionPanel/InstallSection.cs @@ -120,6 +120,8 @@ private void InstallSection_Shown(object sender, EventArgs e) continue; if (!string.IsNullOrEmpty(actionItem.ConditionGroup) && !Package.Groups[actionItem.ConditionGroup].Checked) continue; + if (!Util.IsConditionSatisfied(actionItem.Condition)) + continue; // use a new instance of the action, // because if we chain MPE installations, diff --git a/mediaportal/MPE/MpeCore/Classes/Util.cs b/mediaportal/MPE/MpeCore/Classes/Util.cs index 84b82fca4c8..b6aec4a41bb 100644 --- a/mediaportal/MPE/MpeCore/Classes/Util.cs +++ b/mediaportal/MPE/MpeCore/Classes/Util.cs @@ -278,5 +278,20 @@ public static void KillProcces(string name, bool silent) } } } + + public static bool IsConditionSatisfied(ActionConditionEnum cond) + { + switch (cond) + { + case ActionConditionEnum.PlatformTarget_x86: + return IntPtr.Size == 4; + + case ActionConditionEnum.PlatformTarget_x64: + return IntPtr.Size == 8; + + default: + return true; + } + } } } diff --git a/mediaportal/MPE/MpeCore/Classes/VersionInfo.cs b/mediaportal/MPE/MpeCore/Classes/VersionInfo.cs index 196521d5c15..87cd6001b57 100644 --- a/mediaportal/MPE/MpeCore/Classes/VersionInfo.cs +++ b/mediaportal/MPE/MpeCore/Classes/VersionInfo.cs @@ -115,13 +115,16 @@ public bool IsAnyVersion public static VersionInfo Parse(string s) { VersionInfo ver = new VersionInfo(); - string[] vers = s.Split('.'); - if (vers.Length > 3) + if (s != null) { - ver.Major = vers[0]; - ver.Minor = vers[1]; - ver.Build = vers[2]; - ver.Revision = vers[3]; + string[] vers = s.Split('.'); + if (vers.Length > 3) + { + ver.Major = vers[0]; + ver.Minor = vers[1]; + ver.Build = vers[2]; + ver.Revision = vers[3]; + } } return ver; } diff --git a/mediaportal/MPE/MpeCore/Classes/WizardNavigator.cs b/mediaportal/MPE/MpeCore/Classes/WizardNavigator.cs index 3f3363b64f3..9401abe821a 100644 --- a/mediaportal/MPE/MpeCore/Classes/WizardNavigator.cs +++ b/mediaportal/MPE/MpeCore/Classes/WizardNavigator.cs @@ -54,6 +54,13 @@ public SectionResponseEnum Navigate() continue; } } + + if (!Util.IsConditionSatisfied(currentItem.Condition)) + { + pos++; + continue; + } + Response = MpeInstaller.SectionPanels[currentItem.PanelName].Execute(Package, currentItem); switch (Response) diff --git a/mediaportal/MPE/MpeCore/MpeCore.csproj b/mediaportal/MPE/MpeCore/MpeCore.csproj index 58051b1ed8f..f5b27e33d26 100644 --- a/mediaportal/MPE/MpeCore/MpeCore.csproj +++ b/mediaportal/MPE/MpeCore/MpeCore.csproj @@ -96,6 +96,7 @@ SolutionInfo.cs + diff --git a/mediaportal/MPE/MpeCore/PackageClass.cs b/mediaportal/MPE/MpeCore/PackageClass.cs index adf78c2cd54..7f489c72816 100644 --- a/mediaportal/MPE/MpeCore/PackageClass.cs +++ b/mediaportal/MPE/MpeCore/PackageClass.cs @@ -19,6 +19,7 @@ #endregion using System; +using System.Linq; using System.Collections.Generic; using System.IO; using System.Windows.Forms; @@ -136,7 +137,8 @@ public void CopyGroupCheck(PackageClass packageClass) /// Start copy the package file based on group settings /// /// - public void Install() + /// Optional name of the group to be processed. + public void Install(string strGroupCondition = null) { if (UnInstallInfo == null) { @@ -146,7 +148,7 @@ public void Install() UnInstallInfo.SetInfo(this); foreach (GroupItem groupItem in Groups.Items) { - if (groupItem.Checked) + if (groupItem.Checked && (string.IsNullOrWhiteSpace(strGroupCondition) || strGroupCondition.Equals(groupItem.Name))) { foreach (FileItem fileItem in groupItem.Files.Items) { @@ -201,6 +203,9 @@ public bool CheckDependency(bool silent) bool hasSkinDependency = false; foreach (DependencyItem item in Dependencies.Items) { + if (!Util.IsConditionSatisfied(item.Condition)) + continue; + if (!hasMPDependency && item.Type == MPDependency.DisplayName) { hasMPDependency = true; @@ -314,6 +319,51 @@ private static string ByteArrayToString(Encoding encoding, byte[] byteArray) return encoding.GetString(byteArray); } + /// + /// Verify MediaPortal dependency based on needs + /// + public void VerifyMPDependency() + { + DependencyItem dep; + if (this.CheckMPDependency(out dep)) + { + //Fix old MP versioning; 1.1.6.27644 is considered as unset + Version vOld = new Version(1, 1, 6, 27644); + + if (!dep.MinVersion.IsAnyVersion && dep.MinVersion.CompareTo(vOld) <= 0) + dep.MinVersion = new VersionInfo(); + + if (!dep.MinVersion.IsAnyVersion && dep.MaxVersion.CompareTo(vOld) <= 0) + dep.MaxVersion = new VersionInfo(); + } + else + { + //Create MP dependancy with both max and min as *.*.*.* + Classes.VersionProvider.MediaPortalVersion mpVersion = new Classes.VersionProvider.MediaPortalVersion(); + dep = CreateStrictDependency(mpVersion); + dep.MinVersion = new VersionInfo(); + dep.MaxVersion = new VersionInfo(); + this.Dependencies.Add(dep); + } + + //Conditional execution requires MP 1.33 and higher + if (this.Dependencies.Items.Any(d => d.Condition != ActionConditionEnum.None) || + this.Sections.Items.Any(s => s.Condition != ActionConditionEnum.None + || s.Actions.Items.Any(a => a.Condition != ActionConditionEnum.None))) + { + VersionInfo vMin = new VersionInfo(new Version(1, 33, 0, 0)); + if (dep.MinVersion.IsAnyVersion || dep.MinVersion < vMin) + dep.MinVersion = vMin; + } + + //Make sure the max is always >= min + if (dep.MaxVersion < dep.MinVersion) + dep.MaxVersion = new VersionInfo(); + + //Refresh the dependency message + dep.Message = null; + } + /// /// Checks if package has a MediaPortal dependency. /// diff --git a/mediaportal/MPE/MpeMaker/MainForm.Designer.cs b/mediaportal/MPE/MpeMaker/MainForm.Designer.cs index fb26b9f26a5..43fc3f85c11 100644 --- a/mediaportal/MPE/MpeMaker/MainForm.Designer.cs +++ b/mediaportal/MPE/MpeMaker/MainForm.Designer.cs @@ -28,65 +28,65 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("Extension Information"); - System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("General Information", new System.Windows.Forms.TreeNode[] { + System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("Extension Information"); + System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("General Information", new System.Windows.Forms.TreeNode[] { treeNode1}); - System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("Groups & Files"); - System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("Install sections"); - System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("Dependencies"); - System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("Setup", new System.Windows.Forms.TreeNode[] { + System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("Groups & Files"); + System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("Install sections"); + System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("Dependencies"); + System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("Setup", new System.Windows.Forms.TreeNode[] { treeNode3, treeNode4, treeNode5}); - System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("Build"); - System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("Generate update xml"); - System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("Tools", new System.Windows.Forms.TreeNode[] { + System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("Build"); + System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("Generate update xml"); + System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("Tools", new System.Windows.Forms.TreeNode[] { treeNode8}); - this.mainMenu = new System.Windows.Forms.MenuStrip(); - this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mnu_new = new System.Windows.Forms.ToolStripMenuItem(); - this.mnu_open = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.mnu_save = new System.Windows.Forms.ToolStripMenuItem(); - this.mnu_saveAs = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.mnu_recent = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); - this.treeView1 = new System.Windows.Forms.TreeView(); - this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.saveFileDialog = new System.Windows.Forms.SaveFileDialog(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.openDirToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); - this.mainMenu.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); - this.splitContainer1.Panel1.SuspendLayout(); - this.splitContainer1.SuspendLayout(); - this.toolStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // mainMenu - // - this.mainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mainMenu = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mnu_new = new System.Windows.Forms.ToolStripMenuItem(); + this.mnu_open = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.mnu_save = new System.Windows.Forms.ToolStripMenuItem(); + this.mnu_saveAs = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.mnu_recent = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); + this.treeView1 = new System.Windows.Forms.TreeView(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.saveFileDialog = new System.Windows.Forms.SaveFileDialog(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.openDirToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); + this.mainMenu.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // mainMenu + // + this.mainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem}); - this.mainMenu.Location = new System.Drawing.Point(0, 0); - this.mainMenu.Name = "mainMenu"; - this.mainMenu.Size = new System.Drawing.Size(893, 24); - this.mainMenu.TabIndex = 1; - this.mainMenu.Text = "menuStrip1"; - // - // fileToolStripMenuItem - // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mainMenu.Location = new System.Drawing.Point(0, 0); + this.mainMenu.Name = "mainMenu"; + this.mainMenu.Size = new System.Drawing.Size(895, 27); + this.mainMenu.TabIndex = 1; + this.mainMenu.Text = "menuStrip1"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnu_new, this.mnu_open, this.toolStripSeparator2, @@ -96,148 +96,148 @@ private void InitializeComponent() this.mnu_recent, this.toolStripSeparator1, this.exitToolStripMenuItem}); - this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); - this.fileToolStripMenuItem.Text = "File"; - // - // mnu_new - // - this.mnu_new.Image = global::MpeMaker.Properties.Resources.document_new; - this.mnu_new.Name = "mnu_new"; - this.mnu_new.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.mnu_new.Size = new System.Drawing.Size(178, 22); - this.mnu_new.Text = "New..."; - this.mnu_new.Click += new System.EventHandler(this.mnu_new_Click); - // - // mnu_open - // - this.mnu_open.Image = global::MpeMaker.Properties.Resources.document_open; - this.mnu_open.Name = "mnu_open"; - this.mnu_open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.mnu_open.Size = new System.Drawing.Size(178, 22); - this.mnu_open.Text = "Open..."; - this.mnu_open.Click += new System.EventHandler(this.mnu_open_Click); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(175, 6); - // - // mnu_save - // - this.mnu_save.Image = global::MpeMaker.Properties.Resources.document_save; - this.mnu_save.Name = "mnu_save"; - this.mnu_save.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.mnu_save.Size = new System.Drawing.Size(178, 22); - this.mnu_save.Text = "Save"; - this.mnu_save.Click += new System.EventHandler(this.mnu_save_Click); - // - // mnu_saveAs - // - this.mnu_saveAs.Image = global::MpeMaker.Properties.Resources.document_save_as; - this.mnu_saveAs.Name = "mnu_saveAs"; - this.mnu_saveAs.Size = new System.Drawing.Size(178, 22); - this.mnu_saveAs.Text = "Save As..."; - this.mnu_saveAs.Click += new System.EventHandler(this.mnu_saveAs_Click); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(175, 6); - // - // mnu_recent - // - this.mnu_recent.Name = "mnu_recent"; - this.mnu_recent.Size = new System.Drawing.Size(178, 22); - this.mnu_recent.Text = "Most Recently Used"; - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(175, 6); - // - // exitToolStripMenuItem - // - this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.exitToolStripMenuItem.Text = "Exit"; - this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); - // - // openFileDialog - // - this.openFileDialog.Title = "Open extension installer project file"; - // - // treeView1 - // - this.treeView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(45, 23); + this.fileToolStripMenuItem.Text = "File"; + // + // mnu_new + // + this.mnu_new.Image = global::MpeMaker.Properties.Resources.document_new; + this.mnu_new.Name = "mnu_new"; + this.mnu_new.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); + this.mnu_new.Size = new System.Drawing.Size(215, 24); + this.mnu_new.Text = "New..."; + this.mnu_new.Click += new System.EventHandler(this.mnu_new_Click); + // + // mnu_open + // + this.mnu_open.Image = global::MpeMaker.Properties.Resources.document_open; + this.mnu_open.Name = "mnu_open"; + this.mnu_open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); + this.mnu_open.Size = new System.Drawing.Size(215, 24); + this.mnu_open.Text = "Open..."; + this.mnu_open.Click += new System.EventHandler(this.mnu_open_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(212, 6); + // + // mnu_save + // + this.mnu_save.Image = global::MpeMaker.Properties.Resources.document_save; + this.mnu_save.Name = "mnu_save"; + this.mnu_save.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); + this.mnu_save.Size = new System.Drawing.Size(215, 24); + this.mnu_save.Text = "Save"; + this.mnu_save.Click += new System.EventHandler(this.mnu_save_Click); + // + // mnu_saveAs + // + this.mnu_saveAs.Image = global::MpeMaker.Properties.Resources.document_save_as; + this.mnu_saveAs.Name = "mnu_saveAs"; + this.mnu_saveAs.Size = new System.Drawing.Size(215, 24); + this.mnu_saveAs.Text = "Save As..."; + this.mnu_saveAs.Click += new System.EventHandler(this.mnu_saveAs_Click); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(212, 6); + // + // mnu_recent + // + this.mnu_recent.Name = "mnu_recent"; + this.mnu_recent.Size = new System.Drawing.Size(215, 24); + this.mnu_recent.Text = "Most Recently Used"; + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(212, 6); + // + // exitToolStripMenuItem + // + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + this.exitToolStripMenuItem.Size = new System.Drawing.Size(215, 24); + this.exitToolStripMenuItem.Text = "Exit"; + this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // + // openFileDialog + // + this.openFileDialog.Title = "Open extension installer project file"; + // + // treeView1 + // + this.treeView1.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.treeView1.HideSelection = false; - this.treeView1.HotTracking = true; - this.treeView1.Location = new System.Drawing.Point(0, 0); - this.treeView1.Margin = new System.Windows.Forms.Padding(0); - this.treeView1.Name = "treeView1"; - treeNode1.Name = "Node2"; - treeNode1.Text = "Extension Information"; - treeNode2.Name = "Node0"; - treeNode2.NodeFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - treeNode2.Text = "General Information"; - treeNode3.Name = "Node3"; - treeNode3.Text = "Groups & Files"; - treeNode4.Name = "Node4"; - treeNode4.Text = "Install sections"; - treeNode5.Name = "Node5"; - treeNode5.Text = "Dependencies"; - treeNode6.Name = "Node1"; - treeNode6.NodeFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - treeNode6.Text = "Setup"; - treeNode7.Name = "Node6"; - treeNode7.NodeFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - treeNode7.Text = "Build"; - treeNode8.Name = "Node7"; - treeNode8.Text = "Generate update xml"; - treeNode9.Name = "Node1"; - treeNode9.NodeFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - treeNode9.Text = "Tools"; - this.treeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { + this.treeView1.HideSelection = false; + this.treeView1.HotTracking = true; + this.treeView1.Location = new System.Drawing.Point(0, 0); + this.treeView1.Margin = new System.Windows.Forms.Padding(0); + this.treeView1.Name = "treeView1"; + treeNode1.Name = "Node2"; + treeNode1.Text = "Extension Information"; + treeNode2.Name = "Node0"; + treeNode2.NodeFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + treeNode2.Text = "General Information"; + treeNode3.Name = "Node3"; + treeNode3.Text = "Groups & Files"; + treeNode4.Name = "Node4"; + treeNode4.Text = "Install sections"; + treeNode5.Name = "Node5"; + treeNode5.Text = "Dependencies"; + treeNode6.Name = "Node1"; + treeNode6.NodeFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + treeNode6.Text = "Setup"; + treeNode7.Name = "Node6"; + treeNode7.NodeFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + treeNode7.Text = "Build"; + treeNode8.Name = "Node7"; + treeNode8.Text = "Generate update xml"; + treeNode9.Name = "Node1"; + treeNode9.NodeFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + treeNode9.Text = "Tools"; + this.treeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { treeNode2, treeNode6, treeNode7, treeNode9}); - this.treeView1.ShowLines = false; - this.treeView1.ShowPlusMinus = false; - this.treeView1.Size = new System.Drawing.Size(180, 429); - this.treeView1.TabIndex = 2; - this.treeView1.BeforeCollapse += new System.Windows.Forms.TreeViewCancelEventHandler(this.treeView_BeforeCollapse); - this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_AfterSelect); - // - // splitContainer1 - // - this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer1.IsSplitterFixed = true; - this.splitContainer1.Location = new System.Drawing.Point(0, 49); - this.splitContainer1.Name = "splitContainer1"; - // - // splitContainer1.Panel1 - // - this.splitContainer1.Panel1.BackColor = System.Drawing.SystemColors.ControlDark; - this.splitContainer1.Panel1.Controls.Add(this.treeView1); - // - // splitContainer1.Panel2 - // - this.splitContainer1.Panel2.BackColor = System.Drawing.SystemColors.Control; - this.splitContainer1.Size = new System.Drawing.Size(893, 430); - this.splitContainer1.SplitterDistance = 181; - this.splitContainer1.TabIndex = 3; - // - // saveFileDialog - // - this.saveFileDialog.Title = "Save extension installer proiect file"; - // - // toolStrip1 - // - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.treeView1.ShowLines = false; + this.treeView1.ShowPlusMinus = false; + this.treeView1.Size = new System.Drawing.Size(180, 427); + this.treeView1.TabIndex = 2; + this.treeView1.BeforeCollapse += new System.Windows.Forms.TreeViewCancelEventHandler(this.treeView_BeforeCollapse); + this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_AfterSelect); + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer1.IsSplitterFixed = true; + this.splitContainer1.Location = new System.Drawing.Point(0, 52); + this.splitContainer1.Name = "splitContainer1"; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.BackColor = System.Drawing.SystemColors.ControlDark; + this.splitContainer1.Panel1.Controls.Add(this.treeView1); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.BackColor = System.Drawing.SystemColors.Control; + this.splitContainer1.Size = new System.Drawing.Size(895, 428); + this.splitContainer1.SplitterDistance = 181; + this.splitContainer1.TabIndex = 3; + // + // saveFileDialog + // + this.saveFileDialog.Title = "Save extension installer proiect file"; + // + // toolStrip1 + // + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripButton1, this.toolStripButton2, this.toolStripSeparator6, @@ -247,109 +247,109 @@ private void InitializeComponent() this.openDirToolStripButton, this.toolStripSeparator5, this.toolStripButton5}); - this.toolStrip1.Location = new System.Drawing.Point(0, 24); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(893, 25); - this.toolStrip1.TabIndex = 4; - this.toolStrip1.Text = "toolStrip1"; - // - // toolStripButton1 - // - this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton1.Image = global::MpeMaker.Properties.Resources.document_new; - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(23, 22); - this.toolStripButton1.Text = "New project..."; - this.toolStripButton1.Click += new System.EventHandler(this.mnu_new_Click); - // - // toolStripButton2 - // - this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton2.Image = global::MpeMaker.Properties.Resources.document_open; - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(23, 22); - this.toolStripButton2.Text = "Open project..."; - this.toolStripButton2.Click += new System.EventHandler(this.mnu_open_Click); - // - // toolStripSeparator6 - // - this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25); - // - // toolStripButton3 - // - this.toolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton3.Image = global::MpeMaker.Properties.Resources.document_save; - this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton3.Name = "toolStripButton3"; - this.toolStripButton3.Size = new System.Drawing.Size(23, 22); - this.toolStripButton3.Text = "Save project"; - this.toolStripButton3.Click += new System.EventHandler(this.mnu_save_Click); - // - // toolStripButton4 - // - this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton4.Image = global::MpeMaker.Properties.Resources.document_save_as; - this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton4.Name = "toolStripButton4"; - this.toolStripButton4.Size = new System.Drawing.Size(23, 22); - this.toolStripButton4.Text = "Save project as..."; - this.toolStripButton4.Click += new System.EventHandler(this.mnu_saveAs_Click); - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25); - // - // openDirToolStripButton - // - this.openDirToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.openDirToolStripButton.Image = global::MpeMaker.Properties.Resources.folder_page; - this.openDirToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.openDirToolStripButton.Name = "openDirToolStripButton"; - this.openDirToolStripButton.Size = new System.Drawing.Size(23, 22); - this.openDirToolStripButton.Text = "Open containing folder..."; - this.openDirToolStripButton.Click += new System.EventHandler(this.toolStripButton5_Click); - // - // toolStripSeparator5 - // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25); - // - // toolStripButton5 - // - this.toolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton5.Image = global::MpeMaker.Properties.Resources.Start; - this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton5.Name = "toolStripButton5"; - this.toolStripButton5.Size = new System.Drawing.Size(23, 22); - this.toolStripButton5.Text = "Build package"; - this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click_1); - // - // MainForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(893, 479); - this.Controls.Add(this.splitContainer1); - this.Controls.Add(this.toolStrip1); - this.Controls.Add(this.mainMenu); - this.MinimumSize = new System.Drawing.Size(903, 507); - this.Name = "MainForm"; - this.Text = "MPE Maker"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); - this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed); - this.mainMenu.ResumeLayout(false); - this.mainMenu.PerformLayout(); - this.splitContainer1.Panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); - this.splitContainer1.ResumeLayout(false); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.toolStrip1.Location = new System.Drawing.Point(0, 27); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(895, 25); + this.toolStrip1.TabIndex = 4; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripButton1 + // + this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton1.Image = global::MpeMaker.Properties.Resources.document_new; + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(23, 22); + this.toolStripButton1.Text = "New project..."; + this.toolStripButton1.Click += new System.EventHandler(this.mnu_new_Click); + // + // toolStripButton2 + // + this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton2.Image = global::MpeMaker.Properties.Resources.document_open; + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(23, 22); + this.toolStripButton2.Text = "Open project..."; + this.toolStripButton2.Click += new System.EventHandler(this.mnu_open_Click); + // + // toolStripSeparator6 + // + this.toolStripSeparator6.Name = "toolStripSeparator6"; + this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25); + // + // toolStripButton3 + // + this.toolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton3.Image = global::MpeMaker.Properties.Resources.document_save; + this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton3.Name = "toolStripButton3"; + this.toolStripButton3.Size = new System.Drawing.Size(23, 22); + this.toolStripButton3.Text = "Save project"; + this.toolStripButton3.Click += new System.EventHandler(this.mnu_save_Click); + // + // toolStripButton4 + // + this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton4.Image = global::MpeMaker.Properties.Resources.document_save_as; + this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton4.Name = "toolStripButton4"; + this.toolStripButton4.Size = new System.Drawing.Size(23, 22); + this.toolStripButton4.Text = "Save project as..."; + this.toolStripButton4.Click += new System.EventHandler(this.mnu_saveAs_Click); + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25); + // + // openDirToolStripButton + // + this.openDirToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.openDirToolStripButton.Image = global::MpeMaker.Properties.Resources.folder_page; + this.openDirToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.openDirToolStripButton.Name = "openDirToolStripButton"; + this.openDirToolStripButton.Size = new System.Drawing.Size(23, 22); + this.openDirToolStripButton.Text = "Open containing folder..."; + this.openDirToolStripButton.Click += new System.EventHandler(this.toolStripButton5_Click); + // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(6, 25); + // + // toolStripButton5 + // + this.toolStripButton5.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton5.Image = global::MpeMaker.Properties.Resources.Start; + this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton5.Name = "toolStripButton5"; + this.toolStripButton5.Size = new System.Drawing.Size(23, 22); + this.toolStripButton5.Text = "Build package"; + this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click_1); + // + // MainForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(895, 480); + this.Controls.Add(this.splitContainer1); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.mainMenu); + this.MinimumSize = new System.Drawing.Size(903, 507); + this.Name = "MainForm"; + this.Text = "MPE Maker"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); + this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainForm_FormClosed); + this.mainMenu.ResumeLayout(false); + this.mainMenu.PerformLayout(); + this.splitContainer1.Panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/mediaportal/MPE/MpeMaker/MainForm.cs b/mediaportal/MPE/MpeMaker/MainForm.cs index 5f3d44f36a4..eb4db1feb61 100644 --- a/mediaportal/MPE/MpeMaker/MainForm.cs +++ b/mediaportal/MPE/MpeMaker/MainForm.cs @@ -312,6 +312,11 @@ private static PackageClass GetNewProject() packageClass.CreateMPDependency(); + //Set MP dependency as *.*.*.* + DependencyItem depMP = packageClass.Dependencies.Items.Find(d => d.Type == "MediaPortal"); + depMP.MinVersion = new VersionInfo(); + depMP.MaxVersion = new VersionInfo(); + return packageClass; } @@ -364,21 +369,7 @@ private void SaveProject(string filename) Package.GenerateRelativePath(Path.GetDirectoryName(filename)); Package.GenerateUniqueFileList(); Package.SetPluginsDependencies(); - if (Package.CheckMPDependency(out DependencyItem depMP)) - { - //Fix old MP versioning - Version vOld = new Version(1, 1, 6, 27644); - - if (depMP.MinVersion.CompareTo(vOld) <= 0) - depMP.MinVersion = new VersionInfo(); - - if (depMP.MaxVersion.CompareTo(vOld) <= 0) - depMP.MaxVersion = new VersionInfo(); - } - else - { - Package.CreateMPDependency(); - } + Package.VerifyMPDependency(); if (Package.ProvidesSkin(out FileItem skinFile) && !Package.CheckSkinDependency(out DependencyItem dep)) { @@ -389,6 +380,10 @@ private void SaveProject(string filename) Package.ProjectSettings.ProjectFilename = filename; Package.GenerateAbsolutePath(Path.GetDirectoryName(filename)); SetTitle(); + + //If the selected section is requirement, update the control (MP version might changed) + if (this.treeView1.SelectedNode != null && this.treeView1.SelectedNode.Name == "Node5") //requirement section + ((RequirementsSection)this._panels["Node5"]).RefreshControl(); } #endregion diff --git a/mediaportal/MPE/MpeMaker/Sections/ActionEdit.Designer.cs b/mediaportal/MPE/MpeMaker/Sections/ActionEdit.Designer.cs index 4798bb725c1..7972632cdb0 100644 --- a/mediaportal/MPE/MpeMaker/Sections/ActionEdit.Designer.cs +++ b/mediaportal/MPE/MpeMaker/Sections/ActionEdit.Designer.cs @@ -28,156 +28,204 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.btn_ok = new System.Windows.Forms.Button(); - this.btn_cancel = new System.Windows.Forms.Button(); - this.cmb_type = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); - this.btn_params = new System.Windows.Forms.Button(); - this.lbl_description = new System.Windows.Forms.Label(); - this.cmb_group = new System.Windows.Forms.ComboBox(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.cmb_execute = new System.Windows.Forms.ComboBox(); - this.SuspendLayout(); - // - // btn_ok - // - this.btn_ok.Location = new System.Drawing.Point(12, 228); - this.btn_ok.Name = "btn_ok"; - this.btn_ok.Size = new System.Drawing.Size(75, 23); - this.btn_ok.TabIndex = 0; - this.btn_ok.Text = "Ok"; - this.btn_ok.UseVisualStyleBackColor = true; - this.btn_ok.Click += new System.EventHandler(this.btn_ok_Click); - // - // btn_cancel - // - this.btn_cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btn_cancel.Location = new System.Drawing.Point(245, 228); - this.btn_cancel.Name = "btn_cancel"; - this.btn_cancel.Size = new System.Drawing.Size(75, 23); - this.btn_cancel.TabIndex = 1; - this.btn_cancel.Text = "Cancel"; - this.btn_cancel.UseVisualStyleBackColor = true; - this.btn_cancel.Click += new System.EventHandler(this.btn_cancel_Click); - // - // cmb_type - // - this.cmb_type.Enabled = false; - this.cmb_type.FormattingEnabled = true; - this.cmb_type.Location = new System.Drawing.Point(12, 24); - this.cmb_type.Name = "cmb_type"; - this.cmb_type.Size = new System.Drawing.Size(308, 21); - this.cmb_type.TabIndex = 2; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 8); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(31, 13); - this.label1.TabIndex = 3; - this.label1.Text = "Type"; - // - // btn_params - // - this.btn_params.Location = new System.Drawing.Point(111, 131); - this.btn_params.Name = "btn_params"; - this.btn_params.Size = new System.Drawing.Size(75, 23); - this.btn_params.TabIndex = 4; - this.btn_params.Text = "Edit Params"; - this.btn_params.UseVisualStyleBackColor = true; - this.btn_params.Click += new System.EventHandler(this.button1_Click); - // - // lbl_description - // - this.lbl_description.Location = new System.Drawing.Point(12, 157); - this.lbl_description.Name = "lbl_description"; - this.lbl_description.Size = new System.Drawing.Size(308, 68); - this.lbl_description.TabIndex = 5; - this.lbl_description.Text = "label2"; - // - // cmb_group - // - this.cmb_group.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmb_group.FormattingEnabled = true; - this.cmb_group.Location = new System.Drawing.Point(12, 64); - this.cmb_group.Name = "cmb_group"; - this.cmb_group.Size = new System.Drawing.Size(308, 21); - this.cmb_group.TabIndex = 6; - this.cmb_group.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(12, 48); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(81, 13); - this.label3.TabIndex = 7; - this.label3.Text = "Condition group"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(12, 88); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(75, 13); - this.label2.TabIndex = 8; - this.label2.Text = "Execute when"; - // - // cmb_execute - // - this.cmb_execute.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmb_execute.FormattingEnabled = true; - this.cmb_execute.Items.AddRange(new object[] { + this.cmb_type = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.textBoxName = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.btn_ok = new System.Windows.Forms.Button(); + this.btn_cancel = new System.Windows.Forms.Button(); + this.btn_params = new System.Windows.Forms.Button(); + this.lbl_description = new System.Windows.Forms.Label(); + this.cmb_group = new System.Windows.Forms.ComboBox(); + this.label3 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.cmb_execute = new System.Windows.Forms.ComboBox(); + this.label4 = new System.Windows.Forms.Label(); + this.cmb_execution_condition = new System.Windows.Forms.ComboBox(); + this.SuspendLayout(); + // + // cmb_type + // + this.cmb_type.Enabled = false; + this.cmb_type.FormattingEnabled = true; + this.cmb_type.Location = new System.Drawing.Point(12, 24); + this.cmb_type.Name = "cmb_type"; + this.cmb_type.Size = new System.Drawing.Size(308, 21); + this.cmb_type.TabIndex = 2; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 8); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(31, 13); + this.label1.TabIndex = 3; + this.label1.Text = "Type"; + // + // textBoxName + // + this.textBoxName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxName.Location = new System.Drawing.Point(12, 64); + this.textBoxName.Name = "textBoxName"; + this.textBoxName.Size = new System.Drawing.Size(308, 20); + this.textBoxName.TabIndex = 12; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(12, 48); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(35, 13); + this.label5.TabIndex = 13; + this.label5.Text = "Name"; + // + // btn_ok + // + this.btn_ok.Location = new System.Drawing.Point(12, 325); + this.btn_ok.Name = "btn_ok"; + this.btn_ok.Size = new System.Drawing.Size(75, 23); + this.btn_ok.TabIndex = 0; + this.btn_ok.Text = "Ok"; + this.btn_ok.UseVisualStyleBackColor = true; + this.btn_ok.Click += new System.EventHandler(this.btn_ok_Click); + // + // btn_cancel + // + this.btn_cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btn_cancel.Location = new System.Drawing.Point(245, 325); + this.btn_cancel.Name = "btn_cancel"; + this.btn_cancel.Size = new System.Drawing.Size(75, 23); + this.btn_cancel.TabIndex = 1; + this.btn_cancel.Text = "Cancel"; + this.btn_cancel.UseVisualStyleBackColor = true; + this.btn_cancel.Click += new System.EventHandler(this.btn_cancel_Click); + // + // btn_params + // + this.btn_params.Location = new System.Drawing.Point(111, 211); + this.btn_params.Name = "btn_params"; + this.btn_params.Size = new System.Drawing.Size(75, 23); + this.btn_params.TabIndex = 4; + this.btn_params.Text = "Edit Params"; + this.btn_params.UseVisualStyleBackColor = true; + this.btn_params.Click += new System.EventHandler(this.button1_Click); + // + // lbl_description + // + this.lbl_description.Location = new System.Drawing.Point(12, 237); + this.lbl_description.Name = "lbl_description"; + this.lbl_description.Size = new System.Drawing.Size(308, 68); + this.lbl_description.TabIndex = 5; + this.lbl_description.Text = "label2"; + // + // cmb_group + // + this.cmb_group.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_group.FormattingEnabled = true; + this.cmb_group.Location = new System.Drawing.Point(12, 103); + this.cmb_group.Name = "cmb_group"; + this.cmb_group.Size = new System.Drawing.Size(308, 21); + this.cmb_group.TabIndex = 6; + this.cmb_group.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(12, 87); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(81, 13); + this.label3.TabIndex = 7; + this.label3.Text = "Condition group"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(12, 168); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(75, 13); + this.label2.TabIndex = 8; + this.label2.Text = "Execute when"; + // + // cmb_execute + // + this.cmb_execute.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_execute.FormattingEnabled = true; + this.cmb_execute.Items.AddRange(new object[] { " Before Wizard Screen Show", " After Wizard Screen Show", " After Wizard Screen Hide"}); - this.cmb_execute.Location = new System.Drawing.Point(12, 104); - this.cmb_execute.Name = "cmb_execute"; - this.cmb_execute.Size = new System.Drawing.Size(308, 21); - this.cmb_execute.TabIndex = 9; - this.cmb_execute.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); - // - // ActionEdit - // - this.AcceptButton = this.btn_ok; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.btn_cancel; - this.ClientSize = new System.Drawing.Size(332, 263); - this.Controls.Add(this.cmb_execute); - this.Controls.Add(this.label2); - this.Controls.Add(this.label3); - this.Controls.Add(this.cmb_group); - this.Controls.Add(this.lbl_description); - this.Controls.Add(this.btn_params); - this.Controls.Add(this.label1); - this.Controls.Add(this.cmb_type); - this.Controls.Add(this.btn_cancel); - this.Controls.Add(this.btn_ok); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "ActionEdit"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Edit Action"; - this.ResumeLayout(false); - this.PerformLayout(); + this.cmb_execute.Location = new System.Drawing.Point(12, 184); + this.cmb_execute.Name = "cmb_execute"; + this.cmb_execute.Size = new System.Drawing.Size(308, 21); + this.cmb_execute.TabIndex = 9; + this.cmb_execute.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(12, 128); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(100, 13); + this.label4.TabIndex = 10; + this.label4.Text = "Execution condition"; + // + // cmb_execution_condition + // + this.cmb_execution_condition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_execution_condition.FormattingEnabled = true; + this.cmb_execution_condition.Location = new System.Drawing.Point(12, 144); + this.cmb_execution_condition.Name = "cmb_execution_condition"; + this.cmb_execution_condition.Size = new System.Drawing.Size(308, 21); + this.cmb_execution_condition.TabIndex = 11; + this.cmb_execution_condition.SelectedIndexChanged += new System.EventHandler(this.cmb_execution_condition_SelectedIndexChanged); + // + // ActionEdit + // + this.AcceptButton = this.btn_ok; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.btn_cancel; + this.ClientSize = new System.Drawing.Size(332, 360); + this.Controls.Add(this.label5); + this.Controls.Add(this.textBoxName); + this.Controls.Add(this.cmb_execution_condition); + this.Controls.Add(this.label4); + this.Controls.Add(this.cmb_execute); + this.Controls.Add(this.label2); + this.Controls.Add(this.label3); + this.Controls.Add(this.cmb_group); + this.Controls.Add(this.lbl_description); + this.Controls.Add(this.btn_params); + this.Controls.Add(this.label1); + this.Controls.Add(this.cmb_type); + this.Controls.Add(this.btn_cancel); + this.Controls.Add(this.btn_ok); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "ActionEdit"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Edit Action"; + this.ResumeLayout(false); + this.PerformLayout(); } #endregion - - private System.Windows.Forms.Button btn_ok; - private System.Windows.Forms.Button btn_cancel; private System.Windows.Forms.ComboBox cmb_type; private System.Windows.Forms.Label label1; - private System.Windows.Forms.Button btn_params; - private System.Windows.Forms.Label lbl_description; - private System.Windows.Forms.ComboBox cmb_group; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.ComboBox cmb_execute; - } + private System.Windows.Forms.TextBox textBoxName; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Button btn_ok; + private System.Windows.Forms.Button btn_cancel; + private System.Windows.Forms.Button btn_params; + private System.Windows.Forms.Label lbl_description; + private System.Windows.Forms.ComboBox cmb_group; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.ComboBox cmb_execute; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.ComboBox cmb_execution_condition; + } } \ No newline at end of file diff --git a/mediaportal/MPE/MpeMaker/Sections/ActionEdit.cs b/mediaportal/MPE/MpeMaker/Sections/ActionEdit.cs index e73d5e0a45c..9ae7e6914ba 100644 --- a/mediaportal/MPE/MpeMaker/Sections/ActionEdit.cs +++ b/mediaportal/MPE/MpeMaker/Sections/ActionEdit.cs @@ -55,11 +55,25 @@ public ActionEdit(PackageClass packageClass, ActionItem item) btn_params.Enabled = false; lbl_description.Text = MpeInstaller.ActionProviders[item.ActionType].Description; cmb_execute.SelectedIndex = (int)item.ExecuteLocation; + + this.cmb_execution_condition.Items.AddRange(Enum.GetNames(typeof(ActionConditionEnum))); + this.cmb_execution_condition.SelectedIndex = (int)item.Condition; + + this.textBoxName.Text = item.Name; + _loading = false; } private void btn_ok_Click(object sender, EventArgs e) { + if (string.IsNullOrWhiteSpace(this.textBoxName.Text)) + { + MessageBox.Show("Invalid name.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + else + this._actionItem.Name = this.textBoxName.Text; + DialogResult = DialogResult.OK; this.Close(); } @@ -78,6 +92,14 @@ private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) _actionItem.ExecuteLocation = (ActionExecuteLocationEnum)cmb_execute.SelectedIndex; } + private void cmb_execution_condition_SelectedIndexChanged(object sender, EventArgs e) + { + if (this._loading) + return; + + this._actionItem.Condition = (ActionConditionEnum)this.cmb_execution_condition.SelectedIndex; + } + private void button1_Click(object sender, EventArgs e) { ParamEdit dlg = new ParamEdit(); diff --git a/mediaportal/MPE/MpeMaker/Sections/ActionEdit.resx b/mediaportal/MPE/MpeMaker/Sections/ActionEdit.resx index ff31a6db56e..c7e0d4bdf13 100644 --- a/mediaportal/MPE/MpeMaker/Sections/ActionEdit.resx +++ b/mediaportal/MPE/MpeMaker/Sections/ActionEdit.resx @@ -112,9 +112,9 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/mediaportal/MPE/MpeMaker/Sections/BuildSection.cs b/mediaportal/MPE/MpeMaker/Sections/BuildSection.cs index 78b2420fb6f..dd46d3712f6 100644 --- a/mediaportal/MPE/MpeMaker/Sections/BuildSection.cs +++ b/mediaportal/MPE/MpeMaker/Sections/BuildSection.cs @@ -96,6 +96,8 @@ private void btn_test_Click(object sender, EventArgs e) private void GenPak(bool run) { + Package.VerifyMPDependency(); + list_error.Items.Clear(); list_message.Items.Clear(); string fileName = txt_outfile.Text; diff --git a/mediaportal/MPE/MpeMaker/Sections/InstallSections.Designer.cs b/mediaportal/MPE/MpeMaker/Sections/InstallSections.Designer.cs index 76b8a5184ff..773b5b5c785 100644 --- a/mediaportal/MPE/MpeMaker/Sections/InstallSections.Designer.cs +++ b/mediaportal/MPE/MpeMaker/Sections/InstallSections.Designer.cs @@ -28,468 +28,493 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.listBox_sections = new System.Windows.Forms.ListBox(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.mnu_add = new System.Windows.Forms.ToolStripDropDownButton(); - this.mnu_remove = new System.Windows.Forms.ToolStripButton(); - this.list_groups = new System.Windows.Forms.ListBox(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label1 = new System.Windows.Forms.Label(); - this.cmb_buttons = new System.Windows.Forms.ComboBox(); - this.label5 = new System.Windows.Forms.Label(); - this.cmb_grupvisibility = new System.Windows.Forms.ComboBox(); - this.label4 = new System.Windows.Forms.Label(); - this.txt_guid = new System.Windows.Forms.TextBox(); - this.btn_preview = new System.Windows.Forms.Button(); - this.btn_params = new System.Windows.Forms.Button(); - this.label3 = new System.Windows.Forms.Label(); - this.cmb_sectiontype = new System.Windows.Forms.ComboBox(); - this.label2 = new System.Windows.Forms.Label(); - this.txt_name = new System.Windows.Forms.TextBox(); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.btn_group_down = new System.Windows.Forms.Button(); - this.btn_group_up = new System.Windows.Forms.Button(); - this.mnu_group_remove = new System.Windows.Forms.ToolStrip(); - this.mnu_groulist = new System.Windows.Forms.ToolStripComboBox(); - this.mnu_group_add = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.list_actions = new System.Windows.Forms.ListBox(); - this.toolStrip2 = new System.Windows.Forms.ToolStrip(); - this.mnu_action_add = new System.Windows.Forms.ToolStripDropDownButton(); - this.mnu_action_del = new System.Windows.Forms.ToolStripButton(); - this.mnu_action_edit = new System.Windows.Forms.ToolStripButton(); - this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.btn_down = new System.Windows.Forms.Button(); - this.btn_up = new System.Windows.Forms.Button(); - this.toolStrip1.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.tabControl1.SuspendLayout(); - this.tabPage1.SuspendLayout(); - this.mnu_group_remove.SuspendLayout(); - this.tabPage2.SuspendLayout(); - this.toolStrip2.SuspendLayout(); - this.SuspendLayout(); - // - // listBox_sections - // - this.listBox_sections.Dock = System.Windows.Forms.DockStyle.Left; - this.listBox_sections.FormattingEnabled = true; - this.listBox_sections.Location = new System.Drawing.Point(0, 25); - this.listBox_sections.Name = "listBox_sections"; - this.listBox_sections.Size = new System.Drawing.Size(254, 402); - this.listBox_sections.TabIndex = 0; - this.listBox_sections.SelectedIndexChanged += new System.EventHandler(this.listBox_sections_SelectedIndexChanged); - this.listBox_sections.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnKeyDown); - // - // toolStrip1 - // - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + this.listBox_sections = new System.Windows.Forms.ListBox(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.mnu_add = new System.Windows.Forms.ToolStripDropDownButton(); + this.mnu_remove = new System.Windows.Forms.ToolStripButton(); + this.list_groups = new System.Windows.Forms.ListBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label1 = new System.Windows.Forms.Label(); + this.cmb_buttons = new System.Windows.Forms.ComboBox(); + this.label5 = new System.Windows.Forms.Label(); + this.cmb_grupvisibility = new System.Windows.Forms.ComboBox(); + this.label4 = new System.Windows.Forms.Label(); + this.txt_guid = new System.Windows.Forms.TextBox(); + this.btn_preview = new System.Windows.Forms.Button(); + this.btn_params = new System.Windows.Forms.Button(); + this.label3 = new System.Windows.Forms.Label(); + this.cmb_sectiontype = new System.Windows.Forms.ComboBox(); + this.label2 = new System.Windows.Forms.Label(); + this.txt_name = new System.Windows.Forms.TextBox(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.btn_group_down = new System.Windows.Forms.Button(); + this.btn_group_up = new System.Windows.Forms.Button(); + this.mnu_group_remove = new System.Windows.Forms.ToolStrip(); + this.mnu_groulist = new System.Windows.Forms.ToolStripComboBox(); + this.mnu_group_add = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.list_actions = new System.Windows.Forms.ListBox(); + this.toolStrip2 = new System.Windows.Forms.ToolStrip(); + this.mnu_action_add = new System.Windows.Forms.ToolStripDropDownButton(); + this.mnu_action_del = new System.Windows.Forms.ToolStripButton(); + this.mnu_action_edit = new System.Windows.Forms.ToolStripButton(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.btn_down = new System.Windows.Forms.Button(); + this.btn_up = new System.Windows.Forms.Button(); + this.cmb_execution_condition = new System.Windows.Forms.ComboBox(); + this.label6 = new System.Windows.Forms.Label(); + this.toolStrip1.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.mnu_group_remove.SuspendLayout(); + this.tabPage2.SuspendLayout(); + this.toolStrip2.SuspendLayout(); + this.SuspendLayout(); + // + // listBox_sections + // + this.listBox_sections.Dock = System.Windows.Forms.DockStyle.Left; + this.listBox_sections.FormattingEnabled = true; + this.listBox_sections.Location = new System.Drawing.Point(0, 25); + this.listBox_sections.Name = "listBox_sections"; + this.listBox_sections.Size = new System.Drawing.Size(254, 402); + this.listBox_sections.TabIndex = 0; + this.listBox_sections.SelectedIndexChanged += new System.EventHandler(this.listBox_sections_SelectedIndexChanged); + this.listBox_sections.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnKeyDown); + // + // toolStrip1 + // + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnu_add, this.mnu_remove}); - this.toolStrip1.Location = new System.Drawing.Point(0, 0); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.toolStrip1.Size = new System.Drawing.Size(683, 25); - this.toolStrip1.TabIndex = 2; - this.toolStrip1.Text = "toolStrip1"; - // - // mnu_add - // - this.mnu_add.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mnu_add.Image = global::MpeMaker.Properties.Resources.folder_add; - this.mnu_add.ImageTransparentColor = System.Drawing.Color.Magenta; - this.mnu_add.Name = "mnu_add"; - this.mnu_add.Size = new System.Drawing.Size(29, 22); - this.mnu_add.Text = "Add section"; - // - // mnu_remove - // - this.mnu_remove.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mnu_remove.Image = global::MpeMaker.Properties.Resources.folder_delete; - this.mnu_remove.ImageTransparentColor = System.Drawing.Color.Magenta; - this.mnu_remove.Name = "mnu_remove"; - this.mnu_remove.Size = new System.Drawing.Size(23, 22); - this.mnu_remove.Text = "Remove section"; - this.mnu_remove.ToolTipText = "Remove section"; - this.mnu_remove.Click += new System.EventHandler(this.mnu_remove_Click); - // - // list_groups - // - this.list_groups.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; + this.toolStrip1.Size = new System.Drawing.Size(683, 25); + this.toolStrip1.TabIndex = 2; + this.toolStrip1.Text = "toolStrip1"; + // + // mnu_add + // + this.mnu_add.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.mnu_add.Image = global::MpeMaker.Properties.Resources.folder_add; + this.mnu_add.ImageTransparentColor = System.Drawing.Color.Magenta; + this.mnu_add.Name = "mnu_add"; + this.mnu_add.Size = new System.Drawing.Size(29, 22); + this.mnu_add.Text = "Add section"; + // + // mnu_remove + // + this.mnu_remove.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.mnu_remove.Image = global::MpeMaker.Properties.Resources.folder_delete; + this.mnu_remove.ImageTransparentColor = System.Drawing.Color.Magenta; + this.mnu_remove.Name = "mnu_remove"; + this.mnu_remove.Size = new System.Drawing.Size(23, 22); + this.mnu_remove.Text = "Remove section"; + this.mnu_remove.ToolTipText = "Remove section"; + this.mnu_remove.Click += new System.EventHandler(this.mnu_remove_Click); + // + // list_groups + // + this.list_groups.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.list_groups.FormattingEnabled = true; - this.list_groups.Location = new System.Drawing.Point(6, 31); - this.list_groups.Name = "list_groups"; - this.list_groups.Size = new System.Drawing.Size(342, 134); - this.list_groups.TabIndex = 5; - this.toolTip1.SetToolTip(this.list_groups, "Check the included group item on this section,\r\nnot all sections need groups. "); - this.list_groups.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnKeyDown); - // - // groupBox1 - // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.list_groups.FormattingEnabled = true; + this.list_groups.Location = new System.Drawing.Point(6, 31); + this.list_groups.Name = "list_groups"; + this.list_groups.Size = new System.Drawing.Size(342, 134); + this.list_groups.TabIndex = 5; + this.toolTip1.SetToolTip(this.list_groups, "Check the included group item on this section,\r\nnot all sections need groups. "); + this.list_groups.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnKeyDown); + // + // groupBox1 + // + this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.cmb_buttons); - this.groupBox1.Controls.Add(this.label5); - this.groupBox1.Controls.Add(this.cmb_grupvisibility); - this.groupBox1.Controls.Add(this.label4); - this.groupBox1.Controls.Add(this.txt_guid); - this.groupBox1.Controls.Add(this.btn_preview); - this.groupBox1.Controls.Add(this.btn_params); - this.groupBox1.Controls.Add(this.label3); - this.groupBox1.Controls.Add(this.cmb_sectiontype); - this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.txt_name); - this.groupBox1.Location = new System.Drawing.Point(289, 28); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(391, 190); - this.groupBox1.TabIndex = 7; - this.groupBox1.TabStop = false; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(6, 124); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(43, 13); - this.label1.TabIndex = 11; - this.label1.Text = "Buttons"; - // - // cmb_buttons - // - this.cmb_buttons.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.groupBox1.Controls.Add(this.cmb_execution_condition); + this.groupBox1.Controls.Add(this.label6); + this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.cmb_buttons); + this.groupBox1.Controls.Add(this.label5); + this.groupBox1.Controls.Add(this.cmb_grupvisibility); + this.groupBox1.Controls.Add(this.label4); + this.groupBox1.Controls.Add(this.txt_guid); + this.groupBox1.Controls.Add(this.btn_preview); + this.groupBox1.Controls.Add(this.btn_params); + this.groupBox1.Controls.Add(this.label3); + this.groupBox1.Controls.Add(this.cmb_sectiontype); + this.groupBox1.Controls.Add(this.label2); + this.groupBox1.Controls.Add(this.txt_name); + this.groupBox1.Location = new System.Drawing.Point(289, 28); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(391, 190); + this.groupBox1.TabIndex = 7; + this.groupBox1.TabStop = false; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(6, 108); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(43, 13); + this.label1.TabIndex = 11; + this.label1.Text = "Buttons"; + // + // cmb_buttons + // + this.cmb_buttons.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.cmb_buttons.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmb_buttons.FormattingEnabled = true; - this.cmb_buttons.Items.AddRange(new object[] { + this.cmb_buttons.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_buttons.FormattingEnabled = true; + this.cmb_buttons.Items.AddRange(new object[] { " Back/Next/Cancel ", " Next/Cancel ", " Back/Finish", " Cancel ", " Next ", " Finish "}); - this.cmb_buttons.Location = new System.Drawing.Point(87, 121); - this.cmb_buttons.Name = "cmb_buttons"; - this.cmb_buttons.Size = new System.Drawing.Size(298, 21); - this.cmb_buttons.TabIndex = 10; - this.cmb_buttons.SelectedIndexChanged += new System.EventHandler(this.txt_name_TextChanged); - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(6, 97); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(40, 13); - this.label5.TabIndex = 9; - this.label5.Text = "Visible "; - // - // cmb_grupvisibility - // - this.cmb_grupvisibility.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.cmb_buttons.Location = new System.Drawing.Point(85, 105); + this.cmb_buttons.Name = "cmb_buttons"; + this.cmb_buttons.Size = new System.Drawing.Size(300, 21); + this.cmb_buttons.TabIndex = 10; + this.cmb_buttons.SelectedIndexChanged += new System.EventHandler(this.txt_name_TextChanged); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(6, 85); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(40, 13); + this.label5.TabIndex = 9; + this.label5.Text = "Visible "; + // + // cmb_grupvisibility + // + this.cmb_grupvisibility.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.cmb_grupvisibility.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmb_grupvisibility.FormattingEnabled = true; - this.cmb_grupvisibility.Location = new System.Drawing.Point(87, 94); - this.cmb_grupvisibility.Name = "cmb_grupvisibility"; - this.cmb_grupvisibility.Size = new System.Drawing.Size(298, 21); - this.cmb_grupvisibility.TabIndex = 8; - this.toolTip1.SetToolTip(this.cmb_grupvisibility, "If the selected group is checked, the section will be shown\r\nIf no group specifie" + + this.cmb_grupvisibility.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_grupvisibility.FormattingEnabled = true; + this.cmb_grupvisibility.Location = new System.Drawing.Point(85, 82); + this.cmb_grupvisibility.Name = "cmb_grupvisibility"; + this.cmb_grupvisibility.Size = new System.Drawing.Size(300, 21); + this.cmb_grupvisibility.TabIndex = 8; + this.toolTip1.SetToolTip(this.cmb_grupvisibility, "If the selected group is checked, the section will be shown\r\nIf no group specifie" + "d the section always visible"); - this.cmb_grupvisibility.TextChanged += new System.EventHandler(this.txt_name_TextChanged); - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(6, 16); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(73, 13); - this.label4.TabIndex = 7; - this.label4.Text = "Section GUID"; - // - // txt_guid - // - this.txt_guid.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.cmb_grupvisibility.TextChanged += new System.EventHandler(this.txt_name_TextChanged); + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(6, 16); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(73, 13); + this.label4.TabIndex = 7; + this.label4.Text = "Section GUID"; + // + // txt_guid + // + this.txt_guid.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txt_guid.Location = new System.Drawing.Point(87, 13); - this.txt_guid.Name = "txt_guid"; - this.txt_guid.ReadOnly = true; - this.txt_guid.Size = new System.Drawing.Size(298, 20); - this.txt_guid.TabIndex = 6; - // - // btn_preview - // - this.btn_preview.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btn_preview.Location = new System.Drawing.Point(295, 161); - this.btn_preview.Name = "btn_preview"; - this.btn_preview.Size = new System.Drawing.Size(75, 23); - this.btn_preview.TabIndex = 5; - this.btn_preview.Text = "Preview"; - this.btn_preview.UseVisualStyleBackColor = true; - this.btn_preview.Click += new System.EventHandler(this.btn_preview_Click); - // - // btn_params - // - this.btn_params.Location = new System.Drawing.Point(20, 161); - this.btn_params.Name = "btn_params"; - this.btn_params.Size = new System.Drawing.Size(75, 23); - this.btn_params.TabIndex = 4; - this.btn_params.Text = "Customize"; - this.btn_params.UseVisualStyleBackColor = true; - this.btn_params.Click += new System.EventHandler(this.btn_params_Click); - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(6, 68); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(66, 13); - this.label3.TabIndex = 3; - this.label3.Text = "Section type"; - // - // cmb_sectiontype - // - this.cmb_sectiontype.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.txt_guid.Location = new System.Drawing.Point(85, 13); + this.txt_guid.Name = "txt_guid"; + this.txt_guid.ReadOnly = true; + this.txt_guid.Size = new System.Drawing.Size(300, 20); + this.txt_guid.TabIndex = 6; + // + // btn_preview + // + this.btn_preview.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btn_preview.Location = new System.Drawing.Point(295, 161); + this.btn_preview.Name = "btn_preview"; + this.btn_preview.Size = new System.Drawing.Size(75, 23); + this.btn_preview.TabIndex = 5; + this.btn_preview.Text = "Preview"; + this.btn_preview.UseVisualStyleBackColor = true; + this.btn_preview.Click += new System.EventHandler(this.btn_preview_Click); + // + // btn_params + // + this.btn_params.Location = new System.Drawing.Point(20, 161); + this.btn_params.Name = "btn_params"; + this.btn_params.Size = new System.Drawing.Size(75, 23); + this.btn_params.TabIndex = 4; + this.btn_params.Text = "Customize"; + this.btn_params.UseVisualStyleBackColor = true; + this.btn_params.Click += new System.EventHandler(this.btn_params_Click); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(6, 62); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(66, 13); + this.label3.TabIndex = 3; + this.label3.Text = "Section type"; + // + // cmb_sectiontype + // + this.cmb_sectiontype.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.cmb_sectiontype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmb_sectiontype.Enabled = false; - this.cmb_sectiontype.FormattingEnabled = true; - this.cmb_sectiontype.Location = new System.Drawing.Point(87, 65); - this.cmb_sectiontype.Name = "cmb_sectiontype"; - this.cmb_sectiontype.Size = new System.Drawing.Size(298, 21); - this.cmb_sectiontype.TabIndex = 2; - this.cmb_sectiontype.SelectedIndexChanged += new System.EventHandler(this.txt_name_TextChanged); - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(6, 42); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(72, 13); - this.label2.TabIndex = 1; - this.label2.Text = "Section name"; - // - // txt_name - // - this.txt_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.cmb_sectiontype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_sectiontype.Enabled = false; + this.cmb_sectiontype.FormattingEnabled = true; + this.cmb_sectiontype.Location = new System.Drawing.Point(85, 59); + this.cmb_sectiontype.Name = "cmb_sectiontype"; + this.cmb_sectiontype.Size = new System.Drawing.Size(300, 21); + this.cmb_sectiontype.TabIndex = 2; + this.cmb_sectiontype.SelectedIndexChanged += new System.EventHandler(this.txt_name_TextChanged); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(6, 39); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(72, 13); + this.label2.TabIndex = 1; + this.label2.Text = "Section name"; + // + // txt_name + // + this.txt_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txt_name.Location = new System.Drawing.Point(87, 39); - this.txt_name.Name = "txt_name"; - this.txt_name.Size = new System.Drawing.Size(298, 20); - this.txt_name.TabIndex = 0; - this.txt_name.TextChanged += new System.EventHandler(this.txt_name_TextChanged); - // - // tabControl1 - // - this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.txt_name.Location = new System.Drawing.Point(85, 36); + this.txt_name.Name = "txt_name"; + this.txt_name.Size = new System.Drawing.Size(300, 20); + this.txt_name.TabIndex = 0; + this.txt_name.TextChanged += new System.EventHandler(this.txt_name_TextChanged); + // + // tabControl1 + // + this.tabControl1.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.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Location = new System.Drawing.Point(289, 224); - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(391, 197); - this.tabControl1.TabIndex = 8; - // - // tabPage1 - // - this.tabPage1.Controls.Add(this.btn_group_down); - this.tabPage1.Controls.Add(this.btn_group_up); - this.tabPage1.Controls.Add(this.mnu_group_remove); - this.tabPage1.Controls.Add(this.list_groups); - 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(383, 171); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "Groups"; - this.tabPage1.UseVisualStyleBackColor = true; - // - // btn_group_down - // - this.btn_group_down.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btn_group_down.Image = global::MpeMaker.Properties.Resources.arrow_down; - this.btn_group_down.Location = new System.Drawing.Point(354, 96); - this.btn_group_down.Name = "btn_group_down"; - this.btn_group_down.Size = new System.Drawing.Size(23, 31); - this.btn_group_down.TabIndex = 8; - this.btn_group_down.UseVisualStyleBackColor = true; - this.btn_group_down.Click += new System.EventHandler(this.btn_group_down_Click); - // - // btn_group_up - // - this.btn_group_up.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btn_group_up.Image = global::MpeMaker.Properties.Resources.arrow_up; - this.btn_group_up.Location = new System.Drawing.Point(354, 62); - this.btn_group_up.Name = "btn_group_up"; - this.btn_group_up.Size = new System.Drawing.Size(23, 31); - this.btn_group_up.TabIndex = 7; - this.btn_group_up.UseVisualStyleBackColor = true; - this.btn_group_up.Click += new System.EventHandler(this.btn_group_up_Click); - // - // mnu_group_remove - // - this.mnu_group_remove.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Location = new System.Drawing.Point(289, 224); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(391, 197); + this.tabControl1.TabIndex = 8; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.btn_group_down); + this.tabPage1.Controls.Add(this.btn_group_up); + this.tabPage1.Controls.Add(this.mnu_group_remove); + this.tabPage1.Controls.Add(this.list_groups); + 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(383, 171); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "Groups"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // btn_group_down + // + this.btn_group_down.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btn_group_down.Image = global::MpeMaker.Properties.Resources.arrow_down; + this.btn_group_down.Location = new System.Drawing.Point(354, 96); + this.btn_group_down.Name = "btn_group_down"; + this.btn_group_down.Size = new System.Drawing.Size(23, 31); + this.btn_group_down.TabIndex = 8; + this.btn_group_down.UseVisualStyleBackColor = true; + this.btn_group_down.Click += new System.EventHandler(this.btn_group_down_Click); + // + // btn_group_up + // + this.btn_group_up.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btn_group_up.Image = global::MpeMaker.Properties.Resources.arrow_up; + this.btn_group_up.Location = new System.Drawing.Point(354, 62); + this.btn_group_up.Name = "btn_group_up"; + this.btn_group_up.Size = new System.Drawing.Size(23, 31); + this.btn_group_up.TabIndex = 7; + this.btn_group_up.UseVisualStyleBackColor = true; + this.btn_group_up.Click += new System.EventHandler(this.btn_group_up_Click); + // + // mnu_group_remove + // + this.mnu_group_remove.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnu_groulist, this.mnu_group_add, this.toolStripButton2}); - this.mnu_group_remove.Location = new System.Drawing.Point(3, 3); - this.mnu_group_remove.Name = "mnu_group_remove"; - this.mnu_group_remove.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.mnu_group_remove.Size = new System.Drawing.Size(377, 25); - this.mnu_group_remove.TabIndex = 6; - this.mnu_group_remove.Text = "toolStrip3"; - // - // mnu_groulist - // - this.mnu_groulist.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.mnu_groulist.Name = "mnu_groulist"; - this.mnu_groulist.Size = new System.Drawing.Size(200, 25); - // - // mnu_group_add - // - this.mnu_group_add.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mnu_group_add.Image = global::MpeMaker.Properties.Resources.list_add; - this.mnu_group_add.ImageTransparentColor = System.Drawing.Color.Magenta; - this.mnu_group_add.Name = "mnu_group_add"; - this.mnu_group_add.Size = new System.Drawing.Size(23, 22); - this.mnu_group_add.Text = "Add group"; - this.mnu_group_add.Click += new System.EventHandler(this.mnu_group_add_Click); - // - // toolStripButton2 - // - this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolStripButton2.Image = global::MpeMaker.Properties.Resources.list_remove; - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(23, 22); - this.toolStripButton2.Text = "Remove group"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); - // - // tabPage2 - // - this.tabPage2.Controls.Add(this.list_actions); - this.tabPage2.Controls.Add(this.toolStrip2); - 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(383, 171); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "Actions"; - this.tabPage2.UseVisualStyleBackColor = true; - // - // list_actions - // - this.list_actions.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.mnu_group_remove.Location = new System.Drawing.Point(3, 3); + this.mnu_group_remove.Name = "mnu_group_remove"; + this.mnu_group_remove.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; + this.mnu_group_remove.Size = new System.Drawing.Size(377, 27); + this.mnu_group_remove.TabIndex = 6; + this.mnu_group_remove.Text = "toolStrip3"; + // + // mnu_groulist + // + this.mnu_groulist.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.mnu_groulist.Name = "mnu_groulist"; + this.mnu_groulist.Size = new System.Drawing.Size(200, 27); + // + // mnu_group_add + // + this.mnu_group_add.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.mnu_group_add.Image = global::MpeMaker.Properties.Resources.list_add; + this.mnu_group_add.ImageTransparentColor = System.Drawing.Color.Magenta; + this.mnu_group_add.Name = "mnu_group_add"; + this.mnu_group_add.Size = new System.Drawing.Size(23, 24); + this.mnu_group_add.Text = "Add group"; + this.mnu_group_add.Click += new System.EventHandler(this.mnu_group_add_Click); + // + // toolStripButton2 + // + this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton2.Image = global::MpeMaker.Properties.Resources.list_remove; + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(23, 24); + this.toolStripButton2.Text = "Remove group"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.list_actions); + this.tabPage2.Controls.Add(this.toolStrip2); + 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(383, 171); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "Actions"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // list_actions + // + this.list_actions.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.list_actions.FormattingEnabled = true; - this.list_actions.Location = new System.Drawing.Point(6, 31); - this.list_actions.Name = "list_actions"; - this.list_actions.Size = new System.Drawing.Size(371, 134); - this.list_actions.TabIndex = 1; - this.toolTip1.SetToolTip(this.list_actions, "Atached actions to the section "); - this.list_actions.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnKeyDown); - // - // toolStrip2 - // - this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.list_actions.FormattingEnabled = true; + this.list_actions.Location = new System.Drawing.Point(6, 31); + this.list_actions.Name = "list_actions"; + this.list_actions.Size = new System.Drawing.Size(371, 134); + this.list_actions.TabIndex = 1; + this.toolTip1.SetToolTip(this.list_actions, "Atached actions to the section "); + this.list_actions.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnKeyDown); + // + // toolStrip2 + // + this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnu_action_add, this.mnu_action_del, this.mnu_action_edit}); - this.toolStrip2.Location = new System.Drawing.Point(3, 3); - this.toolStrip2.Name = "toolStrip2"; - this.toolStrip2.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.toolStrip2.Size = new System.Drawing.Size(377, 25); - this.toolStrip2.TabIndex = 0; - this.toolStrip2.Text = "toolStrip2"; - // - // mnu_action_add - // - this.mnu_action_add.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mnu_action_add.Image = global::MpeMaker.Properties.Resources.application_form_add; - this.mnu_action_add.ImageTransparentColor = System.Drawing.Color.Magenta; - this.mnu_action_add.Name = "mnu_action_add"; - this.mnu_action_add.Size = new System.Drawing.Size(29, 22); - this.mnu_action_add.Text = "toolStripButton1"; - this.mnu_action_add.ToolTipText = "Add action"; - // - // mnu_action_del - // - this.mnu_action_del.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mnu_action_del.Image = global::MpeMaker.Properties.Resources.application_form_delete; - this.mnu_action_del.ImageTransparentColor = System.Drawing.Color.Magenta; - this.mnu_action_del.Name = "mnu_action_del"; - this.mnu_action_del.Size = new System.Drawing.Size(23, 22); - this.mnu_action_del.Text = "toolStripButton2"; - this.mnu_action_del.ToolTipText = "Remove action"; - this.mnu_action_del.Click += new System.EventHandler(this.mnu_action_del_Click); - // - // mnu_action_edit - // - this.mnu_action_edit.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mnu_action_edit.Image = global::MpeMaker.Properties.Resources.application_form_edit; - this.mnu_action_edit.ImageTransparentColor = System.Drawing.Color.Magenta; - this.mnu_action_edit.Name = "mnu_action_edit"; - this.mnu_action_edit.Size = new System.Drawing.Size(23, 22); - this.mnu_action_edit.Text = "toolStripButton3"; - this.mnu_action_edit.ToolTipText = "Edit action"; - this.mnu_action_edit.Click += new System.EventHandler(this.mnu_action_edit_Click); - // - // btn_down - // - this.btn_down.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btn_down.Image = global::MpeMaker.Properties.Resources.arrow_down; - this.btn_down.Location = new System.Drawing.Point(260, 222); - this.btn_down.Name = "btn_down"; - this.btn_down.Size = new System.Drawing.Size(23, 31); - this.btn_down.TabIndex = 4; - this.btn_down.UseVisualStyleBackColor = true; - this.btn_down.Click += new System.EventHandler(this.btn_down_Click); - // - // btn_up - // - this.btn_up.Image = global::MpeMaker.Properties.Resources.arrow_up; - this.btn_up.Location = new System.Drawing.Point(260, 185); - this.btn_up.Name = "btn_up"; - this.btn_up.Size = new System.Drawing.Size(23, 31); - this.btn_up.TabIndex = 3; - this.btn_up.UseVisualStyleBackColor = true; - this.btn_up.Click += new System.EventHandler(this.btn_up_Click); - // - // InstallSections - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.tabControl1); - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.btn_down); - this.Controls.Add(this.btn_up); - this.Controls.Add(this.listBox_sections); - this.Controls.Add(this.toolStrip1); - this.Name = "InstallSections"; - this.Size = new System.Drawing.Size(683, 427); - this.Load += new System.EventHandler(this.InstallSections_Load); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.tabControl1.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); - this.tabPage1.PerformLayout(); - this.mnu_group_remove.ResumeLayout(false); - this.mnu_group_remove.PerformLayout(); - this.tabPage2.ResumeLayout(false); - this.tabPage2.PerformLayout(); - this.toolStrip2.ResumeLayout(false); - this.toolStrip2.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.toolStrip2.Location = new System.Drawing.Point(3, 3); + this.toolStrip2.Name = "toolStrip2"; + this.toolStrip2.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; + this.toolStrip2.Size = new System.Drawing.Size(377, 25); + this.toolStrip2.TabIndex = 0; + this.toolStrip2.Text = "toolStrip2"; + // + // mnu_action_add + // + this.mnu_action_add.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.mnu_action_add.Image = global::MpeMaker.Properties.Resources.application_form_add; + this.mnu_action_add.ImageTransparentColor = System.Drawing.Color.Magenta; + this.mnu_action_add.Name = "mnu_action_add"; + this.mnu_action_add.Size = new System.Drawing.Size(29, 22); + this.mnu_action_add.Text = "toolStripButton1"; + this.mnu_action_add.ToolTipText = "Add action"; + // + // mnu_action_del + // + this.mnu_action_del.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.mnu_action_del.Image = global::MpeMaker.Properties.Resources.application_form_delete; + this.mnu_action_del.ImageTransparentColor = System.Drawing.Color.Magenta; + this.mnu_action_del.Name = "mnu_action_del"; + this.mnu_action_del.Size = new System.Drawing.Size(23, 22); + this.mnu_action_del.Text = "toolStripButton2"; + this.mnu_action_del.ToolTipText = "Remove action"; + this.mnu_action_del.Click += new System.EventHandler(this.mnu_action_del_Click); + // + // mnu_action_edit + // + this.mnu_action_edit.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.mnu_action_edit.Image = global::MpeMaker.Properties.Resources.application_form_edit; + this.mnu_action_edit.ImageTransparentColor = System.Drawing.Color.Magenta; + this.mnu_action_edit.Name = "mnu_action_edit"; + this.mnu_action_edit.Size = new System.Drawing.Size(23, 22); + this.mnu_action_edit.Text = "toolStripButton3"; + this.mnu_action_edit.ToolTipText = "Edit action"; + this.mnu_action_edit.Click += new System.EventHandler(this.mnu_action_edit_Click); + // + // btn_down + // + this.btn_down.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.btn_down.Image = global::MpeMaker.Properties.Resources.arrow_down; + this.btn_down.Location = new System.Drawing.Point(260, 222); + this.btn_down.Name = "btn_down"; + this.btn_down.Size = new System.Drawing.Size(23, 31); + this.btn_down.TabIndex = 4; + this.btn_down.UseVisualStyleBackColor = true; + this.btn_down.Click += new System.EventHandler(this.btn_down_Click); + // + // btn_up + // + this.btn_up.Image = global::MpeMaker.Properties.Resources.arrow_up; + this.btn_up.Location = new System.Drawing.Point(260, 185); + this.btn_up.Name = "btn_up"; + this.btn_up.Size = new System.Drawing.Size(23, 31); + this.btn_up.TabIndex = 3; + this.btn_up.UseVisualStyleBackColor = true; + this.btn_up.Click += new System.EventHandler(this.btn_up_Click); + // + // cmb_execution_condition + // + this.cmb_execution_condition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.cmb_execution_condition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_execution_condition.FormattingEnabled = true; + this.cmb_execution_condition.Location = new System.Drawing.Point(85, 128); + this.cmb_execution_condition.Name = "cmb_execution_condition"; + this.cmb_execution_condition.Size = new System.Drawing.Size(300, 21); + this.cmb_execution_condition.TabIndex = 13; + this.cmb_execution_condition.SelectedIndexChanged += new System.EventHandler(this.txt_name_TextChanged); + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(6, 131); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(51, 13); + this.label6.TabIndex = 12; + this.label6.Text = "Condition"; + // + // InstallSections + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.tabControl1); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.btn_down); + this.Controls.Add(this.btn_up); + this.Controls.Add(this.listBox_sections); + this.Controls.Add(this.toolStrip1); + this.Name = "InstallSections"; + this.Size = new System.Drawing.Size(683, 427); + this.Load += new System.EventHandler(this.InstallSections_Load); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage1.PerformLayout(); + this.mnu_group_remove.ResumeLayout(false); + this.mnu_group_remove.PerformLayout(); + this.tabPage2.ResumeLayout(false); + this.tabPage2.PerformLayout(); + this.toolStrip2.ResumeLayout(false); + this.toolStrip2.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -530,5 +555,7 @@ private void InitializeComponent() private System.Windows.Forms.ListBox list_groups; private System.Windows.Forms.Button btn_group_down; private System.Windows.Forms.Button btn_group_up; - } + private System.Windows.Forms.ComboBox cmb_execution_condition; + private System.Windows.Forms.Label label6; + } } diff --git a/mediaportal/MPE/MpeMaker/Sections/InstallSections.cs b/mediaportal/MPE/MpeMaker/Sections/InstallSections.cs index ee74721d52b..76bb9aa37f4 100644 --- a/mediaportal/MPE/MpeMaker/Sections/InstallSections.cs +++ b/mediaportal/MPE/MpeMaker/Sections/InstallSections.cs @@ -56,6 +56,9 @@ public InstallSections() mnu_action_add.DropDownItems.Add(testToolStripMenuItem); cmb_sectiontype.Items.Add(actionProvider.Value.DisplayName); } + + this.cmb_execution_condition.Items.AddRange(Enum.GetNames(typeof(ActionConditionEnum))); + } private void testToolStripMenuItem_Click(object sender, EventArgs e) @@ -168,6 +171,8 @@ private void listBox_sections_SelectedIndexChanged(object sender, EventArgs e) list_actions.Items.Add(acton); } + this.cmb_execution_condition.SelectedIndex = (int)param.Condition; + SelectedSection = param; } } @@ -180,6 +185,7 @@ private void txt_name_TextChanged(object sender, EventArgs e) SelectedSection.PanelName = cmb_sectiontype.Text; SelectedSection.ConditionGroup = cmb_grupvisibility.Text; SelectedSection.WizardButtonsEnum = (WizardButtonsEnum)cmb_buttons.SelectedIndex; + SelectedSection.Condition = (ActionConditionEnum)this.cmb_execution_condition.SelectedIndex; } private void btn_params_Click(object sender, EventArgs e) @@ -244,7 +250,12 @@ private void mnu_action_edit_Click(object sender, EventArgs e) if (list_actions.SelectedItems.Count < 1) return; ActionEdit dlg = new ActionEdit(Package, (ActionItem)list_actions.SelectedItem); - dlg.ShowDialog(); + if (dlg.ShowDialog() == DialogResult.OK) + { + //Force to refresh listbox ( can by changed) + list_actions.DrawMode = DrawMode.OwnerDrawFixed; + list_actions.DrawMode = DrawMode.Normal; + } } private void mnu_action_del_Click(object sender, EventArgs e) diff --git a/mediaportal/MPE/MpeMaker/Sections/InstallSections.resx b/mediaportal/MPE/MpeMaker/Sections/InstallSections.resx index 74c1f0309c9..0623682a654 100644 --- a/mediaportal/MPE/MpeMaker/Sections/InstallSections.resx +++ b/mediaportal/MPE/MpeMaker/Sections/InstallSections.resx @@ -112,27 +112,30 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 - + 215, 17 - + + 215, 17 + + 307, 17 - - 116, 17 + + 307, 17 - + 116, 17 - - 215, 17 + + 116, 17 \ No newline at end of file diff --git a/mediaportal/MPE/MpeMaker/Sections/RequirementsSection.Designer.cs b/mediaportal/MPE/MpeMaker/Sections/RequirementsSection.Designer.cs index e70bfbe2d4b..2318452a57b 100644 --- a/mediaportal/MPE/MpeMaker/Sections/RequirementsSection.Designer.cs +++ b/mediaportal/MPE/MpeMaker/Sections/RequirementsSection.Designer.cs @@ -28,379 +28,404 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.list_versions = new System.Windows.Forms.ListBox(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.mnu_add = new System.Windows.Forms.ToolStripDropDownButton(); - this.mnu_del = new System.Windows.Forms.ToolStripButton(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.lbl_ver = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.txt_name = new System.Windows.Forms.TextBox(); - this.button1 = new System.Windows.Forms.Button(); - this.label3 = new System.Windows.Forms.Label(); - this.txt_message = new System.Windows.Forms.TextBox(); - this.chk_warn = new System.Windows.Forms.CheckBox(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.txt_version4_max = new System.Windows.Forms.TextBox(); - this.txt_version3_max = new System.Windows.Forms.TextBox(); - this.txt_version2_max = new System.Windows.Forms.TextBox(); - this.txt_version1_max = new System.Windows.Forms.TextBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.txt_version4_min = new System.Windows.Forms.TextBox(); - this.txt_version3_min = new System.Windows.Forms.TextBox(); - this.txt_version2_min = new System.Windows.Forms.TextBox(); - this.txt_version1_min = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.txt_id = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.cmb_type = new System.Windows.Forms.ComboBox(); - this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.toolStrip1.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.SuspendLayout(); - // - // list_versions - // - this.list_versions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.components = new System.ComponentModel.Container(); + this.list_versions = new System.Windows.Forms.ListBox(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.mnu_add = new System.Windows.Forms.ToolStripDropDownButton(); + this.mnu_del = new System.Windows.Forms.ToolStripButton(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.lbl_ver = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.txt_name = new System.Windows.Forms.TextBox(); + this.button1 = new System.Windows.Forms.Button(); + this.label3 = new System.Windows.Forms.Label(); + this.txt_message = new System.Windows.Forms.TextBox(); + this.chk_warn = new System.Windows.Forms.CheckBox(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.txt_version4_max = new System.Windows.Forms.TextBox(); + this.txt_version3_max = new System.Windows.Forms.TextBox(); + this.txt_version2_max = new System.Windows.Forms.TextBox(); + this.txt_version1_max = new System.Windows.Forms.TextBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.txt_version4_min = new System.Windows.Forms.TextBox(); + this.txt_version3_min = new System.Windows.Forms.TextBox(); + this.txt_version2_min = new System.Windows.Forms.TextBox(); + this.txt_version1_min = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.txt_id = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.cmb_type = new System.Windows.Forms.ComboBox(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.cmb_execution_condition = new System.Windows.Forms.ComboBox(); + this.label6 = new System.Windows.Forms.Label(); + this.toolStrip1.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.SuspendLayout(); + // + // list_versions + // + this.list_versions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); - this.list_versions.FormattingEnabled = true; - this.list_versions.Location = new System.Drawing.Point(3, 28); - this.list_versions.Name = "list_versions"; - this.list_versions.Size = new System.Drawing.Size(291, 394); - this.list_versions.TabIndex = 0; - this.list_versions.SelectedIndexChanged += new System.EventHandler(this.list_versions_SelectedIndexChanged); - this.list_versions.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnKeyDown); - // - // toolStrip1 - // - this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None; - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.list_versions.FormattingEnabled = true; + this.list_versions.Location = new System.Drawing.Point(3, 28); + this.list_versions.Name = "list_versions"; + this.list_versions.Size = new System.Drawing.Size(291, 394); + this.list_versions.TabIndex = 0; + this.list_versions.SelectedIndexChanged += new System.EventHandler(this.list_versions_SelectedIndexChanged); + this.list_versions.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnKeyDown); + // + // toolStrip1 + // + this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None; + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnu_add, this.mnu_del}); - this.toolStrip1.Location = new System.Drawing.Point(0, 0); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.toolStrip1.Size = new System.Drawing.Size(64, 25); - this.toolStrip1.TabIndex = 1; - this.toolStrip1.Text = "toolStrip1"; - // - // mnu_add - // - this.mnu_add.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mnu_add.Image = global::MpeMaker.Properties.Resources.folder_add; - this.mnu_add.ImageTransparentColor = System.Drawing.Color.Magenta; - this.mnu_add.Name = "mnu_add"; - this.mnu_add.Size = new System.Drawing.Size(29, 22); - this.mnu_add.Text = "Add dependency"; - // - // mnu_del - // - this.mnu_del.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mnu_del.Image = global::MpeMaker.Properties.Resources.folder_delete; - this.mnu_del.ImageTransparentColor = System.Drawing.Color.Magenta; - this.mnu_del.Name = "mnu_del"; - this.mnu_del.Size = new System.Drawing.Size(23, 22); - this.mnu_del.Text = "Remove dependency"; - this.mnu_del.Click += new System.EventHandler(this.mnu_del_Click); - // - // groupBox1 - // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; + this.toolStrip1.Size = new System.Drawing.Size(62, 25); + this.toolStrip1.TabIndex = 1; + this.toolStrip1.Text = "toolStrip1"; + // + // mnu_add + // + this.mnu_add.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.mnu_add.Image = global::MpeMaker.Properties.Resources.folder_add; + this.mnu_add.ImageTransparentColor = System.Drawing.Color.Magenta; + this.mnu_add.Name = "mnu_add"; + this.mnu_add.Size = new System.Drawing.Size(29, 22); + this.mnu_add.Text = "Add dependency"; + // + // mnu_del + // + this.mnu_del.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.mnu_del.Image = global::MpeMaker.Properties.Resources.folder_delete; + this.mnu_del.ImageTransparentColor = System.Drawing.Color.Magenta; + this.mnu_del.Name = "mnu_del"; + this.mnu_del.Size = new System.Drawing.Size(23, 22); + this.mnu_del.Text = "Remove dependency"; + this.mnu_del.Click += new System.EventHandler(this.mnu_del_Click); + // + // groupBox1 + // + this.groupBox1.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.groupBox1.Controls.Add(this.lbl_ver); - this.groupBox1.Controls.Add(this.label5); - this.groupBox1.Controls.Add(this.label4); - this.groupBox1.Controls.Add(this.txt_name); - this.groupBox1.Controls.Add(this.button1); - this.groupBox1.Controls.Add(this.label3); - this.groupBox1.Controls.Add(this.txt_message); - this.groupBox1.Controls.Add(this.chk_warn); - this.groupBox1.Controls.Add(this.groupBox3); - this.groupBox1.Controls.Add(this.groupBox2); - this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.txt_id); - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.cmb_type); - this.groupBox1.Location = new System.Drawing.Point(305, 28); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(386, 396); - this.groupBox1.TabIndex = 2; - this.groupBox1.TabStop = false; - // - // lbl_ver - // - this.lbl_ver.AutoSize = true; - this.lbl_ver.Location = new System.Drawing.Point(129, 190); - this.lbl_ver.Name = "lbl_ver"; - this.lbl_ver.Size = new System.Drawing.Size(40, 13); - this.lbl_ver.TabIndex = 13; - this.lbl_ver.Text = "0.0.0.0"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(39, 190); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(84, 13); - this.label5.TabIndex = 12; - this.label5.Text = "Current version :"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(6, 66); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(35, 13); - this.label4.TabIndex = 11; - this.label4.Text = "Name"; - // - // txt_name - // - this.txt_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.groupBox1.Controls.Add(this.cmb_execution_condition); + this.groupBox1.Controls.Add(this.label6); + this.groupBox1.Controls.Add(this.lbl_ver); + this.groupBox1.Controls.Add(this.label5); + this.groupBox1.Controls.Add(this.label4); + this.groupBox1.Controls.Add(this.txt_name); + this.groupBox1.Controls.Add(this.button1); + this.groupBox1.Controls.Add(this.label3); + this.groupBox1.Controls.Add(this.txt_message); + this.groupBox1.Controls.Add(this.chk_warn); + this.groupBox1.Controls.Add(this.groupBox3); + this.groupBox1.Controls.Add(this.groupBox2); + this.groupBox1.Controls.Add(this.label2); + this.groupBox1.Controls.Add(this.txt_id); + this.groupBox1.Controls.Add(this.label1); + this.groupBox1.Controls.Add(this.cmb_type); + this.groupBox1.Location = new System.Drawing.Point(305, 28); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(386, 396); + this.groupBox1.TabIndex = 2; + this.groupBox1.TabStop = false; + // + // lbl_ver + // + this.lbl_ver.AutoSize = true; + this.lbl_ver.Location = new System.Drawing.Point(129, 221); + this.lbl_ver.Name = "lbl_ver"; + this.lbl_ver.Size = new System.Drawing.Size(40, 13); + this.lbl_ver.TabIndex = 13; + this.lbl_ver.Text = "0.0.0.0"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(39, 221); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(84, 13); + this.label5.TabIndex = 12; + this.label5.Text = "Current version :"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(6, 66); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(35, 13); + this.label4.TabIndex = 11; + this.label4.Text = "Name"; + // + // txt_name + // + this.txt_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txt_name.Location = new System.Drawing.Point(43, 63); - this.txt_name.Name = "txt_name"; - this.txt_name.Size = new System.Drawing.Size(305, 20); - this.txt_name.TabIndex = 10; - this.toolTip1.SetToolTip(this.txt_name, "Name of extension"); - this.txt_name.TextChanged += new System.EventHandler(this.txt_id_TextChanged); - // - // button1 - // - this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.button1.Location = new System.Drawing.Point(357, 37); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(21, 20); - this.button1.TabIndex = 9; - this.button1.Text = "..."; - this.toolTip1.SetToolTip(this.button1, "Browse for installed extension"); - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.BrowseInstalledExtensionIdsClick); - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(41, 246); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(50, 13); - this.label3.TabIndex = 8; - this.label3.Text = "Message"; - // - // txt_message - // - this.txt_message.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.txt_name.Location = new System.Drawing.Point(64, 63); + this.txt_name.Name = "txt_name"; + this.txt_name.Size = new System.Drawing.Size(284, 20); + this.txt_name.TabIndex = 10; + this.toolTip1.SetToolTip(this.txt_name, "Name of extension"); + this.txt_name.TextChanged += new System.EventHandler(this.txt_id_TextChanged); + // + // button1 + // + this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.button1.Location = new System.Drawing.Point(357, 37); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(21, 20); + this.button1.TabIndex = 9; + this.button1.Text = "..."; + this.toolTip1.SetToolTip(this.button1, "Browse for installed extension"); + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.BrowseInstalledExtensionIdsClick); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(41, 277); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(50, 13); + this.label3.TabIndex = 8; + this.label3.Text = "Message"; + // + // txt_message + // + this.txt_message.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.txt_message.Location = new System.Drawing.Point(42, 260); - this.txt_message.Multiline = true; - this.txt_message.Name = "txt_message"; - this.txt_message.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.txt_message.Size = new System.Drawing.Size(303, 130); - this.txt_message.TabIndex = 7; - this.toolTip1.SetToolTip(this.txt_message, "The message show if the version condition not met"); - this.txt_message.TextChanged += new System.EventHandler(this.txt_id_TextChanged); - // - // chk_warn - // - this.chk_warn.AutoSize = true; - this.chk_warn.Location = new System.Drawing.Point(43, 226); - this.chk_warn.Name = "chk_warn"; - this.chk_warn.Size = new System.Drawing.Size(74, 17); - this.chk_warn.TabIndex = 6; - this.chk_warn.Text = "Warn only"; - this.toolTip1.SetToolTip(this.chk_warn, "If cheked only a warning messsage will be displayed\r\nbut the installation will co" + + this.txt_message.Location = new System.Drawing.Point(42, 291); + this.txt_message.Multiline = true; + this.txt_message.Name = "txt_message"; + this.txt_message.ScrollBars = System.Windows.Forms.ScrollBars.Both; + this.txt_message.Size = new System.Drawing.Size(303, 97); + this.txt_message.TabIndex = 7; + this.toolTip1.SetToolTip(this.txt_message, "The message show if the version condition not met"); + this.txt_message.TextChanged += new System.EventHandler(this.txt_id_TextChanged); + // + // chk_warn + // + this.chk_warn.AutoSize = true; + this.chk_warn.Location = new System.Drawing.Point(43, 257); + this.chk_warn.Name = "chk_warn"; + this.chk_warn.Size = new System.Drawing.Size(74, 17); + this.chk_warn.TabIndex = 6; + this.chk_warn.Text = "Warn only"; + this.toolTip1.SetToolTip(this.chk_warn, "If cheked only a warning messsage will be displayed\r\nbut the installation will co" + "ntinue"); - this.chk_warn.UseVisualStyleBackColor = true; - this.chk_warn.CheckedChanged += new System.EventHandler(this.txt_id_TextChanged); - // - // groupBox3 - // - this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.chk_warn.UseVisualStyleBackColor = true; + this.chk_warn.CheckedChanged += new System.EventHandler(this.txt_id_TextChanged); + // + // groupBox3 + // + this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.groupBox3.Controls.Add(this.txt_version4_max); - this.groupBox3.Controls.Add(this.txt_version3_max); - this.groupBox3.Controls.Add(this.txt_version2_max); - this.groupBox3.Controls.Add(this.txt_version1_max); - this.groupBox3.Location = new System.Drawing.Point(42, 138); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(301, 49); - this.groupBox3.TabIndex = 5; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "Max Version"; - // - // txt_version4_max - // - this.txt_version4_max.Location = new System.Drawing.Point(217, 19); - this.txt_version4_max.Name = "txt_version4_max"; - this.txt_version4_max.Size = new System.Drawing.Size(61, 20); - this.txt_version4_max.TabIndex = 12; - this.txt_version4_max.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - this.toolTip1.SetToolTip(this.txt_version4_max, "Any version number can be replaced with * "); - this.txt_version4_max.TextChanged += new System.EventHandler(this.txt_id_TextChanged); - this.txt_version4_max.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_version1_min_KeyDown); - // - // txt_version3_max - // - this.txt_version3_max.Location = new System.Drawing.Point(150, 19); - this.txt_version3_max.Name = "txt_version3_max"; - this.txt_version3_max.Size = new System.Drawing.Size(61, 20); - this.txt_version3_max.TabIndex = 11; - this.txt_version3_max.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - this.toolTip1.SetToolTip(this.txt_version3_max, "Any version number can be replaced with * "); - this.txt_version3_max.TextChanged += new System.EventHandler(this.txt_id_TextChanged); - this.txt_version3_max.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_version1_min_KeyDown); - // - // txt_version2_max - // - this.txt_version2_max.Location = new System.Drawing.Point(86, 19); - this.txt_version2_max.Name = "txt_version2_max"; - this.txt_version2_max.Size = new System.Drawing.Size(61, 20); - this.txt_version2_max.TabIndex = 10; - this.txt_version2_max.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - this.toolTip1.SetToolTip(this.txt_version2_max, "Any version number can be replaced with * "); - this.txt_version2_max.TextChanged += new System.EventHandler(this.txt_id_TextChanged); - this.txt_version2_max.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_version1_min_KeyDown); - // - // txt_version1_max - // - this.txt_version1_max.Location = new System.Drawing.Point(22, 19); - this.txt_version1_max.Name = "txt_version1_max"; - this.txt_version1_max.Size = new System.Drawing.Size(61, 20); - this.txt_version1_max.TabIndex = 9; - this.txt_version1_max.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - this.toolTip1.SetToolTip(this.txt_version1_max, "Any version number can be replaced with * "); - this.txt_version1_max.TextChanged += new System.EventHandler(this.txt_id_TextChanged); - this.txt_version1_max.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_version1_min_KeyDown); - // - // groupBox2 - // - this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.groupBox3.Controls.Add(this.txt_version4_max); + this.groupBox3.Controls.Add(this.txt_version3_max); + this.groupBox3.Controls.Add(this.txt_version2_max); + this.groupBox3.Controls.Add(this.txt_version1_max); + this.groupBox3.Location = new System.Drawing.Point(42, 169); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(301, 49); + this.groupBox3.TabIndex = 5; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Max Version"; + // + // txt_version4_max + // + this.txt_version4_max.Location = new System.Drawing.Point(217, 19); + this.txt_version4_max.Name = "txt_version4_max"; + this.txt_version4_max.Size = new System.Drawing.Size(61, 20); + this.txt_version4_max.TabIndex = 12; + this.txt_version4_max.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.toolTip1.SetToolTip(this.txt_version4_max, "Any version number can be replaced with * "); + this.txt_version4_max.TextChanged += new System.EventHandler(this.txt_id_TextChanged); + this.txt_version4_max.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_version1_min_KeyDown); + // + // txt_version3_max + // + this.txt_version3_max.Location = new System.Drawing.Point(150, 19); + this.txt_version3_max.Name = "txt_version3_max"; + this.txt_version3_max.Size = new System.Drawing.Size(61, 20); + this.txt_version3_max.TabIndex = 11; + this.txt_version3_max.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.toolTip1.SetToolTip(this.txt_version3_max, "Any version number can be replaced with * "); + this.txt_version3_max.TextChanged += new System.EventHandler(this.txt_id_TextChanged); + this.txt_version3_max.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_version1_min_KeyDown); + // + // txt_version2_max + // + this.txt_version2_max.Location = new System.Drawing.Point(86, 19); + this.txt_version2_max.Name = "txt_version2_max"; + this.txt_version2_max.Size = new System.Drawing.Size(61, 20); + this.txt_version2_max.TabIndex = 10; + this.txt_version2_max.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.toolTip1.SetToolTip(this.txt_version2_max, "Any version number can be replaced with * "); + this.txt_version2_max.TextChanged += new System.EventHandler(this.txt_id_TextChanged); + this.txt_version2_max.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_version1_min_KeyDown); + // + // txt_version1_max + // + this.txt_version1_max.Location = new System.Drawing.Point(22, 19); + this.txt_version1_max.Name = "txt_version1_max"; + this.txt_version1_max.Size = new System.Drawing.Size(61, 20); + this.txt_version1_max.TabIndex = 9; + this.txt_version1_max.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.toolTip1.SetToolTip(this.txt_version1_max, "Any version number can be replaced with * "); + this.txt_version1_max.TextChanged += new System.EventHandler(this.txt_id_TextChanged); + this.txt_version1_max.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_version1_min_KeyDown); + // + // groupBox2 + // + this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.groupBox2.Controls.Add(this.txt_version4_min); - this.groupBox2.Controls.Add(this.txt_version3_min); - this.groupBox2.Controls.Add(this.txt_version2_min); - this.groupBox2.Controls.Add(this.txt_version1_min); - this.groupBox2.Location = new System.Drawing.Point(42, 89); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(301, 43); - this.groupBox2.TabIndex = 4; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Min Version"; - // - // txt_version4_min - // - this.txt_version4_min.Location = new System.Drawing.Point(217, 19); - this.txt_version4_min.Name = "txt_version4_min"; - this.txt_version4_min.Size = new System.Drawing.Size(61, 20); - this.txt_version4_min.TabIndex = 12; - this.txt_version4_min.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - this.toolTip1.SetToolTip(this.txt_version4_min, "Any version number can be replaced with * "); - this.txt_version4_min.TextChanged += new System.EventHandler(this.txt_id_TextChanged); - this.txt_version4_min.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_version1_min_KeyDown); - // - // txt_version3_min - // - this.txt_version3_min.Location = new System.Drawing.Point(150, 19); - this.txt_version3_min.Name = "txt_version3_min"; - this.txt_version3_min.Size = new System.Drawing.Size(61, 20); - this.txt_version3_min.TabIndex = 11; - this.txt_version3_min.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - this.toolTip1.SetToolTip(this.txt_version3_min, "Any version number can be replaced with * "); - this.txt_version3_min.TextChanged += new System.EventHandler(this.txt_id_TextChanged); - this.txt_version3_min.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_version1_min_KeyDown); - // - // txt_version2_min - // - this.txt_version2_min.Location = new System.Drawing.Point(86, 19); - this.txt_version2_min.Name = "txt_version2_min"; - this.txt_version2_min.Size = new System.Drawing.Size(61, 20); - this.txt_version2_min.TabIndex = 10; - this.txt_version2_min.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - this.toolTip1.SetToolTip(this.txt_version2_min, "Any version number can be replaced with * "); - this.txt_version2_min.TextChanged += new System.EventHandler(this.txt_id_TextChanged); - this.txt_version2_min.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_version1_min_KeyDown); - // - // txt_version1_min - // - this.txt_version1_min.Location = new System.Drawing.Point(22, 19); - this.txt_version1_min.Name = "txt_version1_min"; - this.txt_version1_min.Size = new System.Drawing.Size(61, 20); - this.txt_version1_min.TabIndex = 9; - this.txt_version1_min.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - this.toolTip1.SetToolTip(this.txt_version1_min, "Any version number can be replaced with * "); - this.txt_version1_min.TextChanged += new System.EventHandler(this.txt_id_TextChanged); - this.txt_version1_min.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_version1_min_KeyDown); - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(7, 40); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(16, 13); - this.label2.TabIndex = 3; - this.label2.Text = "Id"; - // - // txt_id - // - this.txt_id.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.groupBox2.Controls.Add(this.txt_version4_min); + this.groupBox2.Controls.Add(this.txt_version3_min); + this.groupBox2.Controls.Add(this.txt_version2_min); + this.groupBox2.Controls.Add(this.txt_version1_min); + this.groupBox2.Location = new System.Drawing.Point(42, 120); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(301, 43); + this.groupBox2.TabIndex = 4; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Min Version"; + // + // txt_version4_min + // + this.txt_version4_min.Location = new System.Drawing.Point(217, 19); + this.txt_version4_min.Name = "txt_version4_min"; + this.txt_version4_min.Size = new System.Drawing.Size(61, 20); + this.txt_version4_min.TabIndex = 12; + this.txt_version4_min.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.toolTip1.SetToolTip(this.txt_version4_min, "Any version number can be replaced with * "); + this.txt_version4_min.TextChanged += new System.EventHandler(this.txt_id_TextChanged); + this.txt_version4_min.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_version1_min_KeyDown); + // + // txt_version3_min + // + this.txt_version3_min.Location = new System.Drawing.Point(150, 19); + this.txt_version3_min.Name = "txt_version3_min"; + this.txt_version3_min.Size = new System.Drawing.Size(61, 20); + this.txt_version3_min.TabIndex = 11; + this.txt_version3_min.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.toolTip1.SetToolTip(this.txt_version3_min, "Any version number can be replaced with * "); + this.txt_version3_min.TextChanged += new System.EventHandler(this.txt_id_TextChanged); + this.txt_version3_min.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_version1_min_KeyDown); + // + // txt_version2_min + // + this.txt_version2_min.Location = new System.Drawing.Point(86, 19); + this.txt_version2_min.Name = "txt_version2_min"; + this.txt_version2_min.Size = new System.Drawing.Size(61, 20); + this.txt_version2_min.TabIndex = 10; + this.txt_version2_min.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.toolTip1.SetToolTip(this.txt_version2_min, "Any version number can be replaced with * "); + this.txt_version2_min.TextChanged += new System.EventHandler(this.txt_id_TextChanged); + this.txt_version2_min.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_version1_min_KeyDown); + // + // txt_version1_min + // + this.txt_version1_min.Location = new System.Drawing.Point(22, 19); + this.txt_version1_min.Name = "txt_version1_min"; + this.txt_version1_min.Size = new System.Drawing.Size(61, 20); + this.txt_version1_min.TabIndex = 9; + this.txt_version1_min.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.toolTip1.SetToolTip(this.txt_version1_min, "Any version number can be replaced with * "); + this.txt_version1_min.TextChanged += new System.EventHandler(this.txt_id_TextChanged); + this.txt_version1_min.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_version1_min_KeyDown); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(7, 40); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(16, 13); + this.label2.TabIndex = 3; + this.label2.Text = "Id"; + // + // txt_id + // + this.txt_id.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txt_id.Location = new System.Drawing.Point(43, 37); - this.txt_id.Name = "txt_id"; - this.txt_id.Size = new System.Drawing.Size(305, 20); - this.txt_id.TabIndex = 2; - this.toolTip1.SetToolTip(this.txt_id, "Used only if the type is Extension"); - this.txt_id.TextChanged += new System.EventHandler(this.txt_id_TextChanged); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(6, 13); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(31, 13); - this.label1.TabIndex = 1; - this.label1.Text = "Type"; - // - // cmb_type - // - this.cmb_type.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.txt_id.Location = new System.Drawing.Point(64, 37); + this.txt_id.Name = "txt_id"; + this.txt_id.Size = new System.Drawing.Size(284, 20); + this.txt_id.TabIndex = 2; + this.toolTip1.SetToolTip(this.txt_id, "Used only if the type is Extension"); + this.txt_id.TextChanged += new System.EventHandler(this.txt_id_TextChanged); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(6, 13); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(31, 13); + this.label1.TabIndex = 1; + this.label1.Text = "Type"; + // + // cmb_type + // + this.cmb_type.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.cmb_type.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmb_type.FormattingEnabled = true; - this.cmb_type.Location = new System.Drawing.Point(43, 10); - this.cmb_type.Name = "cmb_type"; - this.cmb_type.Size = new System.Drawing.Size(305, 21); - this.cmb_type.TabIndex = 0; - this.cmb_type.SelectedIndexChanged += new System.EventHandler(this.txt_id_TextChanged); - // - // toolTip1 - // - this.toolTip1.IsBalloon = true; - // - // RequirementsSection - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSize = true; - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.toolStrip1); - this.Controls.Add(this.list_versions); - this.Name = "RequirementsSection"; - this.Size = new System.Drawing.Size(702, 428); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.cmb_type.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_type.FormattingEnabled = true; + this.cmb_type.Location = new System.Drawing.Point(64, 10); + this.cmb_type.Name = "cmb_type"; + this.cmb_type.Size = new System.Drawing.Size(284, 21); + this.cmb_type.TabIndex = 0; + this.cmb_type.SelectedIndexChanged += new System.EventHandler(this.txt_id_TextChanged); + // + // toolTip1 + // + this.toolTip1.IsBalloon = true; + // + // cmb_execution_condition + // + this.cmb_execution_condition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.cmb_execution_condition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmb_execution_condition.FormattingEnabled = true; + this.cmb_execution_condition.Location = new System.Drawing.Point(64, 90); + this.cmb_execution_condition.Name = "cmb_execution_condition"; + this.cmb_execution_condition.Size = new System.Drawing.Size(284, 21); + this.cmb_execution_condition.TabIndex = 15; + this.cmb_execution_condition.SelectedIndexChanged += new System.EventHandler(this.txt_id_TextChanged); + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(6, 93); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(51, 13); + this.label6.TabIndex = 14; + this.label6.Text = "Condition"; + // + // RequirementsSection + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoSize = true; + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.toolStrip1); + this.Controls.Add(this.list_versions); + this.Name = "RequirementsSection"; + this.Size = new System.Drawing.Size(702, 428); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -434,5 +459,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.Label label5; private System.Windows.Forms.Label lbl_ver; - } + private System.Windows.Forms.ComboBox cmb_execution_condition; + private System.Windows.Forms.Label label6; + } } diff --git a/mediaportal/MPE/MpeMaker/Sections/RequirementsSection.cs b/mediaportal/MPE/MpeMaker/Sections/RequirementsSection.cs index a51a8abcd14..10382c91d0b 100644 --- a/mediaportal/MPE/MpeMaker/Sections/RequirementsSection.cs +++ b/mediaportal/MPE/MpeMaker/Sections/RequirementsSection.cs @@ -51,6 +51,7 @@ public RequirementsSection() mnu_add.DropDownItems.Add(testToolStripMenuItem); cmb_type.Items.Add(versionProvider.Value.DisplayName); } + this.cmb_execution_condition.Items.AddRange(Enum.GetNames(typeof(ActionConditionEnum))); } private void testToolStripMenuItem_Click(object sender, EventArgs e) @@ -93,6 +94,10 @@ private void txt_id_TextChanged(object sender, EventArgs e) if (MpeInstaller.VersionProviders.ContainsKey(cmb_type.Text)) lbl_ver.Text = MpeInstaller.VersionProviders[cmb_type.Text].Version(txt_id.Text).ToString(); + + SelectedItem.Condition = (ActionConditionEnum)this.cmb_execution_condition.SelectedIndex; + + this.refreshListBox(); } private void UpdateControlStates() @@ -123,6 +128,19 @@ public PackageClass Get() throw new NotImplementedException(); } + public void RefreshControl() + { + this.list_versions_SelectedIndexChanged(null, null); + this.refreshListBox(); + } + + private void refreshListBox() + { + //Redraw the listbox + this.list_versions.DrawMode = DrawMode.OwnerDrawFixed; + this.list_versions.DrawMode = DrawMode.Normal; + } + private void list_versions_SelectedIndexChanged(object sender, EventArgs e) { if (list_versions.SelectedItems.Count < 1) @@ -150,6 +168,9 @@ private void list_versions_SelectedIndexChanged(object sender, EventArgs e) SelectedItem = item; if (MpeInstaller.VersionProviders.ContainsKey(cmb_type.Text)) lbl_ver.Text = MpeInstaller.VersionProviders[cmb_type.Text].Version(txt_id.Text).ToString(); + + this.cmb_execution_condition.SelectedIndex = (int)SelectedItem.Condition; + this.cmb_execution_condition.Enabled = SelectedItem.Type == "Extension"; } private void BrowseInstalledExtensionIdsClick(object sender, EventArgs e) diff --git a/mediaportal/MPE/MpeMaker/Sections/RequirementsSection.resx b/mediaportal/MPE/MpeMaker/Sections/RequirementsSection.resx index dcdaa14cb88..e232810440c 100644 --- a/mediaportal/MPE/MpeMaker/Sections/RequirementsSection.resx +++ b/mediaportal/MPE/MpeMaker/Sections/RequirementsSection.resx @@ -112,15 +112,18 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 - + + 116, 17 + + 116, 17 \ No newline at end of file diff --git a/mediaportal/MPE/MpeMaker/Sections/ToolsUpdateXml.cs b/mediaportal/MPE/MpeMaker/Sections/ToolsUpdateXml.cs index a1482cab968..16f7250852c 100644 --- a/mediaportal/MPE/MpeMaker/Sections/ToolsUpdateXml.cs +++ b/mediaportal/MPE/MpeMaker/Sections/ToolsUpdateXml.cs @@ -108,6 +108,7 @@ private void SetupSaveFileDialog(string oldPath) /// The instance containing the event data. private void btn_gen_Click(object sender, EventArgs e) { + Package.VerifyMPDependency(); Package.WriteUpdateXml(textBox1.Text); }