add screenreader info for text and dynamics

musescore · Jun 15, 2017 · 0c05902 · 0c05902
1 parent 49fc82c
commit 0c05902
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 10 deletions.
diff --git a/libmscore/ambitus.cpp b/libmscore/ambitus.cpp
@@ -732,14 +732,5 @@ QString Ambitus::accessibleInfo()
                                                           .arg(tpc2name(bottomTpc(), NoteSpellingType::STANDARD, NoteCaseType::AUTO, false))
                                                           .arg(QString::number(bottomOctave()));
       }
-
-//---------------------------------------------------------
-//   screenReaderInfo
-//---------------------------------------------------------
-
-QString Ambitus::screenReaderInfo()
-      {
-      return accessibleInfo();
-      }
 }
 
diff --git a/libmscore/ambitus.h b/libmscore/ambitus.h
@@ -89,7 +89,6 @@ class Ambitus : public Element {
       virtual Space     space() const override;
       virtual void      write(Xml&) const override;
       virtual QString   accessibleInfo() override;
-      virtual QString   screenReaderInfo() override;
 
       // properties
       QVariant getProperty(P_ID ) const;

diff --git a/libmscore/dynamic.cpp b/libmscore/dynamic.cpp
@@ -445,5 +445,21 @@ QString Dynamic::accessibleInfo()
       return QString("%1: %2").arg(Element::accessibleInfo()).arg(s);
       }
 
+//---------------------------------------------------------
+//   screenReaderInfo
+//---------------------------------------------------------
+
+QString Dynamic::screenReaderInfo()
+      {
+      QString s;
+
+      if (dynamicType() == Dynamic::Type::OTHER)
+            s = plainText().simplified();
+      else {
+            s = dynamicTypeName();
+            }
+      return QString("%1: %2").arg(Element::accessibleInfo()).arg(s);
+      }
+
 }
 
diff --git a/libmscore/dynamic.h b/libmscore/dynamic.h
@@ -113,6 +113,7 @@ class Dynamic : public Text {
       virtual QVariant propertyDefault(P_ID id) const override;
 
       virtual QString accessibleInfo() override;
+      virtual QString screenReaderInfo() override;
       };
 
 }     // namespace Ms

diff --git a/libmscore/text.cpp b/libmscore/text.cpp
@@ -3044,6 +3044,34 @@ QString Text::accessibleInfo()
       return  QString("%1: %2").arg(rez).arg(s);
       }
 
+//---------------------------------------------------------
+//   screenReaderInfo
+//---------------------------------------------------------
+
+QString Text::screenReaderInfo()
+      {
+      QString rez;
+      const QList<TextStyle>& ts = score()->style()->textStyles();
+      switch (textStyleType()) {
+            case TextStyleType::TITLE:
+            case TextStyleType::SUBTITLE:
+            case TextStyleType::COMPOSER:
+            case TextStyleType::POET:
+            case TextStyleType::TRANSLATOR:
+            case TextStyleType::MEASURE_NUMBER:
+                  rez = qApp->translate("TextStyle",ts.at(int(textStyleType())).name().toUtf8());
+                  break;
+            default:
+                  if ((type() == Element::Type::STAFF_TEXT) && systemFlag())
+                        rez = tr("System Text");
+                  else
+                        rez = Element::accessibleInfo();
+                  break;
+            }
+      QString s = plainText(true).simplified();
+      return  QString("%1: %2").arg(rez).arg(s);
+      }
+
 //---------------------------------------------------------
 //   subtype
 //---------------------------------------------------------

diff --git a/libmscore/text.h b/libmscore/text.h
@@ -336,6 +336,7 @@ class Text : public Element {
 
       void undoSetText(const QString& s) { undoChangeProperty(P_ID::TEXT, s); }
       virtual QString accessibleInfo() override;
+      virtual QString screenReaderInfo() override;
 
       virtual int subtype() const;
       virtual QString subtypeName() const;