Skip to content

Commit d840180

Browse files
committed
GUI - default to host OS's shortcut mode
New users starting Sonic Pi for the first time will have their shortcut mode set to be similar to their host OS.
1 parent 520a739 commit d840180

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

app/gui/mainwindow.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,6 @@ void MainWindow::setupWindowStructure()
415415
errorPane = new QTextBrowser;
416416
metroPane = new SonicPiMetro(m_spClient, m_spAPI, theme, this);
417417

418-
419418
connect(metroPane, SIGNAL(linkEnabled()), this, SLOT(checkEnableLinkMenu()));
420419
connect(metroPane, SIGNAL(linkDisabled()), this, SLOT(uncheckEnableLinkMenu()));
421420

@@ -3526,7 +3525,6 @@ void MainWindow::createToolBar()
35263525
enableLinkAct->setChecked(false);
35273526
connect(enableLinkAct, SIGNAL(triggered()), this, SLOT(toggleLinkMenu()));
35283527

3529-
35303528
linkTapTempoAct = new QAction(tr("Tap Tempo"), this);
35313529
connect(linkTapTempoAct, SIGNAL(triggered()), metroPane, SLOT(tapTempo()));
35323530

@@ -4311,7 +4309,14 @@ void MainWindow::readSettings()
43114309
piSettings->themeStyle = theme->themeNameToStyle(styleName);
43124310
piSettings->show_autocompletion = gui_settings->value("prefs/show-autocompletion", true).toBool();
43134311
piSettings->show_context = gui_settings->value("prefs/show-context", true).toBool();
4314-
piSettings->shortcut_mode = gui_settings->value("prefs/shortcut-mode", 1).toInt();
4312+
#if defined(Q_OS_WIN)
4313+
int os_shortcut_mode = 2;
4314+
#elif defined(Q_OS_MAC)
4315+
int os_shortcut_mode = 3;
4316+
#else
4317+
int os_shortcut_mode = 1;
4318+
#endif
4319+
piSettings->shortcut_mode = gui_settings->value("prefs/shortcut-mode", os_shortcut_mode).toInt();
43154320

43164321
emit settingsChanged();
43174322
}

0 commit comments

Comments
 (0)