diff --git a/mediaportal/MPE/MpeMaker/Dialogs/AddFolder2Group.Designer.cs b/mediaportal/MPE/MpeMaker/Dialogs/AddFolder2Group.Designer.cs index bf04a8819ca..97d130389e3 100644 --- a/mediaportal/MPE/MpeMaker/Dialogs/AddFolder2Group.Designer.cs +++ b/mediaportal/MPE/MpeMaker/Dialogs/AddFolder2Group.Designer.cs @@ -59,7 +59,7 @@ private void InitializeComponent() this.label1.Location = new System.Drawing.Point(12, 8); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(36, 13); - this.label1.TabIndex = 1; + this.label1.TabIndex = 10; this.label1.Text = "Folder"; // // label2 @@ -68,7 +68,7 @@ private void InitializeComponent() this.label2.Location = new System.Drawing.Point(9, 47); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(51, 13); - this.label2.TabIndex = 3; + this.label2.TabIndex = 11; this.label2.Text = "Template"; // // chk_recurs @@ -88,7 +88,7 @@ private void InitializeComponent() this.add_folder.Location = new System.Drawing.Point(379, 24); this.add_folder.Name = "add_folder"; this.add_folder.Size = new System.Drawing.Size(32, 20); - this.add_folder.TabIndex = 5; + this.add_folder.TabIndex = 1; this.add_folder.Text = "..."; this.add_folder.UseVisualStyleBackColor = true; this.add_folder.Click += new System.EventHandler(this.add_folder_Click); @@ -98,7 +98,7 @@ private void InitializeComponent() this.btn_add_template.Location = new System.Drawing.Point(379, 63); this.btn_add_template.Name = "btn_add_template"; this.btn_add_template.Size = new System.Drawing.Size(32, 20); - this.btn_add_template.TabIndex = 6; + this.btn_add_template.TabIndex = 3; this.btn_add_template.Text = "..."; this.btn_add_template.UseVisualStyleBackColor = true; this.btn_add_template.Click += new System.EventHandler(this.btn_add_template_Click); @@ -108,7 +108,7 @@ private void InitializeComponent() this.addButton.Location = new System.Drawing.Point(130, 213); this.addButton.Name = "addButton"; this.addButton.Size = new System.Drawing.Size(75, 23); - this.addButton.TabIndex = 7; + this.addButton.TabIndex = 8; this.addButton.Text = "Add"; this.addButton.UseVisualStyleBackColor = true; this.addButton.Click += new System.EventHandler(this.button1_Click); @@ -119,7 +119,7 @@ private void InitializeComponent() this.cancelButton.Location = new System.Drawing.Point(211, 213); this.cancelButton.Name = "cancelButton"; this.cancelButton.Size = new System.Drawing.Size(75, 23); - this.cancelButton.TabIndex = 8; + this.cancelButton.TabIndex = 9; this.cancelButton.Text = "Cancel"; this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.Click += new System.EventHandler(this.button2_Click); @@ -132,7 +132,7 @@ private void InitializeComponent() this.txt_template.Location = new System.Drawing.Point(12, 62); this.txt_template.Name = "txt_template"; this.txt_template.Size = new System.Drawing.Size(361, 21); - this.txt_template.TabIndex = 9; + this.txt_template.TabIndex = 2; // // label7 // @@ -140,7 +140,7 @@ private void InitializeComponent() this.label7.Location = new System.Drawing.Point(12, 173); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(46, 13); - this.label7.TabIndex = 19; + this.label7.TabIndex = 14; this.label7.Text = "Param 1"; // // txt_param1 @@ -150,7 +150,7 @@ private void InitializeComponent() this.txt_param1.Location = new System.Drawing.Point(104, 170); this.txt_param1.Name = "txt_param1"; this.txt_param1.Size = new System.Drawing.Size(269, 20); - this.txt_param1.TabIndex = 18; + this.txt_param1.TabIndex = 7; // // label6 // @@ -158,7 +158,7 @@ private void InitializeComponent() this.label6.Location = new System.Drawing.Point(12, 146); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(52, 13); - this.label6.TabIndex = 17; + this.label6.TabIndex = 13; this.label6.Text = "Overwrite"; // // cmb_overwrite @@ -174,7 +174,7 @@ private void InitializeComponent() this.cmb_overwrite.Location = new System.Drawing.Point(104, 143); this.cmb_overwrite.Name = "cmb_overwrite"; this.cmb_overwrite.Size = new System.Drawing.Size(269, 21); - this.cmb_overwrite.TabIndex = 16; + this.cmb_overwrite.TabIndex = 6; // // label4 // @@ -194,7 +194,7 @@ private void InitializeComponent() this.cmb_installtype.Location = new System.Drawing.Point(104, 116); this.cmb_installtype.Name = "cmb_installtype"; this.cmb_installtype.Size = new System.Drawing.Size(269, 21); - this.cmb_installtype.TabIndex = 11; + this.cmb_installtype.TabIndex = 5; // // AddFolder2Group // diff --git a/mediaportal/MPE/MpeMaker/Dialogs/AddFolder2Group.resx b/mediaportal/MPE/MpeMaker/Dialogs/AddFolder2Group.resx index c3fe8f176df..a9048db82f8 100644 --- a/mediaportal/MPE/MpeMaker/Dialogs/AddFolder2Group.resx +++ b/mediaportal/MPE/MpeMaker/Dialogs/AddFolder2Group.resx @@ -112,12 +112,12 @@ 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 \ No newline at end of file diff --git a/mediaportal/MPE/MpeMaker/Dialogs/GroupEdit.Designer.cs b/mediaportal/MPE/MpeMaker/Dialogs/GroupEdit.Designer.cs index 2e3ece59c16..2f9769c67cc 100644 --- a/mediaportal/MPE/MpeMaker/Dialogs/GroupEdit.Designer.cs +++ b/mediaportal/MPE/MpeMaker/Dialogs/GroupEdit.Designer.cs @@ -28,89 +28,89 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.txt_name = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.btn_cancel = new System.Windows.Forms.Button(); - this.btn_ok = new System.Windows.Forms.Button(); - this.label2 = new System.Windows.Forms.Label(); - this.txt_displayname = new System.Windows.Forms.TextBox(); - this.SuspendLayout(); - // - // txt_name - // - this.txt_name.Location = new System.Drawing.Point(12, 22); - this.txt_name.Name = "txt_name"; - this.txt_name.Size = new System.Drawing.Size(359, 20); - this.txt_name.TabIndex = 0; - this.txt_name.TextChanged += new System.EventHandler(this.txt_name_TextChanged); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 6); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(65, 13); - this.label1.TabIndex = 1; - this.label1.Text = "Group name"; - // - // btn_cancel - // - this.btn_cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btn_cancel.Location = new System.Drawing.Point(296, 95); - this.btn_cancel.Name = "btn_cancel"; - this.btn_cancel.Size = new System.Drawing.Size(75, 23); - this.btn_cancel.TabIndex = 2; - this.btn_cancel.Text = "Cancel"; - this.btn_cancel.UseVisualStyleBackColor = true; - // - // btn_ok - // - this.btn_ok.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btn_ok.Location = new System.Drawing.Point(215, 95); - this.btn_ok.Name = "btn_ok"; - this.btn_ok.Size = new System.Drawing.Size(75, 23); - this.btn_ok.TabIndex = 3; - this.btn_ok.Text = "Ok"; - this.btn_ok.UseVisualStyleBackColor = true; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(12, 45); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(70, 13); - this.label2.TabIndex = 4; - this.label2.Text = "Display name"; - // - // txt_displayname - // - this.txt_displayname.Location = new System.Drawing.Point(12, 61); - this.txt_displayname.Name = "txt_displayname"; - this.txt_displayname.Size = new System.Drawing.Size(359, 20); - this.txt_displayname.TabIndex = 5; - // - // GroupEdit - // - 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(383, 130); - this.Controls.Add(this.txt_displayname); - this.Controls.Add(this.label2); - this.Controls.Add(this.btn_ok); - this.Controls.Add(this.btn_cancel); - this.Controls.Add(this.txt_name); - this.Controls.Add(this.label1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "GroupEdit"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Group"; - this.Load += new System.EventHandler(this.GroupEdit_Load); - this.ResumeLayout(false); - this.PerformLayout(); + this.txt_name = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.btn_cancel = new System.Windows.Forms.Button(); + this.btn_ok = new System.Windows.Forms.Button(); + this.label2 = new System.Windows.Forms.Label(); + this.txt_displayname = new System.Windows.Forms.TextBox(); + this.SuspendLayout(); + // + // txt_name + // + this.txt_name.Location = new System.Drawing.Point(12, 22); + this.txt_name.Name = "txt_name"; + this.txt_name.Size = new System.Drawing.Size(359, 20); + this.txt_name.TabIndex = 0; + this.txt_name.TextChanged += new System.EventHandler(this.txt_name_TextChanged); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 6); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(65, 13); + this.label1.TabIndex = 1; + this.label1.Text = "Group name"; + // + // btn_cancel + // + this.btn_cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btn_cancel.Location = new System.Drawing.Point(296, 95); + this.btn_cancel.Name = "btn_cancel"; + this.btn_cancel.Size = new System.Drawing.Size(75, 23); + this.btn_cancel.TabIndex = 5; + this.btn_cancel.Text = "Cancel"; + this.btn_cancel.UseVisualStyleBackColor = true; + // + // btn_ok + // + this.btn_ok.DialogResult = System.Windows.Forms.DialogResult.OK; + this.btn_ok.Location = new System.Drawing.Point(215, 95); + this.btn_ok.Name = "btn_ok"; + this.btn_ok.Size = new System.Drawing.Size(75, 23); + this.btn_ok.TabIndex = 4; + this.btn_ok.Text = "Ok"; + this.btn_ok.UseVisualStyleBackColor = true; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(12, 45); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(70, 13); + this.label2.TabIndex = 2; + this.label2.Text = "Display name"; + // + // txt_displayname + // + this.txt_displayname.Location = new System.Drawing.Point(12, 61); + this.txt_displayname.Name = "txt_displayname"; + this.txt_displayname.Size = new System.Drawing.Size(359, 20); + this.txt_displayname.TabIndex = 3; + // + // GroupEdit + // + 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(383, 130); + this.Controls.Add(this.txt_displayname); + this.Controls.Add(this.label2); + this.Controls.Add(this.btn_ok); + this.Controls.Add(this.btn_cancel); + this.Controls.Add(this.txt_name); + this.Controls.Add(this.label1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "GroupEdit"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Group"; + this.Load += new System.EventHandler(this.GroupEdit_Load); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/mediaportal/MPE/MpeMaker/Dialogs/GroupEdit.resx b/mediaportal/MPE/MpeMaker/Dialogs/GroupEdit.resx index ff31a6db56e..c7e0d4bdf13 100644 --- a/mediaportal/MPE/MpeMaker/Dialogs/GroupEdit.resx +++ b/mediaportal/MPE/MpeMaker/Dialogs/GroupEdit.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/MainForm.cs b/mediaportal/MPE/MpeMaker/MainForm.cs index 21550ea77e1..a7f88c801e1 100644 --- a/mediaportal/MPE/MpeMaker/MainForm.cs +++ b/mediaportal/MPE/MpeMaker/MainForm.cs @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2023 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2023 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify diff --git a/mediaportal/MPE/MpeMaker/Program.cs b/mediaportal/MPE/MpeMaker/Program.cs index abe450bde5c..7d6ca41e101 100644 --- a/mediaportal/MPE/MpeMaker/Program.cs +++ b/mediaportal/MPE/MpeMaker/Program.cs @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2023 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2023 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify diff --git a/mediaportal/MPE/MpeMaker/Sections/FilesGroupsSection.Designer.cs b/mediaportal/MPE/MpeMaker/Sections/FilesGroupsSection.Designer.cs index a9e6ab82520..9d1b72ec5ee 100644 --- a/mediaportal/MPE/MpeMaker/Sections/FilesGroupsSection.Designer.cs +++ b/mediaportal/MPE/MpeMaker/Sections/FilesGroupsSection.Designer.cs @@ -67,6 +67,8 @@ private void InitializeComponent() this.cmb_installtype = new System.Windows.Forms.ComboBox(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.treeView1 = new CodersLab.Windows.Controls.TreeView(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStrip.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tabPage_group.SuspendLayout(); @@ -88,7 +90,9 @@ private void InitializeComponent() this.toolStripButton3, this.mnu_add_files, this.mnu_add_folder, - this.mnu_remove_files}); + this.mnu_remove_files, + this.toolStripSeparator1, + this.toolStripButton1}); this.toolStrip.Location = new System.Drawing.Point(0, 0); this.toolStrip.Name = "toolStrip"; this.toolStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; @@ -485,6 +489,21 @@ private void InitializeComponent() this.treeView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnKeyDown); this.treeView1.Leave += new System.EventHandler(this.treeView1_Leave); // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + // + // toolStripButton1 + // + this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton1.Image = global::MpeMaker.Properties.Resources.arrow_down; + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(23, 22); + this.toolStripButton1.Text = "Sort"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // // FilesGroupsSection // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -548,6 +567,7 @@ private void InitializeComponent() private System.Windows.Forms.TextBox txt_source; private System.Windows.Forms.Button btnSelectSourceFile; private System.Windows.Forms.Panel panel1; - - } + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripButton toolStripButton1; + } } diff --git a/mediaportal/MPE/MpeMaker/Sections/FilesGroupsSection.cs b/mediaportal/MPE/MpeMaker/Sections/FilesGroupsSection.cs index 33b5b1a8136..bbe9cbe6503 100644 --- a/mediaportal/MPE/MpeMaker/Sections/FilesGroupsSection.cs +++ b/mediaportal/MPE/MpeMaker/Sections/FilesGroupsSection.cs @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2023 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2023 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify @@ -578,5 +578,11 @@ private void btnSelectSourceFile_Click(object sender, EventArgs e) txt_installpath.Text = destinationFilename; } } + + private void toolStripButton1_Click(object sender, EventArgs e) + { + Package.Groups.Items.Sort((a, b) => (a.ParentGroup + a.Name).CompareTo(b.ParentGroup + b.Name)); + Set(Get()); + } } } \ No newline at end of file diff --git a/mediaportal/MPE/MpeMaker/Sections/FilesGroupsSection.resx b/mediaportal/MPE/MpeMaker/Sections/FilesGroupsSection.resx index ab04d1ca6df..689f647dba1 100644 --- a/mediaportal/MPE/MpeMaker/Sections/FilesGroupsSection.resx +++ b/mediaportal/MPE/MpeMaker/Sections/FilesGroupsSection.resx @@ -112,21 +112,21 @@ 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 - + 338, 17 - + 17, 17 - + 116, 17 - + 246, 17 \ No newline at end of file