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

- capacity choice should not change to "auto" when typing a filename

Browse Source 
- added floppy media change hint
- removed wx console log message that appeared very often
- converted tabs to spaces
This commit is contained in:
Volker Ruppert 2005-11-25 16:24:47 +00:00
parent ec4dcac4d4
commit d62e775d5e
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bochs/gui/wxdialog.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////
// $Id: wxdialog.cc,v 1.78 2005-11-24 18:51:55 vruppert Exp $
// $Id: wxdialog.cc,v 1.79 2005-11-25 16:24:47 vruppert Exp $
/////////////////////////////////////////////////////////////////
// Define BX_PLUGGABLE in files that can be compiled into plugins. For
@ -338,13 +338,11 @@ FloppyConfigDialog::GetFilename ()
void FloppyConfigDialog::OnEvent(wxCommandEvent& event)
{
int id = event.GetId ();
wxLogMessage ("you pressed button id=%d", id);
switch (id) {
case ID_FilenameText:
// when you type into the filename field, ensure that the radio
// button associated with that field is chosen.
diskImageRadioBtn->SetValue (TRUE);
capacity->SetSelection(capacity->FindString("auto"));
break;
case wxID_OK:
// probably should validate before allowing ok
@ -357,22 +355,23 @@ void FloppyConfigDialog::OnEvent(wxCommandEvent& event)
break;
case ID_Capacity:
{
int cap = capacity->GetSelection();
int cap = capacity->GetSelection();
CreateBtn->Enable(floppy_type_n_sectors[cap] > 0);
}
break;
case ID_Create:
{
int cap = capacity->GetSelection ();
char name[1024];
strncpy (name, filename->GetValue ().c_str (), sizeof(name));
int cap = capacity->GetSelection ();
char name[1024];
strncpy (name, filename->GetValue ().c_str (), sizeof(name));
if (CreateImage (0, floppy_type_n_sectors[cap], name)) {
wxString msg;
msg.Printf ("Created a %s disk image called '%s'.",
capacity->GetString (cap).c_str (),
filename->GetValue ().c_str ());
wxMessageBox(msg, "Image Created", wxOK | wxICON_INFORMATION, this);
}
wxString msg;
msg.Printf ("Created a %s disk image called '%s'.",
capacity->GetString (cap).c_str (),
filename->GetValue ().c_str ());
wxMessageBox(msg, "Image Created", wxOK | wxICON_INFORMATION, this);
capacity->SetSelection(capacity->FindString("auto"));
}
}
break;
case wxID_CANCEL:

5
bochs/gui/wxdialog.h
View File

@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////
// $Id: wxdialog.h,v 1.55 2005-11-24 18:51:55 vruppert Exp $
// $Id: wxdialog.h,v 1.56 2005-11-25 16:24:47 vruppert Exp $
////////////////////////////////////////////////////////////////////
//
// wxWidgets dialogs for Bochs
@ -171,7 +171,8 @@ public:
#define FLOPPY_CONFIG_TITLE "Configure %s"
#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_HINT "To create a disk image, choose the file name and capacity, then click on \"Create Image\".\n\n" \
"Clicking OK signals a media change for this drive."
#define FLOPPY_CONFIG_DISKIMG "Disk image: "
private:
void Init (); // called automatically by ShowModal()