Author: gedmurphy Date: Fri Jun 29 18:25:30 2007 New Revision: 27323
URL: http://svn.reactos.org/svn/reactos?rev=27323&view=rev Log: - add an application settings dialog - add a new table to the database plus corresponding code for storing/reading application related data
Added: trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs trunk/tools/RosTE/GUI/ConsoleSettings.cs trunk/tools/RosTE/GUI/ConsoleSettings.resx trunk/tools/RosTE/GUI/qemu.cs Modified: trunk/tools/RosTE/GUI/MainConfig.cs trunk/tools/RosTE/GUI/MainConfig.xsd trunk/tools/RosTE/GUI/MainConfig.xsx trunk/tools/RosTE/GUI/MainForm.Designer.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/MainForm.resx trunk/tools/RosTE/GUI/RosTEGUI.csproj
Added: trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConsoleSettings.Des... ============================================================================== --- trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs (added) +++ trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs Fri Jun 29 18:25:30 2007 @@ -1,0 +1,306 @@ +namespace RosTEGUI +{ + partial class ConsoleSettings + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.button1 = new System.Windows.Forms.Button(); + this.button2 = new System.Windows.Forms.Button(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.conQemuLoc = new System.Windows.Forms.TextBox(); + this.conVdkLoc = new System.Windows.Forms.TextBox(); + this.conDefVmLoc = new System.Windows.Forms.TextBox(); + this.button3 = new System.Windows.Forms.Button(); + this.button4 = new System.Windows.Forms.Button(); + this.button5 = new System.Windows.Forms.Button(); + this.conAppDebug = new System.Windows.Forms.CheckBox(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.conUpdateCombo = new System.Windows.Forms.ComboBox(); + this.conUpdateNow = new System.Windows.Forms.Button(); + this.folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.tabPage2.SuspendLayout(); + this.tabPage3.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.groupBox4.SuspendLayout(); + this.SuspendLayout(); + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Controls.Add(this.tabPage3); + this.tabControl1.Location = new System.Drawing.Point(12, 12); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(303, 287); + this.tabControl1.TabIndex = 0; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.groupBox4); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(295, 261); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "General"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.groupBox3); + this.tabPage2.Controls.Add(this.groupBox2); + this.tabPage2.Controls.Add(this.groupBox1); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(295, 261); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "Paths"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // button1 + // + this.button1.DialogResult = System.Windows.Forms.DialogResult.OK; + this.button1.Location = new System.Drawing.Point(159, 305); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 1; + this.button1.Text = "OK"; + this.button1.UseVisualStyleBackColor = true; + // + // button2 + // + this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.button2.Location = new System.Drawing.Point(240, 305); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(75, 23); + this.button2.TabIndex = 2; + this.button2.Text = "Cancel"; + this.button2.UseVisualStyleBackColor = true; + // + // tabPage3 + // + this.tabPage3.Controls.Add(this.conAppDebug); + this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Size = new System.Drawing.Size(295, 261); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "Advanced"; + this.tabPage3.UseVisualStyleBackColor = true; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.button3); + this.groupBox1.Controls.Add(this.conQemuLoc); + this.groupBox1.Location = new System.Drawing.Point(6, 6); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(283, 65); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Location of QEmu"; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.button4); + this.groupBox2.Controls.Add(this.conVdkLoc); + this.groupBox2.Location = new System.Drawing.Point(6, 88); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(283, 65); + this.groupBox2.TabIndex = 1; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Location of VDK"; + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.button5); + this.groupBox3.Controls.Add(this.conDefVmLoc); + this.groupBox3.Location = new System.Drawing.Point(6, 170); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(283, 65); + this.groupBox3.TabIndex = 2; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Default location for virtual machines"; + // + // conQemuLoc + // + this.conQemuLoc.Location = new System.Drawing.Point(6, 28); + this.conQemuLoc.Name = "conQemuLoc"; + this.conQemuLoc.Size = new System.Drawing.Size(190, 20); + this.conQemuLoc.TabIndex = 0; + // + // conVdkLoc + // + this.conVdkLoc.Location = new System.Drawing.Point(6, 29); + this.conVdkLoc.Name = "conVdkLoc"; + this.conVdkLoc.Size = new System.Drawing.Size(190, 20); + this.conVdkLoc.TabIndex = 0; + // + // conDefVmLoc + // + this.conDefVmLoc.Location = new System.Drawing.Point(6, 30); + this.conDefVmLoc.Name = "conDefVmLoc"; + this.conDefVmLoc.Size = new System.Drawing.Size(190, 20); + this.conDefVmLoc.TabIndex = 0; + // + // button3 + // + this.button3.Location = new System.Drawing.Point(202, 26); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(75, 23); + this.button3.TabIndex = 1; + this.button3.Text = "Browse..."; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click); + // + // button4 + // + this.button4.Location = new System.Drawing.Point(202, 27); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(75, 23); + this.button4.TabIndex = 1; + this.button4.Text = "Browse..."; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.button4_Click); + // + // button5 + // + this.button5.Location = new System.Drawing.Point(202, 28); + this.button5.Name = "button5"; + this.button5.Size = new System.Drawing.Size(75, 23); + this.button5.TabIndex = 1; + this.button5.Text = "Browse..."; + this.button5.UseVisualStyleBackColor = true; + this.button5.Click += new System.EventHandler(this.button5_Click); + // + // conAppDebug + // + this.conAppDebug.AutoSize = true; + this.conAppDebug.Location = new System.Drawing.Point(21, 33); + this.conAppDebug.Name = "conAppDebug"; + this.conAppDebug.Size = new System.Drawing.Size(170, 17); + this.conAppDebug.TabIndex = 0; + this.conAppDebug.Text = "Turn on application debugging"; + this.conAppDebug.UseVisualStyleBackColor = true; + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.conUpdateNow); + this.groupBox4.Controls.Add(this.conUpdateCombo); + this.groupBox4.Location = new System.Drawing.Point(6, 153); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(283, 80); + this.groupBox4.TabIndex = 0; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "Check for updates"; + // + // conUpdateCombo + // + this.conUpdateCombo.FormattingEnabled = true; + this.conUpdateCombo.Items.AddRange(new object[] { + "On startup", + "Daily", + "Weekly", + "Monthly"}); + this.conUpdateCombo.Location = new System.Drawing.Point(6, 33); + this.conUpdateCombo.Name = "conUpdateCombo"; + this.conUpdateCombo.Size = new System.Drawing.Size(190, 21); + this.conUpdateCombo.TabIndex = 0; + // + // conUpdateNow + // + this.conUpdateNow.Location = new System.Drawing.Point(202, 33); + this.conUpdateNow.Name = "conUpdateNow"; + this.conUpdateNow.Size = new System.Drawing.Size(75, 23); + this.conUpdateNow.TabIndex = 1; + this.conUpdateNow.Text = "Check now"; + this.conUpdateNow.UseVisualStyleBackColor = true; + // + // ConsoleSettings + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(327, 340); + this.Controls.Add(this.button2); + this.Controls.Add(this.button1); + this.Controls.Add(this.tabControl1); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "ConsoleSettings"; + this.ShowIcon = false; + this.ShowInTaskbar = false; + this.Text = "Settings"; + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage2.ResumeLayout(false); + this.tabPage3.ResumeLayout(false); + this.tabPage3.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + this.groupBox4.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.Button button5; + private System.Windows.Forms.TextBox conDefVmLoc; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.Button button4; + private System.Windows.Forms.TextBox conVdkLoc; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.TextBox conQemuLoc; + private System.Windows.Forms.TabPage tabPage3; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.CheckBox conAppDebug; + private System.Windows.Forms.Button conUpdateNow; + private System.Windows.Forms.ComboBox conUpdateCombo; + private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog; + } +}
Added: trunk/tools/RosTE/GUI/ConsoleSettings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConsoleSettings.cs?... ============================================================================== --- trunk/tools/RosTE/GUI/ConsoleSettings.cs (added) +++ trunk/tools/RosTE/GUI/ConsoleSettings.cs Fri Jun 29 18:25:30 2007 @@ -1,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace RosTEGUI +{ + public partial class ConsoleSettings : Form + { + private string GetFolderLocation() + { + folderBrowserDialog.ShowDialog(); + return folderBrowserDialog.SelectedPath; + } + + public ConsoleSettings(MainConfig mainConf) + { + InitializeComponent(); + + // set general tab + conUpdateCombo.SelectedIndex = mainConf.UpdateSched; + + // set paths tab + conQemuLoc.Text = mainConf.QemuPath; + conVdkLoc.Text = mainConf.VdkPath; + conDefVmLoc.Text = mainConf.DefVmPath; + + // set advanced tab + conAppDebug.Checked = mainConf.AppDebug; + } + + private void button3_Click(object sender, EventArgs e) + { + conQemuLoc.Text = GetFolderLocation(); + } + + private void button4_Click(object sender, EventArgs e) + { + conVdkLoc.Text = GetFolderLocation(); + } + + private void button5_Click(object sender, EventArgs e) + { + conDefVmLoc.Text = GetFolderLocation(); + } + } +}
Added: trunk/tools/RosTE/GUI/ConsoleSettings.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConsoleSettings.res... ============================================================================== --- trunk/tools/RosTE/GUI/ConsoleSettings.resx (added) +++ trunk/tools/RosTE/GUI/ConsoleSettings.resx Fri Jun 29 18:25:30 2007 @@ -1,0 +1,123 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + xsd:complexType + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + xsd:complexType + xsd:sequence + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + xsd:complexType + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + xsd:complexType + xsd:sequence + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + xsd:complexType + xsd:sequence + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <metadata name="folderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>17, 17</value> + </metadata> +</root>
Modified: trunk/tools/RosTE/GUI/MainConfig.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainConfig.cs?rev=2... ============================================================================== --- trunk/tools/RosTE/GUI/MainConfig.cs (original) +++ trunk/tools/RosTE/GUI/MainConfig.cs Fri Jun 29 18:25:30 2007 @@ -8,15 +8,101 @@ public class MainConfig { private Data data = null; + private DataRow drSettings;
- private static void PrintRows(DataTable dt) + #region properties + + public string QemuPath { - for (int i = 0; i < dt.Rows.Count; i++) - { - string str = "row: " + i + ", VMConfigID: " + dt.Rows[i]["VMConfigID"] + ", Path " + dt.Rows[i]["Path"]; - MessageBox.Show(str); - } + get { return (string)drSettings["QemuPath"]; } + set { drSettings["QemuPath"] = value; } } + + public string VdkPath + { + get { return (string)drSettings["VdkPath"]; } + set { drSettings["VdkPath"] = value; } + } + + public string DefVmPath + { + get { return (string)drSettings["DefVmPath"]; } + set { drSettings["DefVmPath"] = value; } + } + + public int UpdateSched + { + get { return (int)drSettings["UpdateSched"]; } + set { drSettings["UpdateSched"] = value; } + } + + public bool AppDebug + { + get { return (bool)drSettings["AppDebug"]; } + set { drSettings["AppDebug"] = value; } + } + + #endregion + + #region VM Image functions + + public string GetExistingImage(int index) + { + DataTable dt = data.DataSet.Tables["VirtMach"]; + DataRow dr = dt.Rows[index]; + + return (string)dr["Path"]; + } + + public int AddVirtMach(string Path) + { + int i; + DataRow dr; + DataTable dt = data.DataSet.Tables["VirtMach"]; + i = dt.Rows.Count + 1; + dr = dt.NewRow(); + dr["VMConfigID"] = i; + dr["Path"] = Path; + dt.Rows.Add(dr); + return i; + } + + public void DeleteVirtMach(int index) + { + DataTable dt = data.DataSet.Tables["VirtMach"]; + dt.Rows.RemoveAt(index); + } + + public int GetNumberOfVms() + { + DataTable dt = data.DataSet.Tables["VirtMach"]; + return dt.Rows.Count; + } + + #endregion + + #region Settings functions + + public void CreateSettings() + { + DataTable dt = data.DataSet.Tables["Settings"]; + drSettings = dt.NewRow(); + // FIXME: these should be assigned by the installer + drSettings["QemuPath"] = @"C:\Program Files\RosTE\QEmu"; + drSettings["VdkPath"] = @"C:\Program Files\RosTE\VDK"; + drSettings["DefVmPath"] = @"C:\Program Files\RosTE\Images"; + drSettings["UpdateSched"] = 3; + drSettings["AppDebug"] = false; + dt.Rows.Add(drSettings); + } + + public void LoadSettings() + { + DataTable dt = data.DataSet.Tables["Settings"]; + drSettings = dt.Rows[0]; + } + + #endregion
public MainConfig(Data dataIn) { @@ -52,38 +138,5 @@ data.DataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); xtw.Close(); } - - public string GetExistingImage(int index) - { - DataTable dt = data.DataSet.Tables["MainConfig"]; - DataRow dr = dt.Rows[index]; - - return (string)dr["Path"]; - } - - public int AddVirtMach(string Path) - { - int i; - DataRow dr; - DataTable dt = data.DataSet.Tables["MainConfig"]; - i = dt.Rows.Count + 1; - dr = dt.NewRow(); - dr["VMConfigID"] = i; - dr["Path"] = Path; - dt.Rows.Add(dr); - return i; - } - - public void DeleteVirtMach(int index) - { - DataTable dt = data.DataSet.Tables["MainConfig"]; - dt.Rows.RemoveAt(index); - } - - public int GetNumberOfVms() - { - DataTable dt = data.DataSet.Tables["MainConfig"]; - return dt.Rows.Count; - } } }
Modified: trunk/tools/RosTE/GUI/MainConfig.xsd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainConfig.xsd?rev=... ============================================================================== --- trunk/tools/RosTE/GUI/MainConfig.xsd (original) +++ trunk/tools/RosTE/GUI/MainConfig.xsd Fri Jun 29 18:25:30 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <xs:schema id="MainDB" targetNamespace="http://tempuri.org/MainDB.xsd" elementFormDefault="qualified" xmlns="http://tempuri.org/MainDB.xsd" xmlns:mstns="http://tempuri.org/MainDB.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema%22%3E - <xs:element name="MainConfig"> + <xs:element name="VirtMach"> xs:complexType xs:sequence <xs:element name="VMConfigID" type="xs:int" /> @@ -8,4 +8,15 @@ </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="Settings"> + xs:complexType + xs:sequence + <xs:element name="QemuPath" type="xs:string" /> + <xs:element name="VdkPath" type="xs:string" /> + <xs:element name="DefVmPath" type="xs:string" /> + <xs:element name="UpdateSched" type="xs:int" /> + <xs:element name="AppDebug" type="xs:boolean" /> + </xs:sequence> + </xs:complexType> + </xs:element> </xs:schema>
Modified: trunk/tools/RosTE/GUI/MainConfig.xsx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainConfig.xsx?rev=... ============================================================================== --- trunk/tools/RosTE/GUI/MainConfig.xsx (original) +++ trunk/tools/RosTE/GUI/MainConfig.xsx Fri Jun 29 18:25:30 2007 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.--> <XSDDesignerLayout Style="LeftRight" layoutVersion="2" viewPortLeft="0" viewPortTop="-4677" zoom="100"> - <MainConfig_XmlElement left="8863" top="-3071" width="4842" height="3678" selected="0" zOrder="0" index="0" expanded="1" /> + <VirtMach_XmlElement left="8520" top="-3095" width="4842" height="1984" selected="0" zOrder="0" index="0" expanded="1" /> + <Settings_XmlElement left="2461" top="-3148" width="5291" height="3254" selected="0" zOrder="1" index="1" expanded="1" /> </XSDDesignerLayout>
Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.Designer.c... ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.Designer.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.Designer.cs Fri Jun 29 18:25:30 2007 @@ -35,18 +35,10 @@ this.columnAudio = new System.Windows.Forms.ColumnHeader(); this.columnDebug = new System.Windows.Forms.ColumnHeader(); this.mainImageList = new System.Windows.Forms.ImageList(this.components); - this.toolbarLaunch = new System.Windows.Forms.ToolStripButton(); - this.toolbarStop = new System.Windows.Forms.ToolStripButton(); this.toolbarSep1 = new System.Windows.Forms.ToolStripSeparator(); - this.toolbarImageAdd = new System.Windows.Forms.ToolStripButton(); - this.toolbarImageDel = new System.Windows.Forms.ToolStripButton(); this.toolbarSep2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolbarHelpContents = new System.Windows.Forms.ToolStripButton(); this.toolbarSep4 = new System.Windows.Forms.ToolStripSeparator(); - this.toolbarExit = new System.Windows.Forms.ToolStripButton(); this.mainToolbar = new System.Windows.Forms.ToolStrip(); - this.toolbarSnapShot = new System.Windows.Forms.ToolStripButton(); - this.toolbarScreenShot = new System.Windows.Forms.ToolStripButton(); this.toolbarSep3 = new System.Windows.Forms.ToolStripSeparator(); this.mainMenu = new System.Windows.Forms.MenuStrip(); this.mainmenuFile = new System.Windows.Forms.ToolStripMenuItem(); @@ -58,7 +50,21 @@ this.mainmenuHelpContent = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.MainMenuHelpAbout = new System.Windows.Forms.ToolStripMenuItem(); - this.changeSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolbarLaunch = new System.Windows.Forms.ToolStripButton(); + this.toolbarStop = new System.Windows.Forms.ToolStripButton(); + this.toolbarImageAdd = new System.Windows.Forms.ToolStripButton(); + this.toolbarImageDel = new System.Windows.Forms.ToolStripButton(); + this.toolbarSnapShot = new System.Windows.Forms.ToolStripButton(); + this.toolbarScreenShot = new System.Windows.Forms.ToolStripButton(); + this.toolbarHelpContents = new System.Windows.Forms.ToolStripButton(); + this.toolbarExit = new System.Windows.Forms.ToolStripButton(); + this.snapshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.takeSnapshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadSnapshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.deleteSnapshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mainToolbar.SuspendLayout(); this.mainMenu.SuspendLayout(); this.SuspendLayout(); @@ -121,77 +127,20 @@ this.mainImageList.TransparentColor = System.Drawing.Color.Transparent; this.mainImageList.Images.SetKeyName(0, "images.png"); // - // toolbarLaunch - // - this.toolbarLaunch.Image = ((System.Drawing.Image)(resources.GetObject("toolbarLaunch.Image"))); - this.toolbarLaunch.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarLaunch.Name = "toolbarLaunch"; - this.toolbarLaunch.Size = new System.Drawing.Size(61, 22); - this.toolbarLaunch.Text = "Launch"; - this.toolbarLaunch.ToolTipText = "Starts the virtual machine"; - // - // toolbarStop - // - this.toolbarStop.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarStop.Image = ((System.Drawing.Image)(resources.GetObject("toolbarStop.Image"))); - this.toolbarStop.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarStop.Name = "toolbarStop"; - this.toolbarStop.Size = new System.Drawing.Size(23, 22); - this.toolbarStop.ToolTipText = "Stops the virtual machine"; - // // toolbarSep1 // this.toolbarSep1.Name = "toolbarSep1"; this.toolbarSep1.Size = new System.Drawing.Size(6, 25); // - // toolbarImageAdd - // - this.toolbarImageAdd.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarImageAdd.Image = ((System.Drawing.Image)(resources.GetObject("toolbarImageAdd.Image"))); - this.toolbarImageAdd.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarImageAdd.Name = "toolbarImageAdd"; - this.toolbarImageAdd.Size = new System.Drawing.Size(23, 22); - this.toolbarImageAdd.ToolTipText = "Adds a new image"; - this.toolbarImageAdd.Click += new System.EventHandler(this.CreateNewVirtMach); - // - // toolbarImageDel - // - this.toolbarImageDel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarImageDel.Image = ((System.Drawing.Image)(resources.GetObject("toolbarImageDel.Image"))); - this.toolbarImageDel.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarImageDel.Name = "toolbarImageDel"; - this.toolbarImageDel.Size = new System.Drawing.Size(23, 22); - this.toolbarImageDel.ToolTipText = "Deletes an existing image"; - this.toolbarImageDel.Click += new System.EventHandler(this.DeleteVirtMach); - // // toolbarSep2 // this.toolbarSep2.Name = "toolbarSep2"; this.toolbarSep2.Size = new System.Drawing.Size(6, 25); // - // toolbarHelpContents - // - this.toolbarHelpContents.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarHelpContents.Image = ((System.Drawing.Image)(resources.GetObject("toolbarHelpContents.Image"))); - this.toolbarHelpContents.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarHelpContents.Name = "toolbarHelpContents"; - this.toolbarHelpContents.Size = new System.Drawing.Size(23, 22); - this.toolbarHelpContents.ToolTipText = "Opens help file"; - // // toolbarSep4 // this.toolbarSep4.Name = "toolbarSep4"; this.toolbarSep4.Size = new System.Drawing.Size(6, 25); - // - // toolbarExit - // - this.toolbarExit.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarExit.Image = ((System.Drawing.Image)(resources.GetObject("toolbarExit.Image"))); - this.toolbarExit.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarExit.Name = "toolbarExit"; - this.toolbarExit.Size = new System.Drawing.Size(23, 22); - this.toolbarExit.ToolTipText = "Exits application"; - this.toolbarExit.Click += new System.EventHandler(this.toolbarExit_Click); // // mainToolbar // @@ -213,6 +162,141 @@ this.mainToolbar.Size = new System.Drawing.Size(540, 25); this.mainToolbar.TabIndex = 10; // + // toolbarSep3 + // + this.toolbarSep3.Name = "toolbarSep3"; + this.toolbarSep3.Size = new System.Drawing.Size(6, 25); + // + // mainMenu + // + this.mainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mainmenuFile, + this.mainmenuOptions, + this.snapshotToolStripMenuItem, + this.mainmenuHelp}); + this.mainMenu.Location = new System.Drawing.Point(0, 0); + this.mainMenu.Name = "mainMenu"; + this.mainMenu.Size = new System.Drawing.Size(540, 24); + this.mainMenu.TabIndex = 11; + // + // mainmenuFile + // + this.mainmenuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.newToolStripMenuItem, + this.mainmenuFileExit}); + this.mainmenuFile.Name = "mainmenuFile"; + this.mainmenuFile.Size = new System.Drawing.Size(35, 20); + this.mainmenuFile.Text = "File"; + // + // newToolStripMenuItem + // + this.newToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.virtualMachineToolStripMenuItem}); + this.newToolStripMenuItem.Name = "newToolStripMenuItem"; + this.newToolStripMenuItem.Size = new System.Drawing.Size(106, 22); + this.newToolStripMenuItem.Text = "New"; + // + // virtualMachineToolStripMenuItem + // + this.virtualMachineToolStripMenuItem.Name = "virtualMachineToolStripMenuItem"; + this.virtualMachineToolStripMenuItem.Size = new System.Drawing.Size(157, 22); + this.virtualMachineToolStripMenuItem.Text = "Virtual Machine"; + this.virtualMachineToolStripMenuItem.Click += new System.EventHandler(this.CreateNewVirtMach); + // + // mainmenuFileExit + // + this.mainmenuFileExit.Name = "mainmenuFileExit"; + this.mainmenuFileExit.Size = new System.Drawing.Size(106, 22); + this.mainmenuFileExit.Text = "Exit"; + this.mainmenuFileExit.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // + // mainmenuOptions + // + this.mainmenuOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripSeparator2, + this.settingsToolStripMenuItem}); + this.mainmenuOptions.Name = "mainmenuOptions"; + this.mainmenuOptions.Size = new System.Drawing.Size(56, 20); + this.mainmenuOptions.Text = "Options"; + // + // mainmenuHelp + // + this.mainmenuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mainmenuHelpContent, + this.toolStripSeparator1, + this.MainMenuHelpAbout}); + this.mainmenuHelp.Name = "mainmenuHelp"; + this.mainmenuHelp.Size = new System.Drawing.Size(40, 20); + this.mainmenuHelp.Text = "Help"; + // + // mainmenuHelpContent + // + this.mainmenuHelpContent.Name = "mainmenuHelpContent"; + this.mainmenuHelpContent.Size = new System.Drawing.Size(124, 22); + this.mainmenuHelpContent.Text = "Content"; + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(121, 6); + // + // MainMenuHelpAbout + // + this.MainMenuHelpAbout.Name = "MainMenuHelpAbout"; + this.MainMenuHelpAbout.Size = new System.Drawing.Size(124, 22); + this.MainMenuHelpAbout.Text = "About"; + this.MainMenuHelpAbout.Click += new System.EventHandler(this.MainMenuHelpAbout_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6); + // + // settingsToolStripMenuItem + // + this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.settingsToolStripMenuItem.Text = "Settings"; + this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click); + // + // toolbarLaunch + // + this.toolbarLaunch.Image = ((System.Drawing.Image)(resources.GetObject("toolbarLaunch.Image"))); + this.toolbarLaunch.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarLaunch.Name = "toolbarLaunch"; + this.toolbarLaunch.Size = new System.Drawing.Size(61, 22); + this.toolbarLaunch.Text = "Launch"; + this.toolbarLaunch.ToolTipText = "Starts the virtual machine"; + // + // toolbarStop + // + this.toolbarStop.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarStop.Image = ((System.Drawing.Image)(resources.GetObject("toolbarStop.Image"))); + this.toolbarStop.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarStop.Name = "toolbarStop"; + this.toolbarStop.Size = new System.Drawing.Size(23, 22); + this.toolbarStop.ToolTipText = "Stops the virtual machine"; + // + // toolbarImageAdd + // + this.toolbarImageAdd.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarImageAdd.Image = ((System.Drawing.Image)(resources.GetObject("toolbarImageAdd.Image"))); + this.toolbarImageAdd.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarImageAdd.Name = "toolbarImageAdd"; + this.toolbarImageAdd.Size = new System.Drawing.Size(23, 22); + this.toolbarImageAdd.ToolTipText = "Adds a new image"; + this.toolbarImageAdd.Click += new System.EventHandler(this.CreateNewVirtMach); + // + // toolbarImageDel + // + this.toolbarImageDel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarImageDel.Image = ((System.Drawing.Image)(resources.GetObject("toolbarImageDel.Image"))); + this.toolbarImageDel.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarImageDel.Name = "toolbarImageDel"; + this.toolbarImageDel.Size = new System.Drawing.Size(23, 22); + this.toolbarImageDel.ToolTipText = "Deletes an existing image"; + this.toolbarImageDel.Click += new System.EventHandler(this.DeleteVirtMach); + // // toolbarSnapShot // this.toolbarSnapShot.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -233,95 +317,58 @@ this.toolbarScreenShot.Text = "toolStripButton2"; this.toolbarScreenShot.ToolTipText = "Grab a screenshot of the display"; // - // toolbarSep3 - // - this.toolbarSep3.Name = "toolbarSep3"; - this.toolbarSep3.Size = new System.Drawing.Size(6, 25); - // - // mainMenu - // - this.mainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mainmenuFile, - this.mainmenuOptions, - this.mainmenuHelp}); - this.mainMenu.Location = new System.Drawing.Point(0, 0); - this.mainMenu.Name = "mainMenu"; - this.mainMenu.Size = new System.Drawing.Size(540, 24); - this.mainMenu.TabIndex = 11; - // - // mainmenuFile - // - this.mainmenuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.newToolStripMenuItem, - this.mainmenuFileExit}); - this.mainmenuFile.Name = "mainmenuFile"; - this.mainmenuFile.Size = new System.Drawing.Size(35, 20); - this.mainmenuFile.Text = "File"; - // - // newToolStripMenuItem - // - this.newToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.virtualMachineToolStripMenuItem}); - this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(106, 22); - this.newToolStripMenuItem.Text = "New"; - // - // virtualMachineToolStripMenuItem - // - this.virtualMachineToolStripMenuItem.Name = "virtualMachineToolStripMenuItem"; - this.virtualMachineToolStripMenuItem.Size = new System.Drawing.Size(157, 22); - this.virtualMachineToolStripMenuItem.Text = "Virtual Machine"; - this.virtualMachineToolStripMenuItem.Click += new System.EventHandler(this.CreateNewVirtMach); - // - // mainmenuFileExit - // - this.mainmenuFileExit.Name = "mainmenuFileExit"; - this.mainmenuFileExit.Size = new System.Drawing.Size(106, 22); - this.mainmenuFileExit.Text = "Exit"; - this.mainmenuFileExit.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); - // - // mainmenuOptions - // - this.mainmenuOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.changeSettingsToolStripMenuItem}); - this.mainmenuOptions.Name = "mainmenuOptions"; - this.mainmenuOptions.Size = new System.Drawing.Size(56, 20); - this.mainmenuOptions.Text = "Options"; - // - // mainmenuHelp - // - this.mainmenuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mainmenuHelpContent, - this.toolStripSeparator1, - this.MainMenuHelpAbout}); - this.mainmenuHelp.Name = "mainmenuHelp"; - this.mainmenuHelp.Size = new System.Drawing.Size(40, 20); - this.mainmenuHelp.Text = "Help"; - // - // mainmenuHelpContent - // - this.mainmenuHelpContent.Name = "mainmenuHelpContent"; - this.mainmenuHelpContent.Size = new System.Drawing.Size(124, 22); - this.mainmenuHelpContent.Text = "Content"; - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(121, 6); - // - // MainMenuHelpAbout - // - this.MainMenuHelpAbout.Name = "MainMenuHelpAbout"; - this.MainMenuHelpAbout.Size = new System.Drawing.Size(124, 22); - this.MainMenuHelpAbout.Text = "About"; - this.MainMenuHelpAbout.Click += new System.EventHandler(this.MainMenuHelpAbout_Click); - // - // changeSettingsToolStripMenuItem - // - this.changeSettingsToolStripMenuItem.Name = "changeSettingsToolStripMenuItem"; - this.changeSettingsToolStripMenuItem.Size = new System.Drawing.Size(163, 22); - this.changeSettingsToolStripMenuItem.Text = "Change settings"; - this.changeSettingsToolStripMenuItem.Click += new System.EventHandler(this.changeSettingsToolStripMenuItem_Click); + // toolbarHelpContents + // + this.toolbarHelpContents.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarHelpContents.Image = ((System.Drawing.Image)(resources.GetObject("toolbarHelpContents.Image"))); + this.toolbarHelpContents.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarHelpContents.Name = "toolbarHelpContents"; + this.toolbarHelpContents.Size = new System.Drawing.Size(23, 22); + this.toolbarHelpContents.ToolTipText = "Opens help file"; + // + // toolbarExit + // + this.toolbarExit.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarExit.Image = ((System.Drawing.Image)(resources.GetObject("toolbarExit.Image"))); + this.toolbarExit.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarExit.Name = "toolbarExit"; + this.toolbarExit.Size = new System.Drawing.Size(23, 22); + this.toolbarExit.ToolTipText = "Exits application"; + this.toolbarExit.Click += new System.EventHandler(this.toolbarExit_Click); + // + // snapshotToolStripMenuItem + // + this.snapshotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.takeSnapshotToolStripMenuItem, + this.loadSnapshotToolStripMenuItem, + this.toolStripSeparator3, + this.deleteSnapshotToolStripMenuItem}); + this.snapshotToolStripMenuItem.Name = "snapshotToolStripMenuItem"; + this.snapshotToolStripMenuItem.Size = new System.Drawing.Size(64, 20); + this.snapshotToolStripMenuItem.Text = "Snapshot"; + // + // takeSnapshotToolStripMenuItem + // + this.takeSnapshotToolStripMenuItem.Name = "takeSnapshotToolStripMenuItem"; + this.takeSnapshotToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.takeSnapshotToolStripMenuItem.Text = "Take snapshot"; + // + // loadSnapshotToolStripMenuItem + // + this.loadSnapshotToolStripMenuItem.Name = "loadSnapshotToolStripMenuItem"; + this.loadSnapshotToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.loadSnapshotToolStripMenuItem.Text = "Load snapshot"; + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(160, 6); + // + // deleteSnapshotToolStripMenuItem + // + this.deleteSnapshotToolStripMenuItem.Name = "deleteSnapshotToolStripMenuItem"; + this.deleteSnapshotToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.deleteSnapshotToolStripMenuItem.Text = "Delete snapshot"; // // MainForm // @@ -340,7 +387,7 @@ this.Name = "MainForm"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "QEmu Manager"; + this.Text = "ReactOS Testing Environment - VM Manager"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); this.Load += new System.EventHandler(this.MainForm_Load); this.mainToolbar.ResumeLayout(false); @@ -386,7 +433,13 @@ private System.Windows.Forms.ToolStripMenuItem mainmenuOptions; private System.Windows.Forms.ToolStripMenuItem newToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem virtualMachineToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem changeSettingsToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem snapshotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem takeSnapshotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadSnapshotToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; + private System.Windows.Forms.ToolStripMenuItem deleteSnapshotToolStripMenuItem;
} }
Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=273... ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Fri Jun 29 18:25:30 2007 @@ -35,29 +35,43 @@ Close(); }
+ private void LoadVirtualMachines(MainConfig mainConf) + { + int num = mainConf.GetNumberOfVms(); + for (int i = 0; i < num; i++) + { + string image = mainConf.GetExistingImage(i); + VirtualMachine vm = new VirtualMachine(); + if (vm.LoadVMConfig(image)) + { + ListViewItem lvi = VirtMachListView.Items.Add(vm.ToString(), 0); + lvi.SubItems.Add(vm.MemSize.ToString() + " MB"); + lvi.Tag = vm; + } + } + } + private void MainForm_Load(object sender, EventArgs e) { mainData = new Data(); if (!mainData.LoadMainData()) MessageBox.Show("Failed to load Main Schema");
- // read config and load any existing vm's mainConf = new MainConfig(mainData);
+ // load config and load any existing vm's if (mainConf.LoadMainConfig()) { - int num = mainConf.GetNumberOfVms(); - for (int i = 0; i < num; i++) - { - string image = mainConf.GetExistingImage(i); - VirtualMachine vm = new VirtualMachine(); - if (vm.LoadVMConfig(image)) - { - ListViewItem lvi = VirtMachListView.Items.Add(vm.ToString(), 0); - lvi.Tag = vm; - } - } + mainConf.LoadSettings(); + LoadVirtualMachines(mainConf); } + else // create settings for first run + { + mainConf.CreateSettings(); + } + + string str = mainConf.QemuPath; + }
private void MainMenuHelpAbout_Click(object sender, EventArgs e) @@ -171,5 +185,12 @@ { LoadSettingsDialog(); } + + private void settingsToolStripMenuItem_Click(object sender, EventArgs e) + { + ConsoleSettings cs = new ConsoleSettings(mainConf); + cs.StartPosition = FormStartPosition.CenterParent; + cs.ShowDialog(); + } } }
Modified: trunk/tools/RosTE/GUI/MainForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.resx?rev=2... ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.resx (original) +++ trunk/tools/RosTE/GUI/MainForm.resx Fri Jun 29 18:25:30 2007 @@ -161,6 +161,12 @@ XgAC/wYACw== </value> </data> + <metadata name="mainToolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>358, 23</value> + </metadata> + <metadata name="mainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>242, 22</value> + </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="toolbarLaunch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> @@ -184,12 +190,12 @@ <data name="toolbarImageAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAPxJREFUOE9jYKAV - 8PDwYE9LS2Otr69nIscOxtDw4P8OTvZ/gfQ/EDs+Pp6DJIPCIuz+3L5z6/+u3Tv/h0WE/Pbx8eEiyQCQ - 7Xfu3v6/e8+u/0DNv0JDQ3kIGgDyr729PQtQMRvI6TADIqLCfkZHR/PhNQDkTyj+B7Ldxc3p7917d8Au - iIwO/4MkD1aHYRhI8M7dW0B8+z9II4gG4QMH96Pgg4cO4DYAFGhHjh7+f/jIIbwYpwvQnXnm7On/IOzk - 4gCKTpgXsbsA3U8gDVeuXgbj8Ej7PySnA5AB129cA2OyDbh85dJ/ECbLAFDiCY8M/Q3CIDYobxBMSAOi - AAB7J98zlsMqwgAAAABJRU5ErkJggg== + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAPtJREFUOE9jYKAV + 8PDwYE9LS2Otr69nIscOxtDw4P/2DvZ/gfQ/EDs+Pp6DJIPCImz+3L5z6/+u3Tv/h0WE/Pbx8eEiyQCQ + 7Xfu3v6/e8+u/0DNv0JDQ3kIGgDyr729PQtQMRvI6TADIqLCfkZHR/PhNQDkTyj+B7LdycXh7917d8Au + iIwO/4MkD1aHYRhI8M7dW0B8+z9II4gG4QMH96Pgg4cO4DYAFGhHjh7+f/jIIbwYpwvQnXnm7On/IOzg + BI5OmBexuwDdTyANV65eBuPwSNs/JKcDkAHXb1wDY7INuHzl0n8QJssAUOIJjwz9DcIgNihvEExIA6IA + ADzE3xfN6Q2vAAAAAElFTkSuQmCC </value> </data> <data name="toolbarImageDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -200,40 +206,6 @@ qFMYAMrCeub6SDuqAAAAAElFTkSuQmCC </value> </data> - <data name="toolbarHelpContents.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAtlJREFUOE+FU11I - U2EYXllBF3VjW91JklGUmCnCliUqSuaSfgjMm4FKpgRezFwQdKISKddM259LaJA/oNCF/WhRrQsnM8Ib - saBAspmbytz5m2fn7Jy9nfczJddFBx7Od873vO/3vM/7fls0KY/jQlWxlHusWtm563RSI+/D7a2abeE0 - gRvb/uXrs2uDw+OpMeSboqgdnlP6wODhQ4rf51N4ngNJkkAURaDpKPjejikDB7MU5CB3U5KhoaE0T05O - 6IPluiyFQiBMBoBhaIhGIwQME4WYfxxWp6dhrOGKjFyM2UjiOWn42G8yJaTZWWDq64EuKgIm9IskYVka - mPAC0KWlwFhaQZiaAq/KxRiSwHmxKteWuV8WZmaAMZmAKSmBSHU1DJw1JlSpccTAuapEtK4O2MpKYMxm - 4Cf8YMvIkN3njcc1trbbjjdPPEn+1UugCwthpaYGnDpt0lVR5qS6qN0Ij7p27tUlo01NRAk3+hp8z4cV - 652bLk1np/VHJLKsGrUCbDgEI0aj5C4tepTqtLO8+OH7EwaZX14k3LBaFsai+/FYjCdm4ZvIVk9NTUDU - qHuCsPrHWJpwSQJsGbZKEGL/TSCKccJFg0kClLG0tKi6zYLAsfDiaoPorijrSFXgLi+xjZrNcVFVwLIM - LCzMr5WARvj6+xS+txfYxkag372DvsxMxV1R7lg30XWm3N6fdUDhvn8Dtu0ecPbH4HM5FWyABlvh0mqT - vMUCtF4PPEUB4/fDyA2L1G2n4ogRipJiP+cg5vUCXVAAbG0tONPTkzgCRKlXXzAeyM+HWEsL0AYDcK2t - gFJlOaFChoQkAtfdRYI5dR4msrMBYzbKxLF8evTIciAvD7jmZuB63KROnMI1MMA57ORkDEbuplFev0xe - vf6zS6dLfrrfLs/PB4nbiGAwCJPtbbJLuyeJnH8u09+O2y9fKuy8e6vHau2Ye2BtFxG4xn941VO78xtK - 1i8alKXmewAAAABJRU5ErkJggg== -</value> - </data> - <data name="toolbarExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAVxJREFUOE9jYKAF - 0DMx+08Mxmk3SPOjRw/+X7584f+BA3v/r127GswHibPzM/wX1mAAszEMWMLA8B+E0Q3Yvn0r3ABeGYb/ - EsZ4DPjd1AQ25N69O2AXHDy47//OndvhBkjosv1XdGRDuABmK4wGGQAz5MKFsxgGKNlx/NfyZ0c1AKYJ - Rp8BugBmyN69u/8vWbII7gJtP97/+mG8mAaANKFjmCGVleX/o6OjwJqMIgX+W6TxoRrwXlPz/xagAegY - JA7yWk5OFtwFZtES/21yhDENACmGYZBBMM3ogWgZJ/nfvkAUdyDCDAHZfOXKRYxAtEoS/++YJ4mUDv4z - MDJAMUgTzGZQwoEZAGLDEpJ1qsR/l1I8BsAS0oMH98CaQLissgpso12K3H+3EuX/3nXy2FMiMGmyATEj - LCXCNDrnyf/3rlL671en+j+gTut/QL02TgPAyZuYjIQ1L5CTswFNRoUxygqSMgAAAABJRU5ErkJggg== -</value> - </data> - <metadata name="mainToolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>358, 23</value> - </metadata> <data name="toolbarSnapShot.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -266,9 +238,37 @@ YPFAUCD3JItsvn6MXDsv/L6Jf/1tv/Xhnx/zLz/3rRNK6BfzAAAAAElFTkSuQmCC </value> </data> - <metadata name="mainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>242, 22</value> - </metadata> + <data name="toolbarHelpContents.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAthJREFUOE+FU11I + U2EYXllBF3VjW91JklGUmCnSxBIVR+aSfgjMm0FKpgRezFwQdCIbQi5N259DcOBMUOjCfpSwFuRkRngj + FhRIprmpzJ2/eXbOztnbeT9Tcl104OF853zP+37P+7zvt0OT8jiuVJVIuaeqlb37zic18iHc3qnZFU4T + uLHdX7723x4cnkiNId8URe3xnNMHB48fUz76/QrPcyBJEoiiCDQdBf/bMeX50SwFOcjdlmRoaCjNk5MT + em+5I0uhEAhTQWAYGqLRCAHDRCEWmID1mRkYq78pIxdjtpJ4zhZ+6DeZEtLcHDB1dUAXFwMT+kWSsCwN + THgJ6LIyYCwtIExPQ5/KxRiSwHm1KteWeVgWZmeBMZmAKS2FSHU1+C4aE6rUOMJ3qSoRra0FtrISGLMZ + +MkA2DIyZPdl42lNh/WBY7THneRfvwK6qAjWamrArtMmXRXlTqqL2o/wqGv7QV0y2thIlHCjb8D/Ylix + Pbzn0nR22n5EIquqUWvAhkMwYjRK7rLip6lOOw0lT97pz8j86jLhhtWyMBbdj8diPDEL30S2empqAqJG + 3ROE9T/G0oRLEmDLsFWCEPtvAlGMEy4aTBKgjJWVZdVtFgSOhZe36kV3RXl7qgK3obRj1GyOi6oClmVg + aWlxowQ0wj/gU/jeXmAbGoAeHwdfZqbirjA4Nk10XTDYB7KOKNz3b8BaHwFnfwZ+l1PBBmiwFQ6tNslb + LEDr9cBTFDCBAIzctUjddiqOGKEoKfZzHmJeL9AFBcDeuAH29PQkjgBR6tUXTATz8yHW3Ax0YSFwLS2A + UmU5oUKGhCQC191Fgjl1HiazswFjtsrEsew7eWI1mJcHXFMTcD1uUidO4QYY4Bx2cjIGI3fbKG9eJq9e + /9mh0yU/tVnlxcUF4jZiYWEBpqytskN7IImcfy7T347br18r6my932Oztc8/trWJCFzjP7zqqd35DfRf + Lu+Mc2gnAAAAAElFTkSuQmCC +</value> + </data> + <data name="toolbarExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAVxJREFUOE9jYKAF + 0DMx+08Mxmk3SPOjRw/+X7584f+BA3v/r127GswHibPzM/wX1mAAszEMWMLA8B+E0Q3Yvn0r3ABeGYb/ + EsZ4DPjd1AQ25N69O2AXHDy47//OndvhBkjosv1XdGRDuABmK4wGGQAz5MKFsxgGKNlx/NfyZ0c1AKYJ + Rp8BugBmyN69u/8vWbII7gJtP97/+mG8mAaANKFjmCGVleX/o6OjwJqMIgX+W6TxoRrwXlPz/xagAegY + JA7yWk5OFtwFZtES/21yhDENACmGYZBBMM3ogWgZJ/nfvkAUdyDCDAHZfOXKRYxAtEoS/++YJ4mUDv4z + MDJAMUgTzGZQwoEZAGLDEpJ1qsR/l1I8BsAS0oMH98CaQLissgpso12K3H+3EuX/3nXy2FMiMGmyATEj + LCXCNDrnyf/3rlL671en+j+gTut/QL02TgPAyZuYjIQ1L5CTswFNRoUxygqSMgAAAABJRU5ErkJggg== +</value> + </data> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> AAABAAkAEBAAAAEACABoBQAAlgAAACAgAAABAAgAqAgAAP4FAAAwMAAAAQAIAKgOAACmDgAAEBAAAAEA
Modified: trunk/tools/RosTE/GUI/RosTEGUI.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/RosTEGUI.csproj?rev... ============================================================================== --- trunk/tools/RosTE/GUI/RosTEGUI.csproj (original) +++ trunk/tools/RosTE/GUI/RosTEGUI.csproj Fri Jun 29 18:25:30 2007 @@ -120,6 +120,12 @@ <Compile Include="AboutForm.Designer.cs"> <DependentUpon>AboutForm.cs</DependentUpon> </Compile> + <Compile Include="ConsoleSettings.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="ConsoleSettings.Designer.cs"> + <DependentUpon>ConsoleSettings.cs</DependentUpon> + </Compile> <Compile Include="DeleteVM.cs"> <SubType>Form</SubType> </Compile> @@ -163,6 +169,8 @@ <DesignTime>True</DesignTime> <DependentUpon>Resources.resx</DependentUpon> </Compile> + <Compile Include="qemu.cs"> + </Compile> <Compile Include="SettingsForm.cs"> <SubType>Form</SubType> </Compile> @@ -215,6 +223,10 @@ <EmbeddedResource Include="AboutForm.resx"> <SubType>Designer</SubType> <DependentUpon>AboutForm.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="ConsoleSettings.resx"> + <SubType>Designer</SubType> + <DependentUpon>ConsoleSettings.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DeleteVM.resx"> <SubType>Designer</SubType>
Added: trunk/tools/RosTE/GUI/qemu.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/qemu.cs?rev=27323&a... ============================================================================== --- trunk/tools/RosTE/GUI/qemu.cs (added) +++ trunk/tools/RosTE/GUI/qemu.cs Fri Jun 29 18:25:30 2007 @@ -1,0 +1,19 @@ +using System; +using System.Collections; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; +using System.Management; +using System.IO; +using System.Diagnostics; + + +namespace RosTEGUI +{ + public class qemu + { + + } +}