X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Funicodedialog.cpp;h=7576c3b2c9d7258c0c05722c79984f8c7096764b;hb=8fc16957ff5417b21e68ca5d84de89bec38c5a1c;hp=f1e9207b8357c12d02cada5badc2cacbe177400f;hpb=c160571e8a425d3ca936c9f9ca2d3b1660bd9d70;p=kdenlive

diff --git a/src/unicodedialog.cpp b/src/unicodedialog.cpp
index f1e9207b..7576c3b2 100644
--- a/src/unicodedialog.cpp
+++ b/src/unicodedialog.cpp
@@ -9,6 +9,8 @@
 
 #include "unicodedialog.h"
 
+#include <QWheelEvent>
+
 /// CONSTANTS
 
 const int MAX_LENGTH_HEX = 4;
@@ -78,7 +80,7 @@ bool UnicodeDialog::controlCharacter(QString text)
 
     switch (inputMethod) {
     case InputHex:
-        if (t == ""
+        if (t.isEmpty()
                 || (t.length() == 1 && !(t == "9" || t == "a" || t == "d"))
                 || (t.length() == 2 && t.at(0) == QChar('1'))) {
             isControlCharacter = true;
@@ -153,7 +155,7 @@ QString UnicodeDialog::unicodeInfo(QString unicode)
     } else if (u == "2013") {
         infoText = i18n("<p>An en Dash (dash of the width of an n).</p><p>Usage examples: In English language for value ranges (1878&#x2013;1903), for relationships/connections (Zurich&#x2013;Dublin). In the German language it is also used (with spaces!) for showing thoughts: &ldquo;Es war &#x2013; wie immer in den Ferien &#x2013; ein regnerischer Tag.</p> <p>See <a href=\"http://en.wikipedia.org/wiki/Dash\">Wikipedia:Dash</a></p>");
     } else if (u == "2014") {
-        infoText = i18n("<p>An em Dash (dash of the widht of an m).</p><p>Usage examples: In English language to mark&#x2014;like here&#x2014;thoughts. Traditionally without spaces. </p><p>See <a href=\"http://en.wikipedia.org/wiki/Dash\">Wikipedia:Dash</a></p>");
+        infoText = i18n("<p>An em Dash (dash of the width of an m).</p><p>Usage examples: In English language to mark&#x2014;like here&#x2014;thoughts. Traditionally without spaces. </p><p>See <a href=\"http://en.wikipedia.org/wiki/Dash\">Wikipedia:Dash</a></p>");
     } else if (u == "202f") {
         infoText = i18n("<p>Narrow no-break space. Has the same width as U+2009.</p><p>Usage: For units (spaces are marked with U+2423, &#x2423;): 230&#x2423;V, &#x2212;21&#x2423;&deg;C, 50&#x2423;lb, <em>but</em> 90&deg; (no space). In German for abbreviations (like: i.&#x202f;d.&#x202f;R. instead of i.&#xa0;d.&#xa0;R. with U+00a0).</p><p>See <a href=\"http://de.wikipedia.org/wiki/Schmales_Leerzeichen\">Wikipedia:de:Schmales_Leerzeichen</a></p>");
     } else if (u == "2026") {
@@ -164,12 +166,12 @@ QString UnicodeDialog::unicodeInfo(QString unicode)
         infoText = i18n("Open box; stands for a space.");
     } else if (u == "2669") {
         infoText = i18n("Quarter note (Am.) or crochet (Brit.). See <a href=\"http://en.wikipedia.org/wiki/Quarter_note\">Wikipedia:Quarter_note</a>");
-    } else if (u == "266a") {
+    } else if (u == "266a" || u == "266b") {
         infoText = i18n("Eighth note (Am.) or quaver (Brit.). Half as long as a quarter note (U+2669). See <a href=\"http://en.wikipedia.org/wiki/Eighth_note\">Wikipedia:Eighth_note</a>");
-    } else if (u == "266b") {
-        infoText = i18n("Sixteenth note (Am.) or semiquaver (Brit.). Half as long as an eighth note (U+266a). See <a href=\"http://en.wikipedia.org/wiki/Sixteenth_note\">Wikipedia:Sixteenth_note</a>");
     } else if (u == "266c") {
-        infoText = i18n("Thirty-second note (Am.) or demisemiquaver (Brit.). Half as long as a sixteenth note (U+266b). See <a href=\"http://en.wikipedia.org/wiki/Quarter_note\">Wikipedia:Thirty-second_note</a>");
+        infoText = i18n("Sixteenth note (Am.) or semiquaver (Brit.). Half as long as an eighth note (U+266a). See <a href=\"http://en.wikipedia.org/wiki/Sixteenth_note\">Wikipedia:Sixteenth_note</a>");
+    } else if (u == "1D162") {
+        infoText = i18n("Thirty-second note (Am.) or demisemiquaver (Brit.). Half as long as a sixteenth note (U+266b). See <a href=\"http://en.wikipedia.org/wiki/Thirty-second_note\">Wikipedia:Thirty-second_note</a>");
     } else {
         infoText = i18n("<small>No additional information available for this character.</small>");
     }
@@ -208,7 +210,7 @@ void UnicodeDialog::updateOverviewChars(uint unicode)
 
     for (i = 1; i <= 4; i++) {
         if (unicode > i && !controlCharacter(unicode - i)) {
-            left = " " + left;
+            left = ' ' + left;
             left = QChar(unicode - i) + left;
         }
     }
@@ -216,7 +218,7 @@ void UnicodeDialog::updateOverviewChars(uint unicode)
     for (i = 1; i <= 8; i++) {
         if (unicode + i <= MAX_UNICODE_V1 && !controlCharacter(unicode + i)) {
             right += QChar(unicode + i);
-            right += " ";
+            right += ' ';
         }
     }
 
@@ -366,4 +368,12 @@ void UnicodeDialog::slotPrevUnicode()
     unicodeNumber->setText(nextUnicode(text, Backward));
 }
 
+void UnicodeDialog::wheelEvent(QWheelEvent * event)
+{
+    if (frame->underMouse()) {
+        if (event->delta() > 0) slotNextUnicode();
+        else slotPrevUnicode();
+    }
+}
+
 #include "unicodedialog.moc"