merged with release_2_0

5 files changed, 32 insertions, 18 deletions

diff --git a/muse2/muse/master/lmaster.cpp b/muse2/muse/master/lmaster.cpp
index 1553e17f..154b5e1f 100644
--- a/muse2/muse/master/lmaster.cpp
+++ b/muse2/muse/master/lmaster.cpp
@@ -31,6 +31,7 @@
 #include "audio.h"
 #include "shortcuts.h"
 #include "debug.h"
+#include "gconfig.h"
 
 #include <QCloseEvent>
 #include <QGridLayout>
@@ -273,7 +274,7 @@ LMaster::LMaster()
       connect(keyButton, SIGNAL(clicked()), SLOT(insertKey()));
 
       initShortcuts();
-      MusEGlobal::muse->topwinMenuInited(this);
+      finalizeInit();
       }
 
 //---------------------------------------------------------
@@ -285,6 +286,19 @@ LMaster::~LMaster()
       }
 
 //---------------------------------------------------------
+//   focusCanvas
+//---------------------------------------------------------
+
+void LMaster::focusCanvas()
+{
+  if(MusEGlobal::config.smartFocus)
+  {
+    view->setFocus();
+    view->activateWindow();
+  }
+}
+
+//---------------------------------------------------------
 //   insertSig
 //---------------------------------------------------------
 
diff --git a/muse2/muse/master/lmaster.h b/muse2/muse/master/lmaster.h
index 367eff77..d3278333 100644
--- a/muse2/muse/master/lmaster.h
+++ b/muse2/muse/master/lmaster.h
@@ -167,6 +167,7 @@ class LMaster : public MidiEditor {
    public slots:
       void songChanged(int);
       void configChanged();
+      void focusCanvas();
 
    signals:
       void isDeleting(MusEGui::TopWin*);
diff --git a/muse2/muse/master/master.cpp b/muse2/muse/master/master.cpp
index 239467ee..5d6e6e63 100644
--- a/muse2/muse/master/master.cpp
+++ b/muse2/muse/master/master.cpp
@@ -21,7 +21,7 @@
 //=========================================================
 
 #include <stdio.h>
-#include <values.h>
+#include <limits.h>
 
 #include <QCursor>
 #include <QEvent>
@@ -138,7 +138,7 @@ void Master::setPos(int idx, unsigned val, bool adjustScrollbar)
 void Master::leaveEvent(QEvent*)
       {
       emit tempoChanged(-1);
-      emit timeChanged(MAXINT);
+      emit timeChanged(INT_MAX);
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp
index 82ac697b..53ebf953 100644
--- a/muse2/muse/master/masteredit.cpp
+++ b/muse2/muse/master/masteredit.cpp
@@ -40,7 +40,7 @@
 #include "gconfig.h"
 #include "audio.h"
 
-#include <values.h>
+#include <limits.h>
 
 #include <QActionGroup>
 #include <QCloseEvent>
@@ -252,16 +252,13 @@ MasterEdit::MasterEdit()
       connect(canvas, SIGNAL(followEvent(int)), hscroll, SLOT(setOffset(int)));
       connect(canvas, SIGNAL(timeChanged(unsigned)),   SLOT(setTime(unsigned)));
 
-      if(MusEGlobal::config.smartFocus)
-      {
-        connect(curSig,   SIGNAL(returnPressed()), SLOT(focusCanvas()));
-        connect(curSig,   SIGNAL(escapePressed()), SLOT(focusCanvas()));
-        connect(curTempo, SIGNAL(returnPressed()), SLOT(focusCanvas()));
-        connect(curTempo, SIGNAL(escapePressed()), SLOT(focusCanvas()));
-      }
+      connect(curSig,   SIGNAL(returnPressed()), SLOT(focusCanvas()));
+      connect(curSig,   SIGNAL(escapePressed()), SLOT(focusCanvas()));
+      connect(curTempo, SIGNAL(returnPressed()), SLOT(focusCanvas()));
+      connect(curTempo, SIGNAL(escapePressed()), SLOT(focusCanvas()));
       
       initTopwinState();
-      MusEGlobal::muse->topwinMenuInited(this);
+      finalizeInit();
       }
 
 //---------------------------------------------------------
@@ -381,8 +378,11 @@ void MasterEdit::writeConfiguration(int level, MusECore::Xml& xml)
 
 void MasterEdit::focusCanvas()
 {
-  canvas->setFocus();
-  canvas->activateWindow();
+  if(MusEGlobal::config.smartFocus)
+  {
+    canvas->setFocus();
+    canvas->activateWindow();
+  } 
 }
 
 //---------------------------------------------------------
@@ -396,8 +396,7 @@ void MasterEdit::_setRaster(int index)
             };
       _raster = rasterTable[index];
       _rasterInit = _raster;
-      if(MusEGlobal::config.smartFocus)
-        focusCanvas();
+      focusCanvas();
       }
 
 //---------------------------------------------------------
@@ -427,7 +426,7 @@ void MasterEdit::posChanged(int idx, unsigned val, bool)
 
 void MasterEdit::setTime(unsigned tick)
       {
-      if (tick == MAXINT)
+      if (tick == INT_MAX)
             cursorPos->setEnabled(false);
       else {
             cursorPos->setEnabled(true);
diff --git a/muse2/muse/master/masteredit.h b/muse2/muse/master/masteredit.h
index faff69e2..15b5a649 100644
--- a/muse2/muse/master/masteredit.h
+++ b/muse2/muse/master/masteredit.h
@@ -87,10 +87,10 @@ class MasterEdit : public MidiEditor {
       void setTempo(int);
       void sigChange(const AL::TimeSignature&);
       void tempoChange(double);
-      void focusCanvas();
 
    public slots:
       void songChanged(int);
+      void focusCanvas();
 
    signals:
       void isDeleting(MusEGui::TopWin*);