summaryrefslogtreecommitdiff
path: root/muse2/muse/gconfig.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-03-15 18:21:23 +0000
committerFlorian Jung <flo@windfisch.org>2012-03-15 18:21:23 +0000
commit27b7bf6815cda7abb67026c37b3e44daee1803cb (patch)
tree0b9d1c0bc84ac7ff8032e707f2b5fb4e0aaabb5c /muse2/muse/gconfig.cpp
parent2d6f113a10eb485694e20a78500f650776d701e3 (diff)
merged with trunk
Diffstat (limited to 'muse2/muse/gconfig.cpp')
-rw-r--r--muse2/muse/gconfig.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/muse2/muse/gconfig.cpp b/muse2/muse/gconfig.cpp
index 68ac6315..cb9184a3 100644
--- a/muse2/muse/gconfig.cpp
+++ b/muse2/muse/gconfig.cpp
@@ -147,7 +147,6 @@ GlobalConfigValues config = {
QRect(0, 0, 400, 300), // GeometryMain;
QRect(0, 0, 200, 100), // GeometryTransport;
QRect(0, 0, 600, 200), // GeometryBigTime;
- //QRect(0, 0, 300, 500), // GeometryMixer; // Obsolete
{
QString("Mixer A"),
QRect(0, 0, 300, 500), // Mixer1
@@ -193,9 +192,8 @@ GlobalConfigValues config = {
MusECore::DONT_REC_MUTED_OR_HIDDEN,
true, // addHiddenTracks
true, // unhideTracks
- MusEGlobal::PREFER_NEW // drumTrackPreference
+ MusEGlobal::PREFER_NEW, // drumTrackPreference
+ false // smartFocus
};
-//GlobalConfigValues globalConfig = config;
-
} // namespace MusEGlobal