* new option: show colorized scale

* updated translations

git-svn-id: https://vmpk.svn.sourceforge.net/svnroot/vmpk/trunk@349 64c129e3-8119-4a17-9932-72cb407d3134

Author: plcl

desktop/src/colordialog.cpp

@@ -226,6 +226,15 @@ ColorDialog::currentPalette()
     return m_currentPalette;
 }
 
+PianoPalette *
+ColorDialog::getPalette(int pal)
+{
+    if (pal >= 0 && pal < m_paletteList.count()) {
+        return m_paletteList[pal];
+    }
+    return 0;
+}
+
 QList<QString>
 ColorDialog::availablePaletteNames()
 {

desktop/src/colordialog.h

@@ -36,6 +36,7 @@ class ColorDialog : public QDialog
     explicit ColorDialog(QWidget *parent = 0);
     ~ColorDialog();
     PianoPalette *currentPalette();
+    PianoPalette *getPalette(int pal);
     QList<QString> availablePaletteNames();
     QColor getColor(int i);
     void saveCurrentPalette();

desktop/src/constants.h

@@ -103,6 +103,7 @@ const QString QSTR_DRIVERNAMENET("Network UDP (IpMIDI)");
 const QString QSTR_MULTICAST_ADDRESS("225.0.0.37");
 const QString QSTR_PALETTEPREFIX("Palette_");
 const QString QSTR_CURRENTPALETTE("CurrentPalette");
+const QString QSTR_SHOWCOLORSCALE("ShowColorScale");
 
 #if defined(Q_OS_LINUX)
 const QString QSTR_DRIVERDEFAULT(QSTR_DRIVERNAMEALSA);

desktop/src/pianokey.cpp

@@ -81,3 +81,11 @@ void PianoKey::setPressed(bool p)
         update();
     }
 }
+
+void PianoKey::resetBrush()
+{
+    if (m_black)
+        m_brush = blackBrush;
+    else
+        m_brush = whiteBrush;
+}

desktop/src/pianokey.h

@@ -32,7 +32,9 @@ class VPIANO_EXPORT PianoKey : public QGraphicsRectItem
     PianoKey(const QRectF &rect, const bool black, const int note);
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *);
     int getNote() const { return m_note; }
+    void setBrush(const QBrush& b) { m_brush = b; }
     void setPressedBrush(const QBrush& b) { m_selectedBrush = b; }
+    void resetBrush();
     bool isPressed() const { return m_pressed; }
     void setPressed(bool p);
     int getDegree() const { return m_note % 12; }

desktop/src/pianoscene.cpp

@@ -49,8 +49,10 @@ PianoScene::PianoScene ( const int baseOctave,
     m_mousePressed( false ),
     m_velocity( 100 ),
     m_channel( 0 ),
+    m_showColorScale( false ),
     m_handler( 0 ),
-    m_palette( 0 )
+    m_palette( 0 ),
+    m_scalePalette( 0 )
 {
     QBrush hilightBrush(m_keyPressedColor.isValid() ? m_keyPressedColor : QApplication::palette().highlight());
     QFont lblFont(QApplication::font());
@@ -498,6 +500,21 @@ void PianoScene::refreshLabels()
     }
 }
 
+void PianoScene::refreshKeys()
+{
+    QList<PianoKey*>::ConstIterator it;
+    for(it = m_keys.constBegin(); it != m_keys.constEnd(); ++it) {
+        PianoKey* key = (*it);
+        if (m_showColorScale && m_scalePalette != 0) {
+            int degree = key->getNote() % 12;
+            key->setBrush(m_scalePalette->getColor(degree));
+        } else {
+            key->resetBrush();
+        }
+        key->setPressed(false);
+    }
+}
+
 void PianoScene::setShowLabels(bool show)
 {
     if (m_showLabels != show) {
@@ -597,3 +614,12 @@ void PianoScene::retranslate()
               << trUtf8("B");
     refreshLabels();
 }
+
+void PianoScene::setShowColorScale(const bool show)
+{
+    if (m_showColorScale != show && m_scalePalette != 0 ) {
+        m_showColorScale = show;
+        refreshKeys();
+        invalidate();
+    }
+}

desktop/src/pianoscene.h

@@ -52,6 +52,7 @@ class VPIANO_EXPORT PianoScene : public QGraphicsScene
     void setPianoHandler(PianoHandler* handler) { m_handler = handler; }
     PianoPalette* getPianoPalette() const { return m_palette; }
     void setPianoPalette( PianoPalette* p ) { m_palette = p; }
+    void setColorScalePalette( PianoPalette* p ) { m_scalePalette = p; }
 
     QColor getKeyPressedColor() const { return m_keyPressedColor; }
     void setKeyPressedColor(const QColor& color);
@@ -71,6 +72,8 @@ class VPIANO_EXPORT PianoScene : public QGraphicsScene
     void setMouseEnabled( const bool enable );
     bool isTouchEnabled() const { return m_touchEnabled; }
     void setTouchEnabled( const bool enable );
+    bool showColorScale() const { return m_showColorScale; }
+    void setShowColorScale(const bool show);
 
     void showNoteOn( const int note, QColor color, int vel = -1 );
     void showNoteOn( const int note, int vel = -1 );
@@ -116,6 +119,7 @@ class VPIANO_EXPORT PianoScene : public QGraphicsScene
 private:
     void hideOrShowKeys();
     void refreshLabels();
+    void refreshKeys();
     void triggerNoteOn( const int note, const int vel );
     void triggerNoteOff( const int note, const int vel );
     int getNoteFromKey( const int key ) const;
@@ -136,6 +140,7 @@ class VPIANO_EXPORT PianoScene : public QGraphicsScene
     bool m_mousePressed;
     int m_velocity;
     int m_channel;
+    bool m_showColorScale;
     PianoHandler* m_handler;
     KeyboardMap* m_keybdMap;
     QList<PianoKey*> m_keys;
@@ -144,6 +149,7 @@ class VPIANO_EXPORT PianoScene : public QGraphicsScene
     QStringList m_names_s;
     QStringList m_names_f;
     PianoPalette* m_palette;
+    PianoPalette* m_scalePalette;
 };
 
 #endif /*PIANOSCENE_H_*/

