21 Jun
2006
21 Jun
'06
12:35 p.m.
Author: cwittich
Date: Wed Jun 21 16:35:52 2006
New Revision: 22454
URL: http://svn.reactos.ru/svn/reactos?rev=22454&view=rev
Log:
-forgot to commit frmMain.resx
-some code changes
Added:
trunk/tools/Qemu GUI/frmMain.resx
Modified:
trunk/tools/Qemu GUI/QEmu.cs
trunk/tools/Qemu GUI/Qemu GUI.suo
trunk/tools/Qemu GUI/frmMain.cs
Modified: trunk/tools/Qemu GUI/QEmu.cs
URL:
http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=22454&…
==============================================================================
--- trunk/tools/Qemu GUI/QEmu.cs (original)
+++ trunk/tools/Qemu GUI/QEmu.cs Wed Jun 21 16:35:52 2006
@@ -17,6 +17,7 @@
private Audio m_Audio = new Audio();
private Debug m_Debug = new Debug();
private Paths m_Paths = new Paths();
+ private CDROM m_CDROM = new CDROM();
public QEmu()
{
@@ -77,6 +78,13 @@
set { this.m_Floppies = value; }
}
+ [XmlElement("CDROM")]
+ public CDROM CDROM
+ {
+ get { return m_CDROM; }
+ set { this.m_CDROM = value; }
+ }
+
[XmlElement("Harddisks")]
public Harddisks Harddisks
{
@@ -132,6 +140,15 @@
arg = arg + "-hd" + ((char) i + 97) + " " +
this.Harddisks.HDD[i].Path + " ";
}
+
+ /* CD-ROM */
+ if (this.CDROM.Enabled)
+ {
+ if (this.CDROM.UseFromHost)
+ arg = arg + "-cdrom " + this.CDROM.HostDrive + "
";
+ else if (this.CDROM.Image.Length > 0)
+ arg = arg + "-cdrom " + this.CDROM.Image + " ";
+ }
return arg;
}
@@ -255,6 +272,22 @@
}
}
+ public class CDROM
+ {
+ [XmlAttribute("Image")]
+ public string Image;
+ [XmlAttribute("UseFromHost")]
+ public bool UseFromHost;
+ [XmlAttribute("HostDrive")]
+ public string HostDrive;
+ [XmlAttribute("Enabled")]
+ public bool Enabled;
+
+ public CDROM()
+ {
+ }
+ }
+
public class Drive
{
[XmlAttribute("Path")]
Modified: trunk/tools/Qemu GUI/Qemu GUI.suo
URL:
http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/Qemu%20GUI.suo?rev…
==============================================================================
Binary files - no diff available.
Modified: trunk/tools/Qemu GUI/frmMain.cs
URL:
http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmMain.cs?rev=224…
==============================================================================
--- trunk/tools/Qemu GUI/frmMain.cs (original)
+++ trunk/tools/Qemu GUI/frmMain.cs Wed Jun 21 16:35:52 2006
@@ -1639,21 +1639,7 @@
/*
private string GetArgv()
{
-
-
- /// cdrom
- if ((chkUseCDROM.Checked == true) && (hdd_on == false))
- {
- if (optHostCDROM.Checked == true)
- {
- arg = arg + "-cdrom " + cboCDROM.Text + " ";
- }
- else if (txtCDROM.Text != "" && txtCDROM.Text != null)
- {
- arg = arg + "-cdrom " + txtCDROM.Text + " ";
- }
- }
-
+
/// boot options
if (cboBootFrom.Text == "Floppy")
{
@@ -1906,6 +1892,13 @@
numMemory.Value = qemu.Misc.Memory;
numSMP.Value = qemu.Misc.CPUs;
+ /* CD-ROM */
+ optHostCDROM.Checked = qemu.CDROM.UseFromHost;
+ optCDImage.Checked = !qemu.CDROM.UseFromHost;
+ txtCDROM.Text = qemu.CDROM.Image;
+ cboCDROM.Text = qemu.CDROM.HostDrive;
+ chkUseCDROM.Checked = qemu.CDROM.Enabled;
+
/* Paths */
txtQEmuPath.Text = qemu.Paths.QEmu;
txtVDKPath.Text = qemu.Paths.VDK;
@@ -1929,6 +1922,12 @@
qemu.Floppies.FDD[0].Path = txtFloppyA.Text;
qemu.Floppies.FDD[1].Enabled = chkFloppyB.Checked;
qemu.Floppies.FDD[1].Path = txtFloppyB.Text;
+
+ /* CD-ROM */
+ qemu.CDROM.UseFromHost = optHostCDROM.Checked;
+ qemu.CDROM.Image = txtCDROM.Text;
+ qemu.CDROM.HostDrive = cboCDROM.Text;
+ qemu.CDROM.Enabled = chkUseCDROM.Checked;
/* Harddisks */
qemu.Harddisks.HDD[0].Enabled = chkUseHDA.Checked;
Added: trunk/tools/Qemu GUI/frmMain.resx
URL:
http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmMain.resx?rev=2…
==============================================================================
--- trunk/tools/Qemu GUI/frmMain.resx (added)
+++ trunk/tools/Qemu GUI/frmMain.resx Wed Jun 21 16:35:52 2006
@@ -1,0 +1,180 @@
+<?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>
+ <data name="txtAbout.Text" xml:space="preserve">
+ <value>This program is written by Magnus Olsen for ReactOS in C# to use with
Qemu and VDK
+
+ License GPL source code is in ReactOS SVN
+
+Copyright (C) 2006 By Magnus Olsen
+(magnus(a)greatlord.com / greatlord(a)reactos.com)</value>
+ </data>
+ <metadata name="openFile.TrayLocation" type="System.Drawing.Point,
System.Drawing, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a">
+ <value>23, 33</value>
+ </metadata>
+ <metadata name="folderBrowserDialog1.TrayLocation"
type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a">
+ <value>116, 33</value>
+ </metadata>
+ <metadata name="saveFileDialog1.TrayLocation"
type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a">
+ <value>274, 33</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="$this.Icon" type="System.Drawing.Icon,
System.Drawing"
mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAABAAEAICAAAAAAAACoCAAAFgAAACgAAAAgAAAAQAAAAAEACAAAAAAAAAQAAAAAAAAAAAAAAAEAAAAB
+ AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAMDcwADwyqYABAQEAAgICAAMDAwAERERABYW
+ FgAcHBwAIiIiACkpKQBVVVUATU1NAEJCQgA5OTkAgHz/AFBQ/wCTANYA/+zMAMbW7wDW5+cAkKmtAAAA
+ MwAAAGYAAACZAAAAzAAAMwAAADMzAAAzZgAAM5kAADPMAAAz/wAAZgAAAGYzAABmZgAAZpkAAGbMAABm
+ /wAAmQAAAJkzAACZZgAAmZkAAJnMAACZ/wAAzAAAAMwzAADMZgAAzJkAAMzMAADM/wAA/2YAAP+ZAAD/
+ zAAzAAAAMwAzADMAZgAzAJkAMwDMADMA/wAzMwAAMzMzADMzZgAzM5kAMzPMADMz/wAzZgAAM2YzADNm
+ ZgAzZpkAM2bMADNm/wAzmQAAM5kzADOZZgAzmZkAM5nMADOZ/wAzzAAAM8wzADPMZgAzzJkAM8zMADPM
+ /wAz/zMAM/9mADP/mQAz/8wAM///AGYAAABmADMAZgBmAGYAmQBmAMwAZgD/AGYzAABmMzMAZjNmAGYz
+ mQBmM8wAZjP/AGZmAABmZjMAZmZmAGZmmQBmZswAZpkAAGaZMwBmmWYAZpmZAGaZzABmmf8AZswAAGbM
+ MwBmzJkAZszMAGbM/wBm/wAAZv8zAGb/mQBm/8wAzAD/AP8AzACZmQAAmTOZAJkAmQCZAMwAmQAAAJkz
+ MwCZAGYAmTPMAJkA/wCZZgAAmWYzAJkzZgCZZpkAmWbMAJkz/wCZmTMAmZlmAJmZmQCZmcwAmZn/AJnM
+ AACZzDMAZsxmAJnMmQCZzMwAmcz/AJn/AACZ/zMAmcxmAJn/mQCZ/8wAmf//AMwAAACZADMAzABmAMwA
+ mQDMAMwAmTMAAMwzMwDMM2YAzDOZAMwzzADMM/8AzGYAAMxmMwCZZmYAzGaZAMxmzACZZv8AzJkAAMyZ
+ MwDMmWYAzJmZAMyZzADMmf8AzMwAAMzMMwDMzGYAzMyZAMzMzADMzP8AzP8AAMz/MwCZ/2YAzP+ZAMz/
+ zADM//8AzAAzAP8AZgD/AJkAzDMAAP8zMwD/M2YA/zOZAP8zzAD/M/8A/2YAAP9mMwDMZmYA/2aZAP9m
+ zADMZv8A/5kAAP+ZMwD/mWYA/5mZAP+ZzAD/mf8A/8wAAP/MMwD/zGYA/8yZAP/MzAD/zP8A//8zAMz/
+ ZgD//5kA///MAGZm/wBm/2YAZv//AP9mZgD/Zv8A//9mACEApQBfX18Ad3d3AIaGhgCWlpYAy8vLALKy
+ sgDX19cA3d3dAOPj4wDq6uoA8fHxAPj4+ADw+/8ApKCgAICAgAAAAP8AAP8AAAD//wD/AAAA/wD/AP//
+ AAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAP///wf////yB//////////////////v8P///7z////////v7gf///////L3////////
+ /5Ly//////8H7gf/////8v//////8Pf//+7w9+34bewH7///kvD///////H///Lz////////8PDv9+7u
+ 7+zv7+3rkrz/////////8/T//7z///////fv7vLzBwfv8Qft97zv7fj///////+8////B//////377zx
+ 8/MHvPPx7+687/eR+Oz//////wf/B//3////9+/u8vT1B/H08e/zvAeS95GRkZH/////7//3///x///3
+ u/H09Qf09fC89fIHB/DtrpGR7Oz///////8H/+//7fe88/UH9PW88vX08/D39+7tkZH4kf//B//y/+//
+ //GR9/D0B/T1vPL19fTz8vLt9wftkfiRkv/s/+////H/7JHv8e/09bzy//X19PPx8PHtu/DtkZGS9///
+ ////7///ke/v9PW88vX19fX08vHw8PP38fLt7ZH//+//////vK6R9/DzB/H19fX19PPy8fHy9PQH9PPt
+ kff0///////3kZEH8Ae88/Pz8/Py8fDw8fP09PHu9PDsB5L///////+R7e7v7/C88PDw8O4H7++7CfHz
+ 9PDw9O/3/////////+vu95Lu7+8HBwcH7/eS7fe1u/Hz9Afx8uz/////////7/f4B5GR7ZL395Ltka6u
+ kbu7CfDx8+/u7v//////////ru+Ri66urvj4665tbGyR7vHwCQm77vf/kv//////B//s72xsbGxsbGxs
+ bGxsbK737ru7u7Xx9//u/////////weubGxsbGxsZmZmZmZskbu7kZH3u/Dy////////7////2xsi66R
+ ka5sZmZmbK7t9/eRrpG8///3/+////8H/wf//2yutbu7kWxmZmZsbK6Rka6uu/H//wf/7v///+7/8v//
+ /4u78Ly1bGZDQ2xsbGxsrrvx////////////7v///////5G7u5FsZkNmZmxsbK67///////////////v
+ 7v////////+ubGxmZmZsbIuRu//////////u7//////v/////////+7//66ubK6R//8H/////////7z/
+ //////8H///07vf/////7v///wf/////7wfy///x///////////yvO/////0B/////////8H8v////+8
+ 8v//////////////Bwfv/////////////////+8HB/////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAD/////
+</value>
+ </data>
+</root>