Author: cwittich Date: Wed Jun 21 18:56:14 2006 New Revision: 22461
URL: http://svn.reactos.ru/svn/reactos?rev=22461&view=rev Log: -forgot to commit two files -some minor improvements
Added: trunk/tools/Qemu GUI/frmError.Designer.cs trunk/tools/Qemu GUI/frmError.cs Modified: trunk/tools/Qemu GUI/frmMain.cs
Added: trunk/tools/Qemu GUI/frmError.Designer.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmError.Designer.c... ============================================================================== --- trunk/tools/Qemu GUI/frmError.Designer.cs (added) +++ trunk/tools/Qemu GUI/frmError.Designer.cs Wed Jun 21 18:56:14 2006 @@ -1,0 +1,75 @@ +namespace Qemu_GUI +{ + partial class frmError + { + /// <summary> + /// Erforderliche Designervariable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Verwendete Ressourcen bereinigen. + /// </summary> + /// <param name="disposing">True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Vom Windows Form-Designer generierter Code + + /// <summary> + /// Erforderliche Methode für die Designerunterstützung. + /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden. + /// </summary> + private void InitializeComponent() + { + this.txtError = new System.Windows.Forms.TextBox(); + this.btnOK = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // txtError + // + this.txtError.Location = new System.Drawing.Point(12, 12); + this.txtError.Multiline = true; + this.txtError.Name = "txtError"; + this.txtError.Size = new System.Drawing.Size(318, 168); + this.txtError.TabIndex = 0; + // + // btnOK + // + this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; + this.btnOK.Location = new System.Drawing.Point(122, 192); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(93, 23); + this.btnOK.TabIndex = 5; + this.btnOK.Text = "OK"; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // + // frmError + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(342, 224); + this.ControlBox = false; + this.Controls.Add(this.btnOK); + this.Controls.Add(this.txtError); + this.Name = "frmError"; + this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Error"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button btnOK; + public System.Windows.Forms.TextBox txtError; + } +}
Added: trunk/tools/Qemu GUI/frmError.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmError.cs?rev=224... ============================================================================== --- trunk/tools/Qemu GUI/frmError.cs (added) +++ trunk/tools/Qemu GUI/frmError.cs Wed Jun 21 18:56:14 2006 @@ -1,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace Qemu_GUI +{ + public partial class frmError : Form + { + public frmError() + { + InitializeComponent(); + } + + private void btnOK_Click(object sender, EventArgs e) + { + this.Close(); + } + } +}
Modified: trunk/tools/Qemu GUI/frmMain.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmMain.cs?rev=2246... ============================================================================== --- trunk/tools/Qemu GUI/frmMain.cs (original) +++ trunk/tools/Qemu GUI/frmMain.cs Wed Jun 21 18:56:14 2006 @@ -1309,7 +1309,7 @@ this.groupBox2.Size = new System.Drawing.Size(454, 195); this.groupBox2.TabIndex = 21; this.groupBox2.TabStop = false; - this.groupBox2.Text = "QEmu"; + this.groupBox2.Text = "Paths"; // // txtQEmuPath // @@ -1521,24 +1521,28 @@ #region Harddisks private void btnBrowseHDA_Click(object sender, System.EventArgs e) { + openFile.Filter = "Harddisk images |*.vmdk;*.cloop;*.cow;*.qcow;*.raw"; if (openFile.ShowDialog() == DialogResult.OK) txtHDA.Text = openFile.FileName; }
private void btnBrowseHDB_Click(object sender, System.EventArgs e) { + openFile.Filter = "Harddisk images |*.vmdk;*.cloop;*.cow;*.qcow;*.raw"; if (openFile.ShowDialog() == DialogResult.OK) qemu.Harddisks.HDD[1].Path = openFile.FileName; }
private void btnBrowseHDC_Click(object sender, System.EventArgs e) { + openFile.Filter = "Harddisk images |*.vmdk;*.cloop;*.cow;*.qcow;*.raw"; if (openFile.ShowDialog() == DialogResult.OK) txtHDC.Text = openFile.FileName; }
private void btnBrowseHDD_Click(object sender, System.EventArgs e) { + openFile.Filter = "Harddisk images |*.vmdk;*.cloop;*.cow;*.qcow;*.raw"; if (openFile.ShowDialog() == DialogResult.OK) txtHDD.Text = openFile.FileName; } @@ -1720,7 +1724,21 @@
cboCDROM.SelectedIndex = 0; cboBootFrom.SelectedIndex = 1; - cboImageFormat.SelectedIndex = 4; + cboImageFormat.SelectedIndex = 4; + + /* try to load config.xml from current directory */ + try + { + XmlSerializer s = new XmlSerializer(typeof(QEmu)); + TextReader r = new StreamReader(".//config.xml"); + qemu = (QEmu)s.Deserialize(r); + r.Close(); + LoadSettings(); + } + catch + { + } + }
#region Floppy @@ -1774,7 +1792,8 @@ #region Settings private void btnSave_Click(object sender, EventArgs e) { - SaveSettings(); + SaveSettings(); + saveFileDialog1.FileName = "config.xml"; saveFileDialog1.Filter = "QEmu GUI Config (*.xml)|*.xml"; if (saveFileDialog1.ShowDialog() == DialogResult.OK) {
-
cwittich＠svn.reactos.org