@@ -415,7 +415,6 @@ void MainWindow::setupWindowStructure()
415
415
errorPane = new QTextBrowser;
416
416
metroPane = new SonicPiMetro (m_spClient, m_spAPI, theme, this );
417
417
418
-
419
418
connect (metroPane, SIGNAL (linkEnabled ()), this , SLOT (checkEnableLinkMenu ()));
420
419
connect (metroPane, SIGNAL (linkDisabled ()), this , SLOT (uncheckEnableLinkMenu ()));
421
420
@@ -3526,7 +3525,6 @@ void MainWindow::createToolBar()
3526
3525
enableLinkAct->setChecked (false );
3527
3526
connect (enableLinkAct, SIGNAL (triggered ()), this , SLOT (toggleLinkMenu ()));
3528
3527
3529
-
3530
3528
linkTapTempoAct = new QAction (tr (" Tap Tempo" ), this );
3531
3529
connect (linkTapTempoAct, SIGNAL (triggered ()), metroPane, SLOT (tapTempo ()));
3532
3530
@@ -4311,7 +4309,14 @@ void MainWindow::readSettings()
4311
4309
piSettings->themeStyle = theme->themeNameToStyle (styleName);
4312
4310
piSettings->show_autocompletion = gui_settings->value (" prefs/show-autocompletion" , true ).toBool ();
4313
4311
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 ();
4315
4320
4316
4321
emit settingsChanged ();
4317
4322
}
0 commit comments