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

Edit icon

Browse source
This commit is contained in:
Mirek Mazel 2014-09-15 14:44:28 +02:00
parent 094aed1020
commit a7c61a3d67
10 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mscore/data/icons/16/edit.svg
View file

@ -1 +0,0 @@
<?xml version='1.0'?><svg height='16' version='1.1' width='16.000622' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-96.999998,-319.00001)'><path d='m 110.09375,319.00001 c -0.67774,0.68734 -1.36184,1.36746 -2.0625,2.03125 1.08315,0.87351 2.0987,1.85145 2.96875,2.9375 l 2,-1.96875 c 0,-0.0317 0.001,-0.062 0,-0.0937 0,-0.15017 -0.0396,-0.28893 -0.0625,-0.4375 -0.17645,-1.1446 -0.98803,-2.18357 -2.3125,-2.4063 -0.1789,-0.0451 -0.34943,-0.0625 -0.53125,-0.0625 z m -3.125,3.09375 -9.968753,9.90625 0,3 3,0 9.906253,-9.9375 c -0.8582,-1.10346 -1.83763,-2.10619 -2.9375,-2.96875 z' style='fill:#3b3f45;fill-rule:evenodd'/></g></svg>
Side by side

Before

Width:  |  Height:  |  Size: 644 B

1
mscore/data/icons/edit.svg Normal file
View file

@ -0,0 +1 @@
<?xml version='1.0'?><svg height='16' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'><g transform='translate(-96.999821,-319.00026)'><path d='m 109.45642,320.00026 c -0.59299,0.60143 -1.19156,1.19654 -1.80462,1.77735 0.94773,0.76432 1.8363,1.62002 2.59757,2.57033 l 1.74992,-1.72269 c 0,-0.0278 0.001,-0.0542 0,-0.082 0,-0.13134 -0.0346,-0.25281 -0.0547,-0.3828 -0.15443,-1.00153 -0.8645,-1.91065 -2.02338,-2.10553 -0.15645,-0.0394 -0.30574,-0.0547 -0.46483,-0.0547 z m -2.73427,2.70704 -8.722311,8.66797 0,2.62499 2.624901,0 8.66762,-8.69531 c -0.75091,-0.96553 -1.60785,-1.84291 -2.57021,-2.59765 z' style='fill:#3b3f45;fill-rule:evenodd'/><rect height='16' style='fill:none;stroke-width:2' transform='matrix(0,1,1,0,0,0)' width='16' x='319.00024' y='96.999825'/></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 788 B

6
mscore/editstaff.cpp
View file

@ -24,6 +24,7 @@
#include "editpitch.h"
#include "editstafftype.h"
#include "editstringdata.h"
#include "icons.h"
#include "libmscore/instrtemplate.h"
#include "libmscore/measure.h"
#include "libmscore/part.h"
@ -52,6 +53,11 @@ EditStaff::EditStaff(Staff* s, QWidget* parent)
setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
setModal(true);
minPitchASelect->setIcon(*icons[int(Icons::edit_ICON)]);
maxPitchASelect->setIcon(*icons[int(Icons::edit_ICON)]);
minPitchPSelect->setIcon(*icons[int(Icons::edit_ICON)]);
maxPitchPSelect->setIcon(*icons[int(Icons::edit_ICON)]);
Part* part = orgStaff->part();
instrument = *part->instr();
Score* score = part->score();

16
mscore/editstaff.ui
View file

@ -190,10 +190,6 @@
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="musescore.qrc">
<normaloff>:/data/icons/16/edit.svg</normaloff>:/data/icons/16/edit.svg</iconset>
</property>
</widget>
</item>
<item>
@ -215,10 +211,6 @@
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="musescore.qrc">
<normaloff>:/data/icons/16/edit.svg</normaloff>:/data/icons/16/edit.svg</iconset>
</property>
</widget>
</item>
<item>
@ -259,10 +251,6 @@
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="musescore.qrc">
<normaloff>:/data/icons/16/edit.svg</normaloff>:/data/icons/16/edit.svg</iconset>
</property>
</widget>
</item>
<item>
@ -284,10 +272,6 @@
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="musescore.qrc">
<normaloff>:/data/icons/16/edit.svg</normaloff>:/data/icons/16/edit.svg</iconset>
</property>
</widget>
</item>
</layout>