desktop/src/vpiano.cpp

@@ -120,6 +120,7 @@ VPiano::VPiano( QWidget * parent, Qt::WindowFlags flags )
     connect(ui.actionMouseInput, SIGNAL(toggled(bool)), SLOT(slotMouseInput(bool)));
     connect(ui.actionTouchScreenInput, SIGNAL(toggled(bool)), SLOT(slotTouchScreenInput(bool)));
     connect(ui.actionColorPalette, SIGNAL(triggered()), SLOT(slotColorPolicy()));
+    connect(ui.actionColorScale, SIGNAL(toggled(bool)), SLOT(slotColorScale(bool)));
     // Toolbars actions: toggle view
     connect(ui.toolBarNotes->toggleViewAction(), SIGNAL(toggled(bool)),
             ui.actionNotes, SLOT(setChecked(bool)));
@@ -143,8 +144,6 @@ VPiano::VPiano( QWidget * parent, Qt::WindowFlags flags )
     setWindowTitle("VMPK " + PGM_VERSION);
 #endif
     ui.pianokeybd->setPianoHandler(this);
-//    PianoScene *scene = (PianoScene *) ui.pianokeybd->scene();
-//    scene->setMouseEnabled(false);
     initialization();
 }
 
@@ -718,6 +717,7 @@ void VPiano::readSettings()
     NetworkSettings::instance().setIface(QNetworkInterface::interfaceFromName(iface));
 #endif
     m_currentPalette = settings.value(QSTR_CURRENTPALETTE, PAL_SINGLE).toInt();
+    bool colorScale = settings.value(QSTR_SHOWCOLORSCALE, false).toBool();
     settings.endGroup();
 
     dlgColorPolicy()->loadPalette(m_currentPalette);
@@ -747,6 +747,7 @@ void VPiano::readSettings()
     ui.pianokeybd->setMouseEnabled(enableMouse);
     ui.pianokeybd->setTouchEnabled(enableTouch);
     ui.pianokeybd->getPianoScene()->setChannel(m_baseChannel);
+    ui.actionColorScale->setChecked(colorScale);
     slotShowNoteNames();
     if (!insFileName.isEmpty()) {
         dlgPreferences()->setInstrumentsFileName(insFileName);
@@ -901,6 +902,7 @@ void VPiano::writeSettings()
     settings.setValue(QSTR_NETWORKIFACE, dlgPreferences()->getNetworkInterfaceName());
 #endif
     settings.setValue(QSTR_CURRENTPALETTE, m_currentPalette);
+    settings.setValue(QSTR_SHOWCOLORSCALE, ui.actionColorScale->isChecked());
     settings.endGroup();
 
     settings.beginGroup(QSTR_CONNECTIONS);
@@ -1548,7 +1550,9 @@ void VPiano::applyPreferences()
         ui.pianokeybd->resetRawKeyboardMap();
 
     m_currentPalette = dlgColorPolicy()->currentPalette()->paletteId();
-    ui.pianokeybd->getPianoScene()->setPianoPalette(dlgColorPolicy()->currentPalette());
+    currentPianoScene()->setPianoPalette(dlgColorPolicy()->currentPalette());
+    currentPianoScene()->setColorScalePalette(dlgColorPolicy()->getPalette(PAL_SCALE));
+    currentPianoScene()->setShowColorScale(ui.actionColorScale->isChecked());
 
     populateInstruments();
     populateControllers();
@@ -2477,3 +2481,13 @@ void VPiano::slotColorPolicy()
         ui.pianokeybd->getPianoScene()->setPianoPalette(dlgColorPolicy()->currentPalette());
     }
 }
+
+void VPiano::slotColorScale(bool value)
+{
+    currentPianoScene()->setShowColorScale(value);
+}
+
+PianoScene *VPiano::currentPianoScene()
+{
+    return ui.pianokeybd->getPianoScene();
+}

desktop/src/vpiano.h

@@ -143,6 +143,7 @@ protected Q_SLOTS:
     void slotMouseInput(bool value);
     void slotTouchScreenInput(bool value);
     void slotColorPolicy();
+    void slotColorScale(bool value);
     //void slotEditPrograms();
     //void slotDebugDestroyed(QObject *obj);
 
@@ -198,6 +199,7 @@ protected Q_SLOTS:
     QString configuredLanguage();
     void enforceMIDIChannelState();
     QColor getColorFromPolicy(NoteOnEvent *ev);
+    PianoScene *currentPianoScene();
 
     About *dlgAbout();
     Preferences *dlgPreferences();

desktop/src/vpiano.ui

@@ -23,8 +23,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>569</width>
-    <height>219</height>
+    <width>567</width>
+    <height>217</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -49,7 +49,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>569</width>
+     <width>567</width>
      <height>24</height>
     </rect>
    </property>
@@ -100,6 +100,7 @@
     <addaction name="actionExtraControls"/>
     <addaction name="separator"/>
     <addaction name="actionNoteNames"/>
+    <addaction name="actionColorScale"/>
     <addaction name="actionStatusBar"/>
    </widget>
    <widget class="QMenu" name="menuTools">
@@ -715,6 +716,14 @@
     <string>Color Palette</string>
    </property>
   </action>
+  <action name="actionColorScale">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Color Scale</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>