From: <du...@us...> - 2007-03-19 20:39:28
|
Revision: 198 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=198&view=rev Author: dukus Date: 2007-03-19 13:32:28 -0700 (Mon, 19 Mar 2007) Log Message: ----------- More advanced language editor. Logo properties. Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs trunk/plugins/mpinstaler/MPInstaler/Form1.cs trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.Designer.cs trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs Removed Paths: ------------- trunk/plugins/mpinstaler/MPInstaler.suo Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -75,7 +75,7 @@ this.tabPage_Text = new System.Windows.Forms.TabPage(); this.textt_comboBox1 = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); - this.tabPage_Language = new System.Windows.Forms.TabPage(); + this.tabPage_Advanced = new System.Windows.Forms.TabPage(); this.tabPage_Proiect = new System.Windows.Forms.TabPage(); this.proiectt_textBox6 = new System.Windows.Forms.TextBox(); this.label10 = new System.Windows.Forms.Label(); @@ -95,14 +95,19 @@ this.tabPage_Other = new System.Windows.Forms.TabPage(); this.othert_comboBox1 = new System.Windows.Forms.ComboBox(); this.label8 = new System.Windows.Forms.Label(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.label11 = new System.Windows.Forms.Label(); + this.button_browse = new System.Windows.Forms.Button(); this.menuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.tabPage_Skin.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tabPage_Text.SuspendLayout(); + this.tabPage_Advanced.SuspendLayout(); this.tabPage_Proiect.SuspendLayout(); this.tabPage_Thumbs.SuspendLayout(); this.tabPage_Other.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // menuStrip1 @@ -444,7 +449,7 @@ this.tabControl1.Controls.Add(this.tabPage_Plugin); this.tabControl1.Controls.Add(this.tabPage_Skin); this.tabControl1.Controls.Add(this.tabPage_Text); - this.tabControl1.Controls.Add(this.tabPage_Language); + this.tabControl1.Controls.Add(this.tabPage_Advanced); this.tabControl1.Controls.Add(this.tabPage_Proiect); this.tabControl1.Controls.Add(this.tabPage_Thumbs); this.tabControl1.Controls.Add(this.tabPage_Other); @@ -488,14 +493,17 @@ this.label1.TabIndex = 0; this.label1.Text = "Type:"; // - // tabPage_Language + // tabPage_Advanced // - this.tabPage_Language.Location = new System.Drawing.Point(4, 22); - this.tabPage_Language.Name = "tabPage_Language"; - this.tabPage_Language.Size = new System.Drawing.Size(643, 120); - this.tabPage_Language.TabIndex = 3; - this.tabPage_Language.Text = "Properties"; - this.tabPage_Language.UseVisualStyleBackColor = true; + this.tabPage_Advanced.Controls.Add(this.button_browse); + this.tabPage_Advanced.Controls.Add(this.label11); + this.tabPage_Advanced.Controls.Add(this.pictureBox1); + this.tabPage_Advanced.Location = new System.Drawing.Point(4, 22); + this.tabPage_Advanced.Name = "tabPage_Advanced"; + this.tabPage_Advanced.Size = new System.Drawing.Size(643, 120); + this.tabPage_Advanced.TabIndex = 3; + this.tabPage_Advanced.Text = "Advanced Properties"; + this.tabPage_Advanced.UseVisualStyleBackColor = true; // // tabPage_Proiect // @@ -694,6 +702,35 @@ this.label8.TabIndex = 0; this.label8.Text = "Directory (relative) :"; // + // pictureBox1 + // + this.pictureBox1.Location = new System.Drawing.Point(3, 26); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(64, 64); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + this.pictureBox1.LoadCompleted += new System.ComponentModel.AsyncCompletedEventHandler(this.pictureBox1_LoadCompleted); + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(3, 10); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(37, 13); + this.label11.TabIndex = 1; + this.label11.Text = "Logo :"; + // + // button_browse + // + this.button_browse.Location = new System.Drawing.Point(0, 94); + this.button_browse.Name = "button_browse"; + this.button_browse.Size = new System.Drawing.Size(67, 23); + this.button_browse.TabIndex = 2; + this.button_browse.Text = "Browse..."; + this.button_browse.UseVisualStyleBackColor = true; + this.button_browse.Click += new System.EventHandler(this.button_browse_Click); + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -714,12 +751,15 @@ this.tabControl1.ResumeLayout(false); this.tabPage_Text.ResumeLayout(false); this.tabPage_Text.PerformLayout(); + this.tabPage_Advanced.ResumeLayout(false); + this.tabPage_Advanced.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(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -764,7 +804,7 @@ private System.Windows.Forms.TabPage tabPage_Plugin; private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabPage tabPage_Text; - private System.Windows.Forms.TabPage tabPage_Language; + private System.Windows.Forms.TabPage tabPage_Advanced; private System.Windows.Forms.TabPage tabPage_Proiect; private System.Windows.Forms.ColumnHeader columnHeader6; private System.Windows.Forms.ToolStripMenuItem textToolStripMenuItem; @@ -793,6 +833,9 @@ private System.Windows.Forms.TextBox proiectt_textBox5; private System.Windows.Forms.TextBox proiectt_textBox6; private System.Windows.Forms.Label label10; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Button button_browse; + private System.Windows.Forms.Label label11; } } Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -244,6 +244,7 @@ proiectt_textBox4.Text = _struct.Version; proiectt_textBox5.Text = _struct.Description; proiectt_textBox6.Text = _struct.Group; + pictureBox1.Image = _struct.Logo; _loading = false; } @@ -319,6 +320,7 @@ { tabControl1.Controls.Clear(); tabControl1.Controls.Add(tabPage_Proiect); + tabControl1.Controls.Add(tabPage_Advanced); textt_comboBox1.Items.Clear(); textt_comboBox1.Items.Add(MPinstalerStruct.TEXT_LOG_TYPE); textt_comboBox1.Items.Add(MPinstalerStruct.TEXT_README_TYPE); @@ -394,11 +396,13 @@ othert_comboBox1.Text = bossview.SelectedItems[0].SubItems[2].Text; } tabControl1.Controls.Add(tabPage_Proiect); + tabControl1.Controls.Add(tabPage_Advanced); } else { tabControl1.Controls.Clear(); tabControl1.Controls.Add(tabPage_Proiect); + tabControl1.Controls.Add(tabPage_Advanced); } } @@ -467,5 +471,21 @@ { this.Close(); } + + private void button_browse_Click(object sender, EventArgs e) + { + openFileDialog1.Filter = "All files|*.*|png files|*.png|bmp files|*.bmp|jpeg files|*.jpg"; + openFileDialog1.Multiselect = false; + if (openFileDialog1.ShowDialog(this) == DialogResult.OK) + { + pictureBox1.Load(openFileDialog1.FileName); + _struct.Logo = pictureBox1.Image; + } + } + + private void pictureBox1_LoadCompleted(object sender, AsyncCompletedEventArgs e) + { + _struct.Logo = pictureBox1.Image; + } } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/Language dialog.Designer.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -44,11 +44,16 @@ this.columnHeader4 = new System.Windows.Forms.ColumnHeader(); this.columnHeader5 = new System.Windows.Forms.ColumnHeader(); this.button5 = new System.Windows.Forms.Button(); + this.button6 = new System.Windows.Forms.Button(); + this.button7 = new System.Windows.Forms.Button(); + this.button8 = new System.Windows.Forms.Button(); this.SuspendLayout(); // // button1 // - this.button1.Location = new System.Drawing.Point(13, 279); + this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.button1.Location = new System.Drawing.Point(19, 279); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(65, 21); this.button1.TabIndex = 0; @@ -58,9 +63,11 @@ // // button2 // - this.button2.Location = new System.Drawing.Point(309, 279); + this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.button2.Location = new System.Drawing.Point(589, 279); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(75, 21); + this.button2.Size = new System.Drawing.Size(65, 21); this.button2.TabIndex = 1; this.button2.Text = "Remove"; this.button2.UseVisualStyleBackColor = true; @@ -68,6 +75,7 @@ // // languageComboBox // + this.languageComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.languageComboBox.FormattingEnabled = true; this.languageComboBox.Location = new System.Drawing.Point(216, 252); this.languageComboBox.Name = "languageComboBox"; @@ -86,12 +94,14 @@ this.columnHeader3}); this.listView1.FullRowSelect = true; this.listView1.GridLines = true; + this.listView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; this.listView1.Location = new System.Drawing.Point(12, 12); this.listView1.Name = "listView1"; this.listView1.Size = new System.Drawing.Size(372, 235); this.listView1.TabIndex = 3; this.listView1.UseCompatibleStateImageBehavior = false; this.listView1.View = System.Windows.Forms.View.Details; + this.listView1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listView1_MouseDoubleClick); this.listView1.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged); // // columnHeader1 @@ -111,6 +121,7 @@ // // textBox1 // + this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.textBox1.Location = new System.Drawing.Point(12, 253); this.textBox1.Name = "textBox1"; this.textBox1.Size = new System.Drawing.Size(62, 20); @@ -118,6 +129,7 @@ // // textBox2 // + this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.textBox2.Location = new System.Drawing.Point(80, 253); this.textBox2.Name = "textBox2"; this.textBox2.Size = new System.Drawing.Size(130, 20); @@ -125,9 +137,11 @@ // // button3 // - this.button3.Location = new System.Drawing.Point(105, 279); + this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.button3.Location = new System.Drawing.Point(399, 279); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(75, 21); + this.button3.Size = new System.Drawing.Size(65, 21); this.button3.TabIndex = 6; this.button3.Text = "Save"; this.button3.UseVisualStyleBackColor = true; @@ -135,9 +149,11 @@ // // button4 // - this.button4.Location = new System.Drawing.Point(207, 279); + this.button4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.button4.Location = new System.Drawing.Point(494, 279); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(75, 21); + this.button4.Size = new System.Drawing.Size(65, 21); this.button4.TabIndex = 7; this.button4.Text = "Close"; this.button4.UseVisualStyleBackColor = true; @@ -145,6 +161,7 @@ // // comboBox1 // + this.comboBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(13, 306); @@ -154,13 +171,16 @@ // // listView2 // + this.listView2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); this.listView2.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeader4, this.columnHeader5}); this.listView2.FullRowSelect = true; + this.listView2.HideSelection = false; this.listView2.Location = new System.Drawing.Point(434, 12); this.listView2.Name = "listView2"; - this.listView2.Size = new System.Drawing.Size(227, 311); + this.listView2.Size = new System.Drawing.Size(227, 261); this.listView2.TabIndex = 9; this.listView2.UseCompatibleStateImageBehavior = false; this.listView2.View = System.Windows.Forms.View.Details; @@ -176,7 +196,8 @@ // // button5 // - this.button5.Location = new System.Drawing.Point(390, 156); + this.button5.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.button5.Location = new System.Drawing.Point(390, 121); this.button5.Name = "button5"; this.button5.Size = new System.Drawing.Size(38, 23); this.button5.TabIndex = 10; @@ -184,11 +205,50 @@ this.button5.UseVisualStyleBackColor = true; this.button5.Click += new System.EventHandler(this.button5_Click); // + // button6 + // + this.button6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.button6.Location = new System.Drawing.Point(103, 279); + this.button6.Name = "button6"; + this.button6.Size = new System.Drawing.Size(76, 21); + this.button6.TabIndex = 11; + this.button6.Text = "Add all lang."; + this.button6.UseVisualStyleBackColor = true; + this.button6.Click += new System.EventHandler(this.button6_Click); + // + // button7 + // + this.button7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.button7.Location = new System.Drawing.Point(304, 279); + this.button7.Name = "button7"; + this.button7.Size = new System.Drawing.Size(65, 21); + this.button7.TabIndex = 12; + this.button7.Text = "Revert"; + this.button7.UseVisualStyleBackColor = true; + this.button7.Click += new System.EventHandler(this.button7_Click); + // + // button8 + // + this.button8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.button8.Location = new System.Drawing.Point(209, 279); + this.button8.Name = "button8"; + this.button8.Size = new System.Drawing.Size(65, 21); + this.button8.TabIndex = 13; + this.button8.Text = "Clear"; + this.button8.UseVisualStyleBackColor = true; + this.button8.Click += new System.EventHandler(this.button8_Click); + // // Form2 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(673, 335); + this.Controls.Add(this.button8); + this.Controls.Add(this.button7); + this.Controls.Add(this.button6); this.Controls.Add(this.button5); this.Controls.Add(this.listView2); this.Controls.Add(this.comboBox1); @@ -226,5 +286,8 @@ private System.Windows.Forms.Button button5; private System.Windows.Forms.ColumnHeader columnHeader4; private System.Windows.Forms.ColumnHeader columnHeader5; + private System.Windows.Forms.Button button6; + private System.Windows.Forms.Button button7; + private System.Windows.Forms.Button button8; } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/Language dialog.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -152,5 +152,60 @@ listView1.Items.AddRange(new ListViewItem[] { item1 }); } } + + private void button7_Click(object sender, EventArgs e) + { + LoadLanguages(); + listView1.Items.Clear(); + foreach (LanguageString lg in Language) + { + ListViewItem item1 = new ListViewItem(lg.dwCode, 0); + item1.SubItems.Add(lg.mapSting); + item1.SubItems.Add(lg.language); + listView1.Items.AddRange(new ListViewItem[] { item1 }); + } + } + + private void button6_Click(object sender, EventArgs e) + { + foreach (string lg in languageComboBox.Items) + { + MPLanguageHelper mplh = new MPLanguageHelper(); + mplh.Load(lg); + if (mplh.isLoaded) + { + int idx = -1;// this.Language.BinarySearch(ls, new LanguageStringComparer()); + for (int i = 0; i < mplh.Language.Count; i++) + if (mplh.Language[i].dwCode.Trim() == textBox1.Text.Trim()) + { + idx = i; + break; + } + if (idx > -1) + { + ListViewItem item1 = new ListViewItem(mplh.Language[idx].dwCode, 0); + item1.SubItems.Add(mplh.Language[idx].mapSting); + item1.SubItems.Add(lg); + listView1.Items.AddRange(new ListViewItem[] { item1 }); + } + } + } + } + + private void listView1_MouseDoubleClick(object sender, MouseEventArgs e) + { + if (listView1.SelectedItems.Count > 0) + { + textBox1.Text = listView1.SelectedItems[0].SubItems[0].Text; + textBox2.Text = listView1.SelectedItems[0].SubItems[1].Text; + languageComboBox.Text = listView1.SelectedItems[0].SubItems[2].Text; + listView1.Items.Remove(listView1.SelectedItems[0]); + } + } + + private void button8_Click(object sender, EventArgs e) + { + listView1.Items.Clear(); + } } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/MPinstalerStruct.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -41,6 +41,7 @@ string _version = string.Empty; string _description = string.Empty; string _group = string.Empty; + Image _image = null; public ArrayList Uninstall = new ArrayList(); public ArrayList FileList = new ArrayList(); @@ -74,6 +75,12 @@ set {_author = value; } } + public Image Logo + { + get { return _image; } + set { _image = value; } + } + public string Group { get { return _group; } @@ -118,6 +125,7 @@ Version = string.Empty; UpdateURL = string.Empty; Group = string.Empty; + Logo = null; } public bool SaveToFile(string fil) @@ -174,7 +182,8 @@ writer.WriteElementString("UpdateURL", this.UpdateURL); writer.WriteElementString("Version", this.Version); writer.WriteElementString("Description", this.Description); - writer.WriteElementString("Group", this.Group); + writer.WriteElementString("Group", this.Group); + WriteLogoElement(writer); writer.WriteEndElement(); writer.WriteEndElement(); writer.Flush(); @@ -192,6 +201,23 @@ } return true; } + + public void WriteLogoElement(XmlWriter writer) + { + if (this.Logo != null) + { + string t = Path.GetTempFileName(); + this.Logo.Save(t, System.Drawing.Imaging.ImageFormat.Png); + FileStream fs = File.OpenRead(Path.GetFullPath(t)); + byte[] buffer = new byte[fs.Length]; + fs.Read(buffer, 0, buffer.Length); + fs.Close(); + File.Delete(t); + writer.WriteStartElement("Logo"); + writer.WriteBase64(buffer, 0, buffer.Length); + writer.WriteEndElement(); + } + } public void BuilFile(ListBox ls, ProgressBar pb) { @@ -277,6 +303,24 @@ XmlNode node_gr = nodeoption.SelectSingleNode("Group"); if (node_gr != null) this.Group = node_gr.InnerText; + XmlNode node_logo = nodeoption.SelectSingleNode("Logo"); + if (node_logo != null) + { + byte[] buffer = Convert.FromBase64String(node_logo.InnerText); + string t = Path.GetTempFileName(); + FileStream fs = new FileStream(t, FileMode.Create); + fs.Write(buffer, 0, buffer.Length); + fs.Close(); + this.Logo = Image.FromFile(t,true); + try + { + File.Delete(t); + } + catch (Exception) + { + + } + } } public MPIFileList FindList(string typ, string stpy) Modified: trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -304,6 +304,7 @@ writer.WriteElementString("Author", it._intalerStruct.Author); writer.WriteElementString("Description", it._intalerStruct.Description); writer.WriteElementString("Group", it._intalerStruct.Group); + it._intalerStruct.WriteLogoElement(writer); writer.WriteStartElement("Uninstall"); for (int j = 0; j < it._intalerStruct.Uninstall.Count; j++) { Modified: trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/start_form.Designer.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -42,7 +42,7 @@ this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(121, 32); this.button1.TabIndex = 0; - this.button1.Text = "Manage package"; + this.button1.Text = "Create package"; this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // @@ -72,6 +72,7 @@ // // button4 // + this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button4.Location = new System.Drawing.Point(254, 231); this.button4.Name = "button4"; this.button4.Size = new System.Drawing.Size(26, 23); Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.Designer.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -56,6 +56,7 @@ this.columnHeader10 = new System.Windows.Forms.ColumnHeader(); this.label1 = new System.Windows.Forms.Label(); this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.button6 = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); @@ -179,6 +180,7 @@ // // tabPage1 // + this.tabPage1.Controls.Add(this.button6); this.tabPage1.Controls.Add(this.label2); this.tabPage1.Controls.Add(this.comboBox2); this.tabPage1.Controls.Add(this.linkLabel1); @@ -199,7 +201,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(250, 280); + this.label2.Location = new System.Drawing.Point(361, 280); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(36, 13); this.label2.TabIndex = 7; @@ -212,7 +214,7 @@ this.comboBox2.Items.AddRange(new object[] { "List", "Icons"}); - this.comboBox2.Location = new System.Drawing.Point(250, 296); + this.comboBox2.Location = new System.Drawing.Point(361, 296); this.comboBox2.Name = "comboBox2"; this.comboBox2.Size = new System.Drawing.Size(82, 21); this.comboBox2.TabIndex = 6; @@ -319,6 +321,15 @@ this.comboBox1.TabIndex = 0; this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // + // button6 + // + this.button6.Location = new System.Drawing.Point(250, 294); + this.button6.Name = "button6"; + this.button6.Size = new System.Drawing.Size(105, 23); + this.button6.TabIndex = 8; + this.button6.Text = "Find updates"; + this.button6.UseVisualStyleBackColor = true; + // // controlp // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -367,5 +378,6 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.ComboBox comboBox2; private System.Windows.Forms.ColumnHeader columnHeader10; + private System.Windows.Forms.Button button6; } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/controlp.resx 2007-03-19 20:32:28 UTC (rev 198) @@ -126,129 +126,129 @@ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACS HQAAAk1TRnQBSQFMAwEBAAEEAQABBAEAASABAAEgAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABgAMA - ASADAAEBAQABIAYAAUAqAAENASsBdAH/AQ4BMQGBAf8BDgE1AYgB/wEPATsBmQH/AQ8BPAGfAf8BDwFC - AbAB/wEPAUQBtgH/ARABRAG2Af8BEAFEAbYB/wEQAUQBtgH/ARABRAG2Af8BEAFEAbYB/wEQAUQBtgH/ - ARABRAG2Af8BDwFAAaoB/wEPATwBnwH/AQ8BOgGWAf8BDgE1AYgB/wEOAS8BfwH/AQ0BKgFxAf//AKEA - AQ8BOQGTAf8BEgFFAbYB/wEXAUsBuAH/ARsBTwG7Af8BIAFTAb8B/wEkAVgBwwH/ASkBXAHHAf8BLgFh - AcoB/wEyAWYBzgH/ATcBawHRAf8BPAFvAdQB/wFAAXQB1wH/AUQBeAHaAf8BRwF7AdwB/wFKAX4B3gH/ - AU4BgQHgAf8BTwGBAeEB/wFQAYEB4gH/AVABgQHiAf8BTwGBAeEB/wFNAYAB4AH/AUoBfQHeAf8BRQF5 - AdoB/wFAAXMB1gH/ATgBbAHRAf8BLwFjAcsB/wEZAU0BvAH/AQ8BOAGQAf//AI0AAQ8BOgGWAf8BFgFI - AbMB/wEhAVMBtwH/ASUBVwG8Af8BKAFbAcEB/wErAV4BxQH/AS4BYgHJAf8BMQFlAc0B/wE0AWgBzwH/ - ATgBawHRAf8BOwFuAdMB/wE+AXEB1QH/AUEBdAHXAf8BRAF4AdoB/wFHAXoB3AH/AUoBfgHeAf8BTQGB - AeAB/wFQAYEB4gH/AVQBgQHkAf8BVwGBAeYB/wFaAYIB6QH/AV0BhQHrAf8BYAGIAe0B/wFjAYsB7wH/ - AWYBjgHxAf8BaQGSAfMB/wFsAZQB9QH/AWwBlAH1Af8BMwFmAc4B/wEOATkBkwH//wCJAAERAUQBswH/ - AR0BTwGwAf8BIQFTAbUB/wEkAVYBugH/ASgBWgG/Af8BKwFdAcMB/wEuAWEByAH/ATEBZQHMAf8BNAFo - Ac8B/wE3AWsB0QH/AToBbgHTAf8BPgFxAdUB/wFBAXQB1wH/AUQBdwHZAf8BRwF6AdwB/wFKAX0B3gH/ - AU0BgQHgAf8BUAGBAeIB/wFTAYEB5AH/AVYBgQHmAf8BWgGCAegB/wFdAYUB6gH/AWABiAHsAf8BYwGL - Ae8B/wFmAY4B8QH/AWkBkQHzAf8BbAGUAfUB/wFvAZcB9wH/AW4BlgH2Af8BGwFPAb4B//8AiQABFAFG - Aa8B/wEdAU4BrgH/ASEBUgGzAf8BJAFWAbgB/wEnAVkBvQH/ASoBXQHBAf8BLQFgAcYB/wExAWQBygH/ - ATQBZwHOAf8BNwFqAdAB/wE6AW4B0wH/AT0BcQHVAf8BQAF0AdcB/wFDAXcB2QH/AUYBegHbAf8BSQF9 - Ad0B/wFNAYAB3wH/AVABgQHhAf8BUwGBAeQB/wFWAYEB5gH/AVkBgQHoAf8BXAGEAeoB/wFfAYcB7AH/ - AWIBigHuAf8BZQGNAfAB/wFoAZAB8gH/AWoBkwH0Af8BbAGUAfUB/wFtAZUB9gH/ATQBaAHOAf//AIkA - ARUBRwGsAf8BHQFNAawB/wEgAVEBsQH/ASQBVQG2Af8BJwFYAbsB/wEqAVwBvwH/AS0BXwHEAf8BMAFj - AcgB/wEzAWcBzQH/ATYBagHQAf8BOQFtAdIB/wE9AXAB1AH/AUABcwHWAf8BQwF2AdkB/wFGAXkB2wH/ - AUkBfAHdAf8BTAF/Ad8B/wFPAYEB4QH/AVIBgQHjAf8BVQGBAeUB/wFYAYEB5wH/AVsBgwHpAf8BXgGG - AesB/wFhAYkB7QH/AWMBjAHvAf8BZgGOAfEB/wFoAZAB8gH/AWoBkgHzAf8BagGTAfQB/wE9AXEB1QH/ - /wCFAAEOAS4BfAH/ARYBRgGpAf8BHAFMAakB/wEfAVABrwH/ASIBVAG0Af8BJgFXAbkB/wEpAVsBvQH/ - ASwBXwHCAf8BLwFiAcYB/wEyAWUBywH/ATYBaQHPAf8BOQFsAdIB/wE8AW8B1AH/AT8BcgHWAf8BQgF1 - AdgB/wFFAXgB2gH/AUgBewHcAf8BRAF4Ad4B/wE2AW4B2wH/AUgBfwHfAf8BPAF2Ad8B/wFOAYEB5wH/ - AWkBjgHrAf8BTQGBAeoB/wFfAYcB7AH/AWIBigHuAf8BZAGMAe8B/wFmAY4B8QH/AWcBjwHxAf8BZwGQ - AfIB/wFEAXgB2gH/AQ4BLgF8Af//AIEAAQ4BMwGCAf8BGgFJAacB/wEbAUsBpwH/AR4BTwGsAf8BIgFT - AbIB/wElAVYBtwH/ASkBWgG7Af8BLAFeAcAB/wEvAWEBxAH/ATIBZQHJAf8BNQFoAc0B/wE4AWsB0QH/ - ATsBbgHTAf8BPgFxAdUB/wFBAXQB1wH/AUQBdwHZAf8BRwF6AdsB/wE7AXEB3gH/AvwG/wGBAZwB7gH/ - AeQB6wH9Bf8BXwGGAesB/wFXAYEB6wH/AV8BiAHsAf8BYQGKAe4B/wFjAYsB7wH/AWQBjAHvAf8BZAGN - AfAB/wFKAX4B3gH/AQ4BMwGCAf//AIEAAQ4BNwGNAf8BQwFqAbMB/wE0AV4BrgH/AR8BTgGqAf8BIQFR - Aa8B/wEkAVUBtAH/ASgBWQG5Af8BKwFcAb4B/wEuAWABwgH/ATEBYwHHAf8BNAFnAcsB/wE3AWoBzwH/ - AToBbQHSAf8BPQFwAdUB/wFAAXMB1wH/AUMBdgHZAf8BPwF0AdsB/wEdAV4B1wP/Af4F/wH9Af4B/Qn/ - AYsBrgHyAf8BOQF2AeYB/wFRAYEB6wH/AV8BhwHsAf8BYAGIAe0B/wFhAYkB7QH/AWIBigHuAf8BTwGB - AeEB/wEOATcBjgH//wCBAAEPATwBnwH/AVIBdQG1Af8BTwFzAbYB/wE+AWcBtAH/ARoBTAGtAf8BIwFU - AbIB/wEmAVcBtwH/ASoBWwG7Af8BLQFeAcAB/wEwAWIBxAH/ATMBZQHJAf8BNgFpAc0B/wE5AWwB0QH/ - ATsBbwHUAf8BPwFyAdYB/wE3AW8B1wH/AUIBcwHdAf8BbwGLAecF/wFcAYIB4wH/ASgBZQHbAf8BKQFn - Ad0B/wGJAakB7wn/AXMBlgHsAf8BWAGEAeoB/wFdAYYB6wH/AV4BhwHsAf8BXwGHAewB/wFSAYEB4wH/ - AQ8BPAGfAf//AIEAARABPgGkAf8BaAGBAbsB/wFWAXkBtwH/AVABdQG4Af8BQgFsAbUB/wEcAU0BrwH/ - ASUBVgG0Af8BKAFZAbkB/wEsAV0BvgH/AS8BYAHCAf8BMgFkAcYB/wE0AWcBygH/ATcBagHOAf8BOgFu - AdIB/wE9AXEB1QH/AS8BZgHSAf8B2wHlAfUF/wG/AdIB9QH/ASsBZgHYAf8BTQGBAeAB/wFQAYEB4QH/ - ASoBaAHfAf8C/gH9Af8B5AHqAfwB/wFdAYcB6gH/AVkBggHoAf8BWwGDAekB/wFbAYQB6gH/AVwBhAHq - Af8BVAGBAeQB/wEPAT4BpQH//wCBAAEUAUYBtQH/AXsBigHCAf8BXgF/AbkB/wFXAXoBuQH/AVgBeQG+ - Af8BOAFjAbUB/wEgAVABsQH/AScBWAG2Af8BKgFbAbsB/wEtAV8BwAH/ASoBWgHEAf8BGwFTAcIB/wEp - AV8BygH/AS0BYgHQAf8BOwFvAdMB/wEmAWEB1gH/AYMBowHmBf8BrwHHAe8B/wEsAWcB2QH/AUsBfwHe - Af8BTgGBAeAB/wEtAWgB2wH/AfQB+AH9Af8BVAGBAeoB/wFBAXoB5QH/AVcBgQHmAf8BWAGBAecB/wFY - AYEB6AH/AVkBgQHoAf8BVAGBAeUB/wEPAUQBtgH//wCBAAEXAUkBtQH/AYMBmQHIAf8BZAGBAboB/wFf - AX8BugH/AVkBfAG7Af8BWQF8Ab8B/wEaAU8BsAH/ASUBVgG0Af8BKAFaAbgB/wEsAV0BvQH/ARkBUAG7 - Af8ByAHUAfEF/wELAUUBwQH/ARYBUwHJAf8BbgGJAd8B/wFeAYEB3gH/ASwBZwHUBf8BJgFhAdYB/wEv - AWcB2QH/AS0BaAHaAf8BSgGAAeIF/wHUAeEB9AH/AUgBfgHjAf8BVAGBAeQB/wFVAYEB5QH/AVYBgQHm - Af8BVgGBAeYB/wFUAYEB5QH/ARABRAG1Af//AIEAARoBSwG1Af8BlAGmAc4B/wFrAYEBuwH/AWYBgQG7 - Af8BYAGBAbwB/wFhAYEBwAH/ATkBXwG0Af8BEAFFAasB/wEtAVwBuQH/AQsBPAGsAf8BCwEvAa4B/wHd - AeIB9AX/AdMB3AHyAf8BjwGpAeMJ/wF+AZYB4Qn/AaIBugHuAf8BsAHEAe8N/wE9AXUB4gH/AVEBgQHi - Af8BUgGBAeMB/wFTAYEB4wH/AVMBgQHkAf8BUwGBAeQB/wEQAUQBtgH//wCBAAEdAU4BtgH/AaMBswHU - Af8BcgGCAbwB/wFtAYEBvQH/AWcBgQG9Af8BZAGBAb0B/wFNAXQBugH/ARgBSQGqBf8B3wHlAfUB/wHh - AeUB9Bn/ATQBagHQBf8BiAGrAesD/wH+Bf8BngG3Ae0B/wEaAVwB1wH/AToBcgHfAf8BRQF5Ad8B/wFO - AYEB4AH/AU8BgQHhAf8BUAGBAeEB/wFQAYEB4gH/AVABgQHiAf8BEAFEAbYB//8AgQABHwFPAbcB/wGy - Ab8B2gH/AXgBhwG8Af8BdAGEAb4B/wFuAYEBvgH/AWgBgQG/Af8BaQGBAcIB/wEeAU4BrA3/AZYBrgHg - Af8BJAFWAb4B/wELAUIBvAH/AUkBdgHPAf8B4wHnAfgF/wHJAdcB9AH/AZIBrQHrAf8BRAF4AdcB/wFG - AXgB2AH/Ae0B8wH9Af8BWgGBAeEB/wE9AXMB2wH/AUkBfQHdAf8BSgF+Ad4B/wFLAX8B3wH/AUwBgAHf - Af8BTQGAAeAB/wFNAYEB4AH/AU0BgQHgAf8BEQFFAbYB//8AgQABHwFPAbcB/wHAAcsB4QH/AX8BjAG+ - Af8BegGJAb8B/wF1AYYBvwH/AW8BgQHAAf8BcAGEAcAB/wELATQBmQH/AZIBqAHXBf8BdwGLAdEB/wEL - AUEBrQH/ASQBWAG/Af8BLAFdAcIB/wEjAVoBwQH/AQsBRwHDAf8B5wHvAfoJ/wHiAeoB9wH/ASMBXQHP - Af8BLwFpAdcB/wE2AW4B2QH/AUUBeAHaAf8BRgF6AdsB/wFHAXsB3AH/AUkBfAHdAf8BSQF9Ad0B/wFK - AX0B3gH/AUoBfgHeAf8BSgF+Ad4B/wEQAUQBtgH//wCBAAEeAU4BtwH/Ac0B1gHmAf8BgQGTAcAB/wGB - AY4BvwH/AXwBiwHBAf8BdgGHAcEB/wFvAYIBvgH/AUIBbQGxCf8BCwEwAaIB/wEgAVoBtwH/ASsBXAG7 - Af8BLgFfAb8B/wExAWIBwwH/ASMBWQHCAf8BVgGAAdMJ/wE3AWwB1AH/ATQBagHVAf8BPwFyAdYB/wFB - AXQB1wH/AUIBdgHYAf8BQwF3AdkB/wFFAXgB2gH/AUYBeQHbAf8BRgF6AdsB/wFHAXoB3AH/AUcBewHc - Af8BRwF7AdwB/wEQAUQBtgH//wCBAAEbAUwBtgH/AdgB3gHrAf8BhgGaAcQB/wGBAZMBwQH/AYEBkAHB - Af8BcwGFAb0B/wGzAcQB4Qn/Ac0B1gHtAf8BCwE1AaIB/wEmAVcBtAH/ASkBWgG4Af8BLAFdAbwB/wEu - AWABwAH/ASoBXwHEAf8BGgFVAcQF/wG4AckB7wH/AQwBSwHJAf8BNwFpAdIB/wE8AXAB1AH/AT4BcQHV - Af8BPwFzAdYB/wFBAXQB1wH/AUIBdQHYAf8BQwF2AdkB/wFDAXcB2QH/AUQBeAHaAf8BRAF4AdoB/wFD - AXYB2QH/ARABRAG1Af//AIEAARYBSQG1Af8B3wHkAe8B/wGRAaMByQH/AYUBmgHEAf8BgQGUAcIB/wF9 - AY0BwgH/AZsBrgHUAf8B+QH4Af0F/wL1AfoB/wELASwBmwH/ASQBVQGwAf8BJwFYAbUB/wEpAVsBuQH/ - ASwBXQG9Af8BIgFXAcEB/wE6AWoByAn/AW0BhwHeAf8BKAFeAdEB/wE6AW0B0wH/ATsBbwHTAf8BPQFw - AdUB/wE+AXEB1QH/AT8BcgHWAf8BQAFzAdcB/wFBAXQB1wH/AUEBdQHYAf8BQgF1AdgB/wE+AXIB1gH/ - AQ8BQwG2Af//AIEAARABPgGhAf8B4wHoAfEB/wGcAa0BzgH/AY4BoAHHAf8BhgGaAcUB/wGBAZUBwwH/ - AXwBigHAAf8BWgF8AbUB/wHIAdIB6AX/ATUBXgGuAf8BCwFAAaUB/wElAVUBsQH/AScBWAG1Af8BIAFX - AbkB/wELAT4BsQH/AbkBxQHsDf8BHgFXAcgB/wE3AWsB0QH/ATkBbAHSAf8BOgFuAdMB/wE7AW8B0wH/ - ATwBcAHUAf8BPQFxAdUB/wE+AXEB1QH/AT4BcgHWAf8BPwFyAdYB/wE5AW0B0gH/AQ8BPQGiAf//AIEA - AQ8BPAGfAf8B3gHkAfAB/wGpAbcB0wH/AZYBpwHKAf8BjgGhAcgB/wGGAZoBxQH/AYEBlgHFAf8BcQGE - Ab4B/wG3AcYB4wn/AT4BZQG0Af8BCwErAZsB/wELATUBogH/AQsBNwGqAf8BlAGrAd4F/wGVAa0B4wH/ - AUIBcgHLAf8BZwGCAdUB/wEkAVkBxgH/ATQBaAHOAf8BNgFqAdAB/wE3AWsB0QH/ATgBbAHSAf8BOQFt - AdIB/wE6AW4B0wH/ATsBbgHTAf8BOwFvAdMB/wE8AW8B1AH/ATQBaAHPAf8BDwE8AZ8B//8AgQABDgE2 + ASADAAEBAQABIAYAAUAqAAEOASwBdQH/AQ8BMgGBAf8BDwE2AYgB/wEQATwBmQH/ARABPQGfAf8BEAFD + AbAB/wEQAUUBtgH/AREBRQG2Af8BEQFFAbYB/wERAUUBtgH/AREBRQG2Af8BEQFFAbYB/wERAUUBtgH/ + AREBRQG2Af8BEAFBAaoB/wEQAT0BnwH/ARABOwGWAf8BDwE2AYgB/wEPATABgAH/AQ4BKwFyAf//AKEA + ARABOgGTAf8BEwFGAbYB/wEYAUwBuAH/ARwBUAG7Af8BIQFUAb8B/wElAVkBwwH/ASoBXQHHAf8BLwFi + AcoB/wEzAWcBzgH/ATgBbAHRAf8BPQFwAdQB/wFBAXUB1wH/AUUBeQHaAf8BSAF8AdwB/wFLAX8B3gH/ + AU8BgQHgAf8BUAGBAeEB/wFRAYEB4gH/AVEBgQHiAf8BUAGBAeEB/wFOAYEB4AH/AUsBfgHeAf8BRgF6 + AdoB/wFBAXQB1gH/ATkBbQHRAf8BMAFkAcsB/wEaAU4BvAH/ARABOQGQAf//AI0AARABOwGWAf8BFwFJ + AbMB/wEiAVQBtwH/ASYBWAG8Af8BKQFcAcEB/wEsAV8BxQH/AS8BYwHJAf8BMgFmAc0B/wE1AWkBzwH/ + ATkBbAHRAf8BPAFvAdMB/wE/AXIB1QH/AUIBdQHXAf8BRQF5AdoB/wFIAXsB3AH/AUsBfwHeAf8BTgGB + AeAB/wFRAYEB4gH/AVUBgQHkAf8BWAGBAeYB/wFbAYIB6QH/AV4BhQHrAf8BYQGIAe0B/wFkAYsB7wH/ + AWcBjgHxAf8BagGSAfMB/wFtAZQB9QH/AW0BlAH1Af8BNAFnAc4B/wEPAToBkwH//wCJAAESAUUBswH/ + AR4BUAGwAf8BIgFUAbUB/wElAVcBugH/ASkBWwG/Af8BLAFeAcMB/wEvAWIByAH/ATIBZgHMAf8BNQFp + Ac8B/wE4AWwB0QH/ATsBbwHTAf8BPwFyAdUB/wFCAXUB1wH/AUUBeAHZAf8BSAF7AdwB/wFLAX4B3gH/ + AU4BgQHgAf8BUQGBAeIB/wFUAYEB5AH/AVcBgQHmAf8BWwGCAegB/wFeAYUB6gH/AWEBiAHsAf8BZAGL + Ae8B/wFnAY4B8QH/AWoBkQHzAf8BbQGUAfUB/wFwAZcB9wH/AW8BlgH2Af8BHAFQAb4B//8AiQABFQFH + Aa8B/wEeAU8BrgH/ASIBUwGzAf8BJQFXAbgB/wEoAVoBvQH/ASsBXgHBAf8BLgFhAcYB/wEyAWUBygH/ + ATUBaAHOAf8BOAFrAdAB/wE7AW8B0wH/AT4BcgHVAf8BQQF1AdcB/wFEAXgB2QH/AUcBewHbAf8BSgF+ + Ad0B/wFOAYEB3wH/AVEBgQHhAf8BVAGBAeQB/wFXAYEB5gH/AVoBgQHoAf8BXQGEAeoB/wFgAYcB7AH/ + AWMBigHuAf8BZgGNAfAB/wFpAZAB8gH/AWsBkwH0Af8BbQGUAfUB/wFuAZUB9gH/ATUBaQHOAf//AIkA + ARYBSAGsAf8BHgFOAawB/wEhAVIBsQH/ASUBVgG2Af8BKAFZAbsB/wErAV0BvwH/AS4BYAHEAf8BMQFk + AcgB/wE0AWgBzQH/ATcBawHQAf8BOgFuAdIB/wE+AXEB1AH/AUEBdAHWAf8BRAF3AdkB/wFHAXoB2wH/ + AUoBfQHdAf8BTQGAAd8B/wFQAYEB4QH/AVMBgQHjAf8BVgGBAeUB/wFZAYEB5wH/AVwBgwHpAf8BXwGG + AesB/wFiAYkB7QH/AWQBjAHvAf8BZwGOAfEB/wFpAZAB8gH/AWsBkgHzAf8BawGTAfQB/wE+AXIB1QH/ + /wCFAAEPAS8BfQH/ARcBRwGpAf8BHQFNAakB/wEgAVEBrwH/ASMBVQG0Af8BJwFYAbkB/wEqAVwBvQH/ + AS0BYAHCAf8BMAFjAcYB/wEzAWYBywH/ATcBagHPAf8BOgFtAdIB/wE9AXAB1AH/AUABcwHWAf8BQwF2 + AdgB/wFGAXkB2gH/AUkBfAHcAf8BRQF5Ad4B/wE3AW8B2wH/AUkBgAHfAf8BPQF3Ad8B/wFPAYEB5wH/ + AWoBjgHrAf8BTgGBAeoB/wFgAYcB7AH/AWMBigHuAf8BZQGMAe8B/wFnAY4B8QH/AWgBjwHxAf8BaAGQ + AfIB/wFFAXkB2gH/AQ8BLwF9Af//AIEAAQ8BNAGCAf8BGwFKAacB/wEcAUwBpwH/AR8BUAGsAf8BIwFU + AbIB/wEmAVcBtwH/ASoBWwG7Af8BLQFfAcAB/wEwAWIBxAH/ATMBZgHJAf8BNgFpAc0B/wE5AWwB0QH/ + ATwBbwHTAf8BPwFyAdUB/wFCAXUB1wH/AUUBeAHZAf8BSAF7AdsB/wE8AXIB3gH/AvwG/wGBAZwB7gH/ + AeQB6wH9Bf8BYAGGAesB/wFYAYEB6wH/AWABiAHsAf8BYgGKAe4B/wFkAYsB7wH/AWUBjAHvAf8BZQGN + AfAB/wFLAX8B3gH/AQ8BNAGCAf//AIEAAQ8BOAGNAf8BRAFrAbMB/wE1AV8BrgH/ASABTwGqAf8BIgFS + Aa8B/wElAVYBtAH/ASkBWgG5Af8BLAFdAb4B/wEvAWEBwgH/ATIBZAHHAf8BNQFoAcsB/wE4AWsBzwH/ + ATsBbgHSAf8BPgFxAdUB/wFBAXQB1wH/AUQBdwHZAf8BQAF1AdsB/wEeAV8B1wP/Af4F/wH9Af4B/Qn/ + AYsBrgHyAf8BOgF3AeYB/wFSAYEB6wH/AWABhwHsAf8BYQGIAe0B/wFiAYkB7QH/AWMBigHuAf8BUAGB + AeEB/wEPATgBjgH//wCBAAEQAT0BnwH/AVMBdgG1Af8BUAF0AbYB/wE/AWgBtAH/ARsBTQGtAf8BJAFV + AbIB/wEnAVgBtwH/ASsBXAG7Af8BLgFfAcAB/wExAWMBxAH/ATQBZgHJAf8BNwFqAc0B/wE6AW0B0QH/ + ATwBcAHUAf8BQAFzAdYB/wE4AXAB1wH/AUMBdAHdAf8BcAGLAecF/wFdAYIB4wH/ASkBZgHbAf8BKgFo + Ad0B/wGJAakB7wn/AXQBlgHsAf8BWQGEAeoB/wFeAYYB6wH/AV8BhwHsAf8BYAGHAewB/wFTAYEB4wH/ + ARABPQGfAf//AIEAAREBPwGkAf8BaQGBAbsB/wFXAXoBtwH/AVEBdgG4Af8BQwFtAbUB/wEdAU4BrwH/ + ASYBVwG0Af8BKQFaAbkB/wEtAV4BvgH/ATABYQHCAf8BMwFlAcYB/wE1AWgBygH/ATgBawHOAf8BOwFv + AdIB/wE+AXIB1QH/ATABZwHSAf8B2wHlAfUF/wG/AdIB9QH/ASwBZwHYAf8BTgGBAeAB/wFRAYEB4QH/ + ASsBaQHfAf8C/gH9Af8B5AHqAfwB/wFeAYcB6gH/AVoBggHoAf8BXAGDAekB/wFcAYQB6gH/AV0BhAHq + Af8BVQGBAeQB/wEQAT8BpQH//wCBAAEVAUcBtQH/AXwBigHCAf8BXwGAAbkB/wFYAXsBuQH/AVkBegG+ + Af8BOQFkAbUB/wEhAVEBsQH/ASgBWQG2Af8BKwFcAbsB/wEuAWABwAH/ASsBWwHEAf8BHAFUAcIB/wEq + AWABygH/AS4BYwHQAf8BPAFwAdMB/wEnAWIB1gH/AYMBowHmBf8BrwHHAe8B/wEtAWgB2QH/AUwBgAHe + Af8BTwGBAeAB/wEuAWkB2wH/AfQB+AH9Af8BVQGBAeoB/wFCAXsB5QH/AVgBgQHmAf8BWQGBAecB/wFZ + AYEB6AH/AVoBgQHoAf8BVQGBAeUB/wEQAUUBtgH//wCBAAEYAUoBtQH/AYMBmQHIAf8BZQGBAboB/wFg + AYABugH/AVoBfQG7Af8BWgF9Ab8B/wEbAVABsAH/ASYBVwG0Af8BKQFbAbgB/wEtAV4BvQH/ARoBUQG7 + Af8ByAHUAfEF/wEMAUYBwQH/ARcBVAHJAf8BbwGJAd8B/wFfAYEB3gH/AS0BaAHUBf8BJwFiAdYB/wEw + AWgB2QH/AS4BaQHaAf8BSwGBAeIF/wHUAeEB9AH/AUkBfwHjAf8BVQGBAeQB/wFWAYEB5QH/AVcBgQHm + Af8BVwGBAeYB/wFVAYEB5QH/AREBRQG1Af//AIEAARsBTAG1Af8BlAGmAc4B/wFsAYEBuwH/AWcBgQG7 + Af8BYQGBAbwB/wFiAYEBwAH/AToBYAG0Af8BEQFGAasB/wEuAV0BuQH/AQwBPQGsAf8BDAEwAa4B/wHd + AeIB9AX/AdMB3AHyAf8BjwGpAeMJ/wF/AZYB4Qn/AaIBugHuAf8BsAHEAe8N/wE+AXYB4gH/AVIBgQHi + Af8BUwGBAeMB/wFUAYEB4wH/AVQBgQHkAf8BVAGBAeQB/wERAUUBtgH//wCBAAEeAU8BtgH/AaMBswHU + Af8BcwGCAbwB/wFuAYEBvQH/AWgBgQG9Af8BZQGBAb0B/wFOAXUBugH/ARkBSgGqBf8B3wHlAfUB/wHh + AeUB9Bn/ATUBawHQBf8BiAGrAesD/wH+Bf8BngG3Ae0B/wEbAV0B1wH/ATsBcwHfAf8BRgF6Ad8B/wFP + AYEB4AH/AVABgQHhAf8BUQGBAeEB/wFRAYEB4gH/AVEBgQHiAf8BEQFFAbYB//8AgQABIAFQAbcB/wGy + Ab8B2gH/AXkBhwG8Af8BdQGEAb4B/wFvAYEBvgH/AWkBgQG/Af8BagGBAcIB/wEfAU8BrA3/AZYBrgHg + Af8BJQFXAb4B/wEMAUMBvAH/AUoBdwHPAf8B4wHnAfgF/wHJAdcB9AH/AZIBrQHrAf8BRQF5AdcB/wFH + AXkB2AH/Ae0B8wH9Af8BWwGBAeEB/wE+AXQB2wH/AUoBfgHdAf8BSwF/Ad4B/wFMAYAB3wH/AU0BgQHf + Af8BTgGBAeAB/wFOAYEB4AH/AU4BgQHgAf8BEgFGAbYB//8AgQABIAFQAbcB/wHAAcsB4QH/AYABjAG+ + Af8BewGJAb8B/wF2AYYBvwH/AXABgQHAAf8BcQGEAcAB/wEMATUBmQH/AZIBqAHXBf8BeAGLAdEB/wEM + AUIBrQH/ASUBWQG/Af8BLQFeAcIB/wEkAVsBwQH/AQwBSAHDAf8B5wHvAfoJ/wHiAeoB9wH/ASQBXgHP + Af8BMAFqAdcB/wE3AW8B2QH/AUYBeQHaAf8BRwF7AdsB/wFIAXwB3AH/AUoBfQHdAf8BSgF+Ad0B/wFL + AX4B3gH/AUsBfwHeAf8BSwF/Ad4B/wERAUUBtgH//wCBAAEfAU8BtwH/Ac0B1gHmAf8BgQGTAcAB/wGB + AY4BvwH/AX0BiwHBAf8BdwGHAcEB/wFwAYIBvgH/AUMBbgGxCf8BDAExAaIB/wEhAVsBtwH/ASwBXQG7 + Af8BLwFgAb8B/wEyAWMBwwH/ASQBWgHCAf8BVwGBAdMJ/wE4AW0B1AH/ATUBawHVAf8BQAFzAdYB/wFC + AXUB1wH/AUMBdwHYAf8BRAF4AdkB/wFGAXkB2gH/AUcBegHbAf8BRwF7AdsB/wFIAXsB3AH/AUgBfAHc + Af8BSAF8AdwB/wERAUUBtgH//wCBAAEcAU0BtgH/AdgB3gHrAf8BhgGaAcQB/wGBAZMBwQH/AYEBkAHB + Af8BdAGFAb0B/wGzAcQB4Qn/Ac0B1gHtAf8BDAE2AaIB/wEnAVgBtAH/ASoBWwG4Af8BLQFeAbwB/wEv + AWEBwAH/ASsBYAHEAf8BGwFWAcQF/wG4AckB7wH/AQ0BTAHJAf8BOAFqAdIB/wE9AXEB1AH/AT8BcgHV + Af8BQAF0AdYB/wFCAXUB1wH/AUMBdgHYAf8BRAF3AdkB/wFEAXgB2QH/AUUBeQHaAf8BRQF5AdoB/wFE + AXcB2QH/AREBRQG1Af//AIEAARcBSgG1Af8B3wHkAe8B/wGRAaMByQH/AYUBmgHEAf8BgQGUAcIB/wF+ + AY0BwgH/AZsBrgHUAf8B+QH4Af0F/wL1AfoB/wEMAS0BmwH/ASUBVgGwAf8BKAFZAbUB/wEqAVwBuQH/ + AS0BXgG9Af8BIwFYAcEB/wE7AWsByAn/AW4BhwHeAf8BKQFfAdEB/wE7AW4B0wH/ATwBcAHTAf8BPgFx + AdUB/wE/AXIB1QH/AUABcwHWAf8BQQF0AdcB/wFCAXUB1wH/AUIBdgHYAf8BQwF2AdgB/wE/AXMB1gH/ + ARABRAG2Af//AIEAAREBPwGhAf8B4wHoAfEB/wGcAa0BzgH/AY4BoAHHAf8BhgGaAcUB/wGBAZUBwwH/ + AX0BigHAAf8BWwF9AbUB/wHIAdIB6AX/ATYBXwGuAf8BDAFBAaUB/wEmAVYBsQH/ASgBWQG1Af8BIQFY + AbkB/wEMAT8BsQH/AbkBxQHsDf8BHwFYAcgB/wE4AWwB0QH/AToBbQHSAf8BOwFvAdMB/wE8AXAB0wH/ + AT0BcQHUAf8BPgFyAdUB/wE/AXIB1QH/AT8BcwHWAf8BQAFzAdYB/wE6AW4B0gH/ARABPgGiAf//AIEA + ARABPQGfAf8B3gHkAfAB/wGpAbcB0wH/AZYBpwHKAf8BjgGhAcgB/wGGAZoBxQH/AYEBlgHFAf8BcgGE + Ab4B/wG3AcYB4wn/AT8BZgG0Af8BDAEsAZsB/wEMATYBogH/AQwBOAGqAf8BlAGrAd4F/wGVAa0B4wH/ + AUMBcwHLAf8BaAGCAdUB/wElAVoBxgH/ATUBaQHOAf8BNwFrAdAB/wE4AWwB0QH/ATkBbQHSAf8BOgFu + AdIB/wE7AW8B0wH/ATwBbwHTAf8BPAFwAdMB/wE9AXAB1AH/ATUBaQHPAf8BEAE9AZ8B//8AgQABDwE3 AYsB/wHUAdwB7wH/AbYBwgHZAf8BngGuAc4B/wGWAagBywH/AY4BoQHIAf8BhgGbAcYB/wGBAZMBwxX/ - AeQB7QH0Df8BCwEpAasB/wEbAVIBvQH/AScBWwHFAf8BMAFjAcgB/wEyAWUBywH/ATMBZwHOAf8BNAFo - Ac8B/wE1AWkB0AH/ATYBagHQAf8BNwFrAdEB/wE4AWwB0QH/ATgBbAHSAf8BOQFsAdIB/wEvAWMBywH/ - AQ4BNgGLAf//AIEAAQ4BMwGBAf8BxAHPAeoB/wHDAc0B3wH/AaYBtQHRAf8BngGuAc4B/wGXAagBywH/ - AY8BogHIAf8BgQGSAb4B/wGjAbMB1QH/AWkBgQG8Af8BCwEXAYUB/wHrAfAB9Qn/AakBuwHhCf8BawGC - Ac4B/wEjAVYBvQH/ASwBXgHBAf8BLgFgAcUB/wEvAWIByAH/ATABZAHLAf8BMgFlAc0B/wEzAWYBzgH/ - ATQBZwHOAf8BNAFoAc8B/wE1AWkBzwH/ATUBaQHQAf8BNgFqAdAB/wEqAV0BxwH/AQ4BMwGBAf//AIEA - AQ0BLQF5Af8BrgG+AeQB/wHPAdcB5QH/Aa4BuwHVAf8BpgG1AdEB/wGfAa8BzwH/AZcBqAHMAf8BjwGi - AckB/wGHAZwBxwH/AYQBmwHGAf8BdwGHAcQB/wHQAdwB7QX/ATsBZQGwAf8BCwEcAZUB/wEPAUUBqQH/ - AakBuAHhAf8BDAFCAa0B/wEXAU4BswH/ASMBVQG9Af8BJAFXAcEB/wEmAV8BxAH/AS4BYQHHAf8BLwFi - AcoB/wEwAWQBzAH/ATEBZAHMAf8BMgFlAc0B/wEyAWYBzQH/ATMBZgHNAf8BMwFmAc4B/wElAVgBxAH/ - AQ4BLQF5Af//AIUAAZYBqwHdAf8B2gHgAesB/wG3AcIB2AH/Aa8BvAHVAf8BpwG1AdIB/wGfAa8BzwH/ - AZcBqQHMAf8BjwGiAcoB/wGHAZwBxwH/AYEBmAHGAf8BgQGXAc0B/wGnAbYB1wH/AXwBjQHIAf8BbAGC - AcEB/wFiAYEBwwH/AVgBgQHEAf8BWgF/AcUB/wFcAYEBxQH/AVcBfQHGAf8BUgF7AcYB/wFIAXUByQH/ - AUABbgHJAf8BOwFrAcsB/wE2AWgBywH/ATEBZAHLAf8BLwFiAcsB/wEvAWMBywH/ATABYwHMAf8BMAFk - AcwB/wEgAVMBwAH//wCJAAGBAZYB1gH/AeQB6AHwAf8BvwHJAdwB/wG3AcMB2QH/Aa8BvAHVAf8BpwG2 + AeQB7QH0Df8BDAEqAasB/wEcAVMBvQH/ASgBXAHFAf8BMQFkAcgB/wEzAWYBywH/ATQBaAHOAf8BNQFp + Ac8B/wE2AWoB0AH/ATcBawHQAf8BOAFsAdEB/wE5AW0B0QH/ATkBbQHSAf8BOgFtAdIB/wEwAWQBywH/ + AQ8BNwGLAf//AIEAAQ8BNAGBAf8BxAHPAeoB/wHDAc0B3wH/AaYBtQHRAf8BngGuAc4B/wGXAagBywH/ + AY8BogHIAf8BgQGSAb4B/wGjAbMB1QH/AWoBgQG8Af8BDAEYAYUB/wHrAfAB9Qn/AakBuwHhCf8BbAGC + Ac4B/wEkAVcBvQH/AS0BXwHBAf8BLwFhAcUB/wEwAWMByAH/ATEBZQHLAf8BMwFmAc0B/wE0AWcBzgH/ + ATUBaAHOAf8BNQFpAc8B/wE2AWoBzwH/ATYBagHQAf8BNwFrAdAB/wErAV4BxwH/AQ8BNAGBAf//AIEA + AQ4BLgF6Af8BrgG+AeQB/wHPAdcB5QH/Aa4BuwHVAf8BpgG1AdEB/wGfAa8BzwH/AZcBqAHMAf8BjwGi + AckB/wGHAZwBxwH/AYQBmwHGAf8BeAGHAcQB/wHQAdwB7QX/ATwBZgGwAf8BDAEdAZUB/wEQAUYBqQH/ + AakBuAHhAf8BDQFDAa0B/wEYAU8BswH/ASQBVgG9Af8BJQFYAcEB/wEnAWABxAH/AS8BYgHHAf8BMAFj + AcoB/wExAWUBzAH/ATIBZQHMAf8BMwFmAc0B/wEzAWcBzQH/ATQBZwHNAf8BNAFnAc4B/wEmAVkBxAH/ + AQ8BLgF6Af//AIUAAZYBqwHdAf8B2gHgAesB/wG3AcIB2AH/Aa8BvAHVAf8BpwG1AdIB/wGfAa8BzwH/ + AZcBqQHMAf8BjwGiAcoB/wGHAZwBxwH/AYEBmAHGAf8BgQGXAc0B/wGnAbYB1wH/AX0BjQHIAf8BbQGC + AcEB/wFjAYEBwwH/AVkBgQHEAf8BWwGAAcUB/wFdAYEBxQH/AVgBfgHGAf8BUwF8AcYB/wFJAXYByQH/ + AUEBbwHJAf8BPAFsAcsB/wE3AWkBywH/ATIBZQHLAf8BMAFjAcsB/wEwAWQBywH/ATEBZAHMAf8BMQFl + AcwB/wEhAVQBwAH//wCJAAGBAZYB1gH/AeQB6AHwAf8BvwHJAdwB/wG3AcMB2QH/Aa8BvAHVAf8BpwG2 AdIB/wGfAa8BzwH/AZgBqQHNAf8BkAGiAcoB/wGIAZwByAH/AYEBlwHHAf8BgQGUAcgB/wGBAZABxwH/ - AX0BiwHGAf8BdwGHAcYB/wFtAYIBxwH/AWcBgQHHAf8BYQGBAccB/wFbAYABxwH/AVUBfAHIAf8BTwF4 - AcgB/wFJAXQByQH/AUMBcAHKAf8BPQFsAcoB/wE2AWcBywH/ATABYwHKAf8BLQFgAckB/wEtAWEBygH/ - AS0BYQHKAf8BGwFPAb0B//8AiQABZwGBAc0B/wHtAfAB9QH/AccB0AHgAf8BvwHJAd0B/wG3AcMB2QH/ + AX4BiwHGAf8BeAGHAcYB/wFuAYIBxwH/AWgBgQHHAf8BYgGBAccB/wFcAYEBxwH/AVYBfQHIAf8BUAF5 + AcgB/wFKAXUByQH/AUQBcQHKAf8BPgFtAcoB/wE3AWgBywH/ATEBZAHKAf8BLgFhAckB/wEuAWIBygH/ + AS4BYgHKAf8BHAFQAb0B//8AiQABaAGBAc0B/wHtAfAB9QH/AccB0AHgAf8BvwHJAd0B/wG3AcMB2QH/ Aa8BvAHWAf8BpwG2AdMB/wGgAbAB0AH/AZgBqQHNAf8BkAGjAcsB/wGIAZ0ByAH/AYEBlwHGAf8BgQGT - AccB/wGAAZAByAH/AXoBiwHHAf8BdAGHAccB/wFtAYIBxwH/AWcBgQHHAf8BYAGBAccB/wFaAYABxwH/ - AVQBewHIAf8BTgF3AcgB/wFIAXMByQH/AUEBbgHJAf8BOwFqAcoB/wE0AWUBygH/AS4BYQHJAf8BKgFe - AcgB/wEqAV4ByAH/ARYBSgG6Af//AIkAASYBVQG7Af8B8AHyAfgB/wHTAdkB5gH/AcgB0AHhAf8BwAHK + AccB/wGBAZAByAH/AXsBiwHHAf8BdQGHAccB/wFuAYIBxwH/AWgBgQHHAf8BYQGBAccB/wFbAYEBxwH/ + AVUBfAHIAf8BTwF4AcgB/wFJAXQByQH/AUIBbwHJAf8BPAFrAcoB/wE1AWYBygH/AS8BYgHJAf8BKwFf + AcgB/wErAV8ByAH/ARcBSwG6Af//AIkAAScBVgG7Af8B8AHyAfgB/wHTAdkB5gH/AcgB0AHhAf8BwAHK Ad0B/wG4AcMB2gH/AbABvQHWAf8BqAG2AdMB/wGgAbAB0AH/AZgBqgHOAf8BkAGjAcsB/wGIAZ0ByQH/ - AYEBlwHGAf8BgQGSAcYB/wF/AY8BxwH/AXoBiwHHAf8BcwGGAccB/wFtAYIBxwH/AWYBgQHHAf8BYAGB - AccB/wFaAX8BxwH/AVMBegHHAf8BTQF2AcgB/wFGAXIByAH/AUABbQHIAf8BOQFoAckB/wEyAWQByAH/ - ASwBXgHHAf8BJQFZAcQB/wEQAUMBswH//wCJAAENATABgQH/AWUBgQHOAf8B8AHyAfkB/wHlAekB8QH/ + AYEBlwHGAf8BgQGSAcYB/wGAAY8BxwH/AXsBiwHHAf8BdAGGAccB/wFuAYIBxwH/AWcBgQHHAf8BYQGB + AccB/wFbAYABxwH/AVQBewHHAf8BTgF3AcgB/wFHAXMByAH/AUEBbgHIAf8BOgFpAckB/wEzAWUByAH/ + AS0BXwHHAf8BJgFaAcQB/wERAUQBswH//wCJAAEOATEBgQH/AWYBgQHOAf8B8AHyAfkB/wHlAekB8QH/ AdcB3QHpAf8BywHTAeMB/wG+AckB3QH/AbEBvgHYAf8BqAG3AdQB/wGgAbAB0QH/AZkBqgHOAf8BkQGk - AcwB/wGIAZ0ByQH/AYEBlwHHAf8BgQGRAcUB/wF9AYwBxQH/AXgBiQHGAf8BcwGGAccB/wFsAYEBxwH/ - AWUBgQHGAf8BXwGBAcYB/wFZAX4BxgH/AVIBeQHHAf8BTAF0AccB/wFFAXABxwH/AT4BawHIAf8BNwFn - AcgB/wEtAV4BxQH/ARUBSQG5Af8BDQEsAXcB//8AjQABDgEwAYEB/wEjAVMBugH/AV8BgQHMAf8BfgGQ + AcwB/wGIAZ0ByQH/AYEBlwHHAf8BgQGRAcUB/wF+AYwBxQH/AXkBiQHGAf8BdAGGAccB/wFtAYEBxwH/ + AWYBgQHGAf8BYAGBAcYB/wFaAX8BxgH/AVMBegHHAf8BTQF1AccB/wFGAXEBxwH/AT8BbAHIAf8BOAFo + AcgB/wEuAV8BxQH/ARYBSgG5Af8BDgEtAXgB//8AjQABDwExAYEB/wEkAVQBugH/AWABgQHMAf8BfwGQ AdUB/wGOAaUB3AH/AaUBuAHjAf8BuwHJAeoB/wHJAdQB7AH/Ac4B1wHtAf8B0QHZAesB/wHQAdgB6QH/ - AcsB1AHnAf8BwQHMAeMB/wG3AcQB3wH/AawBuwHbAf8BnwGwAdcB/wGRAaYB0wH/AYIBmgHQAf8BewGN - AcwB/wFpAYEByQH/AVYBfAHFAf8BQwFtAcIB/wE4AWQBwAH/AS0BXAG+Af8BJAFVAb0B/wEcAU4BugH/ - AREBRQG2Af8BDQEtAXoB//8ApQABDgEvAX8B/wEOATUBiAH/AQ8BOgGWAf8BDwE8AZ8B/wEPAUEBrQH/ - ARABRAG2Af8BDwFEAbYB/wESAUUBtgH/ARMBRgG2Af8BEwFGAbYB/wERAUQBtgH/AQ8BRAG2Af8BEAFE - AbYB/wEPAT8BpwH/AQ8BPAGfAf8BDwE4AZAB/wEOATQBhQH/AQ4BLgF8Af//AJ0AAUIBTQE+BwABPgMA + AcsB1AHnAf8BwQHMAeMB/wG3AcQB3wH/AawBuwHbAf8BnwGwAdcB/wGRAaYB0wH/AYIBmgHQAf8BfAGN + AcwB/wFqAYEByQH/AVcBfQHFAf8BRAFuAcIB/wE5AWUBwAH/AS4BXQG+Af8BJQFWAb0B/wEdAU8BugH/ + ARIBRgG2Af8BDgEuAXsB//8ApQABDwEwAYAB/wEPATYBiAH/ARABOwGWAf8BEAE9AZ8B/wEQAUIBrQH/ + AREBRQG2Af8BEAFFAbYB/wETAUYBtgH/ARQBRwG2Af8BFAFHAbYB/wESAUUBtgH/ARABRQG2Af8BEQFF + AbYB/wEQAUABpwH/ARABPQGfAf8BEAE5AZAB/wEPATUBhQH/AQ8BLwF9Af//AJ0AAUIBTQE+BwABPgMA ASgDAAGAAwABIAMAAQEBAAEBBgABAhYAA/8BAAH8AgABPwwAAcACAAEDDAABgAIAAQEMAAGAAgABAQwA AYACAAEBDAABgAIAAQH/AD0AAYACAAEBDAABgAIAAQEMAAGAAgABAQwAAYACAAEBDAABgAIAAQEMAAHA AgABAwwAAf4CAAF/DAAL Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.Designer.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.Designer.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -30,6 +30,7 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(wizard_1)); this.panel1 = new System.Windows.Forms.Panel(); + this.listBox1 = new System.Windows.Forms.ListBox(); this.progressBar2 = new System.Windows.Forms.ProgressBar(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); this.label2 = new System.Windows.Forms.Label(); @@ -40,15 +41,17 @@ this.button_back = new System.Windows.Forms.Button(); this.button_next = new System.Windows.Forms.Button(); this.button_cancel = new System.Windows.Forms.Button(); - this.listBox1 = new System.Windows.Forms.ListBox(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // // panel1 // this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.pictureBox2); this.panel1.Controls.Add(this.listBox1); this.panel1.Controls.Add(this.progressBar2); this.panel1.Controls.Add(this.progressBar1); @@ -60,6 +63,15 @@ this.panel1.Size = new System.Drawing.Size(334, 298); this.panel1.TabIndex = 0; // + // listBox1 + // + this.listBox1.FormattingEnabled = true; + this.listBox1.HorizontalScrollbar = true; + this.listBox1.Location = new System.Drawing.Point(14, 174); + this.listBox1.Name = "listBox1"; + this.listBox1.Size = new System.Drawing.Size(308, 108); + this.listBox1.TabIndex = 5; + // // progressBar2 // this.progressBar2.Location = new System.Drawing.Point(14, 143); @@ -88,7 +100,7 @@ this.title_label.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.title_label.Location = new System.Drawing.Point(9, 9); this.title_label.Name = "title_label"; - this.title_label.Size = new System.Drawing.Size(313, 30); + this.title_label.Size = new System.Drawing.Size(252, 30); this.title_label.TabIndex = 1; this.title_label.Text = "label1"; // @@ -152,14 +164,16 @@ this.button_cancel.UseVisualStyleBackColor = true; this.button_cancel.Click += new System.EventHandler(this.button_cancel_Click); // - // listBox1 + // pictureBox2 // - this.listBox1.FormattingEnabled = true; - this.listBox1.HorizontalScrollbar = true; - this.listBox1.Location = new System.Drawing.Point(14, 174); - this.listBox1.Name = "listBox1"; - this.listBox1.Size = new System.Drawing.Size(308, 108); - this.listBox1.TabIndex = 5; + this.pictureBox2.BackColor = System.Drawing.Color.Transparent; + this.pictureBox2.Location = new System.Drawing.Point(267, 4); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(64, 64); + this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox2.TabIndex = 6; + this.pictureBox2.TabStop = false; + this.pictureBox2.Visible = false; // // wizard_1 // @@ -181,6 +195,7 @@ this.panel1.PerformLayout(); this.panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); } @@ -199,5 +214,6 @@ private System.Windows.Forms.ProgressBar progressBar2; private System.Windows.Forms.ProgressBar progressBar1; private System.Windows.Forms.ListBox listBox1; + private System.Windows.Forms.PictureBox pictureBox2; } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs 2007-03-18 18:10:10 UTC (rev 197) +++ trunk/plugins/mpinstaler/MPInstaler/wizard/wizard_1.cs 2007-03-19 20:32:28 UTC (rev 198) @@ -47,6 +47,15 @@ title_label.Text = package._intalerStruct.Name; button_next.Text = "Next"; richTextBox1.Visible = true; + if (package._intalerStruct.Logo != null) + { + pictureBox2.Visible = true; + pictureBox2.Image = package._intalerStruct.Logo; + } + else + { + pictureBox2.Visible = false; + } richTextBox1.Text = String.Format(" Name : {0} \n\n Author : {1} \n\n Version : {2} \n\n Description :\n {3} \n", package._intalerStruct.Name, package._intalerStruct.Author, package._intalerStruct.Version, package._intalerStruct.Description); if (!this.Visible) this.ShowDialog(); break; Deleted: 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. |