diff options
| author | Florian Jung <flo@windfisch.org> | 2011-12-22 00:13:14 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-12-22 00:13:14 +0000 |
| commit | b1b88156cb2adf84e752449f2bc803754b520f8c (patch) | |
| tree | 3d70291cf9671beb4253b23f026212e3350ab004 /muse2/muse/gconfig.cpp | |
| parent | 1057d7190242cdf9248671b316a398db805f5f56 (diff) | |
| parent | 1fe51e45eebbfc2ac198ed4778c9afdb9eaf2ed0 (diff) | |
merged with trunk again (you're committing faster than i can merge ;) )
Diffstat (limited to 'muse2/muse/gconfig.cpp')
| -rw-r--r-- | muse2/muse/gconfig.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/muse2/muse/gconfig.cpp b/muse2/muse/gconfig.cpp index a6abbb93..843c2278 100644 --- a/muse2/muse/gconfig.cpp +++ b/muse2/muse/gconfig.cpp @@ -89,11 +89,11 @@ GlobalConfigValues config = { QColor(200, 192, 171), // waveEditBackgroundColor; { QFont(QString("arial"), 10, QFont::Normal), - QFont(QString("arial"), 8, QFont::Normal), + QFont(QString("arial"), 7, QFont::Normal), // Mixer strips and midi track info panel QFont(QString("arial"), 10, QFont::Normal), QFont(QString("arial"), 10, QFont::Bold), - QFont(QString("arial"), 8, QFont::Bold), // timescale numbers - QFont(QString("Lucidatypewriter"), 14, QFont::Bold), + QFont(QString("arial"), 8, QFont::Normal), // Small numbers: Timescale and markers, part name overlay + QFont(QString("arial"), 8, QFont::Bold), // Small bold numbers such as marker text QFont(QString("arial"), 8, QFont::Bold, true) // Mixer strip labels. Looks and fits better with bold + italic than bold alone, // at the price of only few more pixels than Normal mode. }, @@ -164,16 +164,15 @@ GlobalConfigValues config = { false, // BigTimeVisible; false, // mixer1Visible; false, // mixer2Visible; - false, // markerVisible; - true, // arrangerVisible; + true, // arrangerVisible; true, // showSplashScreen 1, // canvasShowPartType 1 - names, 2 events 5, // canvasShowPartEvent - true, // canvasShowGrid; + true, // canvasShowGrid; QString(""), // canvasBgPixmap; QStringList(), // canvasCustomBgList - QString(":/style.qss"), // default styleSheetFile + QString(""), // default styleSheetFile - For built-in set to ":/style.qss" QString(""), // style QString("sweep"), // externalWavEditor false, // useOldStyleStopShortCut |