From 0d8e763949e498c1baf3a2fac7b0b3a406eb0068 Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@windfisch.org>
Date: Mon, 26 Dec 2011 18:30:21 +0000
Subject:

---
 muse2/muse/app.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'muse2/muse/app.cpp')

diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index 4fd01bf7..d65a071f 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -2442,7 +2442,10 @@ void MusE::configAppearance()
 void MusE::loadTheme(const QString& s)
       {
       if (style()->objectName() != s)
+      {
             QApplication::setStyle(s);
+            style()->setObjectName(s);   // p4.0.45
+      }      
       }
 
 //---------------------------------------------------------
@@ -3021,7 +3024,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()));
@@ -3136,12 +3139,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);
       }
-- 
cgit v1.2.3