diff options
| author | Florian Jung <flo@windfisch.org> | 2011-12-21 17:39:57 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-12-21 17:39:57 +0000 |
| commit | 1057d7190242cdf9248671b316a398db805f5f56 (patch) | |
| tree | ab50268a7db2f80cfb45a7ad6578fe735ab84ce5 /muse2/muse/gconfig.cpp | |
| parent | 9977c7114089b8708d310268833b83343caa0fd1 (diff) | |
| parent | c36a5508aa42e596b005425208054af9a60734b4 (diff) | |
merged with trunk (that is, pulled the fixes from release_2_0)
only quickly tested, seems okay on the first glance
Diffstat (limited to 'muse2/muse/gconfig.cpp')
| -rw-r--r-- | muse2/muse/gconfig.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/muse2/muse/gconfig.cpp b/muse2/muse/gconfig.cpp index a19d9ed8..a6abbb93 100644 --- a/muse2/muse/gconfig.cpp +++ b/muse2/muse/gconfig.cpp @@ -131,8 +131,8 @@ GlobalConfigValues config = { -60.0, // double minSlider; false, // use Jack freewheel 20, // int guiRefresh; - QString(""), // userInstrumentsDir - //QString(""), // helpBrowser; // Obsolete + QString(""), // userInstrumentsDir // Obsolete. Must keep for compatibility. + //QString(""), // helpBrowser; // Obsolete true, // extendedMidi 384, // division for smf export QString(""), // copyright string for smf export @@ -191,7 +191,11 @@ GlobalConfigValues config = { false, // popupsDefaultStayOpen false, // leftMouseButtonCanDecrease false, // rangeMarkerWithoutMMB - MusECore::DONT_REC_MUTED_OR_HIDDEN + MusECore::DONT_REC_MUTED_OR_HIDDEN, + true, // addHiddenTracks + true // unhideTracks }; +//GlobalConfigValues globalConfig = config; + } // namespace MusEGlobal |