diff options
| author | Florian Jung <flo@windfisch.org> | 2011-12-26 19:43:16 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-12-26 19:43:16 +0000 |
| commit | 4d8477ab60093fc4c1f6190a931d0c2fdc65384c (patch) | |
| tree | a885d69728e1b5a00866e370ded173f33057e2e2 /muse2/muse/app.cpp | |
| parent | ef3de045fb88680a549435fa9099908643ee311f (diff) | |
| parent | b988a0a27bc175ce10bc8fa53ed131486813f3e7 (diff) | |
merged with latest release
fake-merged because of the cherry-pick
Diffstat (limited to 'muse2/muse/app.cpp')
| -rw-r--r-- | muse2/muse/app.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp index fcbb8cf3..f63eb6e2 100644 --- a/muse2/muse/app.cpp +++ b/muse2/muse/app.cpp @@ -2443,7 +2443,10 @@ void MusE::configAppearance() void MusE::loadTheme(const QString& s) { if (style()->objectName() != s) + { QApplication::setStyle(s); + style()->setObjectName(s); // p4.0.45 + } } //--------------------------------------------------------- @@ -3022,7 +3025,7 @@ void MusE::updateConfiguration() void MusE::showBigtime(bool on) { if (on && bigtime == 0) { - bigtime = new MusEGui::BigTime(0); + bigtime = new MusEGui::BigTime(this); bigtime->setPos(0, MusEGlobal::song->cpos(), false); connect(MusEGlobal::song, SIGNAL(posChanged(int, unsigned, bool)), bigtime, SLOT(setPos(int, unsigned, bool))); connect(MusEGlobal::muse, SIGNAL(configChanged()), bigtime, SLOT(configChanged())); @@ -3137,12 +3140,10 @@ QWidget* MusE::bigtimeWindow() { return bigtime; } void MusE::focusInEvent(QFocusEvent* ev) { - //if (audioMixer) - // audioMixer->raise(); - if (mixer1) - mixer1->raise(); - if (mixer2) - mixer2->raise(); + //if (mixer1) // Removed p4.0.45 + // mixer1->raise(); + //if (mixer2) + // mixer2->raise(); raise(); QMainWindow::focusInEvent(ev); } |