fix #126901: swap directional icons for RTL languages

musescore · Oct 4, 2016 · d301e3d · d301e3d
1 parent cf14b8d
commit d301e3d
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 9 deletions.
diff --git a/mscore/drumroll.cpp b/mscore/drumroll.cpp
@@ -56,8 +56,14 @@ DrumrollEditor::DrumrollEditor(QWidget* parent)
       layout->setSpacing(0);
 
       QToolBar* tb = addToolBar(tr("Toolbar 1"));
-      tb->addAction(getAction("undo"));
-      tb->addAction(getAction("redo"));
+      if (qApp->layoutDirection() == Qt::LayoutDirection::LeftToRight) {
+            tb->addAction(getAction("undo"));
+            tb->addAction(getAction("redo"));
+            }
+      else {
+            tb->addAction(getAction("redo"));
+            tb->addAction(getAction("undo"));
+            }
       tb->addSeparator();
 #ifdef HAS_MIDI
       tb->addAction(getAction("midi-on"));

diff --git a/mscore/measureproperties.cpp b/mscore/measureproperties.cpp
@@ -44,6 +44,10 @@ MeasureProperties::MeasureProperties(Measure* _m, QWidget* parent)
       connect(previousButton, SIGNAL(clicked()), SLOT(gotoPreviousMeasure()));
       nextButton->setEnabled(_m->nextMeasure() != 0);
       previousButton->setEnabled(_m->prevMeasure() != 0);
+      if (qApp->layoutDirection() == Qt::LayoutDirection::RightToLeft) {
+            horizontalLayout_2->removeWidget(nextButton);
+            horizontalLayout_2->insertWidget(0, nextButton);
+            }
       }
 
 //---------------------------------------------------------

diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -717,9 +717,14 @@ MuseScore::MuseScore()
 
       fileTools = addToolBar("");
       fileTools->setObjectName("file-operations");
-
-      for (auto i : { "file-new", "file-open", "file-save", "print", "undo", "redo"})
-            fileTools->addWidget(new AccessibleToolButton(fileTools, getAction(i)));
+      if (qApp->layoutDirection() == Qt::LayoutDirection::LeftToRight) {
+            for (auto i : { "file-new", "file-open", "file-save", "print", "undo", "redo"})
+                  fileTools->addWidget(new AccessibleToolButton(fileTools, getAction(i)));
+            }
+      else {
+            for (auto i : { "file-new", "file-open", "file-save", "print", "redo", "undo"})
+                  fileTools->addWidget(new AccessibleToolButton(fileTools, getAction(i)));
+            }
 
       fileTools->addSeparator();
       mag = new MagBox;

diff --git a/mscore/pianoroll.cpp b/mscore/pianoroll.cpp
@@ -49,8 +49,14 @@ PianorollEditor::PianorollEditor(QWidget* parent)
 
       QWidget* mainWidget = new QWidget;
       QToolBar* tb = addToolBar(tr("Toolbar 1"));
-      tb->addAction(getAction("undo"));
-      tb->addAction(getAction("redo"));
+      if (qApp->layoutDirection() == Qt::LayoutDirection::LeftToRight) {
+            tb->addAction(getAction("undo"));
+            tb->addAction(getAction("redo"));
+            }
+      else {
+            tb->addAction(getAction("redo"));
+            tb->addAction(getAction("undo"));
+            }
       tb->addSeparator();
 #ifdef HAS_MIDI
       tb->addAction(getAction("midi-on"));

diff --git a/mscore/pluginCreator.cpp b/mscore/pluginCreator.cpp
@@ -75,10 +75,16 @@ PluginCreator::PluginCreator(QWidget* parent)
       editTools->setObjectName("EditOperations");
       actionUndo->setIcon(*icons[int(Icons::undo_ICON)]);
       actionUndo->setShortcut(QKeySequence(QKeySequence::Undo));
-      editTools->addAction(actionUndo);
       actionRedo->setIcon(*icons[int(Icons::redo_ICON)]);
       actionRedo->setShortcut(QKeySequence(QKeySequence::Redo));
-      editTools->addAction(actionRedo);
+      if (qApp->layoutDirection() == Qt::LayoutDirection::LeftToRight) {
+            editTools->addAction(actionUndo);
+            editTools->addAction(actionRedo);
+            }
+      else {
+            editTools->addAction(actionUndo);
+            editTools->addAction(actionRedo);
+            }
       actionUndo->setEnabled(false);
       actionRedo->setEnabled(false);