[Performous-commit] Tapio Vierros : More verbose note tooltip.

[Tapio V. <aa...@us...>]

Module: editor
Branch: master
Commit: 54114b08c0ef2a70ee0009bf9e246c5f8e5c9a50

Author: Tapio Vierros <tap...@gm...>
Date:   Thu Jan 13 13:08:50 2011 +0200

More verbose note tooltip.

---

 editor.ui    |    8 ++++----
 notelabel.cc |   14 ++++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/editor.ui b/editor.ui
index c71a596..8165720 100644
--- a/editor.ui
+++ b/editor.ui
@@ -88,7 +88,7 @@
             <item row="0" column="1">
              <widget class="QLabel" name="valNoteBegin">
               <property name="text">
-               <string>XXX</string>
+               <string>-</string>
               </property>
              </widget>
             </item>
@@ -102,7 +102,7 @@
             <item row="1" column="1">
              <widget class="QLabel" name="valNoteEnd">
               <property name="text">
-               <string>XXX</string>
+               <string>-</string>
               </property>
              </widget>
             </item>
@@ -161,7 +161,7 @@
             <item row="2" column="1">
              <widget class="QLabel" name="valNoteDuration">
               <property name="text">
-               <string>XXX</string>
+               <string>-</string>
               </property>
              </widget>
             </item>
@@ -175,7 +175,7 @@
             <item row="3" column="1">
              <widget class="QLabel" name="valNote">
               <property name="text">
-               <string>XXX</string>
+               <string>-</string>
               </property>
              </widget>
             </item>
diff --git a/notelabel.cc b/notelabel.cc
index a3b192e..9705d65 100644
--- a/notelabel.cc
+++ b/notelabel.cc
@@ -78,8 +78,8 @@ void NoteLabel::createPixmap(QSize size)
 
 	setPixmap(QPixmap::fromImage(image));
 
-	setToolTip(QString("\"%1\"\n%2").arg(lyric()).arg(QString::fromStdString(m_note.typeString())));
 	setStatusTip(QString("Lyric: ") + lyric());
+	updateNote();
 }
 
 void NoteLabel::resizeEvent(QResizeEvent *event)
@@ -90,8 +90,6 @@ void NoteLabel::resizeEvent(QResizeEvent *event)
 
 void NoteLabel::mouseMoveEvent(QMouseEvent *event)
 {
-	QToolTip::showText(event->globalPos(), toolTip(), this);
-
 	NoteGraphWidget* ngw = qobject_cast<NoteGraphWidget*>(parent());
 	if (m_resizing != 0) {
 		// Resizing
@@ -120,7 +118,7 @@ void NoteLabel::mouseMoveEvent(QMouseEvent *event)
 		}
 	}
 	updateNote();
-
+	QToolTip::showText(event->globalPos(), toolTip(), this);
 	event->ignore(); // Propagate event to parent
 }
 
@@ -151,4 +149,12 @@ void NoteLabel::updateNote()
 		// Update note length
 		m_note.end = m_note.begin + ngw->px2s(width());
 	}
+	MusicalScale ms;
+	setToolTip(QString("\"%1\"\n%2\n%3\n%4 s - %5 s")
+		.arg(lyric())
+		.arg(QString::fromStdString(m_note.typeString()))
+		.arg(QString::fromStdString(ms.getNoteStr(ms.getNoteFreq(m_note.note))))
+		.arg(QString::number(m_note.begin))
+		.arg(QString::number(m_note.end))
+		);
 }