From: <du...@us...> - 2007-02-07 20:12:16
|
Revision: 105 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=105&view=rev Author: dukus Date: 2007-02-07 12:11:58 -0800 (Wed, 07 Feb 2007) Log Message: ----------- Some form changing Modified Paths: -------------- trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs trunk/plugins/mpinstaler/MPInstaler/Form1.cs trunk/plugins/mpinstaler/MPInstaler/Form2.Designer.cs trunk/plugins/mpinstaler/MPInstaler/Form2.cs trunk/plugins/mpinstaler/MPInstaler/MPInstaler.csproj trunk/plugins/mpinstaler/MPInstaler/Program.cs trunk/plugins/mpinstaler/MPInstaler.suo Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs 2007-02-07 19:09:40 UTC (rev 104) +++ trunk/plugins/mpinstaler/MPInstaler/Form1.Designer.cs 2007-02-07 20:11:58 UTC (rev 105) @@ -58,6 +58,7 @@ this.columnHeader3 = new System.Windows.Forms.ColumnHeader(); this.columnHeader4 = new System.Windows.Forms.ColumnHeader(); this.columnHeader5 = new System.Windows.Forms.ColumnHeader(); + this.columnHeader6 = new System.Windows.Forms.ColumnHeader(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripComboBox1 = new System.Windows.Forms.ToolStripMenuItem(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); @@ -68,6 +69,7 @@ this.tabPage_Other = new System.Windows.Forms.TabPage(); this.tabPage_Language = new System.Windows.Forms.TabPage(); this.tabPage_Proiect = new System.Windows.Forms.TabPage(); + this.textToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.tabControl1.SuspendLayout(); @@ -163,7 +165,8 @@ this.addToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.windowPluginToolStripMenuItem, this.skinToolStripMenuItem, - this.languageToolStripMenuItem}); + this.languageToolStripMenuItem, + this.textToolStripMenuItem}); this.addToolStripMenuItem.Name = "addToolStripMenuItem"; this.addToolStripMenuItem.Size = new System.Drawing.Size(38, 20); this.addToolStripMenuItem.Text = "Add"; @@ -228,21 +231,21 @@ // componentToolStripMenuItem // this.componentToolStripMenuItem.Name = "componentToolStripMenuItem"; - this.componentToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.componentToolStripMenuItem.Size = new System.Drawing.Size(152, 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(140, 22); + this.mediaToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.mediaToolStripMenuItem.Text = "Media"; this.mediaToolStripMenuItem.Click += new System.EventHandler(this.mediaToolStripMenuItem_Click); // // fullToolStripMenuItem // this.fullToolStripMenuItem.Name = "fullToolStripMenuItem"; - this.fullToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.fullToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.fullToolStripMenuItem.Text = "Full"; this.fullToolStripMenuItem.Visible = false; // @@ -264,13 +267,14 @@ this.columnHeader2, this.columnHeader3, this.columnHeader4, - this.columnHeader5}); + this.columnHeader5, + this.columnHeader6}); this.bossview.ContextMenuStrip = this.contextMenuStrip1; this.bossview.FullRowSelect = true; this.bossview.GridLines = true; this.bossview.Location = new System.Drawing.Point(12, 40); this.bossview.Name = "bossview"; - this.bossview.Size = new System.Drawing.Size(663, 227); + this.bossview.Size = new System.Drawing.Size(651, 227); this.bossview.TabIndex = 2; this.bossview.UseCompatibleStateImageBehavior = false; this.bossview.View = System.Windows.Forms.View.Details; @@ -300,6 +304,11 @@ // this.columnHeader5.Text = "Id"; // + // columnHeader6 + // + this.columnHeader6.Text = "Options"; + this.columnHeader6.Width = 89; + // // contextMenuStrip1 // this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -386,6 +395,12 @@ this.tabPage_Proiect.Text = "Proiect Properties"; this.tabPage_Proiect.UseVisualStyleBackColor = true; // + // textToolStripMenuItem + // + this.textToolStripMenuItem.Name = "textToolStripMenuItem"; + this.textToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.textToolStripMenuItem.Text = "Text"; + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -448,6 +463,8 @@ private System.Windows.Forms.TabPage tabPage_Other; private System.Windows.Forms.TabPage tabPage_Language; private System.Windows.Forms.TabPage tabPage_Proiect; + private System.Windows.Forms.ColumnHeader columnHeader6; + private System.Windows.Forms.ToolStripMenuItem textToolStripMenuItem; } } Modified: trunk/plugins/mpinstaler/MPInstaler/Form1.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-02-07 19:09:40 UTC (rev 104) +++ trunk/plugins/mpinstaler/MPInstaler/Form1.cs 2007-02-07 20:11:58 UTC (rev 105) @@ -90,9 +90,9 @@ foreach (string fil in openFileDialog1.FileNames) switch (type) { - case 1: addrow(Path.GetFileName(fil), MPinstalerStruct.SKIN_TYPE, MPinstalerStruct.SKIN_XML_SUBTYPE, Path.GetFullPath(fil), "02010"); + case 1: addrow(Path.GetFileName(fil), MPinstalerStruct.SKIN_TYPE, MPinstalerStruct.SKIN_XML_SUBTYPE, Path.GetFullPath(fil), "02010",""); break; - case 2: addrow(Path.GetFileName(fil), MPinstalerStruct.SKIN_MEDIA_TYPE, MPinstalerStruct.SKIN_XML_SUBTYPE, Path.GetFullPath(fil), "02020"); + case 2: addrow(Path.GetFileName(fil), MPinstalerStruct.SKIN_MEDIA_TYPE, MPinstalerStruct.SKIN_XML_SUBTYPE, Path.GetFullPath(fil), "02020",""); break; default: break; @@ -127,9 +127,19 @@ item1.SubItems.Add(subtype); item1.SubItems.Add(path); item1.SubItems.Add(id); + item1.SubItems.Add(""); bossview.Items.AddRange(new ListViewItem[] { item1 }); } - + private void addrow(string file, string type, string subtype, string path, string id, string op) + { + ListViewItem item1 = new ListViewItem(file, 0); + item1.SubItems.Add(type); + item1.SubItems.Add(subtype); + item1.SubItems.Add(path); + item1.SubItems.Add(id); + item1.SubItems.Add(op); + bossview.Items.AddRange(new ListViewItem[] { item1 }); + } private void openProiectToolStripMenuItem_Click(object sender, EventArgs e) { string fil; @@ -228,6 +238,7 @@ writer.WriteElementString("SubType", it.SubType); writer.WriteElementString("Source", Path.GetFullPath(it.FileName)); writer.WriteElementString("Id", it.ID); + writer.WriteElementString("Option", it.Option); writer.WriteEndElement(); st = st + bossview.Items[i].SubItems[3].Text + @"\" + bossview.Items[i].Text + ";"; } Modified: trunk/plugins/mpinstaler/MPInstaler/Form2.Designer.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form2.Designer.cs 2007-02-07 19:09:40 UTC (rev 104) +++ trunk/plugins/mpinstaler/MPInstaler/Form2.Designer.cs 2007-02-07 20:11:58 UTC (rev 105) @@ -28,97 +28,98 @@ /// </summary> private void InitializeComponent() { - this.button1 = new System.Windows.Forms.Button(); - this.button2 = new System.Windows.Forms.Button(); - this.comboBox1 = new System.Windows.Forms.ComboBox(); - 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.SuspendLayout(); - // - // button1 - // - this.button1.Location = new System.Drawing.Point(80, 289); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(65, 23); - this.button1.TabIndex = 0; - this.button1.Text = "Add"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // button2 - // - this.button2.Location = new System.Drawing.Point(186, 289); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(75, 23); - this.button2.TabIndex = 1; - this.button2.Text = "Remove"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click); - // - // comboBox1 - // - this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(12, 22); - this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(372, 21); - this.comboBox1.TabIndex = 2; - // - // listView1 - // - this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.button1 = new System.Windows.Forms.Button(); + this.button2 = new System.Windows.Forms.Button(); + this.languageComboBox = new System.Windows.Forms.ComboBox(); + 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.SuspendLayout(); + // + // button1 + // + this.button1.Location = new System.Drawing.Point(80, 289); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(65, 23); + this.button1.TabIndex = 0; + this.button1.Text = "Add"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // button2 + // + this.button2.Location = new System.Drawing.Point(186, 289); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(75, 23); + this.button2.TabIndex = 1; + this.button2.Text = "Remove"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // languageComboBox + // + this.languageComboBox.FormattingEnabled = true; + this.languageComboBox.Location = new System.Drawing.Point(12, 22); + this.languageComboBox.Name = "languageComboBox"; + this.languageComboBox.Size = new System.Drawing.Size(372, 21); + this.languageComboBox.TabIndex = 2; + // + // listView1 + // + this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeader1, this.columnHeader2}); - this.listView1.FullRowSelect = true; - this.listView1.GridLines = true; - this.listView1.Location = new System.Drawing.Point(12, 68); - this.listView1.Name = "listView1"; - this.listView1.Size = new System.Drawing.Size(372, 179); - this.listView1.TabIndex = 3; - 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 = "Id"; - // - // columnHeader2 - // - this.columnHeader2.Text = "Value"; - this.columnHeader2.Width = 308; - // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(12, 253); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(62, 20); - this.textBox1.TabIndex = 4; - // - // textBox2 - // - this.textBox2.Location = new System.Drawing.Point(80, 253); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(304, 20); - this.textBox2.TabIndex = 5; - // - // Form2 - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(396, 333); - this.Controls.Add(this.textBox2); - this.Controls.Add(this.textBox1); - this.Controls.Add(this.listView1); - this.Controls.Add(this.comboBox1); - this.Controls.Add(this.button2); - this.Controls.Add(this.button1); - this.Name = "Form2"; - this.Text = "String Editor"; - this.ResumeLayout(false); - this.PerformLayout(); + this.listView1.FullRowSelect = true; + this.listView1.GridLines = true; + this.listView1.Location = new System.Drawing.Point(12, 68); + this.listView1.Name = "listView1"; + this.listView1.Size = new System.Drawing.Size(372, 179); + this.listView1.TabIndex = 3; + 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 = "Id"; + // + // columnHeader2 + // + this.columnHeader2.Text = "Value"; + this.columnHeader2.Width = 308; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(12, 253); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(62, 20); + this.textBox1.TabIndex = 4; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(80, 253); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(304, 20); + this.textBox2.TabIndex = 5; + // + // Form2 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(396, 333); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.listView1); + this.Controls.Add(this.languageComboBox); + this.Controls.Add(this.button2); + this.Controls.Add(this.button1); + this.Name = "Form2"; + this.Text = "String Editor"; + this.Load += new System.EventHandler(this.Form2_Load); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -126,7 +127,7 @@ private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button2; - private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.ComboBox languageComboBox; private System.Windows.Forms.ListView listView1; private System.Windows.Forms.ColumnHeader columnHeader1; private System.Windows.Forms.ColumnHeader columnHeader2; Modified: trunk/plugins/mpinstaler/MPInstaler/Form2.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Form2.cs 2007-02-07 19:09:40 UTC (rev 104) +++ trunk/plugins/mpinstaler/MPInstaler/Form2.cs 2007-02-07 20:11:58 UTC (rev 105) @@ -5,12 +5,14 @@ using System.Drawing; using System.Text; using System.Windows.Forms; +using System.IO; namespace MPInstaler { public partial class Form2 : Form { - public Form2() + string LanguageDirectory = ""; + public Form2() { InitializeComponent(); } @@ -35,5 +37,30 @@ listView1.Items.RemoveAt(index); } } + + private void Form2_Load(object sender, EventArgs e) + { + if (Directory.Exists(LanguageDirectory)) + { + string[] folders = Directory.GetDirectories(LanguageDirectory, "*.*"); + + foreach (string folder in folders) + { + string fileName = folder.Substring(folder.LastIndexOf(@"\") + 1); + + // + // Exclude cvs folder + // + if (fileName.ToLower() != "cvs") + { + if (fileName.Length > 0) + { + fileName = fileName.Substring(0, 1).ToUpper() + fileName.Substring(1); + languageComboBox.Items.Add(fileName); + } + } + } + } + } } } \ No newline at end of file Modified: trunk/plugins/mpinstaler/MPInstaler/MPInstaler.csproj =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/MPInstaler.csproj 2007-02-07 19:09:40 UTC (rev 104) +++ trunk/plugins/mpinstaler/MPInstaler/MPInstaler.csproj 2007-02-07 20:11:58 UTC (rev 105) @@ -46,6 +46,10 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> + <Reference Include="Core, Version=1.0.2587.35999, Culture=neutral, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>D:\Program Files\Team MediaPortal\MediaPortal\Core.DLL</HintPath> + </Reference> <Reference Include="ICSharpCode.SharpZipLib, Version=0.84.0.0, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"> <SpecificVersion>False</SpecificVersion> <HintPath>D:\Program Files\Team MediaPortal\MediaPortal\ICSharpCode.SharpZipLib.DLL</HintPath> @@ -110,6 +114,10 @@ <SubType>Designer</SubType> <DependentUpon>SkinSelect.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="start_form.resx"> + <SubType>Designer</SubType> + <DependentUpon>start_form.cs</DependentUpon> + </EmbeddedResource> <Compile Include="Properties\Resources.Designer.cs"> <AutoGen>True</AutoGen> <DependentUpon>Resources.resx</DependentUpon> @@ -131,6 +139,12 @@ <Compile Include="SkinSelect.Designer.cs"> <DependentUpon>SkinSelect.cs</DependentUpon> </Compile> + <Compile Include="start_form.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="start_form.Designer.cs"> + <DependentUpon>start_form.cs</DependentUpon> + </Compile> </ItemGroup> <ItemGroup> <BootstrapperPackage Include="Microsoft.Net.Framework.2.0"> Modified: trunk/plugins/mpinstaler/MPInstaler/Program.cs =================================================================== --- trunk/plugins/mpinstaler/MPInstaler/Program.cs 2007-02-07 19:09:40 UTC (rev 104) +++ trunk/plugins/mpinstaler/MPInstaler/Program.cs 2007-02-07 20:11:58 UTC (rev 105) @@ -14,7 +14,7 @@ { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1()); + Application.Run(new start_form()); } } } \ No newline at end of file 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. |