Removed old menu comments from gtk gui.
This commit is contained in:
Matthew Budd
parent
61f55f3e28
commit
c45c6c00cf
|
|
@ -2186,220 +2186,7 @@ gint convertKeypress(GtkWidget *grab, GdkEventKey *event, gpointer user_data)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
// Our menu, in the XML markup format used by GtkUIManager
|
||||
//static char* menuXml =
|
||||
// "<ui>"
|
||||
// " <menubar name='Menubar'>"
|
||||
// " <menu action='FileMenuAction'>"
|
||||
// " <menuitem action='OpenRomAction' />"
|
||||
// " <menuitem action='CloseRomAction' />"
|
||||
// " <separator />"
|
||||
// " <menuitem action='PlayNsfAction' />"
|
||||
// " <separator />"
|
||||
// " <menuitem action='LoadStateFromAction' />"
|
||||
// " <menuitem action='SaveStateAsAction' />"
|
||||
// " <menuitem action='QuickLoadAction' />"
|
||||
// " <menuitem action='QuickSaveAction' />"
|
||||
// " <menu action='ChangeStateMenuAction'>"
|
||||
// " <menuitem action='State0Action' />"
|
||||
// " <menuitem action='State1Action' />"
|
||||
// " <menuitem action='State2Action' />"
|
||||
// " <menuitem action='State3Action' />"
|
||||
// " <menuitem action='State4Action' />"
|
||||
// " <menuitem action='State5Action' />"
|
||||
// " <menuitem action='State6Action' />"
|
||||
// " <menuitem action='State7Action' />"
|
||||
// " <menuitem action='State8Action' />"
|
||||
// " <menuitem action='State9Action' />"
|
||||
// " </menu>"
|
||||
// " <separator />"
|
||||
//#ifdef _S9XLUA_H
|
||||
// " <menuitem action='LoadLuaScriptAction' />"
|
||||
//#endif
|
||||
// " <separator />"
|
||||
// " <menuitem action='ScreenshotAction' />"
|
||||
// " <separator />"
|
||||
// " <menuitem action='QuitAction' />"
|
||||
// " </menu>"
|
||||
// " <menu action='OptionsMenuAction'>"
|
||||
// " <menuitem action='GamepadConfigAction' />"
|
||||
// " <menuitem action='HotkeyConfigAction' />"
|
||||
// " <menuitem action='SoundConfigAction' />"
|
||||
// " <menuitem action='VideoConfigAction' />"
|
||||
// " <menuitem action='PaletteConfigAction' />"
|
||||
// " <menuitem action='NetworkConfigAction' />"
|
||||
// " <menuitem action='AutoResumeAction' />"
|
||||
// " <menuitem action='ToggleMenuAction' />"
|
||||
// " <separator />"
|
||||
// " <menuitem action='FullscreenAction' />"
|
||||
// " </menu>"
|
||||
// " <menu action='EmulationMenuAction'>"
|
||||
// " <menuitem action='PowerAction' />"
|
||||
// " <menuitem action='ResetAction' />"
|
||||
// " <menuitem action='SoftResetAction' />"
|
||||
// " <menuitem action='PauseToggleAction' />"
|
||||
// " <separator />"
|
||||
// " <menuitem action='GameGenieToggleAction' />"
|
||||
// " <menuitem action='LoadGameGenieAction' />"
|
||||
// " <separator />"
|
||||
// " <menuitem action='InsertCoinAction' />"
|
||||
// " <separator />"
|
||||
// " <menu action='FdsMenuAction'>"
|
||||
// " <menuitem action='SwitchDiskAction' />"
|
||||
// " <menuitem action='EjectDiskAction' />"
|
||||
// " <menuitem action='LoadBiosAction' />"
|
||||
// " </menu>"
|
||||
// " </menu>"
|
||||
// " <menu action='ToolsMenuAction'>"
|
||||
// " <menuitem action='CheatsAction' />"
|
||||
// " <menuitem action='RamWatchAction' />"
|
||||
// " </menu>"
|
||||
// " <menu action='MovieMenuAction'>"
|
||||
// " <menuitem action='OpenMovieAction' />"
|
||||
// " <menuitem action='StopMovieAction' />"
|
||||
// " <separator />"
|
||||
// " <menuitem action='RecordMovieAction' />"
|
||||
// " <menuitem action='RecordMovieAsAction' />"
|
||||
// " </menu>"
|
||||
// " <menu action='HelpMenuAction'>"
|
||||
// " <menuitem action='AboutAction' />"
|
||||
// " </menu>"
|
||||
// " </menubar>"
|
||||
// "</ui>";
|
||||
|
||||
// Menu items, as an array of GtkActionEntry structures that define each item
|
||||
//static GtkActionEntry normal_entries[] = {
|
||||
// {"FileMenuAction", NULL, "_File"},
|
||||
// {"OpenRomAction", GTK_STOCK_OPEN, "_Open ROM", "<control>O", NULL, G_CALLBACK(loadGame)},
|
||||
// {"CloseRomAction", GTK_STOCK_CLOSE, "_Close ROM", "<control>C", NULL, G_CALLBACK(closeGame)},
|
||||
// {"PlayNsfAction", GTK_STOCK_OPEN, "_Play NSF", "<control>N", NULL, G_CALLBACK(loadNSF)},
|
||||
// {"LoadStateFromAction", GTK_STOCK_OPEN, "Load State _From", "", NULL, G_CALLBACK(loadStateFrom)},
|
||||
// {"SaveStateAsAction", GTK_STOCK_SAVE_AS, "Save State _As", NULL, NULL, G_CALLBACK(saveStateAs)},
|
||||
// {"QuickLoadAction", "go-jump", "Quick _Load", "F7", NULL, G_CALLBACK(quickLoad)},
|
||||
// {"QuickSaveAction", GTK_STOCK_SAVE, "Qu_ick Save", "F5", NULL, G_CALLBACK(quickSave)},
|
||||
// {"ChangeStateMenuAction", NULL, "C_hange State"},
|
||||
//#ifdef _S9XLUA_H
|
||||
// {"LoadLuaScriptAction", GTK_STOCK_OPEN, "Load L_ua Script", "", NULL, G_CALLBACK(loadLua)},
|
||||
//#endif
|
||||
// {"ScreenshotAction", NULL, "_Screenshot", "F12", NULL, G_CALLBACK(FCEUI_SaveSnapshot)},
|
||||
// {"QuitAction", GTK_STOCK_QUIT, "_Quit", "<control>Q", NULL, G_CALLBACK(quit)},
|
||||
//
|
||||
// {"OptionsMenuAction", NULL, "_Options"},
|
||||
//#if GTK_MAJOR_VERSION == 3 || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 24)
|
||||
// {"GamepadConfigAction", "input-gaming", "_Gamepad Config", NULL, NULL, G_CALLBACK(openGamepadConfig)},
|
||||
//#endif
|
||||
// {"HotkeyConfigAction", "input", "_Hotkey Config", NULL, NULL, G_CALLBACK(openHotkeyConfig)},
|
||||
// {"SoundConfigAction", "audio-x-generic", "_Sound Config", NULL, NULL, G_CALLBACK(openSoundConfig)},
|
||||
// {"VideoConfigAction", "video-display", "_Video Config", NULL, NULL, G_CALLBACK(openVideoConfig)},
|
||||
// {"PaletteConfigAction", GTK_STOCK_SELECT_COLOR, "_Palette Config", NULL, NULL, G_CALLBACK(openPaletteConfig)},
|
||||
// {"NetworkConfigAction", GTK_STOCK_NETWORK, "_Network Config", NULL, NULL, G_CALLBACK(openNetworkConfig)},
|
||||
// {"FullscreenAction", GTK_STOCK_FULLSCREEN, "_Fullscreen", "<alt>Return", NULL, G_CALLBACK(enableFullscreen)},
|
||||
// {"EmulationMenuAction", NULL, "_Emulation"},
|
||||
// {"PowerAction", NULL, "P_ower", NULL, NULL, G_CALLBACK(FCEUI_PowerNES)},
|
||||
// {"SoftResetAction", GTK_STOCK_REFRESH, "_Soft Reset", NULL, NULL, G_CALLBACK(emuReset)},
|
||||
// {"ResetAction", GTK_STOCK_REFRESH, "_Reset", NULL, NULL, G_CALLBACK(hardReset)},
|
||||
// {"PauseToggleAction", GTK_STOCK_MEDIA_PAUSE, "_Pause", "Pause", NULL, G_CALLBACK(togglePause)},
|
||||
// {"FdsMenuAction", GTK_STOCK_FLOPPY, "_FDS"},
|
||||
// {"SwitchDiskAction", "go-jump", "_Switch Disk", NULL, NULL, G_CALLBACK(FCEU_FDSSelect)},
|
||||
// {"EjectDiskAction", "media-eject", "_Eject Disk", NULL, NULL, G_CALLBACK(FCEU_FDSInsert)},
|
||||
// {"LoadBiosAction", GTK_STOCK_OPEN, "Load _BIOS File", "", NULL, G_CALLBACK(loadFdsBios)},
|
||||
// {"LoadGameGenieAction", GTK_STOCK_OPEN, "_Load Game Genie ROM", "", NULL, G_CALLBACK(loadGameGenie)},
|
||||
// {"InsertCoinAction", NULL, "_Insert Coin", NULL, NULL, G_CALLBACK(FCEUI_VSUniCoin)},
|
||||
//
|
||||
// {"ToolsMenuAction", NULL, "_Tools"},
|
||||
// {"CheatsAction", "cheats-win", "_Cheats...", NULL, NULL, G_CALLBACK(openCheatsWindow)},
|
||||
// {"RamWatchAction", "ram-watch", "_RAM Watch...", NULL, NULL, G_CALLBACK(openMemoryWatchWindow)},
|
||||
//
|
||||
// {"MovieMenuAction", NULL, "_Movie"},
|
||||
// {"OpenMovieAction", GTK_STOCK_OPEN, "_Open", "<shift>F7", NULL, G_CALLBACK(loadMovie)},
|
||||
// {"StopMovieAction", GTK_STOCK_MEDIA_STOP, "S_top", NULL, NULL, G_CALLBACK(FCEUI_StopMovie)},
|
||||
// {"RecordMovieAction", GTK_STOCK_MEDIA_RECORD, "_Record", "<shift>F5", NULL, G_CALLBACK(recordMovie)},
|
||||
// {"RecordMovieAsAction", NULL, "Record _As", NULL, NULL, G_CALLBACK(recordMovieAs)},
|
||||
//
|
||||
// {"HelpMenuAction", NULL, "_Help"},
|
||||
// {"AboutAction", GTK_STOCK_ABOUT, "_About", NULL, NULL, G_CALLBACK(openAbout)},
|
||||
//};
|
||||
|
||||
// Menu items with a check box that can be toggled on or off
|
||||
//static GtkToggleActionEntry toggle_entries[] = {
|
||||
// {"GameGenieToggleAction", NULL, "Enable Game _Genie", NULL, NULL, G_CALLBACK(toggleGameGenie), FALSE},
|
||||
// {"AutoResumeAction", NULL, "Auto-Resume Play", NULL, NULL, G_CALLBACK(toggleAutoResume), FALSE},
|
||||
// {"ToggleMenuAction", NULL, "Toggle Menubar (alt)", NULL, NULL, G_CALLBACK(toggleMenuToggling), FALSE},
|
||||
//};
|
||||
|
||||
// Menu items for selecting a save state slot using radio buttons
|
||||
//static GtkRadioActionEntry radio_entries[] = {
|
||||
// {"State0Action", NULL, "0", NULL, NULL, 0},
|
||||
// {"State1Action", NULL, "1", NULL, NULL, 1},
|
||||
// {"State2Action", NULL, "2", NULL, NULL, 2},
|
||||
// {"State3Action", NULL, "3", NULL, NULL, 3},
|
||||
// {"State4Action", NULL, "4", NULL, NULL, 4},
|
||||
// {"State5Action", NULL, "5", NULL, NULL, 5},
|
||||
// {"State6Action", NULL, "6", NULL, NULL, 6},
|
||||
// {"State7Action", NULL, "7", NULL, NULL, 7},
|
||||
// {"State8Action", NULL, "8", NULL, NULL, 8},
|
||||
// {"State9Action", NULL, "9", NULL, NULL, 9},
|
||||
//};
|
||||
|
||||
//static GtkWidget* CreateMenubar( GtkWidget* window)
|
||||
//{
|
||||
// GtkUIManager *ui_manager;
|
||||
// GtkActionGroup *action_group;
|
||||
// GtkAccelGroup* accel_group;
|
||||
// GError *error = NULL;
|
||||
// GtkAction* state;
|
||||
//
|
||||
// /* Make an UIManager (which makes a menubar). */
|
||||
// ui_manager = gtk_ui_manager_new ();
|
||||
//
|
||||
// /* Add the menu items to the UIManager as a GtkActionGroup. */
|
||||
// action_group = gtk_action_group_new ("MenubarActions");
|
||||
// gtk_action_group_add_actions (action_group, normal_entries, G_N_ELEMENTS (normal_entries), NULL);
|
||||
// gtk_action_group_add_toggle_actions (action_group, toggle_entries, G_N_ELEMENTS (toggle_entries), NULL);
|
||||
// gtk_action_group_add_radio_actions (action_group, radio_entries, G_N_ELEMENTS (radio_entries), 0, G_CALLBACK(changeState), NULL);
|
||||
// gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
|
||||
//
|
||||
// /* Read the menu layout from the XML markup. */
|
||||
// gtk_ui_manager_add_ui_from_string (ui_manager, menuXml, -1, &error);
|
||||
// if (error)
|
||||
// {
|
||||
// fprintf (stderr, "Unable to create menu bar: %s\n", error->message);
|
||||
// g_error_free (error);
|
||||
// }
|
||||
//
|
||||
// /* Attach the new accelerator group to the window. */
|
||||
// accel_group = gtk_ui_manager_get_accel_group (ui_manager);
|
||||
// gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
|
||||
//
|
||||
// /* Get an action that can be used to change the active state slot selection. */
|
||||
// state = gtk_action_group_get_action (action_group, "State0Action");
|
||||
// if (state && GTK_IS_RADIO_ACTION (state))
|
||||
// stateSlot = GTK_RADIO_ACTION (state);
|
||||
//
|
||||
// /* Set the autoResume checkbox */
|
||||
// GtkCheckMenuItem* auto_resume_chk = (GtkCheckMenuItem*) gtk_ui_manager_get_widget ( ui_manager, "/Menubar/OptionsMenuAction/AutoResumeAction");
|
||||
// gtk_check_menu_item_set_active (auto_resume_chk, (bool)AutoResumePlay);
|
||||
//
|
||||
// // Sync State of GameGenie Toggle Action to Startup Configuration
|
||||
// int gameGenieEnabled=0;
|
||||
// g_config->getOption("SDL.GameGenie", &gameGenieEnabled);
|
||||
//
|
||||
// if ( gameGenieEnabled )
|
||||
// {
|
||||
// state = gtk_action_group_get_action (action_group, "GameGenieToggleAction");
|
||||
//
|
||||
// if ( state ){
|
||||
// gtk_action_activate( state );
|
||||
// }
|
||||
// }
|
||||
// enableGameGenie(gameGenieEnabled);
|
||||
//
|
||||
// /* Finally, return the actual menu bar created by the UIManager. */
|
||||
// return gtk_ui_manager_get_widget (ui_manager, "/Menubar");
|
||||
//}
|
||||
|
||||
|
||||
static GtkWidget* CreateMenubar2( GtkWidget* window)
|
||||
static GtkWidget* CreateMenubar( GtkWidget* window)
|
||||
{
|
||||
GtkWidget *menubar, *menu, *submenu, *item;
|
||||
GSList *radioGroup;
|
||||
|
|
@ -3043,8 +2830,7 @@ int InitGTKSubsystem(int argc, char** argv)
|
|||
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
|
||||
gtk_container_add(GTK_CONTAINER(MainWindow), vbox);
|
||||
|
||||
//Menubar = CreateMenubar(MainWindow);
|
||||
Menubar = CreateMenubar2(MainWindow);
|
||||
Menubar = CreateMenubar(MainWindow);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX(vbox), Menubar, FALSE, TRUE, 0);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue