LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change colours to unify colour scheme

Browse source
This commit is contained in:
anatoly-os 2019-06-11 14:58:51 +02:00
parent 1e5c2c3655
commit 929cbab218
5 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libmscore/mscore.cpp
View file

@ -293,10 +293,10 @@ void MScore::init()
_globalShare = QString( INSTPREFIX "/share/" INSTALL_NAME);
#endif
selectColor[0].setNamedColor("#1259d0"); //blue
selectColor[1].setNamedColor("#009234"); //green
selectColor[2].setNamedColor("#c04400"); //orange
selectColor[3].setNamedColor("#70167a"); //purple
selectColor[1].setNamedColor("#2E86AB");
selectColor[1].setNamedColor("#306B34");
selectColor[2].setNamedColor("#C73E1D");
selectColor[3].setNamedColor("#8D1E4B");
defaultColor = Qt::black;
dropColor = QColor("#1778db");
@ -307,8 +307,8 @@ void MScore::init()
lastError = "";
layoutBreakColor = QColor("#5999db");
frameMarginColor = QColor("#5999db");
layoutBreakColor = QColor("#A0A0A4");
frameMarginColor = QColor("#A0A0A4");
bgColor.setNamedColor("#dddddd");
//

2
mscore/excerptsdialog.ui
View file

@ -154,7 +154,7 @@
<string>Generate new part for each instrument</string>
</property>
<property name="text">
<string>New All</string>
<string>Generate</string>
</property>
</widget>
</item>

2
mscore/musescore.cpp
View file

@ -1971,7 +1971,7 @@ void MuseScore::retranslate()
checkForUpdateAction->setText(tr("Check for &Update"));
askForHelpAction->setText(tr("Ask for Help"));
reportBugAction->setText(tr("Report a Bug"));
leaveFeedbackAction->setText(tr("Leave feedback"));
leaveFeedbackAction->setText(tr("Feedback"));
revertToFactoryAction->setText(tr("Revert to Factory Settings"));
fileTools->setWindowTitle(tr("File Operations"));

14
mscore/preferences.cpp
View file

@ -144,7 +144,7 @@ void Preferences::init(bool storeInMemoryOnly)
{PREF_SCORE_STYLE_PARTSTYLEFILE, new StringPreference("", false)},
{PREF_UI_CANVAS_BG_USECOLOR, new BoolPreference(true, false)},
{PREF_UI_CANVAS_FG_USECOLOR, new BoolPreference(true, false)},
{PREF_UI_CANVAS_BG_COLOR, new ColorPreference(QColor("#dddddd"), false)},
{PREF_UI_CANVAS_BG_COLOR, new ColorPreference(QColor("#142433"), false)},
{PREF_UI_CANVAS_FG_COLOR, new ColorPreference(QColor("#f9f9f9"), false)},
{PREF_UI_CANVAS_BG_WALLPAPER, new StringPreference(QFileInfo(QString("%1%2").arg(mscoreGlobalShare).arg("wallpaper/background1.png")).absoluteFilePath(), false)},
{PREF_UI_CANVAS_FG_WALLPAPER, new StringPreference(QFileInfo(QString("%1%2").arg(mscoreGlobalShare).arg("wallpaper/paper5.png")).absoluteFilePath(), false)},
@ -167,12 +167,12 @@ void Preferences::init(bool storeInMemoryOnly)
{PREF_UI_PIANO_HIGHLIGHTCOLOR, new ColorPreference(QColor("#1259d0"))},
{PREF_UI_SCORE_NOTE_DROPCOLOR, new ColorPreference(QColor("#1778db"))},
{PREF_UI_SCORE_DEFAULTCOLOR, new ColorPreference(QColor("#000000"))},
{PREF_UI_SCORE_FRAMEMARGINCOLOR, new ColorPreference(QColor("#5999db"))},
{PREF_UI_SCORE_LAYOUTBREAKCOLOR, new ColorPreference(QColor("#5999db"))},
{PREF_UI_SCORE_VOICE1_COLOR, new ColorPreference(QColor("#1259d0"))}, // blue
{PREF_UI_SCORE_VOICE2_COLOR, new ColorPreference(QColor("#009234"))}, // green
{PREF_UI_SCORE_VOICE3_COLOR, new ColorPreference(QColor("#c04400"))}, // orange
{PREF_UI_SCORE_VOICE4_COLOR, new ColorPreference(QColor("#70167a"))}, // purple
{PREF_UI_SCORE_FRAMEMARGINCOLOR, new ColorPreference(QColor("#A0A0A4"))},
{PREF_UI_SCORE_LAYOUTBREAKCOLOR, new ColorPreference(QColor("#A0A0A4"))},
{PREF_UI_SCORE_VOICE1_COLOR, new ColorPreference(QColor("#2E86AB"))},
{PREF_UI_SCORE_VOICE2_COLOR, new ColorPreference(QColor("#306B34"))},
{PREF_UI_SCORE_VOICE3_COLOR, new ColorPreference(QColor("#C73E1D"))},
{PREF_UI_SCORE_VOICE4_COLOR, new ColorPreference(QColor("#8D1E4B"))},
{PREF_UI_THEME_ICONWIDTH, new IntPreference(28, false)},
{PREF_UI_THEME_ICONHEIGHT, new IntPreference(24, false)},
{PREF_UI_THEME_FONTFAMILY, new StringPreference(QApplication::font().family(), false) },

2
mscore/shortcut.cpp
View file

@ -3667,7 +3667,7 @@ Shortcut Shortcut::_sc[] = {
MsWidget::MAIN_WINDOW,
STATE_ALL,
"leave-feedback",
QT_TRANSLATE_NOOP("action", "Leave Feedback"),
QT_TRANSLATE_NOOP("action", "Feedback"),
QT_TRANSLATE_NOOP("action", "Leave feedback"),
0,
Icons::mail_ICON,