diff --git a/src/drivers/Qt/config.cpp b/src/drivers/Qt/config.cpp index 9adba1ca..c54dd8fa 100644 --- a/src/drivers/Qt/config.cpp +++ b/src/drivers/Qt/config.cpp @@ -94,224 +94,225 @@ // return NULL; //} -int getHotKeyConfig( int i, const char **nameOut, const char **keySeqOut ) +int getHotKeyConfig( int i, const char **nameOut, const char **keySeqOut, const char **titleOut ) { const char *name = ""; const char *keySeq = ""; + const char *title = NULL; switch ( i ) { case HK_OPEN_ROM: - name = "OpenROM"; keySeq = "Ctrl+O"; + name = "OpenROM"; keySeq = "Ctrl+O"; title = "Open ROM"; break; case HK_CLOSE_ROM: - name = "CloseROM"; keySeq = "Ctrl+C"; + name = "CloseROM"; keySeq = "Ctrl+C"; title = "Close ROM"; break; case HK_CHEAT_MENU: - name = "CheatMenu"; keySeq = ""; + name = "CheatMenu"; keySeq = ""; title = "Open Cheat Window"; break; case HK_BIND_STATE: - name = "BindState"; keySeq = ""; + name = "BindState"; keySeq = ""; title = "Bind Save State to Movie"; break; case HK_LOAD_LUA: name = "LoadLua"; keySeq = "Ctrl+L"; break; case HK_TOGGLE_BG: - name = "ToggleBG"; keySeq = ""; + name = "ToggleBG"; keySeq = ""; title = "Toggle Background Display"; break; case HK_TOGGLE_FG: - name = "ToggleFG"; keySeq = ""; + name = "ToggleFG"; keySeq = ""; title = "Toggle Object Display"; break; // Save States case HK_SAVE_STATE: - name = "SaveState"; keySeq = "I"; + name = "SaveState"; keySeq = "I"; title = "Save State"; break; case HK_SAVE_STATE_0: - name = "SaveState0"; keySeq = "F10"; + name = "SaveState0"; keySeq = "F10"; title = "Save State to Slot 0"; break; case HK_SAVE_STATE_1: - name = "SaveState1"; keySeq = "F1"; + name = "SaveState1"; keySeq = "F1"; title = "Save State to Slot 1"; break; case HK_SAVE_STATE_2: - name = "SaveState2"; keySeq = "F2"; + name = "SaveState2"; keySeq = "F2"; title = "Save State to Slot 2"; break; case HK_SAVE_STATE_3: - name = "SaveState3"; keySeq = "F3"; + name = "SaveState3"; keySeq = "F3"; title = "Save State to Slot 3"; break; case HK_SAVE_STATE_4: - name = "SaveState4"; keySeq = "F4"; + name = "SaveState4"; keySeq = "F4"; title = "Save State to Slot 4"; break; case HK_SAVE_STATE_5: - name = "SaveState5"; keySeq = "F5"; + name = "SaveState5"; keySeq = "F5"; title = "Save State to Slot 5"; break; case HK_SAVE_STATE_6: - name = "SaveState6"; keySeq = "F6"; + name = "SaveState6"; keySeq = "F6"; title = "Save State to Slot 6"; break; case HK_SAVE_STATE_7: - name = "SaveState7"; keySeq = "F7"; + name = "SaveState7"; keySeq = "F7"; title = "Save State to Slot 7"; break; case HK_SAVE_STATE_8: - name = "SaveState8"; keySeq = "F8"; + name = "SaveState8"; keySeq = "F8"; title = "Save State to Slot 8"; break; case HK_SAVE_STATE_9: - name = "SaveState9"; keySeq = "F9"; + name = "SaveState9"; keySeq = "F9"; title = "Save State to Slot 9"; break; // Load States case HK_LOAD_STATE: - name = "LoadState"; keySeq = "Shift+I"; + name = "LoadState"; keySeq = "Shift+I"; title = "Load State"; break; case HK_LOAD_STATE_0: - name = "LoadState0"; keySeq = "Shift+F10"; + name = "LoadState0"; keySeq = "Shift+F10"; title = "Load State From Slot 0"; break; case HK_LOAD_STATE_1: - name = "LoadState1"; keySeq = "Shift+F1"; + name = "LoadState1"; keySeq = "Shift+F1"; title = "Load State From Slot 1"; break; case HK_LOAD_STATE_2: - name = "LoadState2"; keySeq = "Shift+F2"; + name = "LoadState2"; keySeq = "Shift+F2"; title = "Load State From Slot 2"; break; case HK_LOAD_STATE_3: - name = "LoadState3"; keySeq = "Shift+F3"; + name = "LoadState3"; keySeq = "Shift+F3"; title = "Load State From Slot 3"; break; case HK_LOAD_STATE_4: - name = "LoadState4"; keySeq = "Shift+F4"; + name = "LoadState4"; keySeq = "Shift+F4"; title = "Load State From Slot 4"; break; case HK_LOAD_STATE_5: - name = "LoadState5"; keySeq = "Shift+F5"; + name = "LoadState5"; keySeq = "Shift+F5"; title = "Load State From Slot 5"; break; case HK_LOAD_STATE_6: - name = "LoadState6"; keySeq = "Shift+F6"; + name = "LoadState6"; keySeq = "Shift+F6"; title = "Load State From Slot 6"; break; case HK_LOAD_STATE_7: - name = "LoadState7"; keySeq = "Shift+F7"; + name = "LoadState7"; keySeq = "Shift+F7"; title = "Load State From Slot 7"; break; case HK_LOAD_STATE_8: - name = "LoadState8"; keySeq = "Shift+F8"; + name = "LoadState8"; keySeq = "Shift+F8"; title = "Load State From Slot 8"; break; case HK_LOAD_STATE_9: - name = "LoadState9"; keySeq = "Shift+F9"; + name = "LoadState9"; keySeq = "Shift+F9"; title = "Load State From Slot 9"; break; case HK_FDS_SELECT: - name = "FDSSelect"; keySeq = ""; + name = "FDSSelect"; keySeq = ""; title = "Switch FDS Disk Side"; break; case HK_FDS_EJECT: - name = "FDSEject"; keySeq = ""; + name = "FDSEject"; keySeq = ""; title = "Eject FDS Disk"; break; case HK_VS_INSERT_COIN: - name = "VSInsertCoin"; keySeq = ""; + name = "VSInsertCoin"; keySeq = ""; title = "VS Insert Coin"; break; case HK_VS_TOGGLE_DIPSWITCH: - name = "VSToggleDip"; keySeq = ""; + name = "VSToggleDip"; keySeq = ""; title = "VS Toggle Dipswitch"; break; case HK_TOGGLE_FRAME_DISPLAY: - name = "MovieToggleFrameDisplay"; keySeq = "."; + name = "MovieToggleFrameDisplay"; keySeq = "."; title = "Toggle Frame Display"; break; case HK_TOGGLE_SUBTITLE: - name = "SubtitleDisplay"; keySeq = ""; + name = "SubtitleDisplay"; keySeq = ""; title = "Toggle Movie Subtitles"; break; case HK_POWER: - name = "Power"; keySeq = ""; + name = "Power"; keySeq = ""; title = "Power"; break; case HK_RESET: - name = "Reset"; keySeq = "Ctrl+R"; + name = "Reset"; keySeq = "Ctrl+R"; title = "Reset"; break; case HK_PAUSE: - name = "Pause"; keySeq = "Pause"; + name = "Pause"; keySeq = "Pause"; title = "Pause"; break; case HK_QUIT: - name = "Quit"; keySeq = "Ctrl+Q"; + name = "Quit"; keySeq = "Ctrl+Q"; title = "Exit Application"; break; case HK_SCREENSHOT: - name = "Screenshot"; keySeq = "F12"; + name = "Screenshot"; keySeq = "F12"; break; case HK_DECREASE_SPEED: - name = "DecreaseSpeed"; keySeq = "-"; + name = "DecreaseSpeed"; keySeq = "-"; break; case HK_INCREASE_SPEED: - name = "IncreaseSpeed"; keySeq = "="; + name = "IncreaseSpeed"; keySeq = "="; break; case HK_FRAME_ADVANCE: - name = "FrameAdvance"; keySeq = "\\"; + name = "FrameAdvance"; keySeq = "\\"; break; case HK_TURBO: - name = "Turbo"; keySeq = "Tab"; + name = "Turbo"; keySeq = "Tab"; break; case HK_TOGGLE_INPUT_DISPLAY: - name = "ToggleInputDisplay"; keySeq = ","; + name = "ToggleInputDisplay"; keySeq = ","; break; case HK_MOVIE_TOGGLE_RW: - name = "ToggleMovieRW"; keySeq = "Q"; + name = "ToggleMovieRW"; keySeq = "Q"; break; case HK_PLAY_MOVIE_FROM: - name = "PlayMovieFrom"; keySeq = ""; + name = "PlayMovieFrom"; keySeq = ""; break; case HK_MOVIE_PLAY_RESTART: - name = "PlayMovieFromBeginning"; keySeq = ""; + name = "PlayMovieFromBeginning"; keySeq = ""; break; case HK_RECORD_MOVIE_TO: - name = "RecordMovieTo"; keySeq = ""; + name = "RecordMovieTo"; keySeq = ""; break; case HK_STOP_MOVIE: - name = "StopMovie"; keySeq = ""; + name = "StopMovie"; keySeq = ""; break; case HK_MUTE_CAPTURE: - name = "MuteCapture"; keySeq = "'"; + name = "MuteCapture"; keySeq = "'"; break; case HK_FA_LAG_SKIP: - name = "FrameAdvanceLagSkip"; keySeq = "Delete"; + name = "FrameAdvanceLagSkip"; keySeq = "Delete"; break; case HK_LAG_COUNTER_DISPLAY: - name = "LagCounterDisplay"; keySeq = "/"; + name = "LagCounterDisplay"; keySeq = "/"; break; case HK_SELECT_STATE_0: - name = "SelectState0"; keySeq = "0"; + name = "SelectState0"; keySeq = "0"; title = "Select State Slot 0"; break; case HK_SELECT_STATE_1: - name = "SelectState1"; keySeq = "1"; + name = "SelectState1"; keySeq = "1"; title = "Select State Slot 1"; break; case HK_SELECT_STATE_2: - name = "SelectState2"; keySeq = "2"; + name = "SelectState2"; keySeq = "2"; title = "Select State Slot 2"; break; case HK_SELECT_STATE_3: - name = "SelectState3"; keySeq = "3"; + name = "SelectState3"; keySeq = "3"; title = "Select State Slot 3"; break; case HK_SELECT_STATE_4: - name = "SelectState4"; keySeq = "4"; + name = "SelectState4"; keySeq = "4"; title = "Select State Slot 4"; break; case HK_SELECT_STATE_5: - name = "SelectState5"; keySeq = "5"; + name = "SelectState5"; keySeq = "5"; title = "Select State Slot 5"; break; case HK_SELECT_STATE_6: - name = "SelectState6"; keySeq = "6"; + name = "SelectState6"; keySeq = "6"; title = "Select State Slot 6"; break; case HK_SELECT_STATE_7: - name = "SelectState7"; keySeq = "7"; + name = "SelectState7"; keySeq = "7"; title = "Select State Slot 7"; break; case HK_SELECT_STATE_8: - name = "SelectState8"; keySeq = "8"; + name = "SelectState8"; keySeq = "8"; title = "Select State Slot 8"; break; case HK_SELECT_STATE_9: - name = "SelectState9"; keySeq = "9"; + name = "SelectState9"; keySeq = "9"; title = "Select State Slot 9"; break; case HK_SELECT_STATE_NEXT: - name = "SelectStateNext"; keySeq = ""; + name = "SelectStateNext"; keySeq = ""; title = "Select Next State Slot"; break; case HK_SELECT_STATE_PREV: - name = "SelectStatePrev"; keySeq = ""; + name = "SelectStatePrev"; keySeq = ""; title = "Select Previous State Slot"; break; case HK_VOLUME_DOWN: - name = "VolumeDown"; keySeq = ""; + name = "VolumeDown"; keySeq = ""; break; case HK_VOLUME_UP: - name = "VolumeUp"; keySeq = ""; + name = "VolumeUp"; keySeq = ""; break; case HK_FKB_ENABLE: - name = "FKB_Enable"; keySeq = "ScrollLock"; + name = "FKB_Enable"; keySeq = "ScrollLock"; title = "Toggle Family Keyboard Enable"; break; case HK_FULLSCREEN: - name = "FullScreen"; keySeq = "Alt+Return"; + name = "FullScreen"; keySeq = "Alt+Return"; title = "Toggle Fullscreen View"; break; case HK_MAIN_MENU_HIDE: - name = "MainMenuHide"; keySeq = "Alt+/"; + name = "MainMenuHide"; keySeq = "Alt+/"; title = "Toggle Main Menu Visibility"; break; default: case HK_MAX: @@ -328,6 +329,14 @@ int getHotKeyConfig( int i, const char **nameOut, const char **keySeqOut ) { *keySeqOut = keySeq; } + if ( titleOut ) + { + if ( title == NULL ) + { + title = name; + } + *titleOut = title; + } return 0; } diff --git a/src/drivers/Qt/config.h b/src/drivers/Qt/config.h index e3f22882..d869a8fa 100644 --- a/src/drivers/Qt/config.h +++ b/src/drivers/Qt/config.h @@ -58,7 +58,7 @@ enum HOTKEY { HK_FKB_ENABLE, HK_MAX}; -int getHotKeyConfig( int i, const char **nameOut, const char **keySeqOut ); +int getHotKeyConfig( int i, const char **nameOut, const char **keySeqOut, const char **titleOut = NULL ); #endif