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

- enable ATA channels 1 - 3 in menu only if supported

Browse Source 
- runtime setup for ATA channels now uses limit BX_MAX_ATA_CHANNEL
- simple string dialog box uses the label of the parameter if present
  (otherwise the name is used)
This commit is contained in:
Volker Ruppert 2006-02-27 12:03:56 +00:00
parent 48bb9719a6
commit 32c03a3965
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bochs/gui/wxmain.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// $Id: wxmain.cc,v 1.120 2006-02-26 19:11:20 vruppert Exp $ // $Id: wxmain.cc,v 1.121 2006-02-27 12:03:56 vruppert Exp $
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// //
// wxmain.cc implements the wxWidgets frame, toolbar, menus, and dialogs. // wxmain.cc implements the wxWidgets frame, toolbar, menus, and dialogs.
@ -478,6 +478,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
// disable things that don't work yet // disable things that don't work yet
menuDebug->Enable(ID_Debug_ShowMemory, FALSE); // not implemented menuDebug->Enable(ID_Debug_ShowMemory, FALSE); // not implemented
menuLog->Enable(ID_Log_View, FALSE); // not implemented menuLog->Enable(ID_Log_View, FALSE); // not implemented
// enable ATA channels in menu
menuEdit->Enable(ID_Edit_ATA1, BX_MAX_ATA_CHANNEL > 1);
menuEdit->Enable(ID_Edit_ATA2, BX_MAX_ATA_CHANNEL > 2);
menuEdit->Enable(ID_Edit_ATA3, BX_MAX_ATA_CHANNEL > 3);
CreateStatusBar(); CreateStatusBar();
wxStatusBar *sb = GetStatusBar(); wxStatusBar *sb = GetStatusBar();
@ -928,18 +932,18 @@ void MyFrame::simStatusChanged (StatusChange change, bx_bool popupNotify) {
menuConfiguration->Enable (ID_Config_New, canConfigure); menuConfiguration->Enable (ID_Config_New, canConfigure);
menuConfiguration->Enable (ID_Config_Read, canConfigure); menuConfiguration->Enable (ID_Config_Read, canConfigure);
// only enabled ATA channels with a cdrom connected are available at runtime // only enabled ATA channels with a cdrom connected are available at runtime
for (unsigned i=0; i<4; i++) { for (unsigned i=0; i<BX_MAX_ATA_CHANNEL; i++) {
sprintf(ata_name, "ata.%d.resources", i); sprintf(ata_name, "ata.%d.resources", i);
base = (bx_list_c*) SIM->get_param(ata_name); base = (bx_list_c*) SIM->get_param(ata_name);
if (!SIM->get_param_bool("enabled", base)->get()) { if (!SIM->get_param_bool("enabled", base)->get()) {
menuEdit->Enable (ID_Edit_ATA0+i, canConfigure); menuEdit->Enable(ID_Edit_ATA0+i, canConfigure);
} else { } else {
sprintf(ata_name, "ata.%d.master", i); sprintf(ata_name, "ata.%d.master", i);
base = (bx_list_c*) SIM->get_param(ata_name); base = (bx_list_c*) SIM->get_param(ata_name);
if (SIM->get_param_enum("type", base)->get () != BX_ATA_DEVICE_CDROM) { if (SIM->get_param_enum("type", base)->get() != BX_ATA_DEVICE_CDROM) {
sprintf(ata_name, "ata.%d.slave", i); sprintf(ata_name, "ata.%d.slave", i);
base = (bx_list_c*) SIM->get_param(ata_name); base = (bx_list_c*) SIM->get_param(ata_name);
if (SIM->get_param_enum("type", base)->get () != BX_ATA_DEVICE_CDROM) { if (SIM->get_param_enum("type", base)->get() != BX_ATA_DEVICE_CDROM) {
menuEdit->Enable(ID_Edit_ATA0+i, canConfigure); menuEdit->Enable(ID_Edit_ATA0+i, canConfigure);
} }
} }
@ -1048,8 +1052,11 @@ MyFrame::HandleAskParamString (bx_param_string_c *param)
wxLogDebug ("HandleAskParamString start"); wxLogDebug ("HandleAskParamString start");
bx_param_num_c *opt = param->get_options (); bx_param_num_c *opt = param->get_options ();
wxASSERT (opt != NULL); wxASSERT (opt != NULL);
int n_opt = opt->get (); int n_opt = opt->get();
char *msg = param->get_name (); char *msg = param->get_label();
if ((msg == NULL) || (strlen(msg) == 0)) {
msg = param->get_name();
}
char *newval = NULL; char *newval = NULL;
wxDialog *dialog = NULL; wxDialog *dialog = NULL;
if (n_opt & param->IS_FILENAME) { if (n_opt & param->IS_FILENAME) {