Focussing, shortcuts, transport position snapping.

4 files changed, 19 insertions, 4 deletions

diff --git a/muse2/muse/widgets/bigtime.cpp b/muse2/muse/widgets/bigtime.cpp
index ba9defa9..479f4103 100644
--- a/muse2/muse/widgets/bigtime.cpp
+++ b/muse2/muse/widgets/bigtime.cpp
@@ -34,6 +34,7 @@ BigTime::BigTime(QWidget* parent)
       fmtButton->resize(18,18);
       fmtButton->setChecked(true);
       fmtButton->setToolTip(tr("format display"));
+      fmtButton->setFocusPolicy(Qt::NoFocus);
       barLabel   = new QLabel(dwin);
       beatLabel  = new QLabel(dwin);
       tickLabel  = new QLabel(dwin);
diff --git a/muse2/muse/widgets/scrollscale.cpp b/muse2/muse/widgets/scrollscale.cpp
index f279e6ce..de383deb 100644
--- a/muse2/muse/widgets/scrollscale.cpp
+++ b/muse2/muse/widgets/scrollscale.cpp
@@ -241,12 +241,16 @@ ScrollScale::ScrollScale ( int s1, int s2, int cs, int max_, Qt::Orientation o,
 	}
 
 	scale  = new QSlider (o);
+        // Added by Tim. For some reason focus was on. 
+        // It messes up tabbing, and really should have a shortcut instead.
+        scale->setFocusPolicy(Qt::NoFocus);  
         scale->setMinimum(0);
         scale->setMaximum(1024);
 	scale->setPageStep(1);
 	scale->setValue(cur);	
 
 	scroll = new QScrollBar ( o );
+        //scroll->setFocusPolicy(Qt::NoFocus);  // Tim.
 	setScale ( cur );
 
 	if ( o == Qt::Horizontal )
diff --git a/muse2/muse/widgets/shortcutcapturedialog.cpp b/muse2/muse/widgets/shortcutcapturedialog.cpp
index 5a76d1d9..0b2b66d2 100644
--- a/muse2/muse/widgets/shortcutcapturedialog.cpp
+++ b/muse2/muse/widgets/shortcutcapturedialog.cpp
@@ -15,6 +15,7 @@
 #include <QKeyEvent>
 #include <QKeySequence>
 #include <QInputEvent>
+#include <QChar>
 
 ShortcutCaptureDialog::ShortcutCaptureDialog(QWidget* parent, int index)
    : QDialog(parent)
@@ -40,11 +41,19 @@ void ShortcutCaptureDialog::keyPressEvent(QKeyEvent* e)
       bool shift, alt, ctrl, conflict = false, realkey = false;
       QString msgString = "";
       int temp_key;
-      shift = ((QInputEvent*)e)->modifiers() & Qt::ShiftModifier;
-      ctrl  = ((QInputEvent*)e)->modifiers() & Qt::ControlModifier;
-      alt   = ((QInputEvent*)e)->modifiers() & Qt::AltModifier;
+      Qt::KeyboardModifiers mods = ((QInputEvent*)e)->modifiers();
+      shift = mods & Qt::ShiftModifier;
+      ctrl  = mods & Qt::ControlModifier;
+      alt   = mods & Qt::AltModifier;
       //printf("Key total: %d, alt: %d, ctrl: %d shift: %d\n",e->key(), alt, ctrl, shift);
       temp_key = e->key();
+      
+      QChar keychar(temp_key);
+      bool ispunct = keychar.isPunct();
+      bool issymbol = keychar.isSymbol();
+      //printf("Key:%x, alt:%d, ctrl:%d shift:%d ispunct:%d issymbol:%d text:%s\n",
+      //  e->key(), alt, ctrl, shift, ispunct, issymbol, e->text().toLatin1().constData());  // REMOVE Tim.
+      
       temp_key += (shift ? (int)Qt::SHIFT : 0);    // (int) Tim
       temp_key += (ctrl  ? (int)Qt::CTRL  : 0);    //
       temp_key += (alt   ? (int)Qt::ALT   : 0);    //
@@ -58,6 +67,7 @@ void ShortcutCaptureDialog::keyPressEvent(QKeyEvent* e)
             key = temp_key;
             realkey = true;
             QKeySequence q = QKeySequence(key);
+            //QKeySequence q = QKeySequence(k, mods);
             QString keyString = q;
             if (keyString != QString::null)
                   nshrtLabel->setText(q);
diff --git a/muse2/muse/widgets/view.cpp b/muse2/muse/widgets/view.cpp
index 5bf63dc8..31cc212e 100644
--- a/muse2/muse/widgets/view.cpp
+++ b/muse2/muse/widgets/view.cpp
@@ -235,7 +235,7 @@ void View::paintEvent(QPaintEvent* ev)
       
       //bitBlt(this, ev->rect().topLeft(), &pm, ev->rect(), CopyROP, true);
       QPainter p(this);
-      p.setCompositionMode(QPainter::CompositionMode_Source);
+      //p.setCompositionMode(QPainter::CompositionMode_Source);
       p.drawPixmap(ev->rect().topLeft(), pm, ev->rect());
       
       #else