summaryrefslogtreecommitdiff
path: root/muse2
diff options
context:
space:
mode:
Diffstat (limited to 'muse2')
-rw-r--r--muse2/muse/arranger/trackinfo.cpp10
-rw-r--r--muse2/muse/icons.cpp3
-rw-r--r--muse2/muse/icons.h1
-rw-r--r--muse2/xpm/midi_connector_red_border.xpm26
4 files changed, 36 insertions, 4 deletions
diff --git a/muse2/muse/arranger/trackinfo.cpp b/muse2/muse/arranger/trackinfo.cpp
index 20673b25..18589e82 100644
--- a/muse2/muse/arranger/trackinfo.cpp
+++ b/muse2/muse/arranger/trackinfo.cpp
@@ -1192,12 +1192,14 @@ void Arranger::genMidiTrackInfo()
//midiTrackInfo->iChanDetectLabel->setPixmap(*darkgreendotIcon);
midiTrackInfo->iChanDetectLabel->setPixmap(*darkRedLedIcon);
- //QIcon recEchoIconSet;
+ QIcon recEchoIconSet;
//recEchoIconSet.addPixmap(*recEchoIconOn, QIcon::Normal, QIcon::On);
//recEchoIconSet.addPixmap(*recEchoIconOff, QIcon::Normal, QIcon::Off);
- //midiTrackInfo->recEchoButton->setIcon(recEchoIconSet);
- midiTrackInfo->recEchoButton->setIcon(QIcon(*edit_midiIcon));
- midiTrackInfo->recEchoButton->setIconSize(edit_midiIcon->size());
+ recEchoIconSet.addPixmap(*midiConnectorRedBorderIcon, QIcon::Normal, QIcon::On);
+ recEchoIconSet.addPixmap(*edit_midiIcon, QIcon::Normal, QIcon::Off);
+ midiTrackInfo->recEchoButton->setIcon(recEchoIconSet);
+ //midiTrackInfo->recEchoButton->setIcon(QIcon(*edit_midiIcon));
+ //midiTrackInfo->recEchoButton->setIconSize(edit_midiIcon->size());
// MusE-2: AlignCenter and WordBreak are set in the ui(3) file, but not supported by QLabel. Turn them on here.
diff --git a/muse2/muse/icons.cpp b/muse2/muse/icons.cpp
index 226dcb79..0a843ad0 100644
--- a/muse2/muse/icons.cpp
+++ b/muse2/muse/icons.cpp
@@ -28,6 +28,7 @@
#include "xpm/midi_inputplugins_random_rhythm_generator.xpm"
#include "xpm/midi_local_off.xpm"
#include "xpm/midi_reset_instr.xpm"
+#include "xpm/midi_connector_red_border.xpm"
#include "xpm/settings_appearance_settings.xpm"
#include "xpm/settings_configureshortcuts.xpm"
#include "xpm/settings_follow_song.xpm"
@@ -246,6 +247,7 @@ QPixmap* localoffSIcon;
QPixmap* miditransformSIcon;
QPixmap* midi_plugSIcon;
QPixmap* miditransposeSIcon;
+QPixmap* midiConnectorRedBorderIcon;
QPixmap* mixerSIcon;
QPixmap* mustangSIcon;
QPixmap* resetSIcon;
@@ -597,6 +599,7 @@ void initIcons()
miditransformSIcon = new MPIXMAP(miditransformS_xpm, NULL);
midi_plugSIcon = new MPIXMAP(midi_plugS_xpm, NULL);
miditransposeSIcon = new MPIXMAP(miditransposeS_xpm, NULL);
+ midiConnectorRedBorderIcon = new MPIXMAP(midi_connector_red_border_xpm, NULL);
mixerSIcon = new MPIXMAP(mixerS_xpm, NULL);
mustangSIcon = new MPIXMAP(mustangS_xpm, NULL);
resetSIcon = new MPIXMAP(resetS_xpm, NULL);
diff --git a/muse2/muse/icons.h b/muse2/muse/icons.h
index ccb776cc..6d97890d 100644
--- a/muse2/muse/icons.h
+++ b/muse2/muse/icons.h
@@ -154,6 +154,7 @@ extern QPixmap* localoffSIcon;
extern QPixmap* miditransformSIcon;
extern QPixmap* midi_plugSIcon;
extern QPixmap* miditransposeSIcon;
+extern QPixmap* midiConnectorRedBorderIcon;
extern QPixmap* mixerSIcon;
extern QPixmap* mustangSIcon;
extern QPixmap* resetSIcon;
diff --git a/muse2/xpm/midi_connector_red_border.xpm b/muse2/xpm/midi_connector_red_border.xpm
new file mode 100644
index 00000000..054c7c4f
--- /dev/null
+++ b/muse2/xpm/midi_connector_red_border.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static const char * midi_connector_red_border_xpm[] = {
+"16 16 7 1",
+" c None",
+". c #FF0000",
+"+ c #FFC0C0",
+"@ c #000100",
+"# c #FDF7F6",
+"$ c #2F312E",
+"% c #FEFFFC",
+"................",
+".++++@@@@@@++++.",
+".+##@$$$$$$@##+.",
+".+%@$######$@#+.",
+".+@$#%%$$%#%$@+.",
+".@$#%%#$$%%%#$@.",
+".@$%$$###%$$#$@.",
+".@$#$$%%%#$$#$@.",
+".@$###%%%####$@.",
+".@$%$$%%%%$$#$@.",
+".@$#$$#%%#$$#$@.",
+".+@$##%%%###$@+.",
+".+#@$%%%%%%$@#+.",
+".+%%@$$$$$$@%#+.",
+".++++@@@@@@++++.",
+"................"};