12
mscore/editstyle.cpp
View file

@ -54,6 +54,18 @@ EditStyle::EditStyle(Score* s, QWidget* parent)
setModal(true);
chordDescriptionFileButton->setIcon(*icons[int(Icons::fileOpen_ICON)]);
editEvenHeaderL->setIcon(*icons[int(Icons::edit_ICON)]);
editEvenHeaderC->setIcon(*icons[int(Icons::edit_ICON)]);
editEvenHeaderR->setIcon(*icons[int(Icons::edit_ICON)]);
editOddHeaderL->setIcon(*icons[int(Icons::edit_ICON)]);
editOddHeaderC->setIcon(*icons[int(Icons::edit_ICON)]);
editOddHeaderR->setIcon(*icons[int(Icons::edit_ICON)]);
editEvenFooterL->setIcon(*icons[int(Icons::edit_ICON)]);
editEvenFooterC->setIcon(*icons[int(Icons::edit_ICON)]);
editEvenFooterR->setIcon(*icons[int(Icons::edit_ICON)]);
editOddFooterL->setIcon(*icons[int(Icons::edit_ICON)]);
editOddFooterC->setIcon(*icons[int(Icons::edit_ICON)]);
editOddFooterR->setIcon(*icons[int(Icons::edit_ICON)]);
pageList->setCurrentRow(0);

3
mscore/icons.cpp
View file

@ -142,7 +142,8 @@ static const char* iconNames[] = {
"timesig_prolatio07.svg",
"timesig_prolatio08.svg",
"timesig_prolatio10.svg",
"timesig_prolatio11.svg"
"timesig_prolatio11.svg",
"edit.svg"
};
void genIcons()

2
mscore/icons.h
View file

@ -52,7 +52,7 @@ enum class Icons : signed char { Invalid_ICON = -1,
brackets_ICON,
timesig_allabreve_ICON, timesig_common_ICON, timesig_prolatio01_ICON, timesig_prolatio02_ICON,
timesig_prolatio03_ICON, timesig_prolatio04_ICON, timesig_prolatio05_ICON, timesig_prolatio07_ICON,
timesig_prolatio08_ICON, timesig_prolatio10_ICON, timesig_prolatio11_ICON,
timesig_prolatio08_ICON, timesig_prolatio10_ICON, timesig_prolatio11_ICON, edit_ICON,
voice1_ICON, voice2_ICON, voice3_ICON, voice4_ICON,
ICONS
};

2
mscore/musescore.qrc
View file

@ -7,7 +7,7 @@
<file>data/paper3.png</file>
<file>data/paper4.png</file>
<file>data/paper5.png</file>
<file>data/icons/16/edit.svg</file>
<file>data/icons/edit.svg</file>
<file alias="fonts/mscore/glyphnames.json">../fonts/mscore/glyphnames.json</file>
<file alias="fonts/mscore/metadata.json">../fonts/mscore/metadata.json</file>
<file alias="fonts/gonville/glyphnames.json">../fonts/gonville/glyphnames.json</file>

2
mscore/preferences.cpp
View file

@ -570,6 +570,8 @@ PreferenceDialog::PreferenceDialog(QWidget* parent)
myStylesButton->setIcon(*icons[int(Icons::fileOpen_ICON)]);
myTemplatesButton->setIcon(*icons[int(Icons::fileOpen_ICON)]);
myPluginsButton->setIcon(*icons[int(Icons::fileOpen_ICON)]);
mySoundfontsButton->setIcon(*icons[int(Icons::edit_ICON)]);
mySfzButton->setIcon(*icons[int(Icons::edit_ICON)]);
myImagesButton->setIcon(*icons[int(Icons::fileOpen_ICON)]);
bgWallpaperSelect->setIcon(*icons[int(Icons::fileOpen_ICON)]);

8
mscore/prefsdialog.ui
View file

@ -732,9 +732,9 @@
<property name="accessibleDescription">
<string>Opens a dialog for configuring the soundfont folders</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="5" column="2">
@ -749,7 +749,7 @@
<string>Opens a dialog for configuring the SFZ folders</string>
</property>
<property name="text">
<string>...</string>
<string/>
</property>
</widget>
</item>