diff options
| -rw-r--r-- | muse2/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | muse2/ChangeLog | 5 | ||||
| -rw-r--r-- | muse2/muse/app.cpp | 15 | ||||
| -rw-r--r-- | muse2/muse/app.h | 3 | ||||
| -rw-r--r-- | muse2/muse/icons.cpp | 2 | ||||
| -rw-r--r-- | muse2/muse/instruments/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | muse2/muse/miditransform.cpp | 2 | ||||
| -rw-r--r-- | muse2/muse/mplugins/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | muse2/muse/mplugins/mitplugin.cpp | 5 | ||||
| -rw-r--r-- | muse2/muse/mplugins/rhythm.cpp | 11 | ||||
| -rw-r--r-- | muse2/muse/mplugins/rhythm.h | 12 | ||||
| -rw-r--r-- | muse2/muse/mplugins/rhythmbase.ui | 2071 | ||||
| -rw-r--r-- | muse2/muse/patchbay/patchbay.cpp | 10 | ||||
| -rw-r--r-- | muse2/muse/patchbay/patchbay.h | 16 | ||||
| -rw-r--r-- | muse2/muse/patchbay/patchbaybase.ui | 36 | ||||
| -rw-r--r-- | muse2/muse/shortcuts.cpp | 2 | ||||
| -rw-r--r-- | muse2/synti/CMakeLists.txt | 10 |
17 files changed, 1151 insertions, 1075 deletions
diff --git a/muse2/CMakeLists.txt b/muse2/CMakeLists.txt index 374ae9c7..2624a2c3 100644 --- a/muse2/CMakeLists.txt +++ b/muse2/CMakeLists.txt @@ -79,6 +79,7 @@ option ( ENABLE_OSC "enable Open Sound Control (DSSI also recommended)" option ( ENABLE_DSSI "enable Disposable Soft Synth Interface (OSC also recommended)" ON) option ( ENABLE_VST "enable VST/win support" OFF) option ( ENABLE_FLUID "enable fluidsynth softsynth plugins" ON) +option ( ENABLE_EXPERIMENTAL "enable building experimental features" OFF) ## ## Just print a notice if this is OS X @@ -269,6 +270,10 @@ else ( ENABLE_FLUID ) message("Fluidsynth disabled") endif ( ENABLE_FLUID ) +if ( ENABLE_EXPERIMENTAL ) + set(CMAKE_CXX_FLAGS -DBUILD_EXPERIMENTAL ${CMAKE_CXX_FLAGS}) +endif ( ENABLE_EXPERIMENTAL ) + # # produce config.h file # @@ -373,6 +378,7 @@ summary_add("OSC (Liblo) support" OSC_SUPPORT) summary_add("DSSI support" DSSI_SUPPORT) summary_add("VST support" VST_SUPPORT) summary_add("Fluidsynth support" HAVE_FLUIDSYNTH) +summary_add("Experimental features" ENABLE_EXPERIMENTAL) summary_show() # Make the user aware of what type they're building. diff --git a/muse2/ChangeLog b/muse2/ChangeLog index abf0c4e7..4400d67b 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -7,7 +7,10 @@ - Fixed delete shortcut key. Set in MusE constructor. (Tim) - Reinstated special Toplevel::CLIPLIST case in MusE::toplevelDeleted(). Caused problems. (Tim) TODO: Still not right with the menu checkmark... - - Ported fluidsynthgui, fluidgui to Qt4 (Orcan) + - Ported rhythmbase, fluidsynthgui, fluidgui to Qt4 (Orcan) + - Removed patchbaybase from the project (Orcan) + - Added ENABLE_EXPERIMENTAL flag to cmake. Marked rhythmbase, s1 experimental (Orcan) + - Fixed a connection in miditransform (Orcan) 23.11.2010 - Added Track::cname(), applied to strip labels' object names, so they may be used in style sheets. (Tim) - Added struct SysEx and some friends, to minstrument.h, prep. for the instrument editor. (Tim) diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp index 93e1055e..5cc131b8 100644 --- a/muse2/muse/app.cpp +++ b/muse2/muse/app.cpp @@ -1099,6 +1099,9 @@ MusE::MusE(int argc, char** argv) : QMainWindow() midiInputTrfAction = new QAction(QIcon(*midi_inputplugins_midi_input_transformIcon), tr("Midi Input Transform"), this); midiInputFilterAction = new QAction(QIcon(*midi_inputplugins_midi_input_filterIcon), tr("Midi Input Filter"), this); midiRemoteAction = new QAction(QIcon(*midi_inputplugins_remote_controlIcon), tr("Midi Remote Control"), this); +#ifdef BUILD_EXPERIMENTAL + midiRhythmAction = new QAction(QIcon(*midi_inputplugins_random_rhythm_generatorIcon), tr("Rhythm Generator"), this); +#endif midiResetInstAction = new QAction(QIcon(*midi_reset_instrIcon), tr("Reset Instr."), this); midiInitInstActions = new QAction(QIcon(*midi_init_instrIcon), tr("Init Instr."), this); midiLocalOffAction = new QAction(QIcon(*midi_local_offIcon), tr("local off"), this); @@ -1233,6 +1236,11 @@ MusE::MusE(int argc, char** argv) : QMainWindow() midiPluginSignalMapper->setMapping(midiInputFilterAction, 2); midiPluginSignalMapper->setMapping(midiRemoteAction, 3); +#ifdef BUILD_EXPERIMENTAL + connect(midiRhythmAction, SIGNAL(triggered()), midiPluginSignalMapper, SLOT(map())); + midiPluginSignalMapper->setMapping(midiRhythmAction, 4); +#endif + connect(midiPluginSignalMapper, SIGNAL(mapped(int)), this, SLOT(startMidiInputPlugin(int))); connect(audioBounce2TrackAction, SIGNAL(activated()), SLOT(bounceToTrack())); @@ -1458,6 +1466,9 @@ MusE::MusE(int argc, char** argv) : QMainWindow() midiInputPlugins->addAction(midiInputTrfAction); midiInputPlugins->addAction(midiInputFilterAction); midiInputPlugins->addAction(midiRemoteAction); +#ifdef BUILD_EXPERIMENTAL + midiInputPlugins->addAction(midiRhythmAction); +#endif menu_functions->addSeparator(); menu_functions->addAction(midiResetInstAction); @@ -5046,6 +5057,9 @@ void MusE::updateConfiguration() midiInputTrfAction->setShortcut(shortcuts[SHRT_MIDI_INPUT_TRANSFORM].key); midiInputFilterAction->setShortcut(shortcuts[SHRT_MIDI_INPUT_FILTER].key); midiRemoteAction->setShortcut(shortcuts[SHRT_MIDI_REMOTE_CONTROL].key); +#ifdef BUILD_EXPERIMENTAL + midiRhythmAction->setShortcut(shortcuts[SHRT_RANDOM_RHYTHM_GENERATOR].key); +#endif audioBounce2TrackAction->setShortcut(shortcuts[SHRT_AUDIO_BOUNCE_TO_TRACK].key); audioBounce2FileAction->setShortcut(shortcuts[SHRT_AUDIO_BOUNCE_TO_FILE].key); @@ -5073,7 +5087,6 @@ void MusE::updateConfiguration() // Orcan: Old stuff, needs to be converted. These aren't used anywhere so I commented them out //menuSettings->setAccel(shortcuts[SHRT_CONFIG_AUDIO_PORTS].key, menu_ids[CMD_CONFIG_AUDIO_PORTS]); //menu_help->setAccel(menu_ids[CMD_START_WHATSTHIS], shortcuts[SHRT_START_WHATSTHIS].key); - //midiInputPlugins->setAccel(shortcuts[SHRT_RANDOM_RHYTHM_GENERATOR].key, 4); } diff --git a/muse2/muse/app.h b/muse2/muse/app.h index 34ade79d..5618b181 100644 --- a/muse2/muse/app.h +++ b/muse2/muse/app.h @@ -124,6 +124,9 @@ class MusE : public QMainWindow // Midi Menu Actions QAction *midiEditInstAction, *midiResetInstAction, *midiInitInstActions, *midiLocalOffAction; QAction *midiTrpAction, *midiInputTrfAction, *midiInputFilterAction, *midiRemoteAction; +#ifdef BUILD_EXPERIMENTAL + QAction *midiRhythmAction; +#endif // Audio Menu Actions QAction *audioBounce2TrackAction, *audioBounce2FileAction, *audioRestartAction; diff --git a/muse2/muse/icons.cpp b/muse2/muse/icons.cpp index 1879e2b4..926659ad 100644 --- a/muse2/muse/icons.cpp +++ b/muse2/muse/icons.cpp @@ -23,9 +23,9 @@ #include "xpm/midi_inputplugins.xpm" #include "xpm/midi_inputplugins_midi_input_filter.xpm" #include "xpm/midi_inputplugins_midi_input_transform.xpm" -#include "xpm/midi_inputplugins_random_rhythm_generator.xpm" #include "xpm/midi_inputplugins_remote_control.xpm" #include "xpm/midi_inputplugins_transpose.xpm" +#include "xpm/midi_inputplugins_random_rhythm_generator.xpm" #include "xpm/midi_local_off.xpm" #include "xpm/midi_reset_instr.xpm" #include "xpm/settings_appearance_settings.xpm" diff --git a/muse2/muse/instruments/CMakeLists.txt b/muse2/muse/instruments/CMakeLists.txt index ec68941a..e4108bb8 100644 --- a/muse2/muse/instruments/CMakeLists.txt +++ b/muse2/muse/instruments/CMakeLists.txt @@ -28,6 +28,8 @@ QT4_WRAP_UI3 ( instruments_ui_headers editinstrumentbase.ui ) +# Note that ccontrollerbase.ui is not built. It needs to be converted to Qt4 for revival. + add_library ( instruments STATIC minstrument.cpp editinstrument.cpp diff --git a/muse2/muse/miditransform.cpp b/muse2/muse/miditransform.cpp index ef77badf..c2e962a5 100644 --- a/muse2/muse/miditransform.cpp +++ b/muse2/muse/miditransform.cpp @@ -176,7 +176,7 @@ MidiTransformerDialog::MidiTransformerDialog(QDialog* parent, Qt::WFlags fl) connect(procPosOp, SIGNAL(activated(int)), SLOT(procPosOpSel(int))); connect(funcOp, SIGNAL(activated(int)), SLOT(funcOpSel(int))); connect(funcQuantVal, SIGNAL(valueChanged(int)), SLOT(funcQuantValSel(int))); - connect(presetList, SIGNAL(highlighted(QListWidgetItem*)), + connect(presetList, SIGNAL(itemClicked(QListWidgetItem*)), SLOT(presetChanged(QListWidgetItem*))); connect(nameEntry, SIGNAL(textChanged(const QString&)), SLOT(nameChanged(const QString&))); diff --git a/muse2/muse/mplugins/CMakeLists.txt b/muse2/muse/mplugins/CMakeLists.txt index bd8366f5..68bd7c0f 100644 --- a/muse2/muse/mplugins/CMakeLists.txt +++ b/muse2/muse/mplugins/CMakeLists.txt @@ -37,11 +37,18 @@ -QT4_WRAP_CPP ( mplugins_mocs mittranspose.h midiitransform.h midifilterimpl.h mrconfig.h rhythm.h ) -# QT4_WRAP_UI ( mplugins_uis transform.ui ) +QT4_WRAP_UI ( mplugins_uis midifilter.ui mrconfigbase.ui ) -QT4_WRAP_UI ( mplugins_UIC midifilter.ui mrconfigbase.ui ) -QT4_WRAP_UI3 ( mplugins_uis rhythmbase.ui ) +if ( ENABLE_EXPERIMENTAL ) + QT4_WRAP_UI ( mplugins_experimental_uis rhythmbase.ui) + set ( experimental_hdrs rhythm.h ) + set ( experimental_srcs + rhythm.cpp + ${mplugins_experimental_uis} + ) +endif ( ENABLE_EXPERIMENTAL ) + +QT4_WRAP_CPP ( mplugins_mocs mittranspose.h midiitransform.h midifilterimpl.h mrconfig.h ${experimental_hdrs} ) # add_library ( mplugins SHARED add_library ( mplugins STATIC @@ -50,11 +57,10 @@ add_library ( mplugins STATIC midiitransform.cpp midifilterimpl.cpp mrconfig.cpp - rhythm.cpp random.cpp random.h ${mplugins_mocs} ${mplugins_uis} - ${mplugins_UIC} + ${experimental_srcs} ) add_dependencies(mplugins widgets) diff --git a/muse2/muse/mplugins/mitplugin.cpp b/muse2/muse/mplugins/mitplugin.cpp index e06f4c24..d5ea7c7f 100644 --- a/muse2/muse/mplugins/mitplugin.cpp +++ b/muse2/muse/mplugins/mitplugin.cpp @@ -15,7 +15,10 @@ #include "mittranspose.h" #include "midifilterimpl.h" #include "mrconfig.h" + +#ifdef BUILD_EXPERIMENTAL #include "rhythm.h" +#endif MITPluginList mitPlugins; @@ -60,6 +63,7 @@ void MusE::startMidiInputPlugin(int id) } w = midiRemoteConfig; } +#ifdef BUILD_EXPERIMENTAL else if (id == 4) { if (!midiRhythmGenerator) { midiRhythmGenerator = new RhythmGen(); @@ -68,6 +72,7 @@ void MusE::startMidiInputPlugin(int id) } w = midiRhythmGenerator; } +#endif if (w) { flag = !w->isVisible(); if (flag) diff --git a/muse2/muse/mplugins/rhythm.cpp b/muse2/muse/mplugins/rhythm.cpp index 2a164acf..84b339b2 100644 --- a/muse2/muse/mplugins/rhythm.cpp +++ b/muse2/muse/mplugins/rhythm.cpp @@ -13,18 +13,19 @@ //========================================================= #include "rhythm.h" -//Added by qt3to4: -#include <Q3HBoxLayout> + #include <QCloseEvent> -#include <Q3VBoxLayout> +#include <QHBoxLayout> +#include <QVBoxLayout> //--------------------------------------------------------- // RhythmGen //--------------------------------------------------------- -RhythmGen::RhythmGen(QWidget* parent, const char* name, Qt::WFlags fo) - : RhythmBase(parent, name, fo) +RhythmGen::RhythmGen(QWidget* parent, Qt::WFlags fo) + : QMainWindow(parent, fo) { + setupUi(this); } RhythmGen::~RhythmGen() { diff --git a/muse2/muse/mplugins/rhythm.h b/muse2/muse/mplugins/rhythm.h index 064948d8..eb8d00dd 100644 --- a/muse2/muse/mplugins/rhythm.h +++ b/muse2/muse/mplugins/rhythm.h @@ -15,9 +15,11 @@ #ifndef __RHYTHM_H__ #define __RHYTHM_H__ -#include "rhythmbase.h" -//Added by qt3to4: -#include <QCloseEvent> +#include "ui_rhythmbase.h" + +#include <QMainWindow> + +class QCloseEvent; class tTrack; class tEventWin; @@ -115,7 +117,7 @@ class tRhythm // RhythmGen //--------------------------------------------------------- -class RhythmGen : public RhythmBase +class RhythmGen : public QMainWindow, public Ui::RhythmBase { Q_OBJECT #if 0 @@ -185,7 +187,7 @@ class RhythmGen : public RhythmBase public: // virtual void OnMenuCommand(int id); // virtual void OnSize(int w, int h); - RhythmGen(QWidget* parent = 0, const char* name = 0, Qt::WFlags fo = Qt::Window); + RhythmGen(QWidget* parent = 0, Qt::WFlags fo = Qt::Window); virtual ~RhythmGen(); // void OnPaint(); // void GenRhythm(); diff --git a/muse2/muse/mplugins/rhythmbase.ui b/muse2/muse/mplugins/rhythmbase.ui index 4d236c52..21373690 100644 --- a/muse2/muse/mplugins/rhythmbase.ui +++ b/muse2/muse/mplugins/rhythmbase.ui @@ -1,1004 +1,1095 @@ -<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> -<class>RhythmBase</class> -<widget class="QMainWindow"> - <property name="name"> - <cstring>RhythmBase</cstring> +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>RhythmBase</class> + <widget class="QMainWindow" name="RhythmBase"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>465</width> + <height>605</height> + </rect> + </property> + <property name="windowTitle"> + <string>MusE: Random Rhythm Generator</string> + </property> + <widget class="QWidget" name="widget"> + <property name="geometry"> + <rect> + <x>0</x> + <y>59</y> + <width>465</width> + <height>546</height> + </rect> + </property> + <layout class="QGridLayout"> + <property name="margin"> + <number>6</number> </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>448</width> - <height>603</height> - </rect> + <property name="spacing"> + <number>6</number> </property> - <property name="caption"> - <string>MusE: Random Rhythm Generator</string> - </property> - <property name="opaqueMoving"> - <bool>true</bool> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>6</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QGroupBox" row="1" column="0"> - <property name="name"> - <cstring>GroupBox1</cstring> - </property> - <property name="title"> - <string>Instrument Properties</string> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>11</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>Layout2_2</cstring> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QLabel" row="1" column="2"> - <property name="name"> - <cstring>TextLabel2_3_2</cstring> - </property> - <property name="text"> - <string>counts/bar</string> - </property> - </widget> - <widget class="QLabel" row="0" column="2"> - <property name="name"> - <cstring>TextLabel3_2</cstring> - </property> - <property name="text"> - <string>steps/count</string> - </property> - </widget> - <widget class="QLabel" row="2" column="2"> - <property name="name"> - <cstring>TextLabel1_2_2</cstring> - </property> - <property name="text"> - <string># bars</string> - </property> - </widget> - <widget class="QLineEdit" row="0" column="1"> - <property name="name"> - <cstring>lineInstrument_2</cstring> - </property> - <property name="text"> - <string>test</string> - </property> - <property name="dragEnabled"> - <bool>false</bool> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - <widget class="QSpinBox" row="0" column="5"> - <property name="name"> - <cstring>spinboxContrib_2</cstring> - </property> - <property name="maxValue"> - <number>100</number> - </property> - <property name="minValue"> - <number>0</number> - </property> - <property name="value"> - <number>0</number> - </property> - </widget> - <widget class="QLabel" row="0" column="4"> - <property name="name"> - <cstring>labelContrib_2</cstring> - </property> - <property name="text"> - <string>contrib</string> - </property> - </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>checkRandomize_2</cstring> - </property> - <property name="text"> - <string>randomize</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - <property name="tristate"> - <bool>false</bool> - </property> - </widget> - <widget class="QComboBox" row="1" column="1"> - <item> - <property name="text"> - <string></string> - </property> - </item> - <item> - <property name="text"> - <string>Group 1</string> - </property> - </item> - <item> - <property name="text"> - <string>Group 2</string> - </property> - </item> - <item> - <property name="text"> - <string>Group 3</string> - </property> - </item> - <item> - <property name="text"> - <string>Group 4</string> - </property> - </item> - <item> - <property name="text"> - <string>Group 5</string> - </property> - </item> - <property name="name"> - <cstring>comboGroupSel_2</cstring> - </property> - </widget> - <widget class="QSpinBox" row="0" column="3"> - <property name="name"> - <cstring>spinBoxSteps_2</cstring> - </property> - <property name="maxValue"> - <number>16</number> - </property> - <property name="minValue"> - <number>1</number> - </property> - <property name="value"> - <number>4</number> - </property> - </widget> - <widget class="QSpinBox" row="2" column="3"> - <property name="name"> - <cstring>spinboxBars_2</cstring> - </property> - <property name="maxValue"> - <number>16</number> - </property> - <property name="minValue"> - <number>1</number> - </property> - <property name="value"> - <number>1</number> - </property> - </widget> - <widget class="QLabel" row="1" column="4"> - <property name="name"> - <cstring>labelListen_2</cstring> - </property> - <property name="text"> - <string>listen</string> - </property> - </widget> - <widget class="QLabel" row="0" column="0"> - <property name="name"> - <cstring>TextLabel1_4</cstring> - </property> - <property name="text"> - <string>Instrument</string> - </property> - </widget> - <widget class="QSpinBox" row="1" column="3"> - <property name="name"> - <cstring>spinboxCounts_2</cstring> - </property> - <property name="maxValue"> - <number>16</number> - </property> - <property name="minValue"> - <number>1</number> - </property> - <property name="value"> - <number>4</number> - </property> - </widget> - <widget class="QSpinBox" row="1" column="5"> - <property name="name"> - <cstring>spinboxListen_2</cstring> - </property> - <property name="maxValue"> - <number>100</number> - </property> - <property name="minValue"> - <number>-100</number> - </property> - <property name="value"> - <number>0</number> - </property> - </widget> - <widget class="QLabel" row="1" column="0"> - <property name="name"> - <cstring>TextLabel1_3_2</cstring> - </property> - <property name="text"> - <string>Group</string> - </property> - </widget> - </grid> - </widget> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>Layout65_2</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QPushButton"> - <property name="name"> - <cstring>buttonNew_2</cstring> - </property> - <property name="text"> - <string>&New</string> - </property> - <property name="autoDefault"> - <bool>true</bool> - </property> - <property name="toolTip" stdset="0"> - <string>create new entry</string> - </property> - <property name="whatsThis" stdset="0"> - <string>pressing the New button you create a new entry -in the MusE list of defined controllers</string> - </property> - </widget> - <widget class="QPushButton"> - <property name="name"> - <cstring>buttonDelete_2</cstring> - </property> - <property name="text"> - <string>&Delete</string> - </property> - <property name="autoDefault"> - <bool>true</bool> - </property> - <property name="toolTip" stdset="0"> - <string>delete selected entry</string> - </property> - </widget> - <spacer> - <property name="name"> - <cstring>Spacer1_2</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - <widget class="QPushButton"> - <property name="name"> - <cstring>buttonUp_2</cstring> - </property> - <property name="text"> - <string>Up</string> - </property> - </widget> - <widget class="QPushButton"> - <property name="name"> - <cstring>buttonDown_2</cstring> - </property> - <property name="text"> - <string>Down</string> - </property> - </widget> - </hbox> - </widget> - </vbox> - </widget> - <widget class="QListView" row="0" column="0"> - <column> - <property name="text"> - <string>Instrument </string> - </property> - <property name="clickable"> - <bool>true</bool> - </property> - <property name="resizable"> - <bool>true</bool> - </property> - </column> - <column> - <property name="text"> - <string>Group</string> - </property> - <property name="clickable"> - <bool>true</bool> - </property> - <property name="resizable"> - <bool>true</bool> - </property> - </column> - <column> - <property name="text"> - <string>steps/count </string> - </property> - <property name="clickable"> - <bool>true</bool> - </property> - <property name="resizable"> - <bool>true</bool> - </property> - </column> - <column> - <property name="text"> - <string>counts/bar</string> - </property> - <property name="clickable"> - <bool>true</bool> - </property> - <property name="resizable"> - <bool>true</bool> - </property> - </column> - <column> - <property name="text"> - <string># bars</string> - </property> - <property name="clickable"> - <bool>true</bool> - </property> - <property name="resizable"> - <bool>true</bool> - </property> - </column> - <column> - <property name="text"> - <string>contrib</string> - </property> - <property name="clickable"> - <bool>true</bool> - </property> - <property name="resizable"> - <bool>true</bool> - </property> - </column> - <column> - <property name="text"> - <string>listen</string> - </property> - <property name="clickable"> - <bool>true</bool> - </property> - <property name="resizable"> - <bool>true</bool> - </property> - </column> - <property name="name"> - <cstring>viewInstrument</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>3</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>150</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>32767</width> - <height>150</height> - </size> + <item row="1" column="0"> + <widget class="QGroupBox" name="GroupBox1"> + <property name="title"> + <string>Instrument Properties</string> + </property> + <layout class="QVBoxLayout"> + <property name="spacing"> + <number>6</number> + </property> + <property name="margin"> + <number>11</number> + </property> + <item> + <layout class="QGridLayout"> + <property name="margin"> + <number>0</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <item row="1" column="2"> + <widget class="QLabel" name="TextLabel2_3_2"> + <property name="text"> + <string>counts/bar</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="TextLabel3_2"> + <property name="text"> + <string>steps/count</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QLabel" name="TextLabel1_2_2"> + <property name="text"> + <string># bars</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="lineInstrument_2"> + <property name="text"> + <string>test</string> + </property> + <property name="dragEnabled"> + <bool>false</bool> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="5"> + <widget class="QSpinBox" name="spinboxContrib_2"> + <property name="minimum"> + <number>0</number> + </property> + <property name="maximum"> + <number>100</number> + </property> + <property name="value"> + <number>0</number> + </property> + </widget> + </item> + <item row="0" column="4"> + <widget class="QLabel" name="labelContrib_2"> + <property name="text"> + <string>contrib</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QCheckBox" name="checkRandomize_2"> + <property name="text"> + <string>randomize</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="tristate"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="comboGroupSel_2"> + <item> + <property name="text"> + <string/> </property> - <property name="frameShape"> - <enum>StyledPanel</enum> + </item> + <item> + <property name="text"> + <string>Group 1</string> </property> - <property name="frameShadow"> - <enum>Sunken</enum> + </item> + <item> + <property name="text"> + <string>Group 2</string> </property> - <property name="toolTip" stdset="0"> - <string>list of defined controllers</string> + </item> + <item> + <property name="text"> + <string>Group 3</string> </property> - <property name="whatsThis" stdset="0"> - <string>This is the MusE list of defined controllers.</string> + </item> + <item> + <property name="text"> + <string>Group 4</string> </property> - </widget> - <widget class="QSplitter" row="2" column="0"> - <property name="name"> - <cstring>Splitter3</cstring> + </item> + <item> + <property name="text"> + <string>Group 5</string> </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>7</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="orientation"> - <enum>Vertical</enum> - </property> - <widget class="QSplitter"> - <property name="name"> - <cstring>Splitter2</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>7</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <widget class="QFrame"> - <property name="name"> - <cstring>Frame3</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>3</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>50</width> - <height>50</height> - </size> - </property> - <property name="frameShape"> - <enum>StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>Raised</enum> - </property> - </widget> - <widget class="QFrame"> - <property name="name"> - <cstring>Frame4</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>3</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>50</width> - <height>50</height> - </size> - </property> - <property name="frameShape"> - <enum>StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>Raised</enum> - </property> - </widget> - </widget> - <widget class="QFrame"> - <property name="name"> - <cstring>Frame5</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>3</hsizetype> - <vsizetype>3</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>150</height> - </size> - </property> - <property name="frameShape"> - <enum>StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>Raised</enum> - </property> - <widget class="QLabel"> - <property name="name"> - <cstring>textLabel1</cstring> - </property> - <property name="geometry"> - <rect> - <x>64</x> - <y>26</y> - <width>250</width> - <height>90</height> - </rect> - </property> - <property name="text"> - <string><b>Notice!</b><br> -Random Rhythm Generator is not enabled yet!</string> - </property> - </widget> - </widget> - </widget> - </grid> -</widget> -<menubar> - <property name="name"> - <cstring>menubar</cstring> - </property> - <item text="&File" name="fileMenu"> - <action name="fileNewAction"/> - <action name="fileOpenAction"/> - <action name="fileSaveAction"/> - <action name="fileSaveAsAction"/> - <separator/> - <action name="filePrintAction"/> - <separator/> - <action name="fileExitAction"/> - </item> - <item text="&Edit" name="editMenu"> - <action name="editUndoAction"/> - <action name="editRedoAction"/> - <separator/> - <action name="editCutAction"/> - <action name="editCopyAction"/> - <action name="editPasteAction"/> - <separator/> - <action name="editFindAction"/> + </item> + </widget> + </item> + <item row="0" column="3"> + <widget class="QSpinBox" name="spinBoxSteps_2"> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>16</number> + </property> + <property name="value"> + <number>4</number> + </property> + </widget> + </item> + <item row="2" column="3"> + <widget class="QSpinBox" name="spinboxBars_2"> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>16</number> + </property> + <property name="value"> + <number>1</number> + </property> + </widget> + </item> + <item row="1" column="4"> + <widget class="QLabel" name="labelListen_2"> + <property name="text"> + <string>listen</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="TextLabel1_4"> + <property name="text"> + <string>Instrument</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="QSpinBox" name="spinboxCounts_2"> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>16</number> + </property> + <property name="value"> + <number>4</number> + </property> + </widget> + </item> + <item row="1" column="5"> + <widget class="QSpinBox" name="spinboxListen_2"> + <property name="minimum"> + <number>-100</number> + </property> + <property name="maximum"> + <number>100</number> + </property> + <property name="value"> + <number>0</number> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="TextLabel1_3_2"> + <property name="text"> + <string>Group</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout"> + <property name="spacing"> + <number>6</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QPushButton" name="buttonNew_2"> + <property name="toolTip"> + <string>create new entry</string> + </property> + <property name="whatsThis"> + <string>pressing the New button you create a new entry +in the MusE list of defined controllers</string> + </property> + <property name="text"> + <string>&New</string> + </property> + <property name="autoDefault"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="buttonDelete_2"> + <property name="toolTip"> + <string>delete selected entry</string> + </property> + <property name="text"> + <string>&Delete</string> + </property> + <property name="autoDefault"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <spacer name="Spacer1_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="buttonUp_2"> + <property name="text"> + <string>Up</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="buttonDown_2"> + <property name="text"> + <string>Down</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> </item> - <item text="&Help" name="helpMenu"> - <action name="helpContentsAction"/> - <action name="helpIndexAction"/> - <separator/> - <action name="helpAboutAction"/> + <item row="0" column="0"> + <widget class="QTreeWidget" name="viewInstrument"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>150</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>32767</width> + <height>150</height> + </size> + </property> + <property name="toolTip"> + <string>list of defined controllers</string> + </property> + <property name="whatsThis"> + <string>This is the MusE list of defined controllers.</string> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <column> + <property name="text"> + <string>Instrument </string> + </property> + <property name="clickable"> + <bool>true</bool> + </property> + <property name="resizable"> + <bool>true</bool> + </property> + </column> + <column> + <property name="text"> + <string>Group</string> + </property> + <property name="clickable"> + <bool>true</bool> + </property> + <property name="resizable"> + <bool>true</bool> + </property> + </column> + <column> + <property name="text"> + <string>steps/count </string> + </property> + <property name="clickable"> + <bool>true</bool> + </property> + <property name="resizable"> + <bool>true</bool> + </property> + </column> + <column> + <property name="text"> + <string>counts/bar</string> + </property> + <property name="clickable"> + <bool>true</bool> + </property> + <property name="resizable"> + <bool>true</bool> + </property> + </column> + <column> + <property name="text"> + <string># bars</string> + </property> + <property name="clickable"> + <bool>true</bool> + </property> + <property name="resizable"> + <bool>true</bool> + </property> + </column> + <column> + <property name="text"> + <string>contrib</string> + </property> + <property name="clickable"> + <bool>true</bool> + </property> + <property name="resizable"> + <bool>true</bool> + </property> + </column> + <column> + <property name="text"> + <string>listen</string> + </property> + <property name="clickable"> + <bool>true</bool> + </property> + <property name="resizable"> + <bool>true</bool> + </property> + </column> + </widget> </item> -</menubar> -<toolbars> - <toolbar dock="2"> - <property name="name"> - <cstring>toolBar</cstring> - </property> - <property name="label"> - <string>Tools</string> - </property> - <action name="fileNewAction"/> - <action name="fileOpenAction"/> - <action name="fileSaveAction"/> - </toolbar> -</toolbars> -<actions> - <action> - <property name="name"> - <cstring>fileNewAction</cstring> - </property> - <property name="iconSet"> - <iconset>image0</iconset> - </property> - <property name="text"> - <string>New</string> - </property> - <property name="menuText"> - <string>&New</string> - </property> - <property name="accel"> - <string>Ctrl+N</string> - </property> - </action> - <action> - <property name="name"> - <cstring>fileOpenAction</cstring> - </property> - <property name="iconSet"> - <iconset>image1</iconset> - </property> - <property name="text"> - <string>Open</string> - </property> - <property name="menuText"> - <string>&Open...</string> - </property> - <property name="accel"> - <string>Ctrl+O</string> - </property> - </action> - <action> - <property name="name"> - <cstring>fileSaveAction</cstring> - </property> - <property name="iconSet"> - <iconset>image2</iconset> - </property> - <property name="text"> - <string>Save</string> - </property> - <property name="menuText"> - <string>&Save</string> - </property> - <property name="accel"> - <string>Ctrl+S</string> - </property> - </action> - <action> - <property name="name"> - <cstring>fileSaveAsAction</cstring> - </property> - <property name="text"> - <string>Save As</string> - </property> - <property name="menuText"> - <string>Save &As...</string> - </property> - <property name="accel"> - <string></string> - </property> - </action> - <action> - <property name="name"> - <cstring>filePrintAction</cstring> - </property> - <property name="iconSet"> - <iconset>image3</iconset> - </property> - <property name="text"> - <string>Print</string> - </property> - <property name="menuText"> - <string>&Print...</string> - </property> - <property name="accel"> - <string>Ctrl+P</string> - </property> - </action> - <action> - <property name="name"> - <cstring>fileExitAction</cstring> - </property> - <property name="text"> - <string>Exit</string> - </property> - <property name="menuText"> - <string>E&xit</string> - </property> - <property name="accel"> - <string></string> - </property> - </action> - <action> - <property name="name"> - <cstring>editUndoAction</cstring> - </property> - <property name="iconSet"> - <iconset>image4</iconset> - </property> - <property name="text"> - <string>Undo</string> - </property> - <property name="menuText"> - <string>&Undo</string> - </property> - <property name="accel"> - <string>Ctrl+Z</string> - </property> - </action> - <action> - <property name="name"> - <cstring>editRedoAction</cstring> - </property> - <property name="iconSet"> - <iconset>image5</iconset> + <item row="2" column="0"> + <widget class="QSplitter" name="Splitter3"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <widget class="QSplitter" name="Splitter2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <widget class="QFrame" name="Frame3"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>50</width> + <height>50</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + </widget> + <widget class="QFrame" name="Frame4"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>50</width> + <height>50</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + </widget> + </widget> + <widget class="QFrame" name="Frame5"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>150</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <widget class="QLabel" name="textLabel1"> + <property name="geometry"> + <rect> + <x>64</x> + <y>26</y> + <width>250</width> + <height>90</height> + </rect> </property> <property name="text"> - <string>Redo</string> - </property> - <property name="menuText"> - <string>&Redo</string> - </property> - <property name="accel"> - <string>Ctrl+Y</string> - </property> - </action> - <action> - <property name="name"> - <cstring>editCutAction</cstring> - </property> - <property name="iconSet"> - <iconset>image6</iconset> - </property> - <property name="text"> - <string>Cut</string> - </property> - <property name="menuText"> - <string>&Cut</string> - </property> - <property name="accel"> - <string>Ctrl+X</string> - </property> - </action> - <action> - <property name="name"> - <cstring>editCopyAction</cstring> - </property> - <property name="iconSet"> - <iconset>image7</iconset> - </property> - <property name="text"> - <string>Copy</string> - </property> - <property name="menuText"> - <string>C&opy</string> - </property> - <property name="accel"> - <string>Ctrl+C</string> - </property> - </action> - <action> - <property name="name"> - <cstring>editPasteAction</cstring> - </property> - <property name="iconSet"> - <iconset>image8</iconset> - </property> - <property name="text"> - <string>Paste</string> - </property> - <property name="menuText"> - <string>&Paste</string> - </property> - <property name="accel"> - <string>Ctrl+V</string> - </property> - </action> - <action> - <property name="name"> - <cstring>editFindAction</cstring> - </property> - <property name="iconSet"> - <iconset>image9</iconset> - </property> - <property name="text"> - <string>Find</string> - </property> - <property name="menuText"> - <string>&Find...</string> - </property> - <property name="accel"> - <string>Ctrl+F</string> - </property> - </action> - <action> - <property name="name"> - <cstring>helpContentsAction</cstring> - </property> - <property name="text"> - <string>Contents</string> - </property> - <property name="menuText"> - <string>&Contents...</string> - </property> - <property name="accel"> - <string></string> - </property> - </action> - <action> - <property name="name"> - <cstring>helpIndexAction</cstring> - </property> - <property name="text"> - <string>Index</string> - </property> - <property name="menuText"> - <string>&Index...</string> - </property> - <property name="accel"> - <string></string> - </property> - </action> - <action> - <property name="name"> - <cstring>helpAboutAction</cstring> - </property> - <property name="text"> - <string>About</string> - </property> - <property name="menuText"> - <string>&About...</string> + <string><b>Notice!</b><br> +Random Rhythm Generator is not enabled yet!</string> </property> - <property name="accel"> - <string></string> + <property name="wordWrap"> + <bool>false</bool> </property> - </action> -</actions> -<images> - <image name="image0"> - <data format="XPM.GZ" length="721">789cedd2310ac23014c6f13da778245b11ab29c114f1088aa3200eaf2f151daaa07510f1eef64553ac696fe04787fcf90dc9d03481cd7a09492aae35d647023ae0051277abaafb76b77808a93534df0ca67224e4180856e753c967d59cd5c48fb3e0d4b9269d7312a741e30c723a4e9b596333ce92930c69329cc8b9f7f3b7f42e886a1709bea70a3524142812172892325024182892f681bff2f1bf74a5bb2f19fe0f7ae439172f13a0a94f</data> - </image> - <image name="image1"> - <data format="XPM.GZ" length="691">789cad914d0ac2301085f739c5d0d905b1b62214c423282e05713189165d5441eb42c4bb9b9fa6a67644045f0299978f3713482a61b59c834cc5a5a6faa041efe90c727badaadb7a33bb8b24cfc1ec0964c9402443d0b0381d77b64653e3c8c95a6d6d312e326fc9dad2c85b156c59ba3eacfe41d0c89defc4dfa2dd7c37fc44b025a179043c4152a4b055f4365414ad0e8901fd94c1ae5e19441da9211c68e7f44098d3074d86019e70a0210c089958df7ffb31154f9c7397a6</data> - </image> - <image name="image2"> - <data format="XPM.GZ" length="691">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523232520022530543251d2e253d856405bffcbc54105b19c856360003103711c4b530b63084709340dc64d364a36453103719cc4d49324b0173f5b002b08c32160095494c544e4202400e6932c9406174d39293617a807c226510f6d04e2611d9ff892832688028196554e3b0c9e076010d65b04437341d604f21b5d65c008f8da445</data> - </image> - <image name="image3"> - <data format="XPM.GZ" length="2509">789c7d944973db381085effe152af7cd35d5a1242e604dcdc189b37a899d65e2646a0e240168b32cc992bc646afefb34ba1b509671f40c9a9fde43a349507c72d0bb3c3fed1d3cd95b6f9acda4eb75e3e6a67760b7f3f9c35f7ffff1cfdefe60d0a33f637a83fddff6f62f36bdae77b6b87601704000197f98df331bef3313186e03f7b3ccf4c5ff281cc47e9798f378ca6c22835336ea1f461e48bd93c0832c325c0907b1ff3571cdfe9cb94ebc5536cad791877d9eff4ed87bf5178187fde47f101e66c2b04ccc79fc22ecbdfa2be63afab051369a7f889c4b7e1d38ef47c685709ea93f666e7253f0e620f75f34455634ecdf28d7a5f8af853ba77e1bb86cca7ec98c4be55af93e723564fe2cecbdd6e3fb5d0d93cfd753b555bf6a99d7918df899b0f7ea737f6658d5ea6f13b30f23615308233f4fa6adea3a677f229cfcbbc8ea4f95adfa26b2f8c8cf439d478659e28ed90bd75a0f5789d9c737c25da9f32d73177d682237327fa6acf5f12cb2faaf843ba77c1cb8c9a30f9858e64f849b587f9858d607e62ee5ff148e3e5a65a73c8ddc4abd3a709b2706e1b654e6eb6b6deb5acb5c09db52997fdf5dd1955dc15c305b62f15b65a79c47b6927f11d816895f2696f7cf58d896ea3f4f2cfe85b0f7ea3f6576c9ef477625f34839d63f8aac7e19d89589bdb08bf39f2596f997c2deabff96d925df293be54f817d19c47ccecc1f79f9ee84800db6aa8ed4902c36d1ff29dfa0439fe458a35fe63b56ac2f6b748fe6813b08023dc2e3fd502d2bf552efe11c76891ff2bbba4d4aff3a0fa9aea4c3b08fe6bbef6aa72b79346fe9ae78ba7f3b8d694c48d31ff354678657d4cf98e6ec469833c76b5ce032ac13f3945ee10dae71f39db6788b77788f0ff8150f69ce44f25cfb293ec3233a3e57bdc097f80a5fe31b3ca6e409e9141fe4f78a67f816cf7fd205bec3f7345a5ae503d5ff8827f2bec04fff933ec74bfc8c5f30a3b33ef5768803cd0f69f51c0b1a63ee648425777644e715f5153c43dd0cf050debf58e394561902d2dce3f0c8e0844638030877c2400b5daa3fa7f454b2ac331e2c68c082c53bc98393f73757fc26473567922435388711b4a11f186b7dae9c52e93f555e916b6082f7d08143abf547f4cd1d4c694ce8cae46842926acff89b161c78d95f6ae62aec1fd011e6ac6b589096a41569c9e7fedbe7072ddcc09ab48125ed0d09b6b0a5f98e744bfb3bd3e7eddfdff7fe0305be5c9c</data> - </image> - <image name="image4"> - <data format="XPM.GZ" length="661">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523232520022630543251d2e253d856405bffcbc54105b19c8563600020b63103711c4b530b6308470f5b082019251068344848c32b23808206494a1e23015890819653db8b81e44255c0659025d460fa70c6e3d78ec814b21b90d052422fb070540f50ebaf84196a9b5e6020008a373c8</data> - </image> - <image name="image5"> - <data format="XPM.GZ" length="661">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523232520022630543251d2e253d856405bffcbc54103b11c8563600020b63105719c4b530b6308470f5b0027acb28278201a64c221c4084136132ca7011885c225c06c91890542256193d98a198327a386570ea49449581bb4d2f114d0624a08c230c50fd4f5cb80da04cad351700eee4866e</data> - </image> - <image name="image6"> - <data format="XPM.GZ" length="661">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523232520022630543251d2e253d856405bffcbc54105b19c856360003103711c6b53006abc40a90649491482ac92863955146d6822ca387474619c9301419a03842825819245bd064129513b1cb242602512216994430d44bc4904984c8c1a5e032897a3019a8144c26518f800c92715864d0ec81ab4dc4701b924fb0850e8a4cad351700fe117ccc</data> - </image> - <image name="image7"> - <data format="XPM.GZ" length="706">789c9d92cb0ac2301045f7f98aa1d915b1da82b4889fa0b814c4c54c6ad14515b42e44fc773b79d057ace04da073399c5042a21076db358491b857589d15a813de20cc1f65f9dc1f562f11c431d47b01f36022822928d85c2f479e653dcb990e5772354db82aae4996a8a2e09a734d29cd4c45ae858e3ed69b71226d3c04757ac81036b05edf1ceca0b643364387ccd7a2c69148c625453d079d936be47350239f637ec3e318ec733aa4edd8f997633374dc4d0d9d86fce1b433f60ede4bf101a375a557</data> - </image> - <image name="image8"> - <data format="XPM.GZ" length="736">789c7d92d10a82301486ef7d8ae1ee24321561103d42d165105dcce3465d54507611d1bbb7736cbaadd93f85fd7efb183af38cedb66b96e5c9bd93dd09181ce58d65ede37c7eee0fab57929625339760453a4bd23903b6b95e14ceb999f30505abb255545801aba844d1d3c6d69eb658a186126aac12ab36e9176b5bb5a64da37108c784841e7229251f319101b8885e8837d018c2e9a6b925585a1b6a9640030ec1e63a6302c71faee38fd051434247f51f4c2bad4247936008a2b88368c23128ea50628e9e741ce23bdfcd9cf3e1bf8e3d5fe5e5cf1ff25e261ff1b8c16c</data> - </image> - <image name="image9"> - <data format="XPM.GZ" length="2798">789cb5d5594f23471007f0773e8545bda1e8bfbe66ecd16a1fcc7d3ab017ec46799899ee010c0603365794ef9e9afe574f2201118a14350ffcd4d555d5c7c08795d6c9e1416be5c3d2dd3c9f9f97adf22cbf6dadb8c574faf4dbef9ffe585aee765bfad369a7adeef22f4bcb47f356d91a5f5ff91a325648b75d8fe0dde0ac3bec66c17bb57b596fd8a30f6af73bfd76bf531bd3da499e64491ee66fe94127a54774e686bde0d5da6937eda4a1198ccd99c56fd1cdfa7b3af7c322783b388ff128e94167c0fcebe68cc665e3b01ec7f43031cfcd8e96473a4bacdf073af7593fc42f6a0f7ab11eeecdb1de6963e65fa787b67f0ce826bf6bccfacfb41e68193ca38b94f5e5daec398f22b868eafd4a0f63fe9c8efdcb4d63e63fa7353ff325e6385f44e75c7f4697162f4fd19cc7b0f6b017eba31f5d70fe8cce9cf57345e749cefadfcdb1de061dfb93cd689b9f9863fc9c8efdc8a5d95b7ee62bf43e78dea7d1850b163ab37e654ae7dee64b3ad6c73eadf598ffabd9ea49156dfb0ff791f5b3c4ded315dddcf722ba0cf5704117b1ff03baa997465bfe5573acd7a15d9c5f6bccfc99d9f687f0bd676596b824d8999dbd8f07bab0fc8268c6cb1d5dc67cdd68db4f9b6eea7da17dece76774c9fadf6ae77a5e8e7faff6697d2fdccf882e52cea317ede91d3ad6970bda79cb7f4737f5c27de5651ecf7b37daf27da69b7ae77419f31dd22ee69b98637d4f6b3dee37bcb742fbb5fbd9367bcb7f44bbe85bdadb7923e42b5c11cff3992ed32a0d7ea25d5a55c127b44f6dfd8d39e6ff4157b63f09e7572665dccf23edbce59fd155ea8325bcaf52ebd9feb6ccdeea5fd35565e719be67975415f31dcddf3ffe7b3c04390a943a0a38f87f8f4785539ce11c131d17b8d435f276bc464f71856b1d33dce016779863f15a0dde1feef1a071333ce209cf1861156b58c7c61bf14e3bd9d4f82d6c6347c72ef6b08f038c5ff6c4ff0738d44e8ef059f37ec157cdff0ddff5f763b857e34f71821ff8a9a38d0ebae8a18f04290618be113fd13db691a123404f447229a414f746fc3d0ec56be68e5418c9291239937399683f2f76ccbfd79aeb4263f7e552a67225d732d37123b7a85e8dd7bb923b99eb286481bedccb838ec7d76ec0ee6b03737992423b7916a7b9473a56e1644d73f957e23d0a59970dd99489769eebc94cebb344a5aba6ffecaa793f5e6b8c655df7782c5bb2cd18d9d13cbbb2a773fee57bd617ea7426977dd9f93ba3ea40d75886f7bc7fadbd90b156c9dfffbde8def774cdf6fbbf2f48bdf7fffdfbfdf3e3d25f9a24cea0</data> - </image> -</images> -<connections> - <connection> - <sender>fileNewAction</sender> - <signal>activated()</signal> - <receiver>RhythmBase</receiver> - <slot>fileNew()</slot> - </connection> - <connection> - <sender>fileOpenAction</sender> - <signal>activated()</signal> - <receiver>RhythmBase</receiver> - <slot>fileOpen()</slot> - </connection> - <connection> - <sender>fileSaveAction</sender> - <signal>activated()</signal> - <receiver>RhythmBase</receiver> - <slot>fileSave()</slot> - </connection> - <connection> - <sender>fileSaveAsAction</sender> - <signal>activated()</signal> - <receiver>RhythmBase</receiver> - <slot>fileSaveAs()</slot> - </connection> - <connection> - <sender>filePrintAction</sender> - <signal>activated()</signal> - <receiver>RhythmBase</receiver> - <slot>filePrint()</slot> - </connection> - <connection> - <sender>fileExitAction</sender> - <signal>activated()</signal> - <receiver>RhythmBase</receiver> - <slot>fileExit()</slot> - </connection> - <connection> - <sender>editUndoAction</sender> - <signal>activated()</signal> - <receiver>RhythmBase</receiver> - <slot>editUndo()</slot> - </connection> - <connection> - <sender>editRedoAction</sender> - <signal>activated()</signal> - <receiver>RhythmBase</receiver> - <slot>editRedo()</slot> - </connection> - <connection> - <sender>editCutAction</sender> - <signal>activated()</signal> - <receiver>RhythmBase</receiver> - <slot>editCut()</slot> - </connection> - <connection> - <sender>editCopyAction</sender> - <signal>activated()</signal> - <receiver>RhythmBase</receiver> - <slot>editCopy()</slot> - </connection> - <connection> - <sender>editPasteAction</sender> - <signal>activated()</signal> - <receiver>RhythmBase</receiver> - <slot>editPaste()</slot> - </connection> - <connection> - <sender>editFindAction</sender> - <signal>activated()</signal> - <receiver>RhythmBase</receiver> - <slot>editFind()</slot> - </connection> - <connection> - <sender>helpIndexAction</sender> - <signal>activated()</signal> - <receiver>RhythmBase</receiver> - <slot>helpIndex()</slot> - </connection> - <connection> - <sender>helpContentsAction</sender> - <signal>activated()</signal> - <receiver>RhythmBase</receiver> - <slot>helpContents()</slot> - </connection> - <connection> - <sender>helpAboutAction</sender> - <signal>activated()</signal> - <receiver>RhythmBase</receiver> - <slot>helpAbout()</slot> - </connection> -</connections> -<slots> - <slot>fileNew()</slot> - <slot>fileOpen()</slot> - <slot>fileSave()</slot> - <slot>fileSaveAs()</slot> - <slot>filePrint()</slot> - <slot>fileExit()</slot> - <slot>editUndo()</slot> - <slot>editRedo()</slot> - <slot>editCut()</slot> - <slot>editCopy()</slot> - <slot>editPaste()</slot> - <slot>editFind()</slot> - <slot>helpIndex()</slot> - <slot>helpContents()</slot> - <slot>helpAbout()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -</UI> + </widget> + </widget> + </widget> + </item> + </layout> + </widget> + <widget class="QToolBar" name="toolBar"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>111</width> + <height>38</height> + </rect> + </property> + <property name="label"> + <string>Tools</string> + </property> + <addaction name="fileNewAction"/> + <addaction name="fileOpenAction"/> + <addaction name="fileSaveAction"/> + </widget> + <widget class="QMenuBar" name="menubar"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>465</width> + <height>21</height> + </rect> + </property> + <widget class="QMenu" name="fileMenu"> + <property name="title"> + <string>&File</string> + </property> + <addaction name="fileNewAction"/> + <addaction name="fileOpenAction"/> + <addaction name="fileSaveAction"/> + <addaction name="fileSaveAsAction"/> + <addaction name="separator"/> + <addaction name="filePrintAction"/> + <addaction name="separator"/> + <addaction name="fileExitAction"/> + </widget> + <widget class="QMenu" name="editMenu"> + <property name="title"> + <string>&Edit</string> + </property> + <addaction name="editUndoAction"/> + <addaction name="editRedoAction"/> + <addaction name="separator"/> + <addaction name="editCutAction"/> + <addaction name="editCopyAction"/> + <addaction name="editPasteAction"/> + <addaction name="separator"/> + <addaction name="editFindAction"/> + </widget> + <widget class="QMenu" name="helpMenu"> + <property name="title"> + <string>&Help</string> + </property> + <addaction name="helpContentsAction"/> + <addaction name="helpIndexAction"/> + <addaction name="separator"/> + <addaction name="helpAboutAction"/> + </widget> + <addaction name="fileMenu"/> + <addaction name="editMenu"/> + <addaction name="helpMenu"/> + </widget> + <action name="fileNewAction"> + <property name="icon"> + <iconset> + <normaloff>image0</normaloff>image0</iconset> + </property> + <property name="text"> + <string>&New</string> + </property> + <property name="iconText"> + <string>New</string> + </property> + <property name="shortcut"> + <string>Ctrl+N</string> + </property> + <property name="name" stdset="0"> + <cstring>fileNewAction</cstring> + </property> + </action> + <action name="fileOpenAction"> + <property name="icon"> + <iconset> + <normaloff>image1</normaloff>image1</iconset> + </property> + <property name="text"> + <string>&Open...</string> + </property> + <property name="iconText"> + <string>Open</string> + </property> + <property name="shortcut"> + <string>Ctrl+O</string> + </property> + <property name="name" stdset="0"> + <cstring>fileOpenAction</cstring> + </property> + </action> + <action name="fileSaveAction"> + <property name="icon"> + <iconset> + <normaloff>image2</normaloff>image2</iconset> + </property> + <property name="text"> + <string>&Save</string> + </property> + <property name="iconText"> + <string>Save</string> + </property> + <property name="shortcut"> + <string>Ctrl+S</string> + </property> + <property name="name" stdset="0"> + <cstring>fileSaveAction</cstring> + </property> + </action> + <action name="fileSaveAsAction"> + <property name="text"> + <string>Save &As...</string> + </property> + <property name="iconText"> + <string>Save As</string> + </property> + <property name="shortcut"> + <string/> + </property> + <property name="name" stdset="0"> + <cstring>fileSaveAsAction</cstring> + </property> + </action> + <action name="filePrintAction"> + <property name="icon"> + <iconset> + <normaloff>image3</normaloff>image3</iconset> + </property> + <property name="text"> + <string>&Print...</string> + </property> + <property name="iconText"> + <string>Print</string> + </property> + <property name="shortcut"> + <string>Ctrl+P</string> + </property> + <property name="name" stdset="0"> + <cstring>filePrintAction</cstring> + </property> + </action> + <action name="fileExitAction"> + <property name="text"> + <string>E&xit</string> + </property> + <property name="iconText"> + <string>Exit</string> + </property> + <property name="shortcut"> + <string/> + </property> + <property name="name" stdset="0"> + <cstring>fileExitAction</cstring> + </property> + </action> + <action name="editUndoAction"> + <property name="icon"> + <iconset> + <normaloff>image4</normaloff>image4</iconset> + </property> + <property name="text"> + <string>&Undo</string> + </property> + <property name="iconText"> + <string>Undo</string> + </property> + <property name="shortcut"> + <string>Ctrl+Z</string> + </property> + <property name="name" stdset="0"> + <cstring>editUndoAction</cstring> + </property> + </action> + <action name="editRedoAction"> + <property name="icon"> + <iconset> + <normaloff>image5</normaloff>image5</iconset> + </property> + <property name="text"> + <string>&Redo</string> + </property> + <property name="iconText"> + <string>Redo</string> + </property> + <property name="shortcut"> + <string>Ctrl+Y</string> + </property> + <property name="name" stdset="0"> + <cstring>editRedoAction</cstring> + </property> + </action> + <action name="editCutAction"> + <property name="icon"> + <iconset> + <normaloff>image6</normaloff>image6</iconset> + </property> + <property name="text"> + <string>&Cut</string> + </property> + <property name="iconText"> + <string>Cut</string> + </property> + <property name="shortcut"> + <string>Ctrl+X</string> + </property> + <property name="name" stdset="0"> + <cstring>editCutAction</cstring> + </property> + </action> + <action name="editCopyAction"> + <property name="icon"> + <iconset> + <normaloff>image7</normaloff>image7</iconset> + </property> + <property name="text"> + <string>C&opy</string> + </property> + <property name="iconText"> + <string>Copy</string> + </property> + <property name="shortcut"> + <string>Ctrl+C</string> + </property> + <property name="name" stdset="0"> + <cstring>editCopyAction</cstring> + </property> + </action> + <action name="editPasteAction"> + <property name="icon"> + <iconset> + <normaloff>image8</normaloff>image8</iconset> + </property> + <property name="text"> + <string>&Paste</string> + </property> + <property name="iconText"> + <string>Paste</string> + </property> + <property name="shortcut"> + <string>Ctrl+V</string> + </property> + <property name="name" stdset="0"> + <cstring>editPasteAction</cstring> + </property> + </action> + <action name="editFindAction"> + <property name="icon"> + <iconset> + <normaloff>image9</normaloff>image9</iconset> + </property> + <property name="text"> + <string>&Find...</string> + </property> + <property name="iconText"> + <string>Find</string> + </property> + <property name="shortcut"> + <string>Ctrl+F</string> + </property> + <property name="name" stdset="0"> + <cstring>editFindAction</cstring> + </property> + </action> + <action name="helpContentsAction"> + <property name="text"> + <string>&Contents...</string> + </property> + <property name="iconText"> + <string>Contents</string> + </property> + <property name="shortcut"> + <string/> + </property> + <property name="name" stdset="0"> + <cstring>helpContentsAction</cstring> + </property> + </action> + <action name="helpIndexAction"> + <property name="text"> + <string>&Index...</string> + </property> + <property name="iconText"> + <string>Index</string> + </property> + <property name="shortcut"> + <string/> + </property> + <property name="name" stdset="0"> + <cstring>helpIndexAction</cstring> + </property> + </action> + <action name="helpAboutAction"> + <property name="text"> + <string>&About...</string> + </property> + <property name="iconText"> + <string>About</string> + </property> + <property name="shortcut"> + <string/> + </property> + <property name="name" stdset="0"> + <cstring>helpAboutAction</cstring> + </property> + </action> + </widget> + <layoutdefault spacing="6" margin="11"/> + <resources/> + <connections> + <connection> + <sender>fileNewAction</sender> + <signal>activated()</signal> + <receiver>RhythmBase</receiver> + <slot>fileNew()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>fileOpenAction</sender> + <signal>activated()</signal> + <receiver>RhythmBase</receiver> + <slot>fileOpen()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>fileSaveAction</sender> + <signal>activated()</signal> + <receiver>RhythmBase</receiver> + <slot>fileSave()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>fileSaveAsAction</sender> + <signal>activated()</signal> + <receiver>RhythmBase</receiver> + <slot>fileSaveAs()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>filePrintAction</sender> + <signal>activated()</signal> + <receiver>RhythmBase</receiver> + <slot>filePrint()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>fileExitAction</sender> + <signal>activated()</signal> + <receiver>RhythmBase</receiver> + <slot>fileExit()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>editUndoAction</sender> + <signal>activated()</signal> + <receiver>RhythmBase</receiver> + <slot>editUndo()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>editRedoAction</sender> + <signal>activated()</signal> + <receiver>RhythmBase</receiver> + <slot>editRedo()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>editCutAction</sender> + <signal>activated()</signal> + <receiver>RhythmBase</receiver> + <slot>editCut()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>editCopyAction</sender> + <signal>activated()</signal> + <receiver>RhythmBase</receiver> + <slot>editCopy()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>editPasteAction</sender> + <signal>activated()</signal> + <receiver>RhythmBase</receiver> + <slot>editPaste()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>editFindAction</sender> + <signal>activated()</signal> + <receiver>RhythmBase</receiver> + <slot>editFind()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>helpIndexAction</sender> + <signal>activated()</signal> + <receiver>RhythmBase</receiver> + <slot>helpIndex()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>helpContentsAction</sender> + <signal>activated()</signal> + <receiver>RhythmBase</receiver> + <slot>helpContents()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>helpAboutAction</sender> + <signal>activated()</signal> + <receiver>RhythmBase</receiver> + <slot>helpAbout()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + </connections> +</ui> diff --git a/muse2/muse/patchbay/patchbay.cpp b/muse2/muse/patchbay/patchbay.cpp deleted file mode 100644 index a03804e5..00000000 --- a/muse2/muse/patchbay/patchbay.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "patchbay.h" - -PatchBay::PatchBay (void) { - _patchbay = new PatchBayBase (this, "patchbay"); - setCaption(tr("MusE: ALSA MIDI Patch Bay")); -} - -PatchBay::~PatchBay (void) { - if (_patchbay) delete _patchbay; -} diff --git a/muse2/muse/patchbay/patchbay.h b/muse2/muse/patchbay/patchbay.h deleted file mode 100644 index 14f51a82..00000000 --- a/muse2/muse/patchbay/patchbay.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __MUSE_PATCHBAY_H__ -#define __MUSE_PATCHBAY_H__ - -#include "cobject.h" -#include "patchbaybase.h" - -class PatchBay : public TopWin { - Q_OBJECT - PatchBayBase * _patchbay; - -public: - PatchBay (void); - ~PatchBay (void); -}; - -#endif /* __MUSE_PATCHBAY_H__ */
\ No newline at end of file diff --git a/muse2/muse/patchbay/patchbaybase.ui b/muse2/muse/patchbay/patchbaybase.ui deleted file mode 100644 index 7138982f..00000000 --- a/muse2/muse/patchbay/patchbaybase.ui +++ /dev/null @@ -1,36 +0,0 @@ -<!DOCTYPE UI><UI version="3.0" stdsetdef="1"> -<class>PatchBayBase</class> -<widget class="QDialog"> - <property name="name"> - <cstring>PatchBayBase</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>401</width> - <height>315</height> - </rect> - </property> - <property name="caption"> - <string>ALSA Patch Bay</string> - </property> - <widget class="QGroupBox"> - <property name="name"> - <cstring>alsaPatchbay</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>315</height> - </rect> - </property> - <property name="title"> - <string>ALSA Patch Bay</string> - </property> - </widget> -</widget> -<layoutdefaults spacing="6" margin="11"/> -</UI> diff --git a/muse2/muse/shortcuts.cpp b/muse2/muse/shortcuts.cpp index 61f950eb..6f0e51f9 100644 --- a/muse2/muse/shortcuts.cpp +++ b/muse2/muse/shortcuts.cpp @@ -106,7 +106,9 @@ void initShortCuts() defShrt(SHRT_MIDI_INPUT_FILTER, 0, "Midi: Open midi input filter", ARRANG_SHRT, "midi_open_input_filter"); defShrt(SHRT_MIDI_INPUT_TRANSPOSE, 0, "Midi: Midi input transpose", ARRANG_SHRT, "midi_open_input_transpose"); defShrt(SHRT_MIDI_REMOTE_CONTROL, 0, "Midi: Midi remote control", ARRANG_SHRT, "midi_remote_control"); +#ifdef BUILD_EXPERIMENTAL defShrt(SHRT_RANDOM_RHYTHM_GENERATOR,0,"Midi: Random rhythm generator", ARRANG_SHRT, "midi_random_rhythm_generator"); +#endif defShrt(SHRT_MIDI_RESET, 0, "Midi: Reset midi", ARRANG_SHRT, "midi_reset"); defShrt(SHRT_MIDI_INIT, 0, "Midi: Init midi", ARRANG_SHRT, "midi_init"); defShrt(SHRT_MIDI_LOCAL_OFF, 0, "Midi: Midi local off", ARRANG_SHRT, "midi_local_off"); diff --git a/muse2/synti/CMakeLists.txt b/muse2/synti/CMakeLists.txt index 1a7fd322..d4e558d5 100644 --- a/muse2/synti/CMakeLists.txt +++ b/muse2/synti/CMakeLists.txt @@ -27,9 +27,13 @@ include_directories( ${PROJECT_SOURCE_DIR}/synti ) -# set (SubDirs libsynti s1 organ deicsonze deicsonze2 simpledrums vam) -# set (SubDirs libsynti s1 organ deicsonze simpledrums vam) -set (SubDirs libsynti s1 organ deicsonze simpledrums2 vam) +# set (SubDirs libsynti organ deicsonze deicsonze2 simpledrums vam) +# set (SubDirs libsynti organ deicsonze simpledrums vam) +set (SubDirs libsynti organ deicsonze simpledrums2 vam) + +if (ENABLE_EXPERIMENTAL) + set (SubDirs ${SubDirs} s1 ) +endif (ENABLE_EXPERIMENTAL) if (HAVE_FLUIDSYNTH) set (SubDirs ${SubDirs} fluid fluidsynth ) |