Compare commits

...

3 Commits

Author SHA1 Message Date
visha
2afc6d8085 Corrects space in a line for travis failure 2018-02-13 22:35:04 +05:30
visha
22aceb6277 Corrects characters in a line for travis failure 2018-02-13 22:28:52 +05:30
visha
25ab563b8c Removes the use of QKeySequence::Cancel to remove issues while running make 2018-02-13 21:57:31 +05:30

View File

@@ -187,7 +187,8 @@ void GMainWindow::InitializeHotkeys() {
RegisterHotkey("Main Window", "Load File", QKeySequence::Open);
RegisterHotkey("Main Window", "Start Emulation");
RegisterHotkey("Main Window", "Fullscreen", QKeySequence::FullScreen);
RegisterHotkey("Main Window", "Exit Fullscreen", QKeySequence::Cancel, Qt::ApplicationShortcut);
RegisterHotkey("Main Window", "Exit Fullscreen", QKeySequence(Qt::Key_Escape),
Qt::ApplicationShortcut);
LoadHotkeys();
connect(GetHotkey("Main Window", "Load File", this), &QShortcut::activated, this,