mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- add #ifdefs per operating system so that the dialog boxes display the

Browse Source 
correct name for floppy and cdrom devices:on windows, A:, B:, etc;
  on Linux /dev/fd0 and /dev/cdrom.
- It's perfectly ok to type device names into the blank on those dialog
  boxes, but the label "Disk Image File:" sort of implies that it has to
  be a file.  To try to avoid confusion change the label to simply
  "Disk Image:".
This commit is contained in:
Bryce Denney 2002-09-04 18:39:20 +00:00
parent ce17b410ab
commit 9d20ece24c
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bochs/gui/wxdialog.h
View File

@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////
// $Id: wxdialog.h,v 1.24 2002-09-04 12:29:04 bdenney Exp $
// $Id: wxdialog.h,v 1.25 2002-09-04 18:39:20 bdenney Exp $
////////////////////////////////////////////////////////////////////
//
// wxWindows dialogs for Bochs
@ -106,7 +106,7 @@ DECLARE_EVENT_TABLE()
// | [ ] None/Disabled |
// | [X] Physical floppy drive A: |
// | [ ] Physical floppy drive B: |
// | [ ] Disk image file: [________________________] [Browse] |
// | [ ] Disk image: [_____________________________] [Browse] |
// | |
// | What is the capacity of this disk? [1.44 MB] |
// | |
@ -146,7 +146,7 @@ DECLARE_EVENT_TABLE()
// | | | |
// | | [X] Physical floppy drive A: | |
// | | [ ] Physical floppy drive B: | |
// | | [ ] Disk image file: [____________________] [Browse] | |
// | | [ ] Disk image: [_________________________] [Browse] | |
// | | | |
// | | Media size [1.44 MB] | |
// | | | |
@ -166,7 +166,7 @@ public:
#define FLOPPY_CONFIG_INSTRS "Select the device or image to use when simulating %s."
#define FLOPPY_CONFIG_CAP "What is the capacity of this disk?"
#define FLOPPY_CONFIG_HINT "To create a disk image, choose the file name and capacity, then click on \"Create Image\"."
#define FLOPPY_CONFIG_DISKIMG "Disk image file: "
#define FLOPPY_CONFIG_DISKIMG "Disk image: "
private:
void Init (); // called automatically by ShowModal()
void ShowHelp ();
@ -284,7 +284,7 @@ DECLARE_EVENT_TABLE()
// | | | |
// | | [X] Ejected | |
// | | [ ] Physical CD-ROM drive /dev/cdrom | |
// | | [ ] Disk image file: [____________________] [Browse] | |
// | | [ ] Disk image: [_________________________] [Browse] | |
// | | | |
// | | [ Create Image ] | |
// | +---------------------------------------------------------+ |
@ -737,7 +737,7 @@ Or if you choose the CD-ROM, you get to edit the settings for it.
| | | | | | |
| | |-IDE controller | | [X] Ejected | |
| | | |-Hard Drive 0 | | [ ] Physical CD-ROM drive /dev/cdrom | |
| |*****CD-ROM drive***| | [ ] Disk image file: [________] [Browse] | |
| |*****CD-ROM drive***| | [ ] Disk image: [_____________] [Browse] | |
| | | | | | |
| | |-Keyboard | +---------------------------------------------+ |
| | | | |
@ -761,7 +761,7 @@ CD-ROM button on the toolbar at runtime.
| |
| [X] Ejected |
| [ ] Physical CD-ROM drive /dev/cdrom |
| [ ] Disk image file: [________] [Browse] |
| [ ] Disk image: [_____________] [Browse] |
| |
| |
| [Help] [Cancel] [Ok] |

15
bochs/gui/wxmain.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////
// $Id: wxmain.cc,v 1.32 2002-09-04 14:09:05 bdenney Exp $
// $Id: wxmain.cc,v 1.33 2002-09-04 18:39:20 bdenney Exp $
/////////////////////////////////////////////////////////////////
//
// wxmain.cc implements the wxWindows frame, toolbar, menus, and dialogs.
@ -966,8 +966,15 @@ void MyFrame::editFloppyConfig (int drive)
}
dlg.AddRadio ("Not Present", "");
dlg.AddRadio ("Ejected", "none");
#if defined(__linux__)
dlg.AddRadio ("Physical floppy drive /dev/fd0", "/dev/fd0");
dlg.AddRadio ("Physical floppy drive /dev/fd1", "/dev/fd1");
#elif defined(WIN32)
dlg.AddRadio ("Physical floppy drive A:", "A:");
dlg.AddRadio ("Physical floppy drive B:", "B:");
#else
// add your favorite operating system here
#endif
dlg.SetCapacity (disktype->get () - disktype->get_min ());
dlg.SetFilename (fname->getptr ());
dlg.SetValidateFunc (editFloppyValidate);
@ -1059,7 +1066,13 @@ void MyFrame::editCdromConfig ()
wxASSERT (fname->get_type () == BXT_PARAM_STRING
&& present->get_type () == BXT_PARAM_BOOL
&& status->get_type () == BXT_PARAM_ENUM);
#if defined(__linux__)
dlg.AddRadio ("Physical CD-ROM drive /dev/cdrom", "/dev/cdrom");
#elif defined (WIN32)
dlg.AddRadio ("Physical CD-ROM drive D:", "D:");
#else
// add your favorite operating system here
#endif
dlg.SetEnable (present->get () ? TRUE : FALSE);
dlg.SetFilename (fname->getptr ());
dlg.SetEjected (status->get () == BX_EJECTED);