merged with release_2_0

3 files changed, 20 insertions, 3 deletions

diff --git a/muse2/muse/liste/editevent.cpp b/muse2/muse/liste/editevent.cpp
index 6781c365..a60ea229 100644
--- a/muse2/muse/liste/editevent.cpp
+++ b/muse2/muse/liste/editevent.cpp
@@ -379,7 +379,7 @@ void EditMetaDialog::toggled(bool flag)
 
       QString dst;
       if (flag) {       // convert to hex
-            dst = string2hex((unsigned char*)src, strlen(src));
+            dst = string2hex((unsigned char*)src, ba.length());
             }
       else {            // convert to string
             int len;
@@ -422,7 +422,7 @@ void EditMetaDialog::accept()
       const char* src = ba.constData();
       if (!hexButton->isChecked()) {
             meta = (unsigned char*)strdup(src);
-            len  = strlen(src);
+            len  = ba.length();
             QDialog::accept();
             return;
             }
@@ -638,6 +638,7 @@ EditCtrlDialog::EditCtrlDialog(int tick, const MusECore::Event& event,
                         continue;
                   }
             MusECore::MidiController* c = port->midiController(num);
+	    {
             isList i = sList.begin();
             for (; i != sList.end(); ++i) {
                   if (*i == c->name())
@@ -645,6 +646,7 @@ EditCtrlDialog::EditCtrlDialog(int tick, const MusECore::Event& event,
                   }
             if (i == sList.end())
                   sList.push_back(c->name());
+	    }
             }
       MusECore::MidiController* mc = port->midiController(num);
       int idx = 0;
diff --git a/muse2/muse/liste/listedit.cpp b/muse2/muse/liste/listedit.cpp
index a0d82969..cdc34b45 100644
--- a/muse2/muse/liste/listedit.cpp
+++ b/muse2/muse/liste/listedit.cpp
@@ -46,6 +46,7 @@
 #include "midiport.h"
 #include "midictrl.h"
 #include "app.h"
+#include "gconfig.h"
 
 namespace MusEGui {
 
@@ -606,7 +607,7 @@ ListEdit::ListEdit(MusECore::PartList* pl)
       
       setWindowTitle("MusE: List Editor");
       
-      MusEGlobal::muse->topwinMenuInited(this);
+      finalizeInit();
       }
 
 //---------------------------------------------------------
@@ -1009,4 +1010,17 @@ void ListEdit::keyPressEvent(QKeyEvent* event)
             }
       }
 
+//---------------------------------------------------------
+//   focusCanvas
+//---------------------------------------------------------
+
+void ListEdit::focusCanvas()
+{
+  if(MusEGlobal::config.smartFocus)
+  {
+    liste->setFocus();
+    liste->activateWindow();
+  }
+}
+
 } // namespace MusEGui
diff --git a/muse2/muse/liste/listedit.h b/muse2/muse/liste/listedit.h
index 1c0c1bd9..1dddb9a6 100644
--- a/muse2/muse/liste/listedit.h
+++ b/muse2/muse/liste/listedit.h
@@ -84,6 +84,7 @@ class ListEdit : public MidiEditor {
 
    public slots:
       void songChanged(int);
+      void focusCanvas();
 
    signals:
       void isDeleting(MusEGui::TopWin*);