From 0c95e65ad35efed68995a86d8b0f69babef0f37a Mon Sep 17 00:00:00 2001 From: Werner Schweer Date: Mon, 2 Oct 2006 19:15:22 +0000 Subject: misc updates --- muse/awl/tcanvas.h | 2 +- muse/muse/extmidieditor.cpp | 2 +- muse/muse/gui.h | 3 +- muse/muse/icons.cpp | 96 +++++++++------------- muse/muse/icons.h | 26 ++---- muse/muse/muse.cpp | 2 +- muse/muse/muse.qrc | 6 ++ muse/muse/plugingui.cpp | 4 +- muse/muse/transport.cpp | 2 +- muse/muse/widgets/simplebutton.cpp | 18 ++++- muse/muse/widgets/simplebutton.h | 1 + muse/muse/widgets/tools.cpp | 4 +- muse/muse/widgets/tools.h | 2 +- muse/muse/widgets/utils.cpp | 6 +- muse/muse/xpm/bluedot.xpm | 34 -------- muse/muse/xpm/darkgreendot.svg | 117 +++++++++++++++++++++++++++ muse/muse/xpm/darkgreendot.xpm | 19 ----- muse/muse/xpm/darkreddot.xpm | 17 ---- muse/muse/xpm/dot.xpm | 22 ----- muse/muse/xpm/dot1.xpm | 22 ----- muse/muse/xpm/doth.xpm | 22 ----- muse/muse/xpm/graydot.xpm | 21 ----- muse/muse/xpm/greendot.svg | 117 +++++++++++++++++++++++++++ muse/muse/xpm/greendot.xpm | 18 ----- muse/muse/xpm/record.xpm | 160 ------------------------------------- muse/muse/xpm/record1.xpm | 21 ----- muse/muse/xpm/recordOff.svg | 117 +++++++++++++++++++++++++++ muse/muse/xpm/recordOn.svg | 117 +++++++++++++++++++++++++++ muse/muse/xpm/record_off.xpm | 150 ---------------------------------- muse/muse/xpm/record_on.xpm | 160 ------------------------------------- muse/muse/xpm/reddot.xpm | 17 ---- 31 files changed, 551 insertions(+), 774 deletions(-) delete mode 100644 muse/muse/xpm/bluedot.xpm create mode 100644 muse/muse/xpm/darkgreendot.svg delete mode 100644 muse/muse/xpm/darkgreendot.xpm delete mode 100644 muse/muse/xpm/darkreddot.xpm delete mode 100644 muse/muse/xpm/dot.xpm delete mode 100644 muse/muse/xpm/dot1.xpm delete mode 100644 muse/muse/xpm/doth.xpm delete mode 100644 muse/muse/xpm/graydot.xpm create mode 100644 muse/muse/xpm/greendot.svg delete mode 100644 muse/muse/xpm/greendot.xpm delete mode 100644 muse/muse/xpm/record.xpm delete mode 100644 muse/muse/xpm/record1.xpm create mode 100644 muse/muse/xpm/recordOff.svg create mode 100644 muse/muse/xpm/recordOn.svg delete mode 100644 muse/muse/xpm/record_off.xpm delete mode 100644 muse/muse/xpm/record_on.xpm delete mode 100644 muse/muse/xpm/reddot.xpm diff --git a/muse/awl/tcanvas.h b/muse/awl/tcanvas.h index cdecdbe6..2cf4b3fc 100644 --- a/muse/awl/tcanvas.h +++ b/muse/awl/tcanvas.h @@ -32,7 +32,7 @@ enum TimeCanvasType { enum Tool { PointerTool=1, PencilTool=2, RubberTool=4, CutTool=8, - ScoreTool=16, GlueTool=32, QuantTool=64, DrawTool=128, MuteTool=256 + GlueTool=16, QuantTool=32, DrawTool=64, MuteTool=128 }; enum FollowMode { diff --git a/muse/muse/extmidieditor.cpp b/muse/muse/extmidieditor.cpp index 04c7ee73..4407f25a 100644 --- a/muse/muse/extmidieditor.cpp +++ b/muse/muse/extmidieditor.cpp @@ -38,7 +38,7 @@ GraphMidiEditor::GraphMidiEditor(PartList* pl) : MidiEditor(pl) { - setIconSize(QSize(18, 18)); + setIconSize(QSize(ICON_SIZE); _followSong = true; } diff --git a/muse/muse/gui.h b/muse/muse/gui.h index 2c5fca3c..3c780bfe 100644 --- a/muse/muse/gui.h +++ b/muse/muse/gui.h @@ -41,7 +41,8 @@ static const int infoWidth = 140; static const int STRIP_WIDTH = 66; static const int LABEL_HEIGHT = 20; -static const QSize ICON_SIZE(18, 18); +static const int ICON_WIDTH = 18; +static const QSize ICON_SIZE(ICON_WIDTH, ICON_WIDTH); #endif diff --git a/muse/muse/icons.cpp b/muse/muse/icons.cpp index 35e2c188..65b67953 100644 --- a/muse/muse/icons.cpp +++ b/muse/muse/icons.cpp @@ -19,6 +19,7 @@ //============================================================================= #include "globals.h" +#include "gui.h" #include "xpm/audio_bounce_to_file.xpm" #include "xpm/audio_bounce_to_track.xpm" @@ -55,16 +56,11 @@ #include "xpm/delete.xpm" #include "xpm/play.xpm" -#include "xpm/record_on.xpm" -#include "xpm/record_off.xpm" #include "xpm/punchin1.xpm" #include "xpm/punchout1.xpm" #include "xpm/loop1.xpm" -#include "xpm/dot.xpm" -#include "xpm/doth.xpm" -#include "xpm/dot1.xpm" -#include "xpm/note.xpm" -#include "xpm/note1.xpm" +// #include "xpm/note.xpm" +// #include "xpm/note1.xpm" #include "xpm/stick.xpm" #include "xpm/wave.xpm" #include "xpm/cmark.xpm" @@ -75,20 +71,14 @@ #include "xpm/glue.xpm" #include "xpm/draw.xpm" #include "xpm/quant.xpm" -// #include "xpm/fileprint.xpm" -// #include "xpm/filesave.xpm" -// #include "xpm/fileopen.xpm" -// #include "xpm/fileprintS.xpm" #include "xpm/filesaveS.xpm" #include "xpm/fileopenS.xpm" #include "xpm/master.xpm" -// #include "xpm/filenew.xpm" #include "xpm/filenewS.xpm" #include "xpm/home.xpm" #include "xpm/back.xpm" #include "xpm/forward.xpm" -// #include "xpm/mute.xpm" #include "xpm/solobutton_on.xpm" #include "xpm/solobutton_off.xpm" #include "xpm/mutebutton_on.xpm" @@ -111,9 +101,8 @@ #include "xpm/flagS.xpm" #include "xpm/lock.xpm" #include "xpm/toc.xpm" -// #include "xpm/piano.xpm" #include "xpm/pianoS.xpm" -#include "xpm/exitS.xpm" +// #include "xpm/exitS.xpm" #include "xpm/undo.xpm" #include "xpm/redo.xpm" @@ -122,9 +111,6 @@ #include "xpm/editpaste.xpm" #include "xpm/undoS.xpm" #include "xpm/redoS.xpm" -// #include "xpm/editcutS.xpm" -// #include "xpm/editcopyS.xpm" -// #include "xpm/editpasteS.xpm" #include "xpm/editmute.xpm" #include "xpm/editmuteS.xpm" @@ -137,13 +123,13 @@ // next two lines will vanish soon #include "xpm/solobutton.xpm" #include "xpm/newmutebutton.xpm" -#include "xpm/exit.xpm" -#include "xpm/exit1.xpm" +// #include "xpm/exit.xpm" +// #include "xpm/exit1.xpm" -#include "xpm/greendot.xpm" -#include "xpm/darkgreendot.xpm" -#include "xpm/bluedot.xpm" -#include "xpm/graydot.xpm" +// #include "xpm/greendot.xpm" +// #include "xpm/darkgreendot.xpm" +// #include "xpm/bluedot.xpm" +// #include "xpm/graydot.xpm" #include "xpm/off.xpm" #include "xpm/mastertrackS.xpm" @@ -211,8 +197,8 @@ QPixmap* cliplistSIcon; QPixmap* mixerAudioSIcon; QPixmap* initSIcon; -QPixmap* exitIcon; -QPixmap* exit1Icon; +// QPixmap* exitIcon; +// QPixmap* exit1Icon; QPixmap* newmuteIcon; QPixmap* soloIcon; @@ -224,18 +210,14 @@ QPixmap* punchout1Icon; QPixmap* loop1Icon; QPixmap* playIcon; -QPixmap* record_on_Icon; -QPixmap* record_off_Icon; -QIcon* recordIcon; - QPixmap* stopIcon; QPixmap* fforwardIcon; QPixmap* frewindIcon; -QPixmap* dotIcon; -QPixmap* dothIcon; -QPixmap* dot1Icon; -QPixmap* note1Icon; -QPixmap* noteIcon; +// QPixmap* dotIcon; +// QPixmap* dothIcon; +// QPixmap* dot1Icon; +// QPixmap* note1Icon; +// QPixmap* noteIcon; QPixmap* stickIcon; QPixmap* waveIcon; QPixmap* markIcon[3]; @@ -244,8 +226,6 @@ QPixmap* steprecIcon; QPixmap* glueIcon; QPixmap* drawIcon; QPixmap* quantIcon; -// QPixmap* printIcon; -// QPixmap* printIconS; QPixmap* openIcon; QPixmap* saveIcon; QPixmap* openIconS; @@ -274,7 +254,7 @@ QPixmap* flagIcon; QPixmap* flagIconS; QPixmap* lockIcon; QPixmap* tocIcon; -QPixmap* exitIconS; +// QPixmap* exitIconS; QPixmap* undoIcon; QPixmap* redoIcon; @@ -300,11 +280,13 @@ QIcon* editcutIconSet; QIcon* editmuteIconSet; QIcon* editcopyIconSet; QIcon* editpasteIconSet; +QIcon* recordIcon; +QIcon* onOffIcon; -QPixmap* greendotIcon; -QPixmap* darkgreendotIcon; -QPixmap* graydotIcon; -QPixmap* bluedotIcon; +// QPixmap* greendotIcon; +// QPixmap* darkgreendotIcon; +// QPixmap* graydotIcon; +// QPixmap* bluedotIcon; QPixmap* offIcon; QPixmap* addtrack_addmiditrackIcon; @@ -385,17 +367,8 @@ void initIcons() loop1Icon = new QPixmap(loop1_xpm); playIcon = new QPixmap(play_xpm); - record_on_Icon= new QPixmap(record_on_xpm); - record_off_Icon= new QPixmap(record_off_xpm); - - recordIcon = new QIcon(*record_off_Icon); - recordIcon->addPixmap(*record_on_Icon, QIcon::Normal, QIcon::On); - - dotIcon = new QPixmap(dot_xpm); - dothIcon = new QPixmap(doth_xpm); - dot1Icon = new QPixmap(dot1_xpm); - noteIcon = new QPixmap(note_xpm); - note1Icon = new QPixmap(note1_xpm); +// noteIcon = new QPixmap(note_xpm); +// note1Icon = new QPixmap(note1_xpm); stickIcon = new QPixmap(stick_xpm); waveIcon = new QPixmap(wave_xpm); markIcon[0] = new QPixmap(cmark_xpm); @@ -434,7 +407,7 @@ void initIcons() flagIconS = new QPixmap(flagS_xpm); lockIcon = new QPixmap(lock_xpm); tocIcon = new QPixmap(toc_xpm); - exitIconS = new QPixmap(exitS_xpm); +// exitIconS = new QPixmap(exitS_xpm); undoIcon = new QPixmap(undo_xpm); redoIcon = new QPixmap(redo_xpm); @@ -454,8 +427,8 @@ void initIcons() editpasteIconSet = new QIcon(QPixmap(editpaste_xpm)); editmuteIconSet = new QIcon(QPixmap(editmute_xpm)); - exitIcon = new QPixmap(exit_xpm); - exit1Icon = new QPixmap(exit1_xpm); +// exitIcon = new QPixmap(exit_xpm); +// exit1Icon = new QPixmap(exit1_xpm); // 2 lines odd code newmuteIcon = new QPixmap(newmutebutton_xpm); @@ -465,10 +438,6 @@ void initIcons() muteIconOff = new QPixmap(mutebutton_off_xpm); soloIconOn = new QPixmap(solobutton_on_xpm); soloIconOff = new QPixmap(solobutton_off_xpm); - greendotIcon = new QPixmap(greendot_xpm); - darkgreendotIcon = new QPixmap(darkgreendot_xpm); - bluedotIcon = new QPixmap(bluedot_xpm); - graydotIcon = new QPixmap(graydot_xpm); offIcon = new QPixmap(off_xpm); mastertrackSIcon = new QPixmap(mastertrackS_xpm); @@ -551,5 +520,12 @@ void initIcons() configIcon = new QPixmap(config_xpm); minusIcon = new QPixmap(minus_xpm); plusIcon = new QPixmap(plus_xpm); + + recordIcon = new QIcon; + recordIcon->addFile(":/xpm/recordOn.svg", ICON_SIZE, QIcon::Normal, QIcon::On); + recordIcon->addFile(":/xpm/recordOff.svg", ICON_SIZE, QIcon::Normal, QIcon::Off); + onOffIcon = new QIcon; + onOffIcon->addFile(":/xpm/on.svg", ICON_SIZE, QIcon::Normal, QIcon::On); + onOffIcon->addFile(":/xpm/off.svg", ICON_SIZE, QIcon::Normal, QIcon::Off); } diff --git a/muse/muse/icons.h b/muse/muse/icons.h index dbbce357..19677810 100644 --- a/muse/muse/icons.h +++ b/muse/muse/icons.h @@ -28,11 +28,8 @@ extern QPixmap* punchin1Icon; extern QPixmap* punchout1Icon; extern QPixmap* loop1Icon; extern QPixmap* playIcon; -extern QPixmap* dotIcon; -extern QPixmap* dothIcon; -extern QPixmap* dot1Icon; -extern QPixmap* noteIcon; -extern QPixmap* note1Icon; +// extern QPixmap* noteIcon; +// extern QPixmap* note1Icon; extern QPixmap* stickIcon; extern QPixmap* waveIcon; extern QPixmap* markIcon[3]; @@ -48,8 +45,6 @@ extern QPixmap* glueIcon; extern QPixmap* drawIcon; extern QPixmap* quantIcon; -// extern QPixmap* printIcon; -// extern QPixmap* printIconS; extern QPixmap* openIcon; extern QPixmap* saveIcon; extern QPixmap* openIconS; @@ -80,7 +75,7 @@ extern QPixmap* flagIcon; extern QPixmap* flagIconS; extern QPixmap* lockIcon; extern QPixmap* tocIcon; -extern QPixmap* exitIconS; +// extern QPixmap* exitIconS; extern QPixmap* undoIcon; extern QPixmap* redoIcon; @@ -102,11 +97,8 @@ extern QIcon* editmuteIconSet; extern QIcon* editcopyIconSet; extern QIcon* editpasteIconSet; -extern QPixmap* exitIcon; -extern QPixmap* exit1Icon; -extern QPixmap* record_on_Icon; -extern QPixmap* record_off_Icon; -extern QIcon* recordIcon; +// extern QPixmap* exitIcon; +// extern QPixmap* exit1Icon; extern QPixmap* newmuteIcon; extern QPixmap* soloIcon; @@ -115,10 +107,6 @@ extern QPixmap* muteIconOff; extern QPixmap* soloIconOn; extern QPixmap* soloIconOff; -extern QPixmap* greendotIcon; -extern QPixmap* darkgreendotIcon; -extern QPixmap* graydotIcon; -extern QPixmap* bluedotIcon; extern QPixmap* offIcon; extern QPixmap* mastertrackSIcon; @@ -127,7 +115,6 @@ extern QPixmap* miditransformSIcon; extern QPixmap* midi_plugSIcon; extern QPixmap* miditransposeSIcon; extern QPixmap* mixerSIcon; -// extern QPixmap* mustangSIcon; extern QPixmap* resetSIcon; extern QPixmap* track_addIcon; extern QPixmap* track_deleteIcon; @@ -200,5 +187,8 @@ extern QPixmap* museIcon; extern QPixmap* configIcon; extern QPixmap* minusIcon; extern QPixmap* plusIcon; + +extern QIcon* recordIcon; +extern QIcon* onOffIcon; #endif diff --git a/muse/muse/muse.cpp b/muse/muse/muse.cpp index a4efb2c0..81d2c6d3 100644 --- a/muse/muse/muse.cpp +++ b/muse/muse/muse.cpp @@ -644,7 +644,7 @@ MusE::MusE() menu_ids[CMD_IMPORT_AUDIO]->setEnabled(!midiOnly); menu_file->addSeparator(); - menu_ids[CMD_QUIT] = menu_file->addAction(*exitIconS, tr("&Quit")); + menu_ids[CMD_QUIT] = menu_file->addAction(*onOffIcon, tr("&Quit")); connect(menu_ids[CMD_QUIT], SIGNAL(triggered()), this, SLOT(quitDoc())); menu_file->addSeparator(); diff --git a/muse/muse/muse.qrc b/muse/muse/muse.qrc index e37e035e..edad9ecf 100644 --- a/muse/muse/muse.qrc +++ b/muse/muse/muse.qrc @@ -15,6 +15,12 @@ xpm/frewind.xpm xpm/fforward.xpm xpm/folder_new.png + xpm/recordOn.svg + xpm/recordOff.svg + xpm/greendot.svg + xpm/darkgreendot.svg + xpm/on.svg + xpm/off.svg diff --git a/muse/muse/plugingui.cpp b/muse/muse/plugingui.cpp index a811dc36..d5605749 100644 --- a/muse/muse/plugingui.cpp +++ b/muse/muse/plugingui.cpp @@ -25,6 +25,7 @@ #include "plugingui.h" #include "icons.h" #include "al/xml.h" +#include "gui.h" #include "awl/floatentry.h" #include "awl/slider.h" @@ -339,6 +340,7 @@ static const char* presetBypassText = "Click this button to bypass effect unit"; PluginGui::PluginGui(PluginI* p) : QMainWindow(0) { + setIconSize(ICON_SIZE); plugin = p; setWindowTitle(plugin->name()); @@ -353,7 +355,7 @@ PluginGui::PluginGui(PluginI* p) tools->addAction(QWhatsThis::createAction(this)); - QAction* onOff = tools->addAction(QIcon(*exitIconS), tr("bypass plugin")); + QAction* onOff = tools->addAction(*onOffIcon, tr("bypass plugin")); onOff->setCheckable(true); onOff->setChecked(plugin->on()); onOff->setWhatsThis(tr(presetBypassText)); diff --git a/muse/muse/transport.cpp b/muse/muse/transport.cpp index e54096a4..3f34db8f 100644 --- a/muse/muse/transport.cpp +++ b/muse/muse/transport.cpp @@ -87,7 +87,7 @@ Transport::Transport() tb5->setWhatsThis(tr(playTransportText)); buttons[5] = tb6; - tb6->setIcon(QIcon(*record_on_Icon)); + tb6->setIcon(*recordIcon); tb6->setWhatsThis(tr(recordTransportText)); connect(buttons[0], SIGNAL(clicked()), song, SLOT(rewindStart())); diff --git a/muse/muse/widgets/simplebutton.cpp b/muse/muse/widgets/simplebutton.cpp index 77e72e12..36ab7097 100644 --- a/muse/muse/widgets/simplebutton.cpp +++ b/muse/muse/widgets/simplebutton.cpp @@ -19,6 +19,23 @@ //============================================================================= #include "simplebutton.h" +#include "gui.h" + +//--------------------------------------------------------- +// SimpleButton +//--------------------------------------------------------- + +SimpleButton::SimpleButton(const QString& on, const QString& off, QWidget* parent) + : QToolButton(parent) + { + setAutoRaise(true); + QIcon icon; + icon.addFile(on, ICON_SIZE, QIcon::Normal, QIcon::On); + icon.addFile(off, ICON_SIZE, QIcon::Normal, QIcon::Off); + QAction* a = new QAction(this); + a->setIcon(icon); + setDefaultAction(a); + } //--------------------------------------------------------- // SimpleButton @@ -27,7 +44,6 @@ SimpleButton::SimpleButton(QPixmap* on, QPixmap* off, QWidget* parent) : QToolButton(parent) { -// setStyle(new QWindowsStyle()); setAutoRaise(true); QIcon icon(*off); icon.addPixmap(*on, QIcon::Normal, QIcon::On); diff --git a/muse/muse/widgets/simplebutton.h b/muse/muse/widgets/simplebutton.h index 8eeb8951..469767ac 100644 --- a/muse/muse/widgets/simplebutton.h +++ b/muse/muse/widgets/simplebutton.h @@ -33,6 +33,7 @@ class SimpleButton : public QToolButton { public: SimpleButton(QPixmap* on, QPixmap* off, QWidget* parent = 0); + SimpleButton(const QString& on, const QString& off, QWidget* parent = 0); SimpleButton(const QString& s, QWidget* parent = 0); }; diff --git a/muse/muse/widgets/tools.cpp b/muse/muse/widgets/tools.cpp index 8f081121..cdcd6ea5 100644 --- a/muse/muse/widgets/tools.cpp +++ b/muse/muse/widgets/tools.cpp @@ -36,7 +36,7 @@ const char* infoCut = QT_TR_NOOP("select Cut Tool:\n" "with the cut tool you can split a part"); const char* infoGlue = QT_TR_NOOP("select Glue Tool:\n" "with the glue tool you can glue two parts"); -const char* infoScore = QT_TR_NOOP("select Score Tool:\n"); +// const char* infoScore = QT_TR_NOOP("select Score Tool:\n"); const char* infoQuant = QT_TR_NOOP("select Quantize Tool:\n" "insert display quantize event"); const char* infoDraw = QT_TR_NOOP("select Drawing Tool"); @@ -48,7 +48,7 @@ ToolB toolList[TOOLS] = { {&pencilIcon, QT_TR_NOOP("pencil"), infoPencil }, {&deleteIcon, QT_TR_NOOP("eraser"), infoDel }, {&cutIcon, QT_TR_NOOP("cutter"), infoCut }, - {¬e1Icon, QT_TR_NOOP("score"), infoScore }, +// {¬e1Icon, QT_TR_NOOP("score"), infoScore }, {&glueIcon, QT_TR_NOOP("glue"), infoGlue }, {&quantIcon, QT_TR_NOOP("quantize"), infoQuant }, {&drawIcon, QT_TR_NOOP("draw"), infoDraw }, diff --git a/muse/muse/widgets/tools.h b/muse/muse/widgets/tools.h index 066912e7..ff6c0734 100644 --- a/muse/muse/widgets/tools.h +++ b/muse/muse/widgets/tools.h @@ -33,7 +33,7 @@ struct ToolB { const char* tip; const char* ltip; }; -const int TOOLS = 9; +const int TOOLS = 8; extern ToolB toolList[TOOLS]; //--------------------------------------------------------- diff --git a/muse/muse/widgets/utils.cpp b/muse/muse/widgets/utils.cpp index 55998d27..c4679630 100644 --- a/muse/muse/widgets/utils.cpp +++ b/muse/muse/widgets/utils.cpp @@ -32,7 +32,7 @@ static const int BFONT = 4; // simple button font //--------------------------------------------------------- RecordButton::RecordButton(QWidget* parent) - : SimpleButton(record_on_Icon, record_off_Icon, parent) + : SimpleButton(":/xpm/recordOn.svg", ":/xpm/recordOff.svg", parent) { setCheckable(true); setToolTip(tr("record")); @@ -43,7 +43,7 @@ RecordButton::RecordButton(QWidget* parent) //--------------------------------------------------------- GreendotButton::GreendotButton(QWidget* parent) - : SimpleButton(greendotIcon, darkgreendotIcon, parent) + : SimpleButton(":/xpm/greendot.svg", ":/xpm/darkgreendot.svg", parent) { setCheckable(true); setToolTip(tr("record")); @@ -274,7 +274,7 @@ SimpleButton* newDrumMapButton() SimpleButton* newOffButton() { - SimpleButton* off = new SimpleButton(exit1Icon, exitIcon); + SimpleButton* off = new SimpleButton(":/xpm/off.svg", ":/xpm/on.svg"); off->setCheckable(true); off->setToolTip(QT_TR_NOOP("off")); return off; diff --git a/muse/muse/xpm/bluedot.xpm b/muse/muse/xpm/bluedot.xpm deleted file mode 100644 index a92558f9..00000000 --- a/muse/muse/xpm/bluedot.xpm +++ /dev/null @@ -1,34 +0,0 @@ -/* XPM */ -static const char * bluedot_xpm[] = { -"18 18 13 1", -" c None", -". c #F10606", -"+ c #414141", -"@ c #852A2A", -"# c #473E3E", -"$ c #723030", -"% c #CB1212", -"& c #4E3C3C", -"* c #E20A0A", -"= c #A51F1F", -"- c #9E2121", -"; c #832A2A", -"> c #9C2222", -" ", -" ", -" . ", -" .. ", -" ... ", -" +++++++++@... ", -" #+++++++$..% ", -" &# ..*+ ", -" .= ...-+ ", -" ;.. ....++ ", -" +... ... ++ ", -" ++....... ++ ", -" ++ ..... ++ ", -" ++ .... ++ ", -" ++ .. ++ ", -" +++++>.+++++ ", -" ++++++++++++ ", -" "}; diff --git a/muse/muse/xpm/darkgreendot.svg b/muse/muse/xpm/darkgreendot.svg new file mode 100644 index 00000000..b673f1ae --- /dev/null +++ b/muse/muse/xpm/darkgreendot.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/muse/muse/xpm/darkgreendot.xpm b/muse/muse/xpm/darkgreendot.xpm deleted file mode 100644 index a9451396..00000000 --- a/muse/muse/xpm/darkgreendot.xpm +++ /dev/null @@ -1,19 +0,0 @@ -/* XPM */ -static const char *darkgreendot_xpm[] = { -"12 12 2 1", -". c None", -"# c #007700", -"...#####....", -"..#######...", -".#########..", -"###########.", -"###########.", -"###########.", -"###########.", -"###########.", -".#########..", -"..#######...", -"...#####....", -"............"}; - - diff --git a/muse/muse/xpm/darkreddot.xpm b/muse/muse/xpm/darkreddot.xpm deleted file mode 100644 index a81b9f37..00000000 --- a/muse/muse/xpm/darkreddot.xpm +++ /dev/null @@ -1,17 +0,0 @@ -/* XPM */ -static const char *darkreddot_xpm[]={ -"12 12 2 1", -". c None", -"# c #a70000", -"...#####....", -"..#######...", -".#########..", -"###########.", -"###########.", -"###########.", -"###########.", -"###########.", -".#########..", -"..#######...", -"...#####....", -"............"}; diff --git a/muse/muse/xpm/dot.xpm b/muse/muse/xpm/dot.xpm deleted file mode 100644 index 6f905a79..00000000 --- a/muse/muse/xpm/dot.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static const char *dot_xpm[] = { -/* width height num_colors chars_per_pixel */ -" 16 13 2 1", -/* colors */ -". c none", -"# c #00ff00", -/* pixels */ -"................", -"................", -".......##.......", -"......####......", -".....######.....", -"....########....", -"....########....", -"....########....", -".....######.....", -"......####......", -".......##.......", -"................", -"................" -}; diff --git a/muse/muse/xpm/dot1.xpm b/muse/muse/xpm/dot1.xpm deleted file mode 100644 index 1b2d9887..00000000 --- a/muse/muse/xpm/dot1.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static const char *dot1_xpm[] = { -/* width height num_colors chars_per_pixel */ -" 16 13 2 1", -/* colors */ -". c none", -"# c #909090", -/* pixels */ -"................", -"................", -".......##.......", -"......####......", -".....######.....", -"....########....", -"....########....", -"....########....", -".....######.....", -"......####......", -".......##.......", -"................", -"................" -}; diff --git a/muse/muse/xpm/doth.xpm b/muse/muse/xpm/doth.xpm deleted file mode 100644 index 8ee77790..00000000 --- a/muse/muse/xpm/doth.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static const char *doth_xpm[] = { -/* width height num_colors chars_per_pixel */ -" 16 13 2 1", -/* colors */ -". c none", -"# c #000000", -/* pixels */ -"................", -"................", -".......##.......", -"......#..#......", -".....#....#.....", -"....#......#....", -"....#......#....", -"....#......#....", -".....#....#.....", -"......#..#......", -".......##.......", -"................", -"................" -}; diff --git a/muse/muse/xpm/graydot.xpm b/muse/muse/xpm/graydot.xpm deleted file mode 100644 index daab6980..00000000 --- a/muse/muse/xpm/graydot.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static const char *graydot_xpm[] = { -/* width height num_colors chars_per_pixel */ -" 12 12 2 1", -/* colors */ -". c none", -"# c #aaaaaa", -/* pixels */ -"............", -".....##.....", -"....####....", -"...######...", -"..########..", -"..########..", -"..########..", -"...######...", -"....####....", -".....##.....", -"............", -"............" -}; diff --git a/muse/muse/xpm/greendot.svg b/muse/muse/xpm/greendot.svg new file mode 100644 index 00000000..823240de --- /dev/null +++ b/muse/muse/xpm/greendot.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/muse/muse/xpm/greendot.xpm b/muse/muse/xpm/greendot.xpm deleted file mode 100644 index 704d91a4..00000000 --- a/muse/muse/xpm/greendot.xpm +++ /dev/null @@ -1,18 +0,0 @@ -/* XPM */ -static const char *greendot_xpm[]={ -"12 12 2 1", -". c None", -"# c #00ff00", -"...#####....", -"..#######...", -".#########..", -"###########.", -"###########.", -"###########.", -"###########.", -"###########.", -".#########..", -"..#######...", -"...#####....", -"............"}; - diff --git a/muse/muse/xpm/record.xpm b/muse/muse/xpm/record.xpm deleted file mode 100644 index 9be6ceed..00000000 --- a/muse/muse/xpm/record.xpm +++ /dev/null @@ -1,160 +0,0 @@ -/* XPM */ -static const char * record_xpm[] = { -"15 15 142 2", -" c None", -". c #9B0500", -"+ c #900601", -"@ c #AF0205", -"# c #980401", -"$ c #AF0206", -"% c #A70205", -"& c #A80204", -"* c #A9040A", -"= c #990502", -"- c #A00400", -"; c #CC0004", -"> c #A30404", -", c #BD0212", -"' c #B20207", -") c #AC0201", -"! c #A30800", -"~ c #A70409", -"{ c #990500", -"] c #D50002", -"^ c #DB0400", -"/ c #E70004", -"( c #F20010", -"_ c #E30018", -": c #E00010", -"< c #C00202", -"[ c #AB0200", -"} c #AB0800", -"| c #A90401", -"1 c #A50406", -"2 c #B90201", -"3 c #DE1800", -"4 c #E62300", -"5 c #F10900", -"6 c #FF0016", -"7 c #E60000", -"8 c #E40800", -"9 c #E10900", -"0 c #BB0600", -"a c #BE0200", -"b c #B00200", -"c c #DA0400", -"d c #EB2500", -"e c #F33000", -"f c #F80D00", -"g c #FF0018", -"h c #FE0F00", -"i c #F11000", -"j c #E40F00", -"k c #DF0B00", -"l c #B30200", -"m c #A20200", -"n c #BB0304", -"o c #A00403", -"p c #E40000", -"q c #F90B00", -"r c #FF0F00", -"s c #F90006", -"t c #FB0012", -"u c #F40D00", -"v c #EE0800", -"w c #E70000", -"x c #DA0000", -"y c #D00004", -"z c #AC0500", -"A c #A40202", -"B c #B40207", -"C c #F40010", -"D c #FD0014", -"E c #FF0008", -"F c #F70009", -"G c #EE0010", -"H c #D6000F", -"I c #CF0009", -"J c #A80800", -"K c #BB0211", -"L c #E10018", -"M c #EA0000", -"N c #F10B00", -"O c #EE3000", -"P c #EF0F00", -"Q c #F5000D", -"R c #DA0010", -"S c #B10202", -"T c #A50200", -"U c #A70600", -"V c #9B0403", -"W c #970500", -"X c #E20010", -"Y c #E30800", -"Z c #EF1000", -"` c #F10800", -" . c #FF0009", -".. c #F01000", -"+. c #E10800", -"@. c #DE0000", -"#. c #DA0004", -"$. c #B80207", -"%. c #AF0207", -"&. c #EC0004", -"*. c #AB0204", -"=. c #B30207", -"-. c #E20800", -";. c #E20F00", -">. c #E50002", -",. c #EB000F", -"'. c #EF000D", -"). c #E00000", -"!. c #D70F00", -"~. c #B90500", -"{. c #B10200", -"]. c #AF020C", -"^. c #A90201", -"/. c #A70200", -"(. c #DA0B00", -"_. c #E20D00", -":. c #D90000", -"<. c #D5000F", -"[. c #DD0010", -"}. c #DC0004", -"|. c #D30400", -"1. c #AD0200", -"2. c #AE0204", -"3. c #B3020A", -"4. c #9A0600", -"5. c #AC0800", -"6. c #AF0200", -"7. c #C90000", -"8. c #CD0004", -"9. c #D10009", -"0. c #CA0004", -"a. c #B50207", -"b. c #B40200", -"c. c #9C0400", -"d. c #A90400", -"e. c #A30200", -"f. c #AA0200", -"g. c #B6020E", -"h. c #A90402", -"i. c #A50800", -"j. c #AB0600", -"k. c #B50302", -" ", -" . + @ # $ % & ", -" * = - ; > , - ' ) ! ", -" ~ { ] ^ / ( _ : < [ } ", -" | 1 2 3 4 5 6 7 8 9 0 - a ", -" > b c d e f g h i j k l m n ", -" o - p q r s t u v w x y [ z ", -" A B C 6 g D t E F G H I [ J ", -" o K L M r N E O P Q R S T U ", -" V W X Y Z ` ...+.@.#.$.%.&.", -" *.=.< -.;.>.,.'.).!.~.{.]. ", -" ^./.(._.:.<.[.}.|.1.2.3. ", -" 4.5.6.7.8.9.0.a.b.c.} ", -" d.e.6.b e.f.g.3. ", -" h.z i.j.k. "}; diff --git a/muse/muse/xpm/record1.xpm b/muse/muse/xpm/record1.xpm deleted file mode 100644 index 5b0d8e6f..00000000 --- a/muse/muse/xpm/record1.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static const char *record1_xpm[] = { -/* width height num_colors chars_per_pixel */ -" 12 12 2 1", -/* colors */ -". c none", -"# c #ff0000", -/* pixels */ -"............", -".....##.....", -"....####....", -"...######...", -"..########..", -"..########..", -"..########..", -"...######...", -"....####....", -".....##.....", -"............", -"............" -}; diff --git a/muse/muse/xpm/recordOff.svg b/muse/muse/xpm/recordOff.svg new file mode 100644 index 00000000..05c88a04 --- /dev/null +++ b/muse/muse/xpm/recordOff.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/muse/muse/xpm/recordOn.svg b/muse/muse/xpm/recordOn.svg new file mode 100644 index 00000000..d97f8249 --- /dev/null +++ b/muse/muse/xpm/recordOn.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/muse/muse/xpm/record_off.xpm b/muse/muse/xpm/record_off.xpm deleted file mode 100644 index 3f25c366..00000000 --- a/muse/muse/xpm/record_off.xpm +++ /dev/null @@ -1,150 +0,0 @@ -/* XPM */ -static const char * record_off_xpm[] = { -"15 15 132 2", -" c None", -". c #520002", -"+ c #420002", -"@ c #3F0002", -"# c #350002", -"$ c #3E0002", -"% c #360002", -"& c #370002", -"* c #590006", -"= c #490002", -"- c #3F0000", -"; c #450002", -"> c #470003", -", c #5A0006", -"' c #430003", -") c #3B0001", -"! c #450200", -"~ c #530006", -"{ c #470000", -"] c #520001", -"^ c #5C0200", -"/ c #760002", -"( c #980201", -"_ c #6E0006", -": c #660004", -"< c #630002", -"[ c #3B0000", -"} c #3B0200", -"| c #5A0002", -"1 c #4D0004", -"2 c #610600", -"3 c #740800", -"4 c #990200", -"5 c #B20201", -"6 c #740000", -"7 c #6E0200", -"8 c #680200", -"9 c #560200", -"0 c #390100", -"a c #460002", -"b c #400000", -"c c #590200", -"d c #830800", -"e c #A40B00", -"f c #A80400", -"g c #B00400", -"h c #960400", -"i c #6E0400", -"j c #630300", -"k c #450000", -"l c #330000", -"m c #700000", -"n c #AA0300", -"o c #A60300", -"p c #AA0200", -"q c #B40101", -"r c #AC0400", -"s c #8E0200", -"t c #750000", -"u c #590000", -"v c #4B0002", -"w c #680100", -"x c #330002", -"y c #9D0201", -"z c #A70200", -"A c #B00201", -"B c #AC0001", -"C c #B20101", -"D c #C00000", -"E c #AE0001", -"F c #8C0004", -"G c #530004", -"H c #3A0000", -"I c #540200", -"J c #400002", -"K c #560006", -"L c #670006", -"M c #7F0000", -"N c #A70400", -"O c #990300", -"P c #AF0100", -"Q c #8E0600", -"R c #920400", -"S c #9E0001", -"T c #5A0004", -"U c #430002", -"V c #340000", -"W c #510200", -"X c #6A0004", -"Y c #6C0200", -"Z c #9C0200", -"` c #B20200", -" . c #930300", -".. c #610000", -"+. c #4F0003", -"@. c #3F0003", -"#. c #390002", -"$. c #450003", -"%. c #640002", -"&. c #6A0200", -"*. c #6A0400", -"=. c #710001", -"-. c #810004", -";. c #900004", -">. c #650000", -",. c #540400", -"'. c #500200", -"). c #430000", -"!. c #3F0004", -"~. c #370001", -"{. c #350000", -"]. c #590300", -"^. c #570000", -"/. c #510004", -"(. c #5F0004", -"_. c #5D0002", -":. c #4F0200", -"<. c #3D0000", -"[. c #450004", -"}. c #4D0200", -"|. c #4C0002", -"1. c #440002", -"2. c #490003", -"3. c #380000", -"4. c #370000", -"5. c #3E0000", -"6. c #310000", -"7. c #390000", -"8. c #4A0006", -"9. c #440004", -"0. c #670100", -"a. c #5E0200", -" ", -" . + @ # $ % & ", -" * = - ; > , - ' ) ! ", -" ~ { ] ^ / ( _ : < [ } ", -" | 1 ] 2 3 4 5 6 7 8 9 - 0 ", -" a b c d e f 5 g h i j k l ", -" @ - m n o p q r s t u v [ w ", -" x > y z A B C D E F G = H I ", -" J K L M N O P Q R S T U V W ", -" # b X Y R Z ` .8 ..| +.@. ", -" #.$.%.&.*.=.-.;.>.,.'.).!. ", -" ~.{.].*.^./.(._.:.<.$ [. ", -" }.} - ).a |.1.2.{ 3.} ", -" 0 4.5.b 6.7.8.9. ", -" 0.}.a. "}; diff --git a/muse/muse/xpm/record_on.xpm b/muse/muse/xpm/record_on.xpm deleted file mode 100644 index 64a67cf4..00000000 --- a/muse/muse/xpm/record_on.xpm +++ /dev/null @@ -1,160 +0,0 @@ -/* XPM */ -static const char * record_on_xpm[] = { -"15 15 142 2", -" c None", -". c #9B0500", -"+ c #900601", -"@ c #AF0205", -"# c #980401", -"$ c #AF0206", -"% c #A70205", -"& c #A80204", -"* c #A9040A", -"= c #990502", -"- c #A00400", -"; c #CC0004", -"> c #A30404", -", c #BD0212", -"' c #B20207", -") c #AC0201", -"! c #A30800", -"~ c #A70409", -"{ c #990500", -"] c #D50002", -"^ c #DB0400", -"/ c #E70004", -"( c #F20010", -"_ c #E30018", -": c #E00010", -"< c #C00202", -"[ c #AB0200", -"} c #AB0800", -"| c #A90401", -"1 c #A50406", -"2 c #B90201", -"3 c #DE1800", -"4 c #E62300", -"5 c #F10900", -"6 c #FF0016", -"7 c #E60000", -"8 c #E40800", -"9 c #E10900", -"0 c #BB0600", -"a c #BE0200", -"b c #B00200", -"c c #DA0400", -"d c #EB2500", -"e c #F33000", -"f c #F80D00", -"g c #FF0018", -"h c #FE0F00", -"i c #F11000", -"j c #E40F00", -"k c #DF0B00", -"l c #B30200", -"m c #A20200", -"n c #BB0304", -"o c #A00403", -"p c #E40000", -"q c #F90B00", -"r c #FF0F00", -"s c #F90006", -"t c #FB0012", -"u c #F40D00", -"v c #EE0800", -"w c #E70000", -"x c #DA0000", -"y c #D00004", -"z c #AC0500", -"A c #A40202", -"B c #B40207", -"C c #F40010", -"D c #FD0014", -"E c #FF0008", -"F c #F70009", -"G c #EE0010", -"H c #D6000F", -"I c #CF0009", -"J c #A80800", -"K c #BB0211", -"L c #E10018", -"M c #EA0000", -"N c #F10B00", -"O c #EE3000", -"P c #EF0F00", -"Q c #F5000D", -"R c #DA0010", -"S c #B10202", -"T c #A50200", -"U c #A70600", -"V c #9B0403", -"W c #970500", -"X c #E20010", -"Y c #E30800", -"Z c #EF1000", -"` c #F10800", -" . c #FF0009", -".. c #F01000", -"+. c #E10800", -"@. c #DE0000", -"#. c #DA0004", -"$. c #B80207", -"%. c #AF0207", -"&. c #EC0004", -"*. c #AB0204", -"=. c #B30207", -"-. c #E20800", -";. c #E20F00", -">. c #E50002", -",. c #EB000F", -"'. c #EF000D", -"). c #E00000", -"!. c #D70F00", -"~. c #B90500", -"{. c #B10200", -"]. c #AF020C", -"^. c #A90201", -"/. c #A70200", -"(. c #DA0B00", -"_. c #E20D00", -":. c #D90000", -"<. c #D5000F", -"[. c #DD0010", -"}. c #DC0004", -"|. c #D30400", -"1. c #AD0200", -"2. c #AE0204", -"3. c #B3020A", -"4. c #9A0600", -"5. c #AC0800", -"6. c #AF0200", -"7. c #C90000", -"8. c #CD0004", -"9. c #D10009", -"0. c #CA0004", -"a. c #B50207", -"b. c #B40200", -"c. c #9C0400", -"d. c #A90400", -"e. c #A30200", -"f. c #AA0200", -"g. c #B6020E", -"h. c #A90402", -"i. c #A50800", -"j. c #AB0600", -"k. c #B50302", -" ", -" . + @ # $ % & ", -" * = - ; > , - ' ) ! ", -" ~ { ] ^ / ( _ : < [ } ", -" | 1 2 3 4 5 6 7 8 9 0 - a ", -" > b c d e f g h i j k l m n ", -" o - p q r s t u v w x y [ z ", -" A B C 6 g D t E F G H I [ J ", -" o K L M r N E O P Q R S T U ", -" V W X Y Z ` ...+.@.#.$.%.&.", -" *.=.< -.;.>.,.'.).!.~.{.]. ", -" ^./.(._.:.<.[.}.|.1.2.3. ", -" 4.5.6.7.8.9.0.a.b.c.} ", -" d.e.6.b e.f.g.3. ", -" h.z i.j.k. "}; diff --git a/muse/muse/xpm/reddot.xpm b/muse/muse/xpm/reddot.xpm deleted file mode 100644 index c094934a..00000000 --- a/muse/muse/xpm/reddot.xpm +++ /dev/null @@ -1,17 +0,0 @@ -/* XPM */ -static const char *reddot_xpm[]={ -"12 12 2 1", -". c None", -"# c #ff5600", -"...#####....", -"..#######...", -".#########..", -"###########.", -"###########.", -"###########.", -"###########.", -"###########.", -".#########..", -"..#######...", -"...#####....", -"............"}; -- cgit v1.2.3