diff options
| author | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-11-24 10:41:22 +0000 |
|---|---|---|
| committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-11-24 10:41:22 +0000 |
| commit | 8c1c0f8433225f5c6783106722d294a7f720a5aa (patch) | |
| tree | 679c86d572f2b2d9621eae1dfb045f90b22b7174 /muse2/muse | |
| parent | 535c453c41855e1135db4060edb2101b6cebcb6e (diff) | |
Ported fluidsynthgui to Qt4
Diffstat (limited to 'muse2/muse')
| -rw-r--r-- | muse2/muse/icons.cpp | 12 | ||||
| -rw-r--r-- | muse2/muse/icons.h | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/muse2/muse/icons.cpp b/muse2/muse/icons.cpp index 95bfecdd..1879e2b4 100644 --- a/muse2/muse/icons.cpp +++ b/muse2/muse/icons.cpp @@ -214,6 +214,9 @@ #include "xpm/project.xpm" #include "xpm/user.xpm" +#include "xpm/sine.xpm" +#include "xpm/saw.xpm" + #if QT_VERSION >= 0x040600 #define MPIXMAP(a,b) QPixmap(QIcon::fromTheme(b, QIcon(QPixmap(a))).pixmap(QPixmap(a).width(),QPixmap(a).height())) #define MICON(a,b) QIcon(QIcon::fromTheme(b, QIcon(QPixmap(a)))) @@ -430,6 +433,10 @@ QIcon* globalIcon; QIcon* projectIcon; QIcon* userIcon; + +QPixmap* sineIcon; +QPixmap* sawIcon; + //--------------------------------------------------------- // initIcons //--------------------------------------------------------- @@ -510,7 +517,7 @@ void initIcons() redoIconS = new MPIXMAP(redoS_xpm, "edit-redo"); speakerIcon = new MPIXMAP(speaker_xpm, NULL); - buttondownIcon = new MPIXMAP(buttondown_xpm, NULL); + buttondownIcon = new MPIXMAP(buttondown_xpm, "arrow-down"); configureIcon = new MPIXMAP(configure_xpm, NULL); editmuteIcon = new MPIXMAP(editmute_xpm, NULL); @@ -640,5 +647,8 @@ void initIcons() globalIcon = new MICON(global_xpm, "folder"); userIcon = new MICON(user_xpm, "user-home"); projectIcon = new MICON(project_xpm, "folder-sound"); + + sineIcon = new MPIXMAP(sine_xpm, NULL); + sawIcon = new MPIXMAP(saw_xpm, NULL); } diff --git a/muse2/muse/icons.h b/muse2/muse/icons.h index 146a5e3e..17fa7d6f 100644 --- a/muse2/muse/icons.h +++ b/muse2/muse/icons.h @@ -221,5 +221,8 @@ extern QIcon* globalIcon; extern QIcon* projectIcon; extern QIcon* userIcon; +extern QPixmap* sineIcon; +extern QPixmap* sawIcon; + #endif |