Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [393] trunk/plugins/mpinstaler/MPInstaler
|
From: <du...@us...> - 2007-05-09 17:30:40
|
Revision: 393
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=393&view=rev
Author: dukus
Date: 2007-05-09 10:30:36 -0700 (Wed, 09 May 2007)
Log Message:
-----------
Minor bug fix
Modified Paths:
--------------
trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs
trunk/plugins/mpinstaler/MPInstaler/Form1.cs
trunk/plugins/mpinstaler/MPInstaler/GroupForm.Designer.cs
trunk/plugins/mpinstaler/MPInstaler/GroupForm.cs
trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs
Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs
===================================================================
--- trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs 2007-05-08 19:20:17 UTC (rev 392)
+++ trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs 2007-05-09 17:30:36 UTC (rev 393)
@@ -61,6 +61,7 @@
this.otherToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.customizationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.postSetupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.setupGroupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.bossview = new System.Windows.Forms.ListView();
this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
@@ -81,6 +82,7 @@
this.textt_comboBox1 = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.tabPage_Advanced = new System.Windows.Forms.TabPage();
+ this.propertyGrid2 = new System.Windows.Forms.PropertyGrid();
this.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
this.button_browse = new System.Windows.Forms.Button();
this.label11 = new System.Windows.Forms.Label();
@@ -109,8 +111,6 @@
this.openToolStripButton = new System.Windows.Forms.ToolStripButton();
this.saveToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
- this.setupGroupsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.propertyGrid2 = new System.Windows.Forms.PropertyGrid();
this.menuStrip1.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
this.tabPage_Skin.SuspendLayout();
@@ -368,10 +368,17 @@
// postSetupToolStripMenuItem
//
this.postSetupToolStripMenuItem.Name = "postSetupToolStripMenuItem";
- this.postSetupToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.postSetupToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
this.postSetupToolStripMenuItem.Text = "Post Setup";
this.postSetupToolStripMenuItem.Click += new System.EventHandler(this.postSetupToolStripMenuItem_Click);
//
+ // setupGroupsToolStripMenuItem
+ //
+ this.setupGroupsToolStripMenuItem.Name = "setupGroupsToolStripMenuItem";
+ this.setupGroupsToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
+ this.setupGroupsToolStripMenuItem.Text = "Setup Groups";
+ this.setupGroupsToolStripMenuItem.Click += new System.EventHandler(this.setupGroupsToolStripMenuItem_Click);
+ //
// bossview
//
this.bossview.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -514,7 +521,7 @@
this.tabPage_Text.Controls.Add(this.label1);
this.tabPage_Text.Location = new System.Drawing.Point(4, 22);
this.tabPage_Text.Name = "tabPage_Text";
- this.tabPage_Text.Size = new System.Drawing.Size(643, 120);
+ this.tabPage_Text.Size = new System.Drawing.Size(643, 153);
this.tabPage_Text.TabIndex = 2;
this.tabPage_Text.Text = "Text Properties";
this.tabPage_Text.UseVisualStyleBackColor = true;
@@ -556,6 +563,17 @@
this.tabPage_Advanced.Text = "Advanced Properties";
this.tabPage_Advanced.UseVisualStyleBackColor = true;
//
+ // propertyGrid2
+ //
+ this.propertyGrid2.CommandsVisibleIfAvailable = false;
+ this.propertyGrid2.Location = new System.Drawing.Point(189, 3);
+ this.propertyGrid2.Name = "propertyGrid2";
+ this.propertyGrid2.PropertySort = System.Windows.Forms.PropertySort.NoSort;
+ this.propertyGrid2.Size = new System.Drawing.Size(231, 147);
+ this.propertyGrid2.TabIndex = 6;
+ this.propertyGrid2.ToolbarVisible = false;
+ this.propertyGrid2.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.propertyGrid2_PropertyValueChanged);
+ //
// propertyGrid1
//
this.propertyGrid1.CommandsVisibleIfAvailable = false;
@@ -627,6 +645,7 @@
"Input",
"Others",
"PIM",
+ "Skins",
"Utilities",
"Video/Movies",
"Web",
@@ -861,24 +880,6 @@
this.toolStripContainer1.TabIndex = 5;
this.toolStripContainer1.Text = "toolStripContainer1";
//
- // setupGroupsToolStripMenuItem
- //
- this.setupGroupsToolStripMenuItem.Name = "setupGroupsToolStripMenuItem";
- this.setupGroupsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.setupGroupsToolStripMenuItem.Text = "Setup Groups";
- this.setupGroupsToolStripMenuItem.Click += new System.EventHandler(this.setupGroupsToolStripMenuItem_Click);
- //
- // propertyGrid2
- //
- this.propertyGrid2.CommandsVisibleIfAvailable = false;
- this.propertyGrid2.Location = new System.Drawing.Point(189, 3);
- this.propertyGrid2.Name = "propertyGrid2";
- this.propertyGrid2.PropertySort = System.Windows.Forms.PropertySort.NoSort;
- this.propertyGrid2.Size = new System.Drawing.Size(231, 147);
- this.propertyGrid2.TabIndex = 6;
- this.propertyGrid2.ToolbarVisible = false;
- this.propertyGrid2.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.propertyGrid2_PropertyValueChanged);
- //
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.cs
===================================================================
--- trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-05-08 19:20:17 UTC (rev 392)
+++ trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-05-09 17:30:36 UTC (rev 393)
@@ -579,6 +579,7 @@
private void setupGroupsToolStripMenuItem_Click(object sender, EventArgs e)
{
+ _struct.AddFileList(bossview);
GroupForm dlg = new GroupForm();
dlg._struct = this._struct;
dlg.ShowDialog();
Modified: trunk/plugins/mpinstaler/MPInstaler/GroupForm.Designer.cs
===================================================================
--- trunk/plugins/mpinstaler/MPInstaler/GroupForm.Designer.cs 2007-05-08 19:20:17 UTC (rev 392)
+++ trunk/plugins/mpinstaler/MPInstaler/GroupForm.Designer.cs 2007-05-09 17:30:36 UTC (rev 393)
@@ -30,24 +30,24 @@
{
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
- this.tabPage2 = new System.Windows.Forms.TabPage();
- this.button1 = new System.Windows.Forms.Button();
+ this.button5 = new System.Windows.Forms.Button();
+ this.button4 = new System.Windows.Forms.Button();
+ this.textBox2 = new System.Windows.Forms.TextBox();
+ this.textBox1 = new System.Windows.Forms.TextBox();
this.listView1 = new System.Windows.Forms.ListView();
this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
- this.textBox1 = new System.Windows.Forms.TextBox();
- this.textBox2 = new System.Windows.Forms.TextBox();
- this.comboBox1 = new System.Windows.Forms.ComboBox();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.button3 = new System.Windows.Forms.Button();
+ this.button2 = new System.Windows.Forms.Button();
+ this.listView3 = new System.Windows.Forms.ListView();
+ this.columnHeader4 = new System.Windows.Forms.ColumnHeader();
this.listView2 = new System.Windows.Forms.ListView();
- this.listView3 = new System.Windows.Forms.ListView();
this.columnHeader3 = new System.Windows.Forms.ColumnHeader();
- this.columnHeader4 = new System.Windows.Forms.ColumnHeader();
- this.button2 = new System.Windows.Forms.Button();
- this.button3 = new System.Windows.Forms.Button();
- this.button4 = new System.Windows.Forms.Button();
- this.button5 = new System.Windows.Forms.Button();
- this.label1 = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
+ this.comboBox1 = new System.Windows.Forms.ComboBox();
+ this.button1 = new System.Windows.Forms.Button();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
@@ -78,34 +78,39 @@
this.tabPage1.Text = "Groups";
this.tabPage1.UseVisualStyleBackColor = true;
//
- // tabPage2
+ // button5
//
- this.tabPage2.Controls.Add(this.label2);
- this.tabPage2.Controls.Add(this.label1);
- this.tabPage2.Controls.Add(this.button3);
- this.tabPage2.Controls.Add(this.button2);
- this.tabPage2.Controls.Add(this.listView3);
- this.tabPage2.Controls.Add(this.listView2);
- this.tabPage2.Controls.Add(this.comboBox1);
- this.tabPage2.Location = new System.Drawing.Point(4, 22);
- this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(477, 209);
- this.tabPage2.TabIndex = 1;
- this.tabPage2.Text = "Groups mapping";
- this.tabPage2.UseVisualStyleBackColor = true;
- this.tabPage2.Enter += new System.EventHandler(this.tabPage2_Enter);
+ this.button5.Location = new System.Drawing.Point(396, 173);
+ this.button5.Name = "button5";
+ this.button5.Size = new System.Drawing.Size(75, 23);
+ this.button5.TabIndex = 4;
+ this.button5.Text = "Remove";
+ this.button5.UseVisualStyleBackColor = true;
//
- // button1
+ // button4
//
- this.button1.Location = new System.Drawing.Point(406, 257);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(75, 23);
- this.button1.TabIndex = 1;
- this.button1.Text = "Close";
- this.button1.UseVisualStyleBackColor = true;
- this.button1.Click += new System.EventHandler(this.button1_Click);
+ this.button4.Location = new System.Drawing.Point(315, 173);
+ this.button4.Name = "button4";
+ this.button4.Size = new System.Drawing.Size(75, 23);
+ this.button4.TabIndex = 3;
+ this.button4.Text = "Add";
+ this.button4.UseVisualStyleBackColor = true;
+ this.button4.Click += new System.EventHandler(this.button4_Click);
//
+ // textBox2
+ //
+ this.textBox2.Location = new System.Drawing.Point(65, 147);
+ this.textBox2.Name = "textBox2";
+ this.textBox2.Size = new System.Drawing.Size(406, 20);
+ this.textBox2.TabIndex = 2;
+ //
+ // textBox1
+ //
+ this.textBox1.Location = new System.Drawing.Point(6, 147);
+ this.textBox1.Name = "textBox1";
+ this.textBox1.Size = new System.Drawing.Size(53, 20);
+ this.textBox1.TabIndex = 1;
+ //
// listView1
//
this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
@@ -130,45 +135,67 @@
this.columnHeader2.Text = "Name";
this.columnHeader2.Width = 372;
//
- // textBox1
+ // tabPage2
//
- this.textBox1.Location = new System.Drawing.Point(6, 147);
- this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(53, 20);
- this.textBox1.TabIndex = 1;
+ this.tabPage2.Controls.Add(this.label2);
+ this.tabPage2.Controls.Add(this.label1);
+ this.tabPage2.Controls.Add(this.button3);
+ this.tabPage2.Controls.Add(this.button2);
+ this.tabPage2.Controls.Add(this.listView3);
+ this.tabPage2.Controls.Add(this.listView2);
+ this.tabPage2.Controls.Add(this.comboBox1);
+ this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Name = "tabPage2";
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage2.Size = new System.Drawing.Size(477, 209);
+ this.tabPage2.TabIndex = 1;
+ this.tabPage2.Text = "Groups mapping";
+ this.tabPage2.UseVisualStyleBackColor = true;
+ this.tabPage2.Enter += new System.EventHandler(this.tabPage2_Enter);
//
- // textBox2
+ // label2
//
- this.textBox2.Location = new System.Drawing.Point(65, 147);
- this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(406, 20);
- this.textBox2.TabIndex = 2;
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(6, 30);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(69, 13);
+ this.label2.TabIndex = 6;
+ this.label2.Text = "Avaiable files";
//
- // comboBox1
+ // label1
//
- this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboBox1.FormattingEnabled = true;
- this.comboBox1.Location = new System.Drawing.Point(6, 6);
- this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(465, 21);
- this.comboBox1.TabIndex = 0;
- this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(267, 30);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(69, 13);
+ this.label1.TabIndex = 5;
+ this.label1.Text = "Files in group";
//
- // listView2
+ // button3
//
- this.listView2.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
- this.columnHeader3});
- this.listView2.Location = new System.Drawing.Point(6, 49);
- this.listView2.Name = "listView2";
- this.listView2.Size = new System.Drawing.Size(170, 154);
- this.listView2.TabIndex = 1;
- this.listView2.UseCompatibleStateImageBehavior = false;
- this.listView2.View = System.Windows.Forms.View.Details;
+ this.button3.Location = new System.Drawing.Point(196, 124);
+ this.button3.Name = "button3";
+ this.button3.Size = new System.Drawing.Size(49, 22);
+ this.button3.TabIndex = 4;
+ this.button3.Text = "<-";
+ this.button3.UseVisualStyleBackColor = true;
+ this.button3.Click += new System.EventHandler(this.button3_Click);
//
+ // button2
+ //
+ this.button2.Location = new System.Drawing.Point(196, 85);
+ this.button2.Name = "button2";
+ this.button2.Size = new System.Drawing.Size(49, 21);
+ this.button2.TabIndex = 3;
+ this.button2.Text = "->";
+ this.button2.UseVisualStyleBackColor = true;
+ this.button2.Click += new System.EventHandler(this.button2_Click);
+ //
// listView3
//
this.listView3.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeader4});
+ this.listView3.FullRowSelect = true;
this.listView3.Location = new System.Drawing.Point(270, 49);
this.listView3.Name = "listView3";
this.listView3.Size = new System.Drawing.Size(200, 153);
@@ -176,73 +203,48 @@
this.listView3.UseCompatibleStateImageBehavior = false;
this.listView3.View = System.Windows.Forms.View.Details;
//
- // columnHeader3
- //
- this.columnHeader3.Text = "File name";
- this.columnHeader3.Width = 162;
- //
// columnHeader4
//
this.columnHeader4.Text = "Filename";
- this.columnHeader4.Width = 191;
+ this.columnHeader4.Width = 128;
//
- // button2
+ // listView2
//
- this.button2.Location = new System.Drawing.Point(196, 85);
- this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(49, 21);
- this.button2.TabIndex = 3;
- this.button2.Text = "->";
- this.button2.UseVisualStyleBackColor = true;
- this.button2.Click += new System.EventHandler(this.button2_Click);
+ this.listView2.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.columnHeader3});
+ this.listView2.FullRowSelect = true;
+ this.listView2.Location = new System.Drawing.Point(6, 49);
+ this.listView2.Name = "listView2";
+ this.listView2.Size = new System.Drawing.Size(170, 154);
+ this.listView2.TabIndex = 1;
+ this.listView2.UseCompatibleStateImageBehavior = false;
+ this.listView2.View = System.Windows.Forms.View.Details;
//
- // button3
+ // columnHeader3
//
- this.button3.Location = new System.Drawing.Point(196, 124);
- this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(49, 22);
- this.button3.TabIndex = 4;
- this.button3.Text = "<-";
- this.button3.UseVisualStyleBackColor = true;
- this.button3.Click += new System.EventHandler(this.button3_Click);
+ this.columnHeader3.Text = "File name";
+ this.columnHeader3.Width = 107;
//
- // button4
+ // comboBox1
//
- this.button4.Location = new System.Drawing.Point(315, 173);
- this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(75, 23);
- this.button4.TabIndex = 3;
- this.button4.Text = "Add";
- this.button4.UseVisualStyleBackColor = true;
- this.button4.Click += new System.EventHandler(this.button4_Click);
+ this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBox1.FormattingEnabled = true;
+ this.comboBox1.Location = new System.Drawing.Point(6, 6);
+ this.comboBox1.Name = "comboBox1";
+ this.comboBox1.Size = new System.Drawing.Size(465, 21);
+ this.comboBox1.TabIndex = 0;
+ this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
- // button5
+ // button1
//
- this.button5.Location = new System.Drawing.Point(396, 173);
- this.button5.Name = "button5";
- this.button5.Size = new System.Drawing.Size(75, 23);
- this.button5.TabIndex = 4;
- this.button5.Text = "Remove";
- this.button5.UseVisualStyleBackColor = true;
+ this.button1.Location = new System.Drawing.Point(406, 257);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(75, 23);
+ this.button1.TabIndex = 1;
+ this.button1.Text = "Close";
+ this.button1.UseVisualStyleBackColor = true;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
//
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(267, 30);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(69, 13);
- this.label1.TabIndex = 5;
- this.label1.Text = "Files in group";
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(6, 30);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(69, 13);
- this.label2.TabIndex = 6;
- this.label2.Text = "Avaiable files";
- //
// GroupForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
Modified: trunk/plugins/mpinstaler/MPInstaler/GroupForm.cs
===================================================================
--- trunk/plugins/mpinstaler/MPInstaler/GroupForm.cs 2007-05-08 19:20:17 UTC (rev 392)
+++ trunk/plugins/mpinstaler/MPInstaler/GroupForm.cs 2007-05-09 17:30:36 UTC (rev 393)
@@ -91,10 +91,18 @@
listView3.Items.Clear();
foreach (MPIFileList fl in _struct.FileList)
{
- if (_struct.FindFileInGroup(comboBox1.Text, fl.FileNameShort))
- listView3.Items.Add(fl.FileNameShort);
+ if (_struct.FindFileInGroup(comboBox1.Text, fl.FileName))
+ {
+ ListViewItem item1 = new ListViewItem(fl.FileName, 0);
+ //item1.SubItems.Add(fl.FileName);
+ listView3.Items.AddRange(new ListViewItem[] { item1 });
+ }
else
- listView2.Items.Add(fl.FileNameShort);
+ {
+ ListViewItem item1 = new ListViewItem(fl.FileName, 0);
+ //item1.SubItems.Add(fl.FileName);
+ listView2.Items.AddRange(new ListViewItem[] { item1 });
+ }
}
}
Modified: trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs
===================================================================
--- trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs 2007-05-08 19:20:17 UTC (rev 392)
+++ trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs 2007-05-09 17:30:36 UTC (rev 393)
@@ -193,7 +193,7 @@
return true;
for(int i=0;i<SetupGroups.Count;i++)
{
- if (FindFileInGroup(SetupGroups[i].Id, fl.FileNameShort) && SetupGroups[i].Checked)
+ if (FindFileInGroup(SetupGroups[i].Id, fl.FileName) && SetupGroups[i].Checked)
return true;
}
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
