From: <du...@us...> - 2007-02-28 20:40:36
|
Revision: 145 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=145&view=rev Author: dukus Date: 2007-02-28 12:36:51 -0800 (Wed, 28 Feb 2007) Log Message: ----------- Reinstall, New type : Others Minor bug Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs trunk/plugins/mpinstaler/MPInstaler/Form1.cs trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs trunk/plugins/mpinstaler/MPInstaler/start_form.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs trunk/plugins/mpinstaler/MPInstaler.suo Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs 2007-02-28 14:22:45 UTC (rev 144) +++ trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs 2007-02-28 20:36:51 UTC (rev 145) @@ -68,6 +68,8 @@ this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); this.tabPage_Skin = new System.Windows.Forms.TabPage(); + this.label6 = new System.Windows.Forms.Label(); + this.skint_comboBox1 = new System.Windows.Forms.ComboBox(); this.tabPage_Plugin = new System.Windows.Forms.TabPage(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage_Text = new System.Windows.Forms.TabPage(); @@ -83,14 +85,20 @@ this.label3 = new System.Windows.Forms.Label(); this.proiectt_textBox1 = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); - this.skint_comboBox1 = new System.Windows.Forms.ComboBox(); - this.label6 = new System.Windows.Forms.Label(); + this.tabPage_Thumbs = new System.Windows.Forms.TabPage(); + this.thumbst_comboBox1 = new System.Windows.Forms.ComboBox(); + this.label7 = new System.Windows.Forms.Label(); + this.tabPage_Other = new System.Windows.Forms.TabPage(); + this.label8 = new System.Windows.Forms.Label(); + this.othert_comboBox1 = new System.Windows.Forms.ComboBox(); this.menuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.tabPage_Skin.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tabPage_Text.SuspendLayout(); this.tabPage_Proiect.SuspendLayout(); + this.tabPage_Thumbs.SuspendLayout(); + this.tabPage_Other.SuspendLayout(); this.SuspendLayout(); // // menuStrip1 @@ -185,9 +193,9 @@ this.skinToolStripMenuItem, this.languageToolStripMenuItem, this.textToolStripMenuItem, - this.otherToolStripMenuItem, this.settingsToolStripMenuItem, - this.textToolStripMenuItem1}); + this.textToolStripMenuItem1, + this.otherToolStripMenuItem}); this.addToolStripMenuItem.Name = "addToolStripMenuItem"; this.addToolStripMenuItem.Size = new System.Drawing.Size(38, 20); this.addToolStripMenuItem.Text = "Add"; @@ -252,14 +260,14 @@ // componentToolStripMenuItem // this.componentToolStripMenuItem.Name = "componentToolStripMenuItem"; - this.componentToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.componentToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.componentToolStripMenuItem.Text = "Component"; this.componentToolStripMenuItem.Click += new System.EventHandler(this.componentToolStripMenuItem_Click); // // mediaToolStripMenuItem // this.mediaToolStripMenuItem.Name = "mediaToolStripMenuItem"; - this.mediaToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.mediaToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.mediaToolStripMenuItem.Text = "Media"; this.mediaToolStripMenuItem.Click += new System.EventHandler(this.mediaToolStripMenuItem_Click); // @@ -267,7 +275,7 @@ // this.fullToolStripMenuItem.Enabled = false; this.fullToolStripMenuItem.Name = "fullToolStripMenuItem"; - this.fullToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.fullToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.fullToolStripMenuItem.Text = "Full"; this.fullToolStripMenuItem.Visible = false; // @@ -290,6 +298,7 @@ this.otherToolStripMenuItem.Name = "otherToolStripMenuItem"; this.otherToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.otherToolStripMenuItem.Text = "Other"; + this.otherToolStripMenuItem.Click += new System.EventHandler(this.otherToolStripMenuItem_Click); // // settingsToolStripMenuItem // @@ -301,7 +310,7 @@ // this.textToolStripMenuItem1.Name = "textToolStripMenuItem1"; this.textToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); - this.textToolStripMenuItem1.Text = "Text"; + this.textToolStripMenuItem1.Text = "Thumbs"; this.textToolStripMenuItem1.Click += new System.EventHandler(this.textToolStripMenuItem1_Click); // // bossview @@ -393,6 +402,24 @@ this.tabPage_Skin.Text = "Skin Properties"; this.tabPage_Skin.UseVisualStyleBackColor = true; // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(6, 14); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(34, 13); + this.label6.TabIndex = 1; + this.label6.Text = "Skin :"; + // + // skint_comboBox1 + // + this.skint_comboBox1.FormattingEnabled = true; + this.skint_comboBox1.Location = new System.Drawing.Point(6, 30); + this.skint_comboBox1.Name = "skint_comboBox1"; + this.skint_comboBox1.Size = new System.Drawing.Size(141, 21); + this.skint_comboBox1.TabIndex = 0; + this.skint_comboBox1.TextChanged += new System.EventHandler(this.tab_skin_change); + // // tabPage_Plugin // this.tabPage_Plugin.Location = new System.Drawing.Point(4, 22); @@ -412,6 +439,8 @@ this.tabControl1.Controls.Add(this.tabPage_Text); this.tabControl1.Controls.Add(this.tabPage_Language); this.tabControl1.Controls.Add(this.tabPage_Proiect); + this.tabControl1.Controls.Add(this.tabPage_Thumbs); + this.tabControl1.Controls.Add(this.tabPage_Other); this.tabControl1.Location = new System.Drawing.Point(12, 273); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; @@ -546,24 +575,79 @@ this.label2.TabIndex = 0; this.label2.Text = "Name :"; // - // skint_comboBox1 + // tabPage_Thumbs // - this.skint_comboBox1.FormattingEnabled = true; - this.skint_comboBox1.Location = new System.Drawing.Point(6, 30); - this.skint_comboBox1.Name = "skint_comboBox1"; - this.skint_comboBox1.Size = new System.Drawing.Size(141, 21); - this.skint_comboBox1.TabIndex = 0; - this.skint_comboBox1.TextChanged += new System.EventHandler(this.tab_skin_change); + this.tabPage_Thumbs.Controls.Add(this.thumbst_comboBox1); + this.tabPage_Thumbs.Controls.Add(this.label7); + this.tabPage_Thumbs.Location = new System.Drawing.Point(4, 22); + this.tabPage_Thumbs.Name = "tabPage_Thumbs"; + this.tabPage_Thumbs.Padding = new System.Windows.Forms.Padding(3); + this.tabPage_Thumbs.Size = new System.Drawing.Size(643, 120); + this.tabPage_Thumbs.TabIndex = 5; + this.tabPage_Thumbs.Text = "Thumbs Properties"; + this.tabPage_Thumbs.UseVisualStyleBackColor = true; // - // label6 + // thumbst_comboBox1 // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(6, 14); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(34, 13); - this.label6.TabIndex = 1; - this.label6.Text = "Skin :"; + this.thumbst_comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.thumbst_comboBox1.FormattingEnabled = true; + this.thumbst_comboBox1.Items.AddRange(new object[] { + "TV\\Logos", + "TV\\Recorded", + "TV\\Shows", + "Music\\Albums", + "Music\\Artists", + "Music\\Genre", + "Videos\\Actors", + "Videos\\Genre", + "Videos\\Title", + "Radio", + "ExternalDisplay"}); + this.thumbst_comboBox1.Location = new System.Drawing.Point(9, 30); + this.thumbst_comboBox1.Name = "thumbst_comboBox1"; + this.thumbst_comboBox1.Size = new System.Drawing.Size(177, 21); + this.thumbst_comboBox1.TabIndex = 1; + this.thumbst_comboBox1.TextChanged += new System.EventHandler(this.tab_thumbs_change); // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(6, 14); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(55, 13); + this.label7.TabIndex = 0; + this.label7.Text = "Directory :"; + // + // tabPage_Other + // + this.tabPage_Other.Controls.Add(this.othert_comboBox1); + this.tabPage_Other.Controls.Add(this.label8); + this.tabPage_Other.Location = new System.Drawing.Point(4, 22); + this.tabPage_Other.Name = "tabPage_Other"; + this.tabPage_Other.Padding = new System.Windows.Forms.Padding(3); + this.tabPage_Other.Size = new System.Drawing.Size(643, 120); + this.tabPage_Other.TabIndex = 6; + this.tabPage_Other.Text = "Properties"; + this.tabPage_Other.UseVisualStyleBackColor = true; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(6, 12); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(98, 13); + this.label8.TabIndex = 0; + this.label8.Text = "Directory (relative) :"; + // + // othert_comboBox1 + // + this.othert_comboBox1.FormattingEnabled = true; + this.othert_comboBox1.Location = new System.Drawing.Point(9, 28); + this.othert_comboBox1.Name = "othert_comboBox1"; + this.othert_comboBox1.Size = new System.Drawing.Size(269, 21); + this.othert_comboBox1.TabIndex = 1; + this.othert_comboBox1.TextChanged += new System.EventHandler(this.tab_other_change); + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -586,6 +670,10 @@ this.tabPage_Text.PerformLayout(); this.tabPage_Proiect.ResumeLayout(false); this.tabPage_Proiect.PerformLayout(); + this.tabPage_Thumbs.ResumeLayout(false); + this.tabPage_Thumbs.PerformLayout(); + this.tabPage_Other.ResumeLayout(false); + this.tabPage_Other.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -649,6 +737,12 @@ private System.Windows.Forms.TextBox proiectt_textBox4; private System.Windows.Forms.Label label6; private System.Windows.Forms.ComboBox skint_comboBox1; + private System.Windows.Forms.TabPage tabPage_Thumbs; + private System.Windows.Forms.ComboBox thumbst_comboBox1; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.TabPage tabPage_Other; + private System.Windows.Forms.ComboBox othert_comboBox1; + private System.Windows.Forms.Label label8; } } Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-02-28 14:22:45 UTC (rev 144) +++ trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-02-28 20:36:51 UTC (rev 145) @@ -114,6 +114,19 @@ } } + private void addother(string ty, string sty) + { + // string fil; + openFileDialog1.Filter = "All files|*.*|xml files|*.xml|png files|*.png|bmp files|*.bmp|jpeg files|*.jpg"; + openFileDialog1.Multiselect = true; + if (openFileDialog1.ShowDialog(this) == DialogResult.OK) + { + foreach (string fil in openFileDialog1.FileNames) + addrow(Path.GetFileName(fil), ty, sty, Path.GetFullPath(fil), "04010", ""); + + } + } + private void subtitleToolStripMenuItem_Click(object sender, EventArgs e) { addplugin(3); @@ -305,27 +318,32 @@ { if (bossview.SelectedItems.Count > 0) { + tabControl1.Controls.Clear(); if (bossview.SelectedItems[0].SubItems[1].Text == MPinstalerStruct.PLUGIN_TYPE) { - tabControl1.Controls.Clear(); tabControl1.Controls.Add(tabPage_Plugin); - tabControl1.Controls.Add(tabPage_Proiect); } if (bossview.SelectedItems[0].SubItems[1].Text == MPinstalerStruct.SKIN_TYPE || bossview.SelectedItems[0].SubItems[1].Text == MPinstalerStruct.SKIN_MEDIA_TYPE) { - tabControl1.Controls.Clear(); tabControl1.Controls.Add(tabPage_Skin); - tabControl1.Controls.Add(tabPage_Proiect); skint_comboBox1.Text = bossview.SelectedItems[0].SubItems[2].Text; } if (bossview.SelectedItems[0].SubItems[1].Text == MPinstalerStruct.TEXT_TYPE) { - tabControl1.Controls.Clear(); tabControl1.Controls.Add(tabPage_Text); - tabControl1.Controls.Add(tabPage_Proiect); textt_comboBox1.Text = bossview.SelectedItems[0].SubItems[2].Text; } - + if (bossview.SelectedItems[0].SubItems[1].Text == MPinstalerStruct.THUMBS_TYPE) + { + tabControl1.Controls.Add(tabPage_Thumbs); + thumbst_comboBox1.Text = bossview.SelectedItems[0].SubItems[2].Text; + } + if (bossview.SelectedItems[0].SubItems[1].Text == MPinstalerStruct.OTHER_TYPE) + { + tabControl1.Controls.Add(tabPage_Other); + othert_comboBox1.Text = bossview.SelectedItems[0].SubItems[2].Text; + } + tabControl1.Controls.Add(tabPage_Proiect); } else { @@ -337,7 +355,7 @@ private void textToolStripMenuItem1_Click(object sender, EventArgs e) { - + addother(MPinstalerStruct.THUMBS_TYPE,thumbst_comboBox1.Text); } private void textToolStripMenuItem_Click(object sender, EventArgs e) @@ -361,6 +379,22 @@ } } + private void tab_thumbs_change(object sender, EventArgs e) + { + if (bossview.SelectedItems.Count > 0) + { + bossview.SelectedItems[0].SubItems[2].Text = thumbst_comboBox1.Text; + } + } + + private void tab_other_change(object sender, EventArgs e) + { + if (bossview.SelectedItems.Count > 0) + { + bossview.SelectedItems[0].SubItems[2].Text = othert_comboBox1.Text; + } + } + private void proiectt_textBox1_TextChanged(object sender, EventArgs e) { if (!_loading) @@ -372,6 +406,11 @@ } } + private void otherToolStripMenuItem_Click(object sender, EventArgs e) + { + addother(MPinstalerStruct.OTHER_TYPE, ""); + } + } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs 2007-02-28 14:22:45 UTC (rev 144) +++ trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs 2007-02-28 20:36:51 UTC (rev 145) @@ -30,6 +30,8 @@ public const string TEXT_EULA_TYPE = "EULA"; public const string TEXT_LOG_TYPE = "Log"; public const string TEXT_README_TYPE = "Ream_me"; + public const string THUMBS_TYPE = "Thumbs"; + public const string OTHER_TYPE = "Other"; string _builFileName = string.Empty; string _proiectFileName = string.Empty; @@ -98,6 +100,7 @@ Author = string.Empty; Name = string.Empty; Version = string.Empty; + UpdateURL = string.Empty; } public bool SaveToFile(string fil) @@ -105,6 +108,7 @@ Stream myStream; if ((myStream = File.Open(fil, FileMode.Create, FileAccess.Write, FileShare.None)) != null) { + this.ProiectdFileName = fil; // Code to write the stream goes here. XmlDocument doc = new XmlDocument(); XmlWriter writer = null; @@ -286,6 +290,15 @@ { ret = "Release" + @"\" + "Text" + @"\" + flst.SubType + @"\" + Path.GetFileName(flst.FileName); } + + if (flst.Type == THUMBS_TYPE) + { + ret = "Release" + @"\" + "Thumbs" + @"\" + flst.SubType + @"\" + Path.GetFileName(flst.FileName); + } + if (flst.Type == OTHER_TYPE) + { + ret = "Release" + @"\" + "Other" + @"\" + Path.GetFileName(flst.FileName); + } return ret; } @@ -328,6 +341,17 @@ ret = Config.GetFolder(Config.Dir.Skin) + @"\" + flst.SubType + @"\" + "Media" + @"\" + Path.GetFileName(flst.FileName); } + if (flst.Type == THUMBS_TYPE) + { + ret = Config.GetFolder(Config.Dir.Thumbs) + @"\" + flst.SubType +@"\" + Path.GetFileName(flst.FileName); + } + if (flst.Type == OTHER_TYPE) + { + if (String.IsNullOrEmpty(flst.SubType)) + ret = Config.GetFolder(Config.Dir.Thumbs) + @"\" + flst.SubType + @"\" + Path.GetFileName(flst.FileName); + else + ret = Config.GetFolder(Config.Dir.Thumbs) + @"\" + flst.SubType + @"\" + Path.GetFileName(flst.FileName); + } if (flst.Type == TEXT_TYPE) { ret = Config.GetFolder(Config.Dir.Base) + @"\" + Path.GetFileName(flst.FileName); Modified: trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-02-28 14:22:45 UTC (rev 144) +++ trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-02-28 20:36:51 UTC (rev 145) @@ -179,8 +179,14 @@ public void Add(MPpackageStruct pk) { + for (int i = 0; i < lst.Count; i++) + { + if (((MPpackageStruct)lst[i])._intalerStruct.Name.Trim() == pk._intalerStruct.Name.Trim()) + lst.RemoveAt(i); + } lst.Add(pk); - File.Copy(pk.FileName,InstalDir+@"\"+Path.GetFileName(pk.FileName),true); + if (Path.GetFullPath(pk.FileName) != Path.GetFullPath(InstalDir + @"\" + Path.GetFileName(pk.FileName))) + File.Copy(pk.FileName, InstalDir + @"\" + Path.GetFileName(pk.FileName), true); } public void SaveToFile() Modified: trunk/plugins/mpinstaler/MPInstaler/start_form.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/start_form.cs 2007-02-28 14:22:45 UTC (rev 144) +++ trunk/plugins/mpinstaler/MPInstaler/start_form.cs 2007-02-28 20:36:51 UTC (rev 145) @@ -43,8 +43,6 @@ } else MessageBox.Show("Invalid package !"); - - } private void button3_Click(object sender, EventArgs e) Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs 2007-02-28 14:22:45 UTC (rev 144) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs 2007-02-28 20:36:51 UTC (rev 145) @@ -29,14 +29,14 @@ private void InitializeComponent() { this.listView1 = new System.Windows.Forms.ListView(); + this.columnHeader1 = new System.Windows.Forms.ColumnHeader(); + this.columnHeader2 = new System.Windows.Forms.ColumnHeader(); + this.columnHeader3 = new System.Windows.Forms.ColumnHeader(); + this.columnHeader4 = new System.Windows.Forms.ColumnHeader(); this.button1 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button(); - this.columnHeader1 = new System.Windows.Forms.ColumnHeader(); - this.columnHeader2 = new System.Windows.Forms.ColumnHeader(); - this.columnHeader3 = new System.Windows.Forms.ColumnHeader(); this.button4 = new System.Windows.Forms.Button(); - this.columnHeader4 = new System.Windows.Forms.ColumnHeader(); this.SuspendLayout(); // // listView1 @@ -49,15 +49,38 @@ this.columnHeader2, this.columnHeader3, this.columnHeader4}); + this.listView1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.listView1.FullRowSelect = true; this.listView1.GridLines = true; this.listView1.HideSelection = false; this.listView1.Location = new System.Drawing.Point(-1, -3); + this.listView1.MultiSelect = false; this.listView1.Name = "listView1"; this.listView1.Size = new System.Drawing.Size(632, 304); this.listView1.TabIndex = 0; this.listView1.UseCompatibleStateImageBehavior = false; this.listView1.View = System.Windows.Forms.View.Details; + this.listView1.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged); // + // columnHeader1 + // + this.columnHeader1.Text = "Name"; + this.columnHeader1.Width = 179; + // + // columnHeader2 + // + this.columnHeader2.Text = "Author"; + this.columnHeader2.Width = 194; + // + // columnHeader3 + // + this.columnHeader3.Text = "Version"; + this.columnHeader3.Width = 202; + // + // columnHeader4 + // + this.columnHeader4.Text = "File"; + // // button1 // this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -91,21 +114,6 @@ this.button3.Text = "Update"; this.button3.UseVisualStyleBackColor = true; // - // columnHeader1 - // - this.columnHeader1.Text = "Name"; - this.columnHeader1.Width = 179; - // - // columnHeader2 - // - this.columnHeader2.Text = "Author"; - this.columnHeader2.Width = 194; - // - // columnHeader3 - // - this.columnHeader3.Text = "Version"; - this.columnHeader3.Width = 202; - // // button4 // this.button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -113,13 +121,10 @@ this.button4.Name = "button4"; this.button4.Size = new System.Drawing.Size(75, 23); this.button4.TabIndex = 4; - this.button4.Text = "Reinstal"; + this.button4.Text = "Reinstall"; this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.button4_Click); // - // columnHeader4 - // - this.columnHeader4.Text = "File"; - // // controlp // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs 2007-02-28 14:22:45 UTC (rev 144) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.cs 2007-02-28 20:36:51 UTC (rev 145) @@ -6,6 +6,7 @@ using System.Drawing; using System.Text; using System.Windows.Forms; +using MediaPortal.Configuration; namespace MPInstaler { @@ -43,8 +44,36 @@ item1.SubItems.Add(pk._intalerStruct.Version); item1.SubItems.Add(Path.GetFileName(pk.FileName)); listView1.Items.AddRange(new ListViewItem[] { item1 }); - MessageBox.Show(pk.FileName); } } + + private void listView1_SelectedIndexChanged(object sender, EventArgs e) + { + if (listView1.SelectedItems.Count > 0) + { + button1.Enabled = true; + button2.Enabled = true; + button3.Enabled = true; + } + else + { + button1.Enabled = false; + button2.Enabled = false; + button3.Enabled = false; + } + } + + private void button4_Click(object sender, EventArgs e) + { + wizard_1 wiz = new wizard_1(); + wiz.package.LoadFromFile(Config.GetFolder(Config.Dir.Base) + @"\" + "Instaler" + @"\" + listView1.SelectedItems[0].SubItems[3].Text); + if (wiz.package.isValid) + { + wiz.nextStep(1); + } + else + MessageBox.Show("Invalid package !"); + + } } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs 2007-02-28 14:22:45 UTC (rev 144) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs 2007-02-28 20:36:51 UTC (rev 145) @@ -31,9 +31,10 @@ button_back.Visible = false; progressBar1.Visible = false; progressBar2.Visible = false; + label2.Visible = false; title_label.Text = package._intalerStruct.Name; - label2.Visible = false; button_next.Text = "Next"; + richTextBox1.Visible = true; richTextBox1.Text = String.Format(" Name : {0} \n\n Author : {1} \n\n Version : {2}", package._intalerStruct.Name,package._intalerStruct.Author,package._intalerStruct.Version); if (!this.Visible) this.ShowDialog(); break; @@ -46,6 +47,7 @@ label2.Text = "License Agreement"; button_next.Text = "I Agree"; button_back.Visible = true; + richTextBox1.Visible = true; richTextBox1.Text = package.txt_EULA; break; } @@ -57,6 +59,7 @@ label2.Text = "Change log"; button_next.Text = "Next"; button_back.Visible = true; + richTextBox1.Visible = true; richTextBox1.Text = package.txt_log; break; } @@ -67,6 +70,7 @@ label2.Visible = true; label2.Text = "Read me"; button_back.Visible = true; + richTextBox1.Visible = true; richTextBox1.Text = package.txt_readme; break; } @@ -75,13 +79,25 @@ progressBar1.Visible = false; progressBar2.Visible = false; label2.Visible = true; + label2.Text = "Select skin"; + button_next.Text = "Next"; + button_back.Visible = true; + richTextBox1.Visible = false; + break; + } + case 6: + { + progressBar1.Visible = false; + progressBar2.Visible = false; + label2.Visible = true; label2.Text = "Instaling ..."; button_next.Text = "Next"; button_back.Visible = true; + richTextBox1.Visible = true; richTextBox1.Text = String.Format("Intall paths : \nPlugins : {0}\nSkin : {1}", Config.GetFolder(Config.Dir.Plugins), Config.GetFolder(Config.Dir.Skin)); break; } - case 6: + case 7: { label2.Visible = true; progressBar1.Visible = true; @@ -101,6 +117,7 @@ private void install() { MPInstallHelper inst = new MPInstallHelper(); + inst.LoadFromFile(); button_next.Visible = false; button_back.Visible = false; button_cancel.Enabled = false; @@ -150,6 +167,10 @@ test_next_step(m); } break; + case 5: + step += m; + test_next_step(m); + break; default: break; } Modified: trunk/plugins/mpinstaler/MPInstaler.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |