Index: branches/diebuche/ChameleonPrefPane/Sources/TableViewsController.h =================================================================== --- branches/diebuche/ChameleonPrefPane/Sources/TableViewsController.h (revision 95) +++ branches/diebuche/ChameleonPrefPane/Sources/TableViewsController.h (revision 96) @@ -28,9 +28,13 @@ IBOutlet NSTabViewItem * mEfiInject; IBOutlet NSTabViewItem * mSmbios; IBOutlet NSTabViewItem * mAbout; + + // Menu selection tv + IBOutlet NSTableColumn * mMenuIcon; IBOutlet NSTableColumn * mMenuName; + // Boot selection tv IBOutlet NSTableColumn * mPartitionImgColumn; IBOutlet NSTableColumn * mFileSystemColumn; IBOutlet NSTableColumn * mPartitionNameColumn; Index: branches/diebuche/ChameleonPrefPane/Sources/TableViewsController.mm =================================================================== --- branches/diebuche/ChameleonPrefPane/Sources/TableViewsController.mm (revision 95) +++ branches/diebuche/ChameleonPrefPane/Sources/TableViewsController.mm (revision 96) @@ -29,18 +29,30 @@ { NSString* title; MenuEntryPane pane; -} ; + NSImage** img; +}; + +static NSImage* mImgPaneBootFrom; +static NSImage* mImgPaneBootSetup; +static NSImage* mImgPaneBootFlags; +static NSImage* mImgPanePeripherals; +static NSImage* mImgPaneAdvanced; +static NSImage* mImgPaneEfiInject; +static NSImage* mImgPaneSmbios; +static NSImage* mImgPaneAbout; + + static const MenuEntry sMenuList[] = { - {(NSLocalizedString(@"Boot_From", nil)), PaneBootFrom}, - {(NSLocalizedString(@"Boot_Setup", nil)), PaneBootSetup}, - {(NSLocalizedString(@"Boot_Flags", nil)), PaneBootFlags}, - {(NSLocalizedString(@"Peripherals", nil)), PanePeripherals}, - {(NSLocalizedString(@"Advanced", nil)), PaneAdvanced}, - {(NSLocalizedString(@"Efi_Inject", nil)), PaneEfiInject}, - {(NSLocalizedString(@"SMBIOS", nil)), PaneSmbios}, - {(NSLocalizedString(@"About", nil)), PaneAbout} + {(NSLocalizedString(@"Boot_From", nil)), PaneBootFrom, &mImgPaneBootFrom}, + {(NSLocalizedString(@"Boot_Setup", nil)), PaneBootSetup, &mImgPaneBootSetup}, + {(NSLocalizedString(@"Boot_Flags", nil)), PaneBootFlags, &mImgPaneBootFlags}, + {(NSLocalizedString(@"Peripherals", nil)), PanePeripherals, &mImgPanePeripherals}, + {(NSLocalizedString(@"Advanced", nil)), PaneAdvanced, &mImgPaneAdvanced}, + {(NSLocalizedString(@"Efi Inject", nil)), PaneEfiInject, &mImgPaneEfiInject}, + {(NSLocalizedString(@"Bios", nil)), PaneSmbios, &mImgPaneSmbios}, + {(NSLocalizedString(@"About", nil)), PaneAbout, &mImgPaneAbout} }; const int iMenuListSize = sizeof(sMenuList)/ sizeof(MenuEntry); @@ -64,6 +76,15 @@ mCDROMImage = [self getImageResource: @"CDROM" ofType: @"png"]; mUnknownImage = [self getImageResource: @"Chameleon" ofType: @"tiff"]; + mImgPaneBootFrom = [self getImageResource:@"MacOSX" ofType:@"png"]; + mImgPaneBootSetup = [self getImageResource:@"MacOSX" ofType:@"png"]; + mImgPaneBootFlags = [self getImageResource:@"MacOSX" ofType:@"png"]; + mImgPanePeripherals = [self getImageResource:@"MacOSX" ofType:@"png"]; + mImgPaneAdvanced = [self getImageResource:@"MacOSX" ofType:@"png"]; + mImgPaneEfiInject = [self getImageResource:@"MacOSX" ofType:@"png"]; + mImgPaneSmbios = [self getImageResource:@"MacOSX" ofType:@"png"]; + mImgPaneAbout = [self getImageResource:@"MacOSX" ofType:@"png"]; + return self; } @@ -225,6 +246,10 @@ { ret = sMenuList[row].title; } + else if (tableColumn == mMenuIcon) + { + ret = *sMenuList[row].img; + } return ret; } //--------------------------------------------------------------------------