ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
June 2007
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
21 participants
420 discussions
Start a n
N
ew thread
[gedmurphy] 27289: - add an populate harddrives and netcards to the DB - highlight when the user is moving outside of the recommended mem settings - improve the error reporting messages
by gedmurphy@svn.reactos.org
Author: gedmurphy Date: Wed Jun 27 19:59:51 2007 New Revision: 27289 URL:
http://svn.reactos.org/svn/reactos?rev=27289&view=rev
Log: - add an populate harddrives and netcards to the DB - highlight when the user is moving outside of the recommended mem settings - improve the error reporting messages Modified: trunk/tools/RosTE/GUI/ErrorForm.Designer.cs trunk/tools/RosTE/GUI/ErrorForm.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/SettingsForm.cs trunk/tools/RosTE/GUI/VMConfig.xsd trunk/tools/RosTE/GUI/VMConfig.xsx trunk/tools/RosTE/GUI/VirtualMachine.cs Modified: trunk/tools/RosTE/GUI/ErrorForm.Designer.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ErrorForm.Designer…
============================================================================== --- trunk/tools/RosTE/GUI/ErrorForm.Designer.cs (original) +++ trunk/tools/RosTE/GUI/ErrorForm.Designer.cs Wed Jun 27 19:59:51 2007 @@ -70,7 +70,9 @@ this.Controls.Add(this.errorCopyBtn); this.Controls.Add(this.errorCloseBtn); this.Controls.Add(this.errorText); + this.MaximizeBox = false; this.Name = "ErrorForm"; + this.ShowIcon = false; this.Text = "Error"; this.ResumeLayout(false); this.PerformLayout(); Modified: trunk/tools/RosTE/GUI/ErrorForm.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ErrorForm.cs?rev=2…
============================================================================== --- trunk/tools/RosTE/GUI/ErrorForm.cs (original) +++ trunk/tools/RosTE/GUI/ErrorForm.cs Wed Jun 27 19:59:51 2007 @@ -10,11 +10,11 @@ { public partial class ErrorForm : Form { - public ErrorForm(string message) + public ErrorForm(string message, string exception, string trace) { InitializeComponent(); - errorText.Text = message; + errorText.Text = message + " : " + exception + "\n\t" + trace; } private void errorCloseBtn_Click(object sender, EventArgs e) Modified: trunk/tools/RosTE/GUI/MainForm.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=27…
============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Wed Jun 27 19:59:51 2007 @@ -136,7 +136,18 @@ if (delFrm.DeleteFullVM) { VirtualMachine vm = (VirtualMachine)lvi.Tag; - Directory.Delete(vm.DefDir, true); + + try + { + Directory.Delete(vm.DefDir, true); + } + catch (DirectoryNotFoundException ex) + { + MessageBox.Show(vm.DefDir + " has was not found!", + "error", + MessageBoxButtons.OK, + MessageBoxIcon.Error); + } } mainConf.DeleteVirtMach(lvi.Index/*lvi.Tag*/); Modified: trunk/tools/RosTE/GUI/SettingsForm.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.cs?re…
============================================================================== --- trunk/tools/RosTE/GUI/SettingsForm.cs (original) +++ trunk/tools/RosTE/GUI/SettingsForm.cs Wed Jun 27 19:59:51 2007 @@ -226,11 +226,23 @@ memoryUpDwn.Value = tb.Value; char[] chars = { ' ', 'M', 'B' }; - string str = memoryRecMax.Text.TrimEnd(chars); - if (tb.Value > Convert.ToInt32(str)) - memoryTrkBar.BackColor = Color.MistyRose; - else - memoryTrkBar.BackColor = SystemColors.Menu; + string max = memoryRecMax.Text.TrimEnd(chars); + string min = memoryRecMin.Text.TrimEnd(chars); + if (tb.Value > Convert.ToInt32(max)) + { + memoryRecMin.ForeColor = SystemColors.WindowText; + memoryRecMax.ForeColor = Color.Red; + } + else if (tb.Value < Convert.ToInt32(min)) + { + memoryRecMin.ForeColor = Color.Red; + memoryRecMax.ForeColor = SystemColors.WindowText; + } + else + { + memoryRecMin.ForeColor = SystemColors.WindowText; + memoryRecMax.ForeColor = SystemColors.WindowText; + } } private void memoryUpDwn_ValueChanged(object sender, EventArgs e) @@ -278,4 +290,4 @@ } } } -} +} Modified: trunk/tools/RosTE/GUI/VMConfig.xsd URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMConfig.xsd?rev=2…
============================================================================== --- trunk/tools/RosTE/GUI/VMConfig.xsd (original) +++ trunk/tools/RosTE/GUI/VMConfig.xsd Wed Jun 27 19:59:51 2007 @@ -31,8 +31,9 @@ <xs:sequence> <xs:element name="DiskID" type="xs:int" /> <xs:element name="VirtMachID" type="xs:int" /> + <xs:element name="Name" type="xs:string" /> <xs:element name="Path" type="xs:string" /> - <xs:element name="Size" type="xs:string" /> + <xs:element name="Size" type="xs:int" /> </xs:sequence> </xs:complexType> <xs:keyref name="VMConfigHardDisks" refer="VMConfigKey"> Modified: trunk/tools/RosTE/GUI/VMConfig.xsx URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMConfig.xsx?rev=2…
============================================================================== --- trunk/tools/RosTE/GUI/VMConfig.xsx (original) +++ trunk/tools/RosTE/GUI/VMConfig.xsx Wed Jun 27 19:59:51 2007 @@ -1,9 +1,9 @@ <?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="-128" viewPortTop="-6097" zoom="100"> - <VMConfig_XmlElement left="7091" top="-3148" width="7858" height="11721" selected="0" zOrder="0" index="0" expanded="1" /> - <HardDisks_XmlElement left="872" top="-3201" width="5292" height="2831" selected="0" zOrder="3" index="1" expanded="1" /> - <NetCards_XmlElement left="16033" top="-3176" width="5292" height="5371" selected="0" zOrder="1" index="2" expanded="1" /> - <VMConfigHardDisks_XmlKeyref left="5129" top="-5302" width="503" height="503" selected="0" zOrder="4" expanded="0" /> - <VMConfigNetCards_XmlKeyref left="13857" top="-5195" width="503" height="503" selected="0" zOrder="8" expanded="0" /> +<XSDDesignerLayout Style="LeftRight" layoutVersion="2" viewPortLeft="-842" viewPortTop="-6097" zoom="100"> + <VMConfig_XmlElement left="5159" top="-3175" width="7858" height="11721" selected="0" zOrder="0" index="0" expanded="1" /> + <HardDisks_XmlElement left="-451" top="-3228" width="5292" height="3254" selected="0" zOrder="2" index="1" expanded="1" /> + <NetCards_XmlElement left="13546" top="-3176" width="5292" height="5371" selected="0" zOrder="1" index="2" expanded="1" /> + <VMConfigHardDisks_XmlKeyref left="4996" top="-5275" width="503" height="503" selected="0" zOrder="3" expanded="0" /> + <VMConfigNetCards_XmlKeyref left="12692" top="-5195" width="503" height="503" selected="0" zOrder="7" expanded="0" /> </XSDDesignerLayout> Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?…
============================================================================== --- trunk/tools/RosTE/GUI/VirtualMachine.cs (original) +++ trunk/tools/RosTE/GUI/VirtualMachine.cs Wed Jun 27 19:59:51 2007 @@ -4,13 +4,18 @@ using System.Data; using System.Xml; using System.Windows.Forms; +using System.Collections; namespace RosTEGUI { public class VirtualMachine { private Data data; - private DataRow dataRow; + private DataRow vmDataRow; + private DataRow hdDataRow; + private DataRow netDataRow; + private ArrayList hardDrives; + #region Virtual machine properties @@ -117,11 +122,12 @@ { try { - return (int)dataRow[key]; - } - catch (ArgumentException e) - { - ErrorForm err = new ErrorForm(e.Message); + return (int)vmDataRow[key]; + } + catch (ArgumentException e) + { + string message = "Failed to get " + key + " value"; + ErrorForm err = new ErrorForm(message, e.Message, e.StackTrace); err.ShowDialog(); return 0; } @@ -131,11 +137,12 @@ { try { - return (bool)dataRow[key]; - } - catch (ArgumentException e) - { - ErrorForm err = new ErrorForm(e.Message); + return (bool)vmDataRow[key]; + } + catch (ArgumentException e) + { + string message = "Failed to get " + key + " value"; + ErrorForm err = new ErrorForm(message, e.Message, e.StackTrace); err.ShowDialog(); return false; } @@ -145,11 +152,12 @@ { try { - return (string)dataRow[key]; - } - catch (ArgumentException e) - { - ErrorForm err = new ErrorForm(e.Message); + return (string)vmDataRow[key]; + } + catch (ArgumentException e) + { + string message = "Failed to get " + key + " value"; + ErrorForm err = new ErrorForm(message, e.Message, e.StackTrace); err.ShowDialog(); return string.Empty; } @@ -159,11 +167,12 @@ { try { - dataRow[key] = value; - } - catch (ArgumentException e) - { - ErrorForm err = new ErrorForm(e.Message); + vmDataRow[key] = value; + } + catch (ArgumentException e) + { + string message = "Failed to set " + key + " value"; + ErrorForm err = new ErrorForm(message, e.Message, e.StackTrace); err.ShowDialog(); } } @@ -172,11 +181,12 @@ { try { - dataRow[key] = value; - } - catch (ArgumentException e) - { - ErrorForm err = new ErrorForm(e.Message); + vmDataRow[key] = value; + } + catch (ArgumentException e) + { + string message = "Failed to set " + key + " value"; + ErrorForm err = new ErrorForm(message, e.Message, e.StackTrace); err.ShowDialog(); } } @@ -185,25 +195,17 @@ { try { - dataRow[key] = value; - } - catch (ArgumentException e) - { - ErrorForm err = new ErrorForm(e.Message); + vmDataRow[key] = value; + } + catch (ArgumentException e) + { + string message = "Failed to set " + key + " value"; + ErrorForm err = new ErrorForm(message, e.Message, e.StackTrace); err.ShowDialog(); } } #endregion - - private static void PrintRows(DataTable dt) - { - for (int i = 0; i < dt.Rows.Count; i++) - { - string str = "row: " + i + ", Name: " + dt.Rows[i]["Name"] + ", DefDir " + dt.Rows[i]["DefDir"]; - MessageBox.Show(str); - } - } private bool PopulateVMDatabase(string name, string dir, @@ -215,33 +217,52 @@ try { - DataTable dt = data.DataSet.Tables["VMConfig"]; - int i = dt.Rows.Count + 1; - dataRow = dt.NewRow(); - dataRow["VirtMachID"] = i; - dataRow["Name"] = name; - dataRow["MachType"] = "pc"; - dataRow["DefDir"] = dir; - dataRow["MemSize"] = memSize; - dataRow["SetClockToHost"] = true; - dataRow["CdRomEnable"] = true; - dataRow["CdRomUsePhys"] = true; - dataRow["CdRomPhysDrv"] = string.Empty; - dataRow["CdRomUseIso"] = false; - dataRow["CdRomIsoImg"] = string.Empty; - dataRow["FloppyEnable"] = true; - dataRow["FloppyUsePhys"] = true; - dataRow["FloppyPhysDrv"] = string.Empty; - dataRow["FloppyUseImg"] = false; - dataRow["FloppyIsoImg"] = string.Empty; - - dt.Rows.Add(dataRow); + DataTable vmdt = data.DataSet.Tables["VMConfig"]; + vmDataRow = vmdt.NewRow(); + vmDataRow["VirtMachID"] = vmdt.Rows.Count + 1; + vmDataRow["Name"] = name; + vmDataRow["MachType"] = "pc"; + vmDataRow["DefDir"] = dir; + vmDataRow["MemSize"] = memSize; + vmDataRow["SetClockToHost"] = true; + vmDataRow["CdRomEnable"] = true; + vmDataRow["CdRomUsePhys"] = true; + vmDataRow["CdRomPhysDrv"] = string.Empty; + vmDataRow["CdRomUseIso"] = false; + vmDataRow["CdRomIsoImg"] = string.Empty; + vmDataRow["FloppyEnable"] = true; + vmDataRow["FloppyUsePhys"] = true; + vmDataRow["FloppyPhysDrv"] = string.Empty; + vmDataRow["FloppyUseImg"] = false; + vmDataRow["FloppyIsoImg"] = string.Empty; + vmdt.Rows.Add(vmDataRow); + + DataTable hddt = data.DataSet.Tables["HardDisks"]; + hdDataRow = hddt.NewRow(); + hdDataRow["DiskID"] = hddt.Rows.Count + 1; + hdDataRow["VirtMachID"] = vmDataRow["VirtMachID"]; + hdDataRow["Name"] = "hda"; + hdDataRow["Path"] = string.Empty; + hdDataRow["Size"] = 0; + hddt.Rows.Add(hdDataRow); + + DataTable netdt = data.DataSet.Tables["NetCards"]; + netDataRow = netdt.NewRow(); + netDataRow["CardID"] = netdt.Rows.Count + 1; + netDataRow["VirtMachID"] = vmDataRow["VirtMachID"]; + netDataRow["Option"] = "hda"; + netDataRow["Vlan"] = 0; + netDataRow["MacAddr"] = string.Empty; + netDataRow["Model"] = string.Empty; + netDataRow["Hostname"] = string.Empty; + netdt.Rows.Add(netDataRow); ret = true; } catch (Exception e) { - ErrorForm err = new ErrorForm(e.Message); + string message = "Failed to populate database"; + ErrorForm err = new ErrorForm(message, e.Message, e.StackTrace); err.ShowDialog(); } @@ -314,14 +335,17 @@ data.DataSet.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema); xtr.Close(); - DataTable dt = data.DataSet.Tables["VMConfig"]; - dataRow = dt.Rows[0]; + DataTable vmdt = data.DataSet.Tables["VMConfig"]; + vmDataRow = vmdt.Rows[0]; + + DataTable hddt = data.DataSet.Tables["HardDisks"]; + hdDataRow = hddt.Rows[0]; ret = true; } catch (Exception e) { - MessageBox.Show("error loading VM Config.xml: " + e.Message); + MessageBox.Show("error loading the VM Config.xml: " + e.Message); } }
17 years, 6 months
1
0
0
0
[gedmurphy] 27288: - fix a bug in the database (requires deletion of the generated main config.xml) - populate floppy page
by gedmurphy@svn.reactos.org
Author: gedmurphy Date: Wed Jun 27 17:00:45 2007 New Revision: 27288 URL:
http://svn.reactos.org/svn/reactos?rev=27288&view=rev
Log: - fix a bug in the database (requires deletion of the generated main config.xml) - populate floppy page Modified: trunk/tools/RosTE/GUI/SettingsForm.cs trunk/tools/RosTE/GUI/VMConfig.xsd trunk/tools/RosTE/GUI/VirtualMachine.cs Modified: trunk/tools/RosTE/GUI/SettingsForm.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.cs?re…
============================================================================== --- trunk/tools/RosTE/GUI/SettingsForm.cs (original) +++ trunk/tools/RosTE/GUI/SettingsForm.cs Wed Jun 27 17:00:45 2007 @@ -85,11 +85,39 @@ } } + private void LoadFloppyPage() + { + DriveInfo[] drives = DriveInfo.GetDrives(); + + foreach (DriveInfo drive in drives) + { + if (drive.DriveType == DriveType.Removable) + floppyPhyDrvCombo.Items.Add(drive); + } + + floppyEnableChkBox.Checked = VirtMach.FloppyEnable; + + int id = floppyPhyDrvCombo.FindString(VirtMach.FloppyPhysDrv); + if (id == -1) id = 0; + floppyPhyDrvCombo.SelectedIndex = id; + + if (VirtMach.CdRomUsePhys) + { + floppyPhyDrvRadio.Checked = true; + } + else + { + floppyImgRadio.Checked = true; + floppyImgTxtBox.Text = VirtMach.FloppyIsoImg; + } + } + private void LoadFormData() { if (!LoadMemoryPage()) MessageBox.Show("An error occured whilst loading memory page data"); LoadCdRomPage(); + LoadFloppyPage(); } private void SettingsForm_Load(object sender, EventArgs e) Modified: trunk/tools/RosTE/GUI/VMConfig.xsd URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMConfig.xsd?rev=2…
============================================================================== --- trunk/tools/RosTE/GUI/VMConfig.xsd (original) +++ trunk/tools/RosTE/GUI/VMConfig.xsd Wed Jun 27 17:00:45 2007 @@ -16,7 +16,7 @@ <xs:element name="CdRomIsoImg" type="xs:string" /> <xs:element name="FloppyEnable" type="xs:boolean" /> <xs:element name="FloppyUsePhys" type="xs:boolean" /> - <xs:element name="FloppyPhyDrive" type="xs:string" /> + <xs:element name="FloppyPhysDrv" type="xs:string" /> <xs:element name="FloppyUseImg" type="xs:boolean" /> <xs:element name="FloppyIsoImg" type="xs:string" /> </xs:sequence> Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?…
============================================================================== --- trunk/tools/RosTE/GUI/VirtualMachine.cs (original) +++ trunk/tools/RosTE/GUI/VirtualMachine.cs Wed Jun 27 17:00:45 2007 @@ -226,12 +226,12 @@ dataRow["SetClockToHost"] = true; dataRow["CdRomEnable"] = true; dataRow["CdRomUsePhys"] = true; - dataRow["CdRomPhysDrv"] = "R:"; + dataRow["CdRomPhysDrv"] = string.Empty; dataRow["CdRomUseIso"] = false; dataRow["CdRomIsoImg"] = string.Empty; dataRow["FloppyEnable"] = true; dataRow["FloppyUsePhys"] = true; - dataRow["FloppyPhyDrive"] = "A:"; + dataRow["FloppyPhysDrv"] = string.Empty; dataRow["FloppyUseImg"] = false; dataRow["FloppyIsoImg"] = string.Empty; @@ -241,7 +241,8 @@ } catch (Exception e) { - MessageBox.Show("error populating VM database: " + e.Message); + ErrorForm err = new ErrorForm(e.Message); + err.ShowDialog(); } return ret;
17 years, 6 months
1
0
0
0
[gedmurphy] 27287: add exception handling to the set properties
by gedmurphy@svn.reactos.org
Author: gedmurphy Date: Wed Jun 27 16:13:22 2007 New Revision: 27287 URL:
http://svn.reactos.org/svn/reactos?rev=27287&view=rev
Log: add exception handling to the set properties Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?…
============================================================================== --- trunk/tools/RosTE/GUI/VirtualMachine.cs (original) +++ trunk/tools/RosTE/GUI/VirtualMachine.cs Wed Jun 27 16:13:22 2007 @@ -22,91 +22,91 @@ public string Name { get { return GetStringValue("Name"); } - set { dataRow["Name"] = value; } + set { SetStringValue("Name", value); } } public string MachType { get { return GetStringValue("MachType"); } - set { dataRow["MachType"] = value; } + set { SetStringValue("MachType", value); } } public string DefDir { get { return GetStringValue("DefDir"); } - set { dataRow["DefDir"] = value; } + set { SetStringValue("DefDir", value); } } public int MemSize { get { return GetIntValue("MemSize"); } - set { dataRow["MemSize"] = value; } + set { SetIntValue("MemSize", value); } } public bool SetClockToHost { get { return GetBoolValue("SetClockToHost"); } - set { dataRow["SetClockToHost"] = value; } + set { SetBoolValue("SetClockToHost", value); } } public bool CdRomEnable { get { return GetBoolValue("CdRomEnable"); } - set { dataRow["CdRomEnable"] = value; } + set { SetBoolValue("CdRomEnable", value); } } public bool CdRomUsePhys { get { return GetBoolValue("CdRomUsePhys"); } - set { dataRow["CdRomUsePhys"] = value; } + set { SetBoolValue("CdRomUsePhys", value); } } public string CdRomPhysDrv { get { return GetStringValue("CdRomPhysDrv"); } - set { dataRow["CdRomPhysDrv"] = value; } + set { SetStringValue("CdRomPhysDrv", value); } } public bool CdRomUseIso { get { return GetBoolValue("CdRomUseIso"); } - set { dataRow["CdRomUseIso"] = value; } + set { SetBoolValue("CdRomUseIso", value); } } public string CdRomIsoImg { get { return GetStringValue("CdRomIsoImg"); } - set { dataRow["CdRomIsoImg"] = value; } + set { SetStringValue("CdRomIsoImg", value); } } public bool FloppyEnable { get { return GetBoolValue("FloppyEnable"); } - set { dataRow["FloppyEnable"] = value; } + set { SetBoolValue("FloppyEnable", value); } } public bool FloppyUsePhys { get { return GetBoolValue("FloppyUsePhys"); } - set { dataRow["FloppyUsePhys"] = value; } + set { SetBoolValue("FloppyUsePhys", value); } } public string FloppyPhysDrv { get { return GetStringValue("FloppyPhysDrv"); } - set { dataRow["FloppyPhysDrv"] = value; } + set { SetStringValue("FloppyPhysDrv", value); } } public bool FloppyUseIso { get { return GetBoolValue("FloppyUseIso"); } - set { dataRow["FloppyUseIso"] = value; } + set { SetBoolValue("FloppyUseIso", value); } } public string FloppyIsoImg { get { return GetStringValue("FloppyIsoImg"); } - set { dataRow["FloppyIsoImg"] = value; } + set { SetStringValue("FloppyIsoImg", value); } } #endregion @@ -152,6 +152,45 @@ ErrorForm err = new ErrorForm(e.Message); err.ShowDialog(); return string.Empty; + } + } + + private void SetIntValue(string key, int value) + { + try + { + dataRow[key] = value; + } + catch (ArgumentException e) + { + ErrorForm err = new ErrorForm(e.Message); + err.ShowDialog(); + } + } + + private void SetBoolValue(string key, bool value) + { + try + { + dataRow[key] = value; + } + catch (ArgumentException e) + { + ErrorForm err = new ErrorForm(e.Message); + err.ShowDialog(); + } + } + + private void SetStringValue(string key, string value) + { + try + { + dataRow[key] = value; + } + catch (ArgumentException e) + { + ErrorForm err = new ErrorForm(e.Message); + err.ShowDialog(); } }
17 years, 6 months
1
0
0
0
[gedmurphy] 27286: - populate the memory and cdrom property pages - add exception handling to the get properties via helping functions - Add a very basic error display form
by gedmurphy@svn.reactos.org
Author: gedmurphy Date: Wed Jun 27 15:56:09 2007 New Revision: 27286 URL:
http://svn.reactos.org/svn/reactos?rev=27286&view=rev
Log: - populate the memory and cdrom property pages - add exception handling to the get properties via helping functions - Add a very basic error display form Added: trunk/tools/RosTE/GUI/ErrorForm.Designer.cs trunk/tools/RosTE/GUI/ErrorForm.cs trunk/tools/RosTE/GUI/ErrorForm.resx Modified: trunk/tools/RosTE/GUI/RosTEGUI.csproj trunk/tools/RosTE/GUI/SettingsForm.Designer.cs trunk/tools/RosTE/GUI/SettingsForm.cs trunk/tools/RosTE/GUI/SettingsForm.resx trunk/tools/RosTE/GUI/VMConfig.xsd trunk/tools/RosTE/GUI/VMConfig.xsx trunk/tools/RosTE/GUI/VirtualMachine.cs [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/tools/RosTE/GUI/ErrorForm.Designer.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ErrorForm.Designer…
Added: trunk/tools/RosTE/GUI/ErrorForm.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ErrorForm.cs?rev=2…
Added: trunk/tools/RosTE/GUI/ErrorForm.resx URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ErrorForm.resx?rev…
Modified: trunk/tools/RosTE/GUI/RosTEGUI.csproj URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/RosTEGUI.csproj?re…
Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.Desig…
Modified: trunk/tools/RosTE/GUI/SettingsForm.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.cs?re…
Modified: trunk/tools/RosTE/GUI/SettingsForm.resx URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.resx?…
Modified: trunk/tools/RosTE/GUI/VMConfig.xsd URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMConfig.xsd?rev=2…
Modified: trunk/tools/RosTE/GUI/VMConfig.xsx URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMConfig.xsx?rev=2…
Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?…
17 years, 6 months
1
0
0
0
[dgorbachev] 27285: The last commit. Bulgarian translations by CCTAHEB (sstpr [at] narod [dot] ru). Bug #2344.
by dgorbachev@svn.reactos.org
Author: dgorbachev Date: Wed Jun 27 03:31:01 2007 New Revision: 27285 URL:
http://svn.reactos.org/svn/reactos?rev=27285&view=rev
Log: The last commit. Bulgarian translations by CCTAHEB (sstpr [at] narod [dot] ru). Bug #2344. Added: trunk/reactos/base/applications/cacls/lang/bg-BG.rc trunk/reactos/base/applications/calc/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/bg-BG.rc Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/calc/rsrc.rc trunk/reactos/dll/cpl/desk/desk.rc Added: trunk/reactos/base/applications/cacls/lang/bg-BG.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la…
============================================================================== --- trunk/reactos/base/applications/cacls/lang/bg-BG.rc (added) +++ trunk/reactos/base/applications/cacls/lang/bg-BG.rc Wed Jun 27 03:31:01 2007 @@ -1,0 +1,74 @@ +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + +IDS_HELP, "Ïîêàçâà èëè èçìåíÿ ñïèñúöèòå çà äîñòúï (ACL èëè ÑçÄ) äî ôàéëîâåòå\n\n\ +CACLS ôàéëîâî_èìå [/T] [/E] [/C] [/G ïîòðåáèòåë:ïðàâà [...]] [/R ïîòðåáèòåë [...]]\n\ + [/P ïîòðåáèòåë:ïðàâà [...]] [/D èìå [...]]\n\ + ôàéëîâî_èìå Ïîêàçâàíå íà ÑçÄ.\n\ + /T Ïðîìåíÿ ÑçÄ íà óêàçàíèòå ôàéëîâå â\n\ + òåêóùàòà ïàïêà è âñè÷êè ïîäïàïêè. \n\ + /E Ïðîìÿíà íà ÑçÄ, âìåñòî çàìÿíà.\n\ + /C Ïðîäúëæàâàíå ïîðàäè ãðåøêè ïîðàäè îòêàç íà äîñòúï.\n\ + /G ïîòðåáèòåë:ïðàâà Ïðåäîñòàâÿíå íà ïðàâà íà äîñòúï íà óêàçàíèÿ ïîòðåáèòåë.\n\ + Ïðàâàòà ìîãà äà ñà: R ×åòåíå\n\ + W Ïèñàíå\n\ + C Ïðîìÿíà (ïèñàíå)\n\ + F Âñè÷êè ïðàâà\n\ + /R ïîòðåáèòåë Revoke specified user's access rights (only valid with /E).\n\ + /P ïîòðåáèòåë:ïðàâà Çàìÿíà íà ïðàâàòà çà äîñòúï íà ïîòðåáèòåëÿ.\n\ + Ïðàâàòà ìîãàò äà ñà: N Áåç ïðàâî íà äîñòúï\n\ + R ×åòåíå\n\ + W Ïèñàíå\n\ + C Ïðîìÿíà (ïèñàíå)\n\ + F Âñè÷êè ïðàâà \n\ + /D ïîòðåáèòåë Ëèøàâàíå íà ïîòðåáèòåë îò äîñòúï.\n\ +Ìîãàò äà ñå èçïîëçâàò çàìåñòâàùè çíàöè (* è ?) çà óêàçâàíå íà ïîâå÷å îò åäèí ôàéë..\n\n\ +Ñúêðàùåíèÿ:\n\ + CI Îíàñëåäÿâàíå íà ñúäúðæàòåëè.\n\ + ACE ùå áúäå îíàñëåäåí îò ïàïêèòå.\n\ + OI Îíàñëåäÿâàíå íà ïðåäìåòè (îáåêòè).\n\ + ACE ùå áúäå íàñëåäåí îò ôàéëîâåòå.\n\ + IO - Inherit Only.\n\ + Íÿìà äà ñå ïðèëàãà ACE âúðõó òåêóùèÿ ôàéë/ ïàïêà.\n" + +IDS_ABBR_CI, "(CI)" +IDS_ABBR_OI, "(OI)" +IDS_ABBR_IO, "(IO)" +IDS_ABBR_FULL, "F" +IDS_ABBR_READ, "R" +IDS_ABBR_WRITE, "W" +IDS_ABBR_CHANGE, "C" +IDS_ABBR_NONE, "N" +IDS_ALLOW, "" +IDS_DENY, "(DENY)" +IDS_SPECIAL_ACCESS, "(èçâúíðåäíè ïðàâà:)" +IDS_GENERIC_READ, "GENERIC_READ" +IDS_GENERIC_WRITE, "GENERIC_WRITE" +IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" +IDS_GENERIC_ALL, "GENERIC_ALL" +IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE" +IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ" +IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE" +IDS_FILE_READ_DATA, "FILE_READ_DATA" +IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA" +IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA" +IDS_FILE_READ_EA, "FILE_READ_EA" +IDS_FILE_WRITE_EA, "FILE_WRITE_EA" +IDS_FILE_EXECUTE, "FILE_EXECUTE" +IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD" +IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES" +IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES" +IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED" +IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY" +IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL" +IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED" +IDS_SYNCHRONIZE, "SYNCHRONIZE" +IDS_WRITE_OWNER, "WRITE_OWNER" +IDS_WRITE_DAC, "WRITE_DAC" +IDS_READ_CONTROL, "READ_CONTROL" +IDS_DELETE, "DELETE" +IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL" +} + Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs…
============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc (original) +++ trunk/reactos/base/applications/cacls/rsrc.rc Wed Jun 27 03:31:01 2007 @@ -8,6 +8,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* include localised resources */ +#include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" Added: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
============================================================================== --- trunk/reactos/base/applications/calc/lang/bg-BG.rc (added) +++ trunk/reactos/base/applications/calc/lang/bg-BG.rc Wed Jun 27 03:31:01 2007 @@ -1,0 +1,141 @@ +#include "winecalc.h" + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "Èç÷èñëèòåë" + + IDS_COPYRIGHT1, "Calculator 5.0. Licensed under LGPL 2" + IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT3 "San Jose, California, USA" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "
http://www.ActionMessage.com/winecalc/
" + + IDS_BTN_BACKSPACE, "Èçÿä" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "êîðåí 2" + IDS_BTN_DEGREES, "Ãðàäóñè" + IDS_BTN_RADIANS, "Ðàäèàíè" + IDS_BTN_GRADS, "Ãðàäîâå" + IDS_BTN_SHRT_HEX "Øåñòí." + IDS_BTN_SHRT_DEC "Äåñòí." + IDS_BTN_SHRT_OCT "Îñì." + IDS_BTN_SHRT_BIN "Äâîè÷." + IDS_ERR_INVALID_INPUT, "Íåïðàâèëíè âõîäíè äàííè." + IDS_ERR_DIVIDE_BY_ZERO, "Äåëåíåòî íà íóëà å íåâúçìîæíî." + IDS_ERR_UNDEFINED, "Èç÷èñëåíèåòî å íåâúçìîæíî." +} + +MAIN_MENU MENU DISCARDABLE +{ + POPUP "&Îáðàáîòêà" { + MENUITEM "&Çàïîìíè Ctrl+C", IDM_COPY + MENUITEM "&Ïîñòàâè Ctrl+V", IDM_PASTE + } + POPUP "&Èçãëåä" { + MENUITEM "Îáèêíîâåí", IDM_MODE_STANDARD + MENUITEM "Íàó÷åí", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_DIGIT_GROUPING + } + POPUP "&Ïîìîù" { + MENUITEM "Ïîìîù", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Çà ïðèëîæåíèåòî", IDM_ABOUT + } +} + +SCIMS_MENU MENU DISCARDABLE +{ + POPUP "&Îáðàáîòêà" { + MENUITEM "&Çàïîìíÿíå Ctrl+C", IDM_COPY + MENUITEM "&Ïîñòàâÿíå Ctrl+V", IDM_PASTE + } + POPUP "&Èçãëåä" { + MENUITEM "Îáèêíîâåí", IDM_MODE_STANDARD + MENUITEM "Íàó÷åí", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Øåñòí.\tF5", ID_CALC_NS_HEX + MENUITEM "Äåñòí.\tF6", ID_CALC_NS_DEC + MENUITEM "Îñì.\tF7", ID_CALC_NS_OCT + MENUITEM "Äâîè÷.\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Ãðàäóñè\tF2", ID_CALC_MS_DEGREES + MENUITEM "Ðàäèàíè\tF3", ID_CALC_MS_RADIANS + MENUITEM "Ãðàäîâå\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_DIGIT_GROUPING + } + POPUP "&Ïîìîù" { + MENUITEM "Ïîìîù", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Çà ïðèëîæåíèåòî", IDM_ABOUT + } +} + +SCIWS_MENU MENU DISCARDABLE +{ + POPUP "&Îáðàáîòêà" { + MENUITEM "&Çàïîìíÿíå Ctrl+C", IDM_COPY + MENUITEM "&Ïîñòàâÿíå Ctrl+V", IDM_PASTE + } + POPUP "&Èçãëåä" { + MENUITEM "Îáèêíîâåí", IDM_MODE_STANDARD + MENUITEM "Íàó÷åí", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Øåñòíàäåñåòè÷åí\tF5", ID_CALC_NS_HEX + MENUITEM "Äåñåòè÷åí\tF6", ID_CALC_NS_DEC + MENUITEM "Îñìè÷åí\tF7", ID_CALC_NS_OCT + MENUITEM "Äâîè÷åí\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "×äóìà\tF12", ID_CALC_WS_QWORD + MENUITEM "Ääóìà\tF2", ID_CALC_WS_DWORD + MENUITEM "Äóìà\tF3", ID_CALC_WS_WORD + MENUITEM "Áàéò\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_DIGIT_GROUPING + } + POPUP "&Ïîìîù" { + MENUITEM "Ïîìîù", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Çà ïðèëîæåíèåòî", IDM_ABOUT + } +} + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "Çà GNU winecalc" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "Äîáðå", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "Êàêâî å òîâà?", IDM_WHATS_THIS + } +} + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "Ñòàòèñòèêà" +FONT 9, "Tahoma" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END + Modified: trunk/reactos/base/applications/calc/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rsr…
============================================================================== --- trunk/reactos/base/applications/calc/rsrc.rc (original) +++ trunk/reactos/base/applications/calc/rsrc.rc Wed Jun 27 03:31:01 2007 @@ -23,6 +23,7 @@ IDI_CALCICON ICON "calculator.ico" +#include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" Modified: trunk/reactos/dll/cpl/desk/desk.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=2…
============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rc (original) +++ trunk/reactos/dll/cpl/desk/desk.rc Wed Jun 27 03:31:01 2007 @@ -14,6 +14,7 @@ IDC_DESK_ICON2 ICON "resources/applet.ico" IDC_MONITOR BITMAP "resources/monitor.bmp" +#include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" Added: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc…
============================================================================== --- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc (added) +++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc Wed Jun 27 03:31:01 2007 @@ -1,0 +1,189 @@ +/* Bulgarian translation by ÑÑÒÀÍÅ (sstpr AT narod DOT ru) 25.VI.2007 */ + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ðàáîòíà ïëîù" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, + 70, 10, 105, 70,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 + LTEXT "Èçáåðåòå èçîáðàæåíèå, êîåòî äà èçïîëçâàòå êàòî óêðàñà íà ðàáîòíàòà ñè ïëîù:", + IDC_STATIC, 8, 103, 180, 9 + PUSHBUTTON "&Îáçîð...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 + PUSHBUTTON "&Öâÿò...", IDC_COLOR_BUTTON, 188, 177, 50, 15 + LTEXT "Ðàçïîëîæåíèå:", IDC_STATIC, 188, 138, 36, 9 + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + + +IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Åêðàíåí ïðåäïàçèòåë" +FONT 8, "MS Shell Dlg", 0, 0 +BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 70, 10, 105, 70, WS_EX_STATICEDGE + GROUPBOX "&Åêðàíåí ïðåäïàçèòåë",IDC_SCREENS_DUMMY, 8, 92, 230, 52 + COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Íà&ñòðîéêè",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "Ïðå&ãëåä",IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "&Èç÷àêâàíå",IDC_WAITTEXT, 14, 125, 16, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP, 54, 123, 12, 13 + LTEXT "ìèíóòè", IDC_MINTEXT, 70, 125, 26, 9 + CONTROL "Èñêàíå íà ïàðîëà ïðè âðúùàíå êúì ðàáîòà.",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 + GROUPBOX "&Åíåðãîñïåñòÿâàùè âúçìîæíîñòè íà ìîíèòîðà âè", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + LTEXT "To adjust the power settings for your monitor, click on Power Settings.", + IDC_STATIC, 14, 166, 146 ,20 + PUSHBUTTON "Çàõðàíâàíå...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 +END + + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Îáëèê" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "Öâåòîâè íàáîð", IDC_STATIC, 7, 140, 64, 7 + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Îùå", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Ðàçøèðåí îáëèê" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "×àñò:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Ðàçìåð", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&Ïúðâè öâÿò:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&Âòîðè öâÿò:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "Øðèôò:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "Ðàçìåð íà øðèôòà:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL + + LTEXT "Öâÿò:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 + CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP + + AUTOCHECKBOX "Ï", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE + AUTOCHECKBOX "Ê ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Îòêàç", IDCANCEL, 191, 220, 50, 14 + DEFPUSHBUTTON "Äîáðå", IDOK, 137, 220, 50, 14 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Íàñòðîéêè" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Åêðàí:",1820,3,100,30,8 + LTEXT "<íÿìà>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&Åêðàííà îáëàñò",1818,3,120,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 + LTEXT "Ïî- ìàëêî",1815,9,130,15,8,NOT WS_GROUP + LTEXT "Ïîâå÷å",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Öâåòîâå",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,148,103,9 + PUSHBUTTON "Ðàç&øèðåíè...",IDC_SETTINGS_ADVANCED,306,165,56,14 +END + +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Îáèêíîâåíî", ID_MENU_NORMAL + MENUITEM "Èçêëþ÷åíî", ID_MENU_DISABLED + MENUITEM "Èçáðàíî", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Åêðàí" + IDS_CPLDESCRIPTION "Íàñòðîéêè íà ðàáîòíàòà ïëîù è åêðàííèÿ ïðåäïàçèòåë." + IDS_NONE "(Íÿìà)" + IDS_CENTER " ñðåäàòà" + IDS_STRETCH "Ðàçòåãíàòî" + IDS_TILE "Íàñòåëåíî" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "16 öâÿòà" + IDS_COLOR_8BIT "256 öâÿòà" + IDS_COLOR_16BIT "Ìíîãîöâåòíî (16 áèòà)" + IDS_COLOR_24BIT "Ïúëíîöâåòíî (24 áèòà)" + IDS_COLOR_32BIT "Ïúëíîöâåòíî (32 áèòà)" + IDS_PIXEL "%lux%lu òî÷êè" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Èçîáðàæåíèÿ (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Íåòåêóù ïðîçîðåä" + IDS_ACTWIN "Òåêóù ïðîçîðåä" + IDS_WINTEXT "Òåêñò íà ïðîçðöèòå" + IDS_MESSBOX "Êóòèÿ çà ñúîáùåíèÿ" + IDS_MESSTEXT "Òåêñò íà ñúîáùåíèÿòà" + IDS_BUTTEXT "Äîáðå" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ELEMENT_1 "Ðàáîòíà ïëîù" + IDS_ELEMENT_2 "Íàäïèñâàíèÿ íà íåòåêóùèòå ïðîçîðöè" + IDS_ELEMENT_3 "Ðàìêà íà íåòåêóùèòå ïðîçîðöè" + IDS_ELEMENT_4 "Íàäïèñâàíèÿ íà òåêóùèòå ïðîçîðöè" + IDS_ELEMENT_5 "Ðàìêà íà òåêóùèòå ïðîçîðöè" + IDS_ELEMENT_6 "Ìåíþ" + IDS_ELEMENT_7 "Ïîäñêàçêè" + IDS_ELEMENT_8 "Ïðîçîðöè" + IDS_ELEMENT_9 "Ïëúçãà÷è" + IDS_ELEMENT_10 "Òðèìåðíè ïðåäìåòè" + IDS_ELEMENT_11 "Öâÿò íà çàãëàâèÿòà" + IDS_ELEMENT_12 "Ñèìâîëíî çàãëàâèå" + IDS_ELEMENT_13 "Íàäïèñíà ëåíòà" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Âúïðîñèòåëåí ïðîçîðåö" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Ïîäêðàñêà íà ïðèëîæåíèÿòà" + IDS_ELEMENT_18 "Ïîäçàãëàâèÿ" + IDS_ELEMENT_19 "Âîäîðàâíà ðàçðåäêà" + IDS_ELEMENT_20 "Îòâåñíà ðàçðåäêà" + IDS_ELEMENT_21 "Áúðçè ñâåäåíèÿ" + IDS_ELEMENT_22 "Ñèìâîë" +END
17 years, 6 months
1
0
0
0
[fireball] 27284: - Do some "hardware detection" for OLPC (so the kernel doesn't crash with CONFIG_INITIALIZATION_FAILED bugcheck).
by fireball@svn.reactos.org
Author: fireball Date: Wed Jun 27 00:46:34 2007 New Revision: 27284 URL:
http://svn.reactos.org/svn/reactos?rev=27284&view=rev
Log: - Do some "hardware detection" for OLPC (so the kernel doesn't crash with CONFIG_INITIALIZATION_FAILED bugcheck). Added: branches/olpc/boot/freeldr/freeldr/arch/i386/olpchw.c (with props) Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/hwpci.c branches/olpc/boot/freeldr/freeldr/arch/i386/macholpc.c Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/hwpci.c URL:
http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/…
============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/hwpci.c (original) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/hwpci.c Wed Jun 27 00:46:34 2007 @@ -139,7 +139,7 @@ } -static VOID +VOID DetectPciIrqRoutingTable(FRLDRHKEY BusKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/macholpc.c URL:
http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/…
============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/macholpc.c (original) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/macholpc.c Wed Jun 27 00:46:34 2007 @@ -287,11 +287,6 @@ return 1; } -VOID OlpcHwDetect() -{ - ofwprintf("OlpcHwDetect\n"); -} - /* Strategy: * * For now, it'll be easy enough to use the boot command line as our boot path. Added: branches/olpc/boot/freeldr/freeldr/arch/i386/olpchw.c URL:
http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/…
============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/olpchw.c (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/olpchw.c Wed Jun 27 00:46:34 2007 @@ -1,0 +1,142 @@ +/* $Id: olpchw.c 21339 2006-03-18 22:09:16Z peterw $ + * + * FreeLoader + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <freeldr.h> + +#define NDEBUG +#include <debug.h> + +VOID +DetectPciIrqRoutingTable(FRLDRHKEY BusKey); + +VOID +OlpcDetectPciBios(FRLDRHKEY SystemKey, ULONG *BusNumber) +{ + PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + WCHAR Buffer[80]; + FRLDRHKEY BiosKey; + ULONG Size; + LONG Error; + + /* Report the PCI BIOS */ + if (TRUE/*FindPciBios(&BusData)*/) + { + /* Create new bus key */ + swprintf(Buffer, + L"MultifunctionAdapter\\%u", *BusNumber); + Error = RegCreateKey(SystemKey, + Buffer, + &BiosKey); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); + return; + } + + /* Set 'Component Information' */ + SetComponentInformation(BiosKey, + 0x0, + 0x0, + 0xFFFFFFFF); + + /* Increment bus number */ + (*BusNumber)++; + + /* Set 'Identifier' value */ + Error = RegSetValue(BiosKey, + L"Identifier", + REG_SZ, + (PCHAR)L"PCI BIOS", + 9 * sizeof(WCHAR)); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); + return; + } + + /* Set 'Configuration Data' value */ + Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR); + FullResourceDescriptor = MmAllocateMemory(Size); + if (FullResourceDescriptor == NULL) + { + DbgPrint((DPRINT_HWDETECT, + "Failed to allocate resource descriptor\n")); + return; + } + + /* Initialize resource descriptor */ + memset(FullResourceDescriptor, 0, Size); + FullResourceDescriptor->InterfaceType = PCIBus; + FullResourceDescriptor->BusNumber = 0; + FullResourceDescriptor->PartialResourceList.Version = 1; + FullResourceDescriptor->PartialResourceList.Revision = 1; + FullResourceDescriptor->PartialResourceList.Count = 1; + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Type = CmResourceTypeBusNumber; + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].ShareDisposition = CmResourceShareDeviceExclusive; + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.BusNumber.Start = 0; + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.BusNumber.Length = 1; + + /* Set 'Configuration Data' value */ + Error = RegSetValue(BiosKey, + L"Configuration Data", + REG_FULL_RESOURCE_DESCRIPTOR, + (PCHAR) FullResourceDescriptor, + Size); + MmFreeMemory(FullResourceDescriptor); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, + "RegSetValue(Configuration Data) failed (Error %u)\n", + (int)Error)); + return; + } + + DetectPciIrqRoutingTable(BiosKey); + } +} + + + +VOID OlpcHwDetect() +{ + FRLDRHKEY SystemKey; + ULONG BusNumber = 0; + LONG Error; + + ofwprintf("OlpcHwDetect()\n"); + + /* Create the 'System' key */ + Error = RegCreateKey(NULL, + L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System", + &SystemKey); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); + return; + } + + /* Detect buses */ + OlpcDetectPciBios(SystemKey, &BusNumber); + //DetectApmBios(SystemKey, &BusNumber); + //DetectPnpBios(SystemKey, &BusNumber); + //DetectIsaBios(SystemKey, &BusNumber); + //DetectAcpiBios(SystemKey, &BusNumber); + + ofwprintf("DetectHardware() Done\n"); +} Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/olpchw.c ------------------------------------------------------------------------------ svn:eol-style = native
17 years, 6 months
1
0
0
0
[gedmurphy] 27283: - Give each VM it's own DataSet instead of maintaining separate DataRows. Fixes a bug where by VM config files were loading up multiple images - Drop the ArrayList as we can rely on the ListView for storing our objects now - Add some primitive error handling
by gedmurphy@svn.reactos.org
Author: gedmurphy Date: Tue Jun 26 19:15:33 2007 New Revision: 27283 URL:
http://svn.reactos.org/svn/reactos?rev=27283&view=rev
Log: - Give each VM it's own DataSet instead of maintaining separate DataRows. Fixes a bug where by VM config files were loading up multiple images - Drop the ArrayList as we can rely on the ListView for storing our objects now - Add some primitive error handling Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/MainForm.resx trunk/tools/RosTE/GUI/SettingsForm.Designer.cs trunk/tools/RosTE/GUI/SettingsForm.cs trunk/tools/RosTE/GUI/SettingsForm.resx trunk/tools/RosTE/GUI/VMDataBase.cs trunk/tools/RosTE/GUI/VirtualMachine.cs [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.Designer.…
Modified: trunk/tools/RosTE/GUI/MainForm.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=27…
Modified: trunk/tools/RosTE/GUI/MainForm.resx URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.resx?rev=…
Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.Desig…
Modified: trunk/tools/RosTE/GUI/SettingsForm.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.cs?re…
Modified: trunk/tools/RosTE/GUI/SettingsForm.resx URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.resx?…
Modified: trunk/tools/RosTE/GUI/VMDataBase.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMDataBase.cs?rev=…
Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?…
17 years, 6 months
1
0
0
0
[gedmurphy] 27282: - change the new explorer rbuild files to stop the IRC users from going insane. - just remove the comment in shell.rbuild to build (just don't expect a fully working shell)
by gedmurphy@svn.reactos.org
Author: gedmurphy Date: Tue Jun 26 17:30:53 2007 New Revision: 27282 URL:
http://svn.reactos.org/svn/reactos?rev=27282&view=rev
Log: - change the new explorer rbuild files to stop the IRC users from going insane. - just remove the comment in shell.rbuild to build (just don't expect a fully working shell) Modified: trunk/reactos/base/shell/explorer-new/explorer.rbuild trunk/reactos/base/shell/shell.rbuild Modified: trunk/reactos/base/shell/explorer-new/explorer.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex…
============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rbuild (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rbuild Tue Jun 26 17:30:53 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <rbuild xmlns:xi="
http://www.w3.org/2001/XInclude
"> - <module name="explorer" type="win32gui" installname="explorer2.exe" unicode="true"> - <include base="explorer">.</include> + <module name="explorer_new" type="win32gui" installname="explorer_new.exe" unicode="true"> + <include base="explorer_new">.</include> <define name="WIN32" /> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0600</define> Modified: trunk/reactos/base/shell/shell.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/shell.rbuild?re…
============================================================================== --- trunk/reactos/base/shell/shell.rbuild (original) +++ trunk/reactos/base/shell/shell.rbuild Tue Jun 26 17:30:53 2007 @@ -7,5 +7,10 @@ <directory name="explorer"> <xi:include href="explorer/explorer.rbuild" /> </directory> +<!-- + <directory name="explorer-new"> + <xi:include href="explorer-new/explorer.rbuild" /> + </directory> +--> </group> </rbuild>
17 years, 6 months
1
0
0
0
[gedmurphy] 27281: populate the general page in the settings dialog
by gedmurphy@svn.reactos.org
Author: gedmurphy Date: Tue Jun 26 14:17:37 2007 New Revision: 27281 URL:
http://svn.reactos.org/svn/reactos?rev=27281&view=rev
Log: populate the general page in the settings dialog Modified: trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/SettingsForm.Designer.cs trunk/tools/RosTE/GUI/SettingsForm.cs trunk/tools/RosTE/GUI/SettingsForm.resx trunk/tools/RosTE/GUI/VMConfig.xsd trunk/tools/RosTE/GUI/VMConfig.xsx trunk/tools/RosTE/GUI/VirtualMachine.cs [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/tools/RosTE/GUI/MainForm.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=27…
Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.Desig…
Modified: trunk/tools/RosTE/GUI/SettingsForm.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.cs?re…
Modified: trunk/tools/RosTE/GUI/SettingsForm.resx URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.resx?…
Modified: trunk/tools/RosTE/GUI/VMConfig.xsd URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMConfig.xsd?rev=2…
Modified: trunk/tools/RosTE/GUI/VMConfig.xsx URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMConfig.xsx?rev=2…
Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?…
17 years, 6 months
1
0
0
0
[dreimer] 27280: - Translate the Strings in the German Solitaire RC File, which were added a while ago. - Add a German RC File to th new Explorer. Its my first commit in Trunk, if I broke something, kill me ; -)
by dreimer@svn.reactos.org
Author: dreimer Date: Tue Jun 26 11:55:08 2007 New Revision: 27280 URL:
http://svn.reactos.org/svn/reactos?rev=27280&view=rev
Log: - Translate the Strings in the German Solitaire RC File, which were added a while ago. - Add a German RC File to th new Explorer. Its my first commit in Trunk, if I broke something, kill me ;-) Added: trunk/reactos/base/shell/explorer-new/lang/de-DE.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc trunk/reactos/base/shell/explorer-new/explorer.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Tue Jun 26 11:55:08 2007 @@ -34,9 +34,9 @@ STRINGTABLE BEGIN - IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." - IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_NAME "Solitär" + IDS_SOL_ABOUT "Solitär von J Brown\n\nCardLib version 1.0." + IDS_SOL_QUIT "Laufendes Spiel beenden?" END Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex…
============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rc (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rc Tue Jun 26 11:55:08 2007 @@ -14,6 +14,7 @@ IDB_STARTMENU BITMAP DISCARDABLE res/logov.bmp #include "lang/en-US.rc" +#include "lang/de-DE.rc" #include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" Added: trunk/reactos/base/shell/explorer-new/lang/de-DE.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la…
============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/de-DE.rc (added) +++ trunk/reactos/base/shell/explorer-new/lang/de-DE.rc Tue Jun 26 11:55:08 2007 @@ -1,0 +1,59 @@ +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN + +IDM_TRAYWND MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Taskbar fi&xieren", ID_LOCKTASKBAR + MENUITEM "E&igenschaften", ID_SHELL_CMD_PROPERTIES + END +END + +IDM_STARTMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Programme", IDM_PROGRAMS + BEGIN + MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "F&avoriten", IDM_FAVORITES + BEGIN + MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&Dokumente", IDM_DOCUMENTS + BEGIN + MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&Einstellungen", IDM_SETTINGS + BEGIN + MENUITEM "S&ystemsteuerung", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED + MENUITEM SEPARATOR + MENUITEM "&Sicherheit...", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "&Netzwerkverbindungen", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "&Drucker und Faxgeräte", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "&Taskbar und Startmenü", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + END + POPUP "Sear&ch", IDM_SEARCH + BEGIN + MENUITEM SEPARATOR + END + MENUITEM "&Hilfe und Support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "A&usführen...", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "S&ynchronisieren", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED + MENUITEM "Ab&melden %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "T&rennen...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED + MENUITEM "Comput&er undocken", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "He&runterfahren...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_START "Start" + IDS_PROPERTIES "E&igenschaften" + IDS_OPEN_ALL_USERS "Öffnen &Alle Benutzer" + IDS_EXPLORE_ALL_USERS "Explorer A&lle Benutzer" +END
17 years, 6 months
1
0
0
0
← Newer
1
...
4
5
6
7
8
9
10
...
42
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
Results per page:
10
25
50
100
200