Index: trunk/i386/boot2/boot.h =================================================================== --- trunk/i386/boot2/boot.h (revision 1076) +++ trunk/i386/boot2/boot.h (revision 1077) @@ -60,6 +60,7 @@ #define kDefaultKernel "mach_kernel" #define kGUIKey "GUI" #define kBootBannerKey "Boot Banner" +#define kShowInfoKey "ShowInfo" // gui.c #define kWaitForKeypressKey "Wait" #define kDSDT "DSDT" /* acpi_patcher.c */ Index: trunk/i386/boot2/gui.c =================================================================== --- trunk/i386/boot2/gui.c (revision 1076) +++ trunk/i386/boot2/gui.c (revision 1077) @@ -800,8 +800,10 @@ void drawDeviceList (int start, int end, int selection) { - int i; - position_t p, p_prev, p_next; + int i; + bool shoWinfo = true; //Azi:showinfo + extern bool showBootBanner; // + position_t p, p_prev, p_next; //uint8_t maxDevices = MIN( gui.maxdevices, menucount ); @@ -857,23 +859,29 @@ if(gui.menu.draw) drawInfoMenuItems(); - -#if DEBUG - gui.debug.cursor = pos( 10, 100); - dprintf( &gui.screen, "label %s\n", param->label ); - dprintf( &gui.screen, "biosdev 0x%x\n", param->biosdev ); - dprintf(&gui.screen, "width %d\n", gui.screen.width); - dprintf(&gui.screen, "height %d\n", gui.screen.height); - dprintf( &gui.screen, "type 0x%x\n", param->type ); - dprintf( &gui.screen, "flags 0x%x\n", param->flags ); - dprintf( &gui.screen, "part_no %d\n", param->part_no ); - dprintf( &gui.screen, "part_boff 0x%x\n", param->part_boff ); - dprintf( &gui.screen, "part_type 0x%x\n", param->part_type ); - dprintf( &gui.screen, "bps 0x%x\n", param->bps ); - dprintf( &gui.screen, "name %s\n", param->name ); - dprintf( &gui.screen, "type_name %s\n", param->type_name ); - dprintf( &gui.screen, "modtime %d\n", param->modTime ); -#endif + + //Azi: make this info more accessible. + getBoolForKey(kShowInfoKey, &shoWinfo, &bootInfo->bootConfig); + + if (shoWinfo && showBootBanner) // no boot banner, no showinfo. + { + gui.debug.cursor = pos( 10, 100); + dprintf( &gui.screen, "label: %s\n", param->label ); + dprintf( &gui.screen, "biosdev: 0x%x\n", param->biosdev ); + dprintf( &gui.screen, "type: 0x%x\n", param->type ); + dprintf( &gui.screen, "flags: 0x%x\n", param->flags ); + dprintf( &gui.screen, "part_no: %d\n", param->part_no ); + dprintf( &gui.screen, "part_boff: 0x%x\n", param->part_boff ); + dprintf( &gui.screen, "part_type: 0x%x\n", param->part_type ); + dprintf( &gui.screen, "bps: 0x%x\n", param->bps ); + dprintf( &gui.screen, "name: %s\n", param->name ); + dprintf( &gui.screen, "type_name: %s\n", param->type_name ); + dprintf( &gui.screen, "modtime: %d\n", param->modTime ); + dprintf( &gui.screen, "width: %d\n", gui.screen.width ); + dprintf( &gui.screen, "height: %d\n", gui.screen.height ); +// dprintf( &gui.screen, "attr: 0x%x\n", gui.screen.attr ); //Azi: reminder +// dprintf( &gui.screen, "mm: %d\n", gui.screen.mm ); + } } drawDeviceIcon( param, gui.devicelist.pixmap, p, isSelected); Index: trunk/i386/boot2/options.c =================================================================== --- trunk/i386/boot2/options.c (revision 1076) +++ trunk/i386/boot2/options.c (revision 1077) @@ -30,6 +30,7 @@ #include "embedded.h" #include "pci.h" +bool showBootBanner = true; //Azi:showinfo static bool shouldboot = false; extern int multiboot_timeout; @@ -873,7 +874,6 @@ gui.devicelist.draw = true; gui.redraw = true; if (!(gBootMode & kBootModeQuiet)) { - bool showBootBanner = true; // Check if "Boot Banner"=N switch is present in config file. getBoolForKey(kBootBannerKey, &showBootBanner, &bootInfo->bootConfig); Index: trunk/doc/BootHelp.txt =================================================================== --- trunk/doc/BootHelp.txt (revision 1076) +++ trunk/doc/BootHelp.txt (revision 1077) @@ -62,6 +62,8 @@ GUI=No Disable the GUI (enabled by default). "Boot Banner"=Yes|No Show boot banner in GUI mode (enabled by default). + ShowInfo=No Disables display of partition and resolution details. + "Boot Banner"=No will also disable this info. "Legacy Logo"=Yes|No Use the legacy grey apple logo (disabled by default). PciRoot= Use an alternate value for PciRoot (default value 0). Index: trunk/CHANGES =================================================================== --- trunk/CHANGES (revision 1076) +++ trunk/CHANGES (revision 1077) @@ -1,3 +1,6 @@ +- Added "ShowInfo" key (enabled by default for now), which enables/disables the display of + partition and resolution related info, on the Gui. + This info may not play well with some custom themes. - Modules can now be selected between not compiled, compiled into chameleon, or compiled as modules. - New makefile + configuration system. - Added the BOOT2_MAX_LENGTH constant in memory.h. This is now used in mboot.c to relocate the correct