summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse2/ChangeLog24
-rw-r--r--muse2/muse/app.cpp21
-rw-r--r--muse2/muse/app.h5
-rw-r--r--muse2/muse/appearance.cpp12
-rw-r--r--muse2/muse/arranger/alayout.cpp6
-rw-r--r--muse2/muse/arranger/arranger.cpp3
-rw-r--r--muse2/muse/arranger/pcanvas.cpp4
-rw-r--r--muse2/muse/arranger/tlist.cpp8
-rw-r--r--muse2/muse/arranger/tlist.h3
-rw-r--r--muse2/muse/driver/alsamidi.cpp39
-rw-r--r--muse2/muse/gconfig.cpp13
-rw-r--r--muse2/muse/helper.cpp15
-rw-r--r--muse2/muse/icons.cpp26
-rw-r--r--muse2/muse/icons.h5
-rw-r--r--muse2/muse/ladspa.h2
-rw-r--r--muse2/muse/liste/editevent.cpp2
-rw-r--r--muse2/muse/master/tscale.cpp2
-rw-r--r--muse2/muse/mixer/amixer.cpp2
-rw-r--r--muse2/muse/mixer/astrip.cpp32
-rw-r--r--muse2/muse/mixer/mstrip.cpp32
-rw-r--r--muse2/muse/node.cpp23
-rw-r--r--muse2/muse/plugin.cpp245
-rw-r--r--muse2/muse/plugin.h19
-rw-r--r--muse2/muse/widgets/CMakeLists.txt4
-rw-r--r--muse2/muse/widgets/custom_widget_actions.cpp196
-rw-r--r--muse2/muse/widgets/custom_widget_actions.h86
-rw-r--r--muse2/muse/widgets/doublelabel.cpp2
-rw-r--r--muse2/muse/widgets/mtrackinfo.cpp28
-rw-r--r--muse2/muse/widgets/mtrackinfobase.ui115
-rw-r--r--muse2/muse/widgets/mtscale.cpp4
-rw-r--r--muse2/muse/widgets/mtscale_flo.cpp4
-rw-r--r--muse2/muse/widgets/musewidgetsplug.cpp21
-rw-r--r--muse2/muse/widgets/pixmap_button.cpp174
-rw-r--r--muse2/muse/widgets/pixmap_button.h87
-rw-r--r--muse2/muse/widgets/popupmenu.cpp17
-rw-r--r--muse2/muse/widgets/popupmenu.h3
-rw-r--r--muse2/muse/widgets/routepopup.cpp538
-rw-r--r--muse2/muse/widgets/routepopup.h11
-rw-r--r--muse2/share/locale/muse_de.ts147
-rw-r--r--muse2/share/locale/muse_en.ts1111
-rw-r--r--muse2/share/locale/muse_es.ts669
-rw-r--r--muse2/share/locale/muse_fr.ts301
-rw-r--r--muse2/share/locale/muse_pl.ts301
-rw-r--r--muse2/share/locale/muse_ru.ts335
-rw-r--r--muse2/share/locale/muse_sv_SE.ts303
-rw-r--r--muse2/share/templates/MusE.cfg8
-rw-r--r--muse2/synti/vam/COPYING5
-rw-r--r--muse2/xpm/midi_thru_off4.xpm20
-rw-r--r--muse2/xpm/midi_thru_on4.xpm20
-rw-r--r--muse2/xpm/routing_input_button_slim_4.xpm53
-rw-r--r--muse2/xpm/routing_midi_input_button_slim.xpm58
-rw-r--r--muse2/xpm/routing_midi_output_button_slim.xpm58
-rw-r--r--muse2/xpm/routing_output_button_slim_4.xpm53
-rw-r--r--muse2/xpm/toggle_small.xpm15
54 files changed, 3468 insertions, 1822 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 356e62d5..2f2a8a87 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,27 @@
+20.12.2011:
+ - Litle break for some polish. Route button icons. Rebuild midi track info ui file - was 3 columns not 2. (Tim)
+ * Fixed: Hopefully, finally: Non-appearing track info scroll bar. (Tim)
+ Simple movement of recursive call of sb->setVisible() to end of TLLayout::setGeometry().
+ - Audio strip prefader now controls audio. (Tim)
+18.12.2011:
+ * Fixed: Annoying ladspa browser issues. Leak: Dialog was not destroyed. Sorting. Save complete state. (Tim)
+17.12.2011:
+ - Fixed long-time graphics corruption issue: Large areas of desktop erased to background. (Tim...)
+ Fixed class RoutePopupMenu. Now a subclass of PopupMenu. Changed all usages to 'short-lived' ::exe(),
+ no more single 'long-life' pointer in class MusE. That should allow multiple instances, using ::popup().
+ Also fixed class PopupMenu. Tested all submenu and item destructors - OK, everything destroyed on close.
+ - Fixed TList::ColorMenu parenting. Pass it a parent from TList::mousePressEvent.
+ - If Jack is running but no Jack midi devices were found at start, auto-fill with ALSA just to give something.
+ * Fixed: Some relief from mixer strip and midi track info bloated size. (Tim)
+ Changed default strip font size from 8 to 7. Changed icon sizing - just let strip layout do its thing, instead of forcing size.
+ Changed default style sheet to blank. Was causing problems with track info font size.
+ Fixed mixer: Rebuild mixer upon config font changes.
+ Re-arranged some font usages. Updated descriptive tooltips on font entry boxes.
+ Re-claimed font#5 as a 'small bold' font for things like markers.
+16.12.2011:
+ * New: Midi routing matrix! No more clumsy routing menu items. Currently for Midi Track iR and Audio Input iR solo routes. (Tim)
+14.12.2011:
+ - Corrected FSF address in ladspa.h and vam/COPYING. (Orcan)
12.12.2011:
* Improved: Midi ports list now fills automatically at start. (Marked as p4.0.41 Tim...)
An effort to help new users and others. If auto-filling the mid ports proves too much or unpopular, a simple change
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index c71e23fc..fcbb8cf3 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -327,7 +327,7 @@ MusE::MusE(int /*argc*/, char** /*argv*/) : QMainWindow()
mixer2 = 0;
watchdogThread = 0;
editInstrument = 0;
- routingPopupMenu = 0;
+ //routingPopupMenu = 0;
progress = 0;
activeTopWin = NULL;
currentMenuSharingTopwin = NULL;
@@ -1620,18 +1620,6 @@ void MusE::closeEvent(QCloseEvent* event)
printf("MusE: Exiting Metronome\n");
MusECore::exitMetronome();
- // Make sure to delete the menu. ~routingPopupMenu() will NOT be called automatically.
- // Even though it is a child of MusE, it just passes MusE onto the underlying PopupMenus.
- if(routingPopupMenu)
- delete routingPopupMenu;
- #if 0
- if(routingPopupView)
- {
- routingPopupView->clear();
- delete routingPopupView;
- }
- #endif
-
MusEGlobal::song->cleanupForQuit();
// Give midi devices a chance to close first, above in cleanupForQuit.
@@ -1802,18 +1790,20 @@ void MusE::showTransport(bool flag)
viewTransportAction->setChecked(flag);
}
+/*
//---------------------------------------------------------
// getRoutingPopupMenu
// Get the special common routing popup menu. Used (so far)
// by audio strip, midi strip, and midi trackinfo.
//---------------------------------------------------------
-MusEGui::RoutePopupMenu* MusE::getRoutingPopupMenu()
+MusEGui::RoutePopupMenu* MusE::()
{
if(!routingPopupMenu)
routingPopupMenu = new MusEGui::RoutePopupMenu(this);
return routingPopupMenu;
}
+*/
//---------------------------------------------------------
// saveAs
@@ -2494,7 +2484,8 @@ void MusE::changeConfig(bool writeFlag)
//loadStyleSheetFile(MusEGlobal::config.styleSheetFile);
loadTheme(MusEGlobal::config.style);
QApplication::setFont(MusEGlobal::config.fonts[0]);
- loadStyleSheetFile(MusEGlobal::config.styleSheetFile);
+ if(!MusEGlobal::config.styleSheetFile.isEmpty())
+ loadStyleSheetFile(MusEGlobal::config.styleSheetFile);
emit configChanged();
updateConfiguration();
diff --git a/muse2/muse/app.h b/muse2/muse/app.h
index 184581dc..5dad1ff5 100644
--- a/muse2/muse/app.h
+++ b/muse2/muse/app.h
@@ -85,7 +85,6 @@ class MidiSyncConfig;
class MidiTransformerDialog;
class PrinterConfig;
class RhythmGen;
-class RoutePopupMenu;
class ScoreEdit;
class ShortcutConfig;
class TopWin;
@@ -185,9 +184,6 @@ class MusE : public QMainWindow
QMenu* menu_audio, *menuAutomation, *menuUtils;
QMenu* menu_functions, *menuScriptPlugins;
- // Special common menu for routes. Used (so far) by audio and midi strip, and midi trackinfo.
- RoutePopupMenu* routingPopupMenu;
-
QMenu* follow;
QMenu* midiInputPlugins;
@@ -408,7 +404,6 @@ class MusE : public QMainWindow
bool importWaveToTrack(QString& name, unsigned tick=0, MusECore::Track* track=NULL);
void importPartToTrack(QString& filename, unsigned tick, MusECore::Track* track);
void showTransport(bool flag);
- RoutePopupMenu* getRoutingPopupMenu();
const ToplevelList* getToplevels() { return &toplevels; }
diff --git a/muse2/muse/appearance.cpp b/muse2/muse/appearance.cpp
index 49397c0f..e60db239 100644
--- a/muse2/muse/appearance.cpp
+++ b/muse2/muse/appearance.cpp
@@ -129,12 +129,12 @@ Appearance::Appearance(Arranger* a, QWidget* parent)
lastSelectedBgItem = 0;
fontName0->setToolTip(tr("Main application font, and default font for any\n controls not defined here."));
- fontName1->setToolTip(tr("For small controls like mixer strips.\nAlso timescale small numbers, arranger part name overlay,\n and effects rack."));
- fontName2->setToolTip(tr("Midi track info panel. Transport controls."));
- fontName3->setToolTip(tr("Controller graph and S/X buttons. Large numbers for time\n and tempo scale, and time signature."));
- fontName4->setToolTip(tr("Time scale markers."));
- fontName5->setToolTip(tr("List editor: meta event edit dialog multi-line edit box."));
- fontName6->setToolTip(tr("Mixer label font. Auto-font-sizing up to chosen font size.\nWord-breaking but only with spaces."));
+ fontName1->setToolTip(tr("Mixer strips and effects racks. Midi track info panel.\nMidi control panel entry box."));
+ fontName2->setToolTip(tr("Transport controls."));
+ fontName3->setToolTip(tr("Time scale upper, and time signature.\nController graph and S/X buttons."));
+ fontName4->setToolTip(tr("Time scale lower, and arranger part name overlay."));
+ fontName5->setToolTip(tr("Tempo scale, and markers."));
+ fontName6->setToolTip(tr("Mixer labels. Auto-font-sizing up to chosen font size.\nWord-breaking but only with spaces."));
fontSize6->setToolTip(tr("Maximum mixer label auto-font-sizing font size."));
globalAlphaSlider->setToolTip(tr("Global opacity (opposite of transparency)."));
diff --git a/muse2/muse/arranger/alayout.cpp b/muse2/muse/arranger/alayout.cpp
index 119da498..84923f12 100644
--- a/muse2/muse/arranger/alayout.cpp
+++ b/muse2/muse/arranger/alayout.cpp
@@ -138,7 +138,8 @@ void TLLayout::setGeometry(const QRect &rect)
range = 0;
// Note this appears to cause a single recursive call to this function - jumps to beginning,
// because now the scroll bar wants to be put in the layout.
- sb->setVisible(range != 0);
+ // Moved below. p4.0.44
+ ///sb->setVisible(range != 0);
if (range)
sb->setMaximum(range);
@@ -154,6 +155,9 @@ void TLLayout::setGeometry(const QRect &rect)
li[4]->setGeometry(QRect(0, y2, w, s4.height()));
li[5]->setGeometry(QRect(3, y3, s5.width(), s5.height()));
+ /// Fix for non-appearing scrollbar. Yes, we must allow the recursive call, but try it here, not above. p4.0.44 Tim
+ sb->setVisible(range != 0);
+
//_inSetGeometry = false;
}
diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp
index cb024070..af5c9785 100644
--- a/muse2/muse/arranger/arranger.cpp
+++ b/muse2/muse/arranger/arranger.cpp
@@ -1032,12 +1032,13 @@ void Arranger::genTrackInfo(QWidget* parent)
noTrackInfo->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding));
midiTrackInfo = new MidiTrackInfo(trackInfo);
+
//midiTrackInfo->setFocusPolicy(Qt::TabFocus); // p4.0.9
//midiTrackInfo->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
trackInfo->addWidget(noTrackInfo, 0);
trackInfo->addWidget(midiTrackInfo, 1);
trackInfo->addWidget(0, 2);
-
+
/// genMidiTrackInfo();
}
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index 3889928f..fc0014e2 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -1764,7 +1764,7 @@ void PartCanvas::drawItem(QPainter& p, const CItem* item, const QRect& rect)
//bool rev = (brightness < 12000 || part->selected()) && !part->mute() && !item->isMoving();
bool rev = brightness >= 12000 && !part->selected();
p.save();
- p.setFont(MusEGlobal::config.fonts[1]);
+ p.setFont(MusEGlobal::config.fonts[4]);
p.setWorldMatrixEnabled(false);
if (rev)
p.setPen(Qt::white);
@@ -2257,7 +2257,7 @@ void PartCanvas::drawItem(QPainter& p, const CItem* item, const QRect& rect)
brightness = part_r*29 + part_g*59 + part_b*12;
//bool rev = (brightness < 12000 || part->selected()) && !part->mute() && !item->isMoving();
bool rev = brightness >= 12000 && !part->selected();
- p.setFont(MusEGlobal::config.fonts[1]);
+ p.setFont(MusEGlobal::config.fonts[4]);
if (rev)
p.setPen(Qt::white);
else
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp
index f5edc8cf..8cc2a05a 100644
--- a/muse2/muse/arranger/tlist.cpp
+++ b/muse2/muse/arranger/tlist.cpp
@@ -1142,10 +1142,11 @@ void TList::changeAutomationColor(QAction* act)
// colorMenu
//---------------------------------------------------------
//QMenu* TList::colorMenu(QColor c, int id)
-PopupMenu* TList::colorMenu(QColor c, int id)
+PopupMenu* TList::colorMenu(QColor c, int id, QWidget* parent)
{
//QMenu * m = new QMenu(this);
- PopupMenu * m = new PopupMenu(this); //, true); TODO
+ //PopupMenu * m = new PopupMenu(this); //, true); TODO
+ PopupMenu * m = new PopupMenu(parent); //, true); //
for (int i = 0; i< 6; i++) {
QPixmap pix(10,10);
QPainter p(&pix);
@@ -1307,7 +1308,8 @@ void TList::mousePressEvent(QMouseEvent* ev)
data += 150; // illegal color > 100
act->setData(data);
//QMenu *m = colorMenu(cl->color(), cl->id());
- PopupMenu *m = colorMenu(cl->color(), cl->id());
+ //PopupMenu *m = colorMenu(cl->color(), cl->id());
+ PopupMenu *m = colorMenu(cl->color(), cl->id(), p);
act->setMenu(m);
}
connect(p, SIGNAL(triggered(QAction*)), SLOT(changeAutomation(QAction*)));
diff --git a/muse2/muse/arranger/tlist.h b/muse2/muse/arranger/tlist.h
index 864e287b..53f708e7 100644
--- a/muse2/muse/arranger/tlist.h
+++ b/muse2/muse/arranger/tlist.h
@@ -27,6 +27,7 @@
#include <QWidget>
+class QWidget;
class QKeyEvent;
class QLineEdit;
class QSpinBox;
@@ -109,7 +110,7 @@ class TList : public QWidget {
MusECore::TrackList getRecEnabledTracks();
void setHeaderToolTips();
//QMenu* colorMenu(QColor c, int id);
- PopupMenu* colorMenu(QColor c, int id);
+ PopupMenu* colorMenu(QColor c, int id, QWidget* parent);
private slots:
void returnPressed();
diff --git a/muse2/muse/driver/alsamidi.cpp b/muse2/muse/driver/alsamidi.cpp
index 4687f17f..2c6f9468 100644
--- a/muse2/muse/driver/alsamidi.cpp
+++ b/muse2/muse/driver/alsamidi.cpp
@@ -79,6 +79,16 @@ int MidiAlsaDevice::selectWfd()
QString MidiAlsaDevice::open()
{
_openFlags &= _rwFlags; // restrict to available bits
+
+ snd_seq_port_info_t *pinfo;
+ snd_seq_port_info_alloca(&pinfo);
+ int rv = snd_seq_get_any_port_info(alsaSeq, adr.client, adr.port, pinfo);
+ if(rv < 0)
+ {
+ printf("MidiAlsaDevice::open Error getting port info: adr: %d:%d: %s\n", adr.client, adr.port, snd_strerror(rv));
+ return QString(snd_strerror(rv));
+ }
+
snd_seq_port_subscribe_t* subs;
// Allocated on stack, no need to call snd_seq_port_subscribe_free() later.
snd_seq_port_subscribe_alloca(&subs);
@@ -87,12 +97,9 @@ QString MidiAlsaDevice::open()
int wer = 0;
int rer = 0;
- snd_seq_port_info_t *pinfo;
- snd_seq_port_info_alloca(&pinfo);
- //snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
- snd_seq_port_info_set_addr(pinfo, &adr);
-
int cap = snd_seq_port_info_get_capability(pinfo);
+
+ //printf("MidiAlsaDevice::open cap:%d\n", cap);
// subscribe for writing
if (_openFlags & 1)
@@ -151,6 +158,15 @@ QString MidiAlsaDevice::open()
void MidiAlsaDevice::close()
{
+ snd_seq_port_info_t *pinfo;
+ snd_seq_port_info_alloca(&pinfo);
+ int rv = snd_seq_get_any_port_info(alsaSeq, adr.client, adr.port, pinfo);
+ if(rv < 0)
+ {
+ printf("MidiAlsaDevice::close Error getting port info: adr: %d:%d: %s\n", adr.client, adr.port, snd_strerror(rv));
+ return;
+ }
+
snd_seq_port_subscribe_t* subs;
// Allocated on stack, no need to call snd_seq_port_subscribe_free() later.
snd_seq_port_subscribe_alloca(&subs);
@@ -158,13 +174,10 @@ void MidiAlsaDevice::close()
int wer = 0;
int rer = 0;
- snd_seq_port_info_t *pinfo;
- snd_seq_port_info_alloca(&pinfo);
- //snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
- snd_seq_port_info_set_addr(pinfo, &adr);
-
int cap = snd_seq_port_info_get_capability(pinfo);
+ //printf("MidiAlsaDevice::close cap:%d\n", cap);
+
// This function appears to be called only by MidiPort::setMidiDevice(),
// which closes then opens the device.
// Because the open flags are set BEFORE setMidiDevice() is called, we must ignore the flags.
@@ -881,10 +894,10 @@ void exitMidiAlsa()
// Allocated on stack, no need to call snd_seq_port_subscribe_free() later.
snd_seq_port_subscribe_alloca(&subs);
- snd_seq_port_info_t *pinfo;
- snd_seq_port_info_alloca(&pinfo);
+ //snd_seq_port_info_t *pinfo;
+ //snd_seq_port_info_alloca(&pinfo);
//snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo));
- snd_seq_port_info_set_addr(pinfo, &announce_adr);
+ //snd_seq_port_info_set_addr(pinfo, &announce_adr);
snd_seq_port_subscribe_set_dest(subs, &musePort);
snd_seq_port_subscribe_set_sender(subs, &announce_adr);
diff --git a/muse2/muse/gconfig.cpp b/muse2/muse/gconfig.cpp
index a6abbb93..843c2278 100644
--- a/muse2/muse/gconfig.cpp
+++ b/muse2/muse/gconfig.cpp
@@ -89,11 +89,11 @@ GlobalConfigValues config = {
QColor(200, 192, 171), // waveEditBackgroundColor;
{
QFont(QString("arial"), 10, QFont::Normal),
- QFont(QString("arial"), 8, QFont::Normal),
+ QFont(QString("arial"), 7, QFont::Normal), // Mixer strips and midi track info panel
QFont(QString("arial"), 10, QFont::Normal),
QFont(QString("arial"), 10, QFont::Bold),
- QFont(QString("arial"), 8, QFont::Bold), // timescale numbers
- QFont(QString("Lucidatypewriter"), 14, QFont::Bold),
+ QFont(QString("arial"), 8, QFont::Normal), // Small numbers: Timescale and markers, part name overlay
+ QFont(QString("arial"), 8, QFont::Bold), // Small bold numbers such as marker text
QFont(QString("arial"), 8, QFont::Bold, true) // Mixer strip labels. Looks and fits better with bold + italic than bold alone,
// at the price of only few more pixels than Normal mode.
},
@@ -164,16 +164,15 @@ GlobalConfigValues config = {
false, // BigTimeVisible;
false, // mixer1Visible;
false, // mixer2Visible;
-
false, // markerVisible;
- true, // arrangerVisible;
+ true, // arrangerVisible;
true, // showSplashScreen
1, // canvasShowPartType 1 - names, 2 events
5, // canvasShowPartEvent
- true, // canvasShowGrid;
+ true, // canvasShowGrid;
QString(""), // canvasBgPixmap;
QStringList(), // canvasCustomBgList
- QString(":/style.qss"), // default styleSheetFile
+ QString(""), // default styleSheetFile - For built-in set to ":/style.qss"
QString(""), // style
QString("sweep"), // externalWavEditor
false, // useOldStyleStopShortCut
diff --git a/muse2/muse/helper.cpp b/muse2/muse/helper.cpp
index 144d876d..a0d85133 100644
--- a/muse2/muse/helper.cpp
+++ b/muse2/muse/helper.cpp
@@ -453,9 +453,10 @@ QString getUniqueUntitledName()
// -------------------------------------------------------------------------------------------------------
// populateMidiPorts()
-// This version creats separate devices for input and output ports.
+// This version creats separate devices for Jack midi input and outputs.
// It does not attempt to pair them together.
// -------------------------------------------------------------------------------------------------------
+
void populateMidiPorts()
{
if(!MusEGlobal::checkAudioDevice())
@@ -464,6 +465,8 @@ void populateMidiPorts()
MusECore::MidiDevice* dev = 0;
int port_num = 0;
+
+ int jack_midis_found = 0;
// If Jack is running, prefer Jack midi devices over ALSA.
if(MusEGlobal::audioDevice->deviceType() == MusECore::AudioDevice::JACK_AUDIO)
@@ -475,6 +478,7 @@ void populateMidiPorts()
dev = MusECore::MidiJackDevice::createJackMidiDevice(*i, 1);
if(dev)
{
+ ++jack_midis_found;
//printf("populateMidiPorts Created jack writeable device: %s\n", dev->name().toLatin1().constData());
//dev->setOpenFlags(1);
MusEGlobal::midiSeq->msgSetMidiDevice(&MusEGlobal::midiPorts[port_num], dev);
@@ -492,6 +496,7 @@ void populateMidiPorts()
dev = MusECore::MidiJackDevice::createJackMidiDevice(*i, 2);
if(dev)
{
+ ++jack_midis_found;
//printf("populateMidiPorts Created jack readable device: %s\n", dev->name().toLatin1().constData());
//dev->setOpenFlags(2);
MusEGlobal::midiSeq->msgSetMidiDevice(&MusEGlobal::midiPorts[port_num], dev);
@@ -503,9 +508,13 @@ void populateMidiPorts()
}
}
}
- else
+ //else
// If Jack is not running, use ALSA devices.
- if(MusEGlobal::audioDevice->deviceType() == MusECore::AudioDevice::DUMMY_AUDIO)
+ //if(MusEGlobal::audioDevice->deviceType() == MusECore::AudioDevice::DUMMY_AUDIO)
+ // Try to do the user a favour: If we still have no Jack devices, even if Jack is running, fill with ALSA.
+ // It is possible user has Jack running on ALSA back-end but without midi support.
+ // IE. They use Jack for audio but use ALSA for midi!
+ if(MusEGlobal::audioDevice->deviceType() == MusECore::AudioDevice::DUMMY_AUDIO || jack_midis_found == 0)
{
for(MusECore::iMidiDevice i = MusEGlobal::midiDevices.begin(); i != MusEGlobal::midiDevices.end(); ++i)
{
diff --git a/muse2/muse/icons.cpp b/muse2/muse/icons.cpp
index 67bb4827..5e2cfce5 100644
--- a/muse2/muse/icons.cpp
+++ b/muse2/muse/icons.cpp
@@ -43,8 +43,8 @@
#include "xpm/midi_inputplugins_random_rhythm_generator.xpm"
#include "xpm/midi_local_off.xpm"
#include "xpm/midi_reset_instr.xpm"
-#include "xpm/midi_thru_off3.xpm"
-#include "xpm/midi_thru_on3.xpm"
+#include "xpm/midi_thru_off4.xpm"
+#include "xpm/midi_thru_on4.xpm"
#include "xpm/settings_appearance_settings.xpm"
#include "xpm/settings_configureshortcuts.xpm"
#include "xpm/settings_follow_song.xpm"
@@ -119,6 +119,10 @@
#include "xpm/mutebutton_off.xpm"
#include "xpm/rec_echo_on.xpm"
#include "xpm/rec_echo_off.xpm"
+#include "xpm/routing_input_button_slim_4.xpm"
+#include "xpm/routing_output_button_slim_4.xpm"
+#include "xpm/routing_midi_input_button_slim.xpm"
+#include "xpm/routing_midi_output_button_slim.xpm"
#include "xpm/eye.xpm"
#include "xpm/eye_gray.xpm"
@@ -178,6 +182,7 @@
#include "xpm/exit.xpm"
#include "xpm/exit1.xpm"
+#include "xpm/toggle_small.xpm"
#include "xpm/redled.xpm"
#include "xpm/darkredled.xpm"
#include "xpm/greendot.xpm"
@@ -243,6 +248,7 @@
#include "xpm/sine.xpm"
#include "xpm/saw.xpm"
+#include "icons.h"
#if QT_VERSION >= 0x040600
#define MPIXMAP(a,b) QPixmap(QIcon::fromTheme(b, QIcon(QPixmap(a))).pixmap(QPixmap(a).width(),QPixmap(a).height()))
@@ -288,6 +294,11 @@ QPixmap* exit1Icon;
QPixmap* newmuteIcon;
QPixmap* soloIcon;
+QPixmap* routesInIcon;
+QPixmap* routesOutIcon;
+QPixmap* routesMidiInIcon;
+QPixmap* routesMidiOutIcon;
+
QPixmap* pointerIcon;
QPixmap* pencilIcon;
QPixmap* deleteIcon;
@@ -403,6 +414,7 @@ QIcon* editpaste2TrackIcon;
QIcon* editpasteClone2TrackIcon;
*/
+QPixmap* toggle_small_Icon;
QPixmap* redLedIcon;
QPixmap* darkRedLedIcon;
QPixmap* greendotIcon;
@@ -605,6 +617,11 @@ void initIcons()
newmuteIcon = new MPIXMAP(newmutebutton_xpm, NULL);
soloIcon = new MPIXMAP(solobutton_xpm, NULL);
+ routesInIcon = new MPIXMAP(routing_input_button_slim_4_xpm, NULL);
+ routesOutIcon = new MPIXMAP(routing_output_button_slim_4_xpm, NULL);
+ routesMidiInIcon = new MPIXMAP(routing_midi_input_button_slim_xpm, NULL);
+ routesMidiOutIcon = new MPIXMAP(routing_midi_output_button_slim_xpm, NULL);
+
recEchoIconOn = new MPIXMAP(rec_echo_on_xpm, NULL);
recEchoIconOff = new MPIXMAP(rec_echo_off_xpm, NULL);
muteIconOn = new MPIXMAP(mutebutton_on_xpm, NULL);
@@ -620,6 +637,7 @@ void initIcons()
//soloIconSet2->addPixmap(*soloblksqIconOn, QIcon::Normal, QIcon::On);
//soloIconSet2->addPixmap(*soloblksqIconOff, QIcon::Normal, QIcon::Off);
+ toggle_small_Icon = new MPIXMAP(toggle_small_xpm, NULL);
redLedIcon = new MPIXMAP(redled_xpm, NULL);
darkRedLedIcon = new MPIXMAP(darkredled_xpm, NULL);
greendotIcon = new MPIXMAP(greendot_xpm, NULL);
@@ -635,8 +653,8 @@ void initIcons()
miditransformSIcon = new MPIXMAP(miditransformS_xpm, NULL);
midi_plugSIcon = new MPIXMAP(midi_plugS_xpm, NULL);
miditransposeSIcon = new MPIXMAP(miditransposeS_xpm, NULL);
- midiThruOnIcon = new MPIXMAP(midi_thru_on3_xpm, NULL);
- midiThruOffIcon = new MPIXMAP(midi_thru_off3_xpm, NULL);
+ midiThruOnIcon = new MPIXMAP(midi_thru_on4_xpm, NULL);
+ midiThruOffIcon = new MPIXMAP(midi_thru_off4_xpm, NULL);
mixerSIcon = new MPIXMAP(mixerS_xpm, NULL);
mustangSIcon = new MPIXMAP(mustangS_xpm, NULL);
diff --git a/muse2/muse/icons.h b/muse2/muse/icons.h
index 32f08a58..115a79fc 100644
--- a/muse2/muse/icons.h
+++ b/muse2/muse/icons.h
@@ -150,6 +150,10 @@ extern QPixmap* record_off_Icon;
extern QPixmap* newmuteIcon;
extern QPixmap* soloIcon;
+extern QPixmap* routesInIcon;
+extern QPixmap* routesOutIcon;
+extern QPixmap* routesMidiInIcon;
+extern QPixmap* routesMidiOutIcon;
extern QPixmap* muteIconOn;
extern QPixmap* muteIconOff;
extern QPixmap* soloIconOn;
@@ -159,6 +163,7 @@ extern QPixmap* soloblksqIconOff;
//extern QIcon* soloIconSet1;
//extern QIcon* soloIconSet2;
+extern QPixmap* toggle_small_Icon;
extern QPixmap* redLedIcon;
extern QPixmap* darkRedLedIcon;
extern QPixmap* greendotIcon;
diff --git a/muse2/muse/ladspa.h b/muse2/muse/ladspa.h
index 7bbc338f..d7e0e902 100644
--- a/muse2/muse/ladspa.h
+++ b/muse2/muse/ladspa.h
@@ -16,7 +16,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifndef LADSPA_INCLUDED
diff --git a/muse2/muse/liste/editevent.cpp b/muse2/muse/liste/editevent.cpp
index cc52d26e..c31ecb3a 100644
--- a/muse2/muse/liste/editevent.cpp
+++ b/muse2/muse/liste/editevent.cpp
@@ -330,7 +330,7 @@ EditMetaDialog::EditMetaDialog(int tick, const MusECore::Event& ev,
connect(hexButton, SIGNAL(toggled(bool)), SLOT(toggled(bool)));
edit = new QTextEdit;
- edit->setFont(MusEGlobal::config.fonts[5]);
+ edit->setFont(MusEGlobal::config.fonts[0]);
if (!ev.empty()) {
epos->setValue(tick);
diff --git a/muse2/muse/master/tscale.cpp b/muse2/muse/master/tscale.cpp
index 23e7337b..57bb898d 100644
--- a/muse2/muse/master/tscale.cpp
+++ b/muse2/muse/master/tscale.cpp
@@ -37,7 +37,7 @@ namespace MusEGui {
TScale::TScale(QWidget* parent, int ymag)
: View(parent, 1, ymag)
{
- setFont(MusEGlobal::config.fonts[4]);
+ setFont(MusEGlobal::config.fonts[5]);
//int w = 4 * QFontMetrics(MusEGlobal::config.fonts[4]).width('0');
int w = 4 * fontMetrics().width('0');
setFixedWidth(w);
diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp
index 34c8190b..f1da3f70 100644
--- a/muse2/muse/mixer/amixer.cpp
+++ b/muse2/muse/mixer/amixer.cpp
@@ -542,7 +542,7 @@ void AudioMixerApp::updateMixer(UpdateAction action)
void AudioMixerApp::configChanged()
{
- songChanged(SC_CONFIG);
+ songChanged(-1); // Catch when fonts change, do full rebuild.
}
//---------------------------------------------------------
diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp
index 9c393a1a..ecb2f507 100644
--- a/muse2/muse/mixer/astrip.cpp
+++ b/muse2/muse/mixer/astrip.cpp
@@ -895,7 +895,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
record->setToolTip(tr("record"));
record->setChecked(t->recordFlag());
record->setIcon(t->recordFlag() ? QIcon(*record_on_Icon) : QIcon(*record_off_Icon));
- record->setIconSize(record_on_Icon->size());
+ ///record->setIconSize(record_on_Icon->size());
connect(record, SIGNAL(clicked(bool)), SLOT(recordToggled(bool)));
}
@@ -906,7 +906,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
mute->setToolTip(tr("mute"));
mute->setChecked(t->mute());
mute->setIcon(t->mute() ? QIcon(*muteIconOff) : QIcon(*muteIconOn));
- mute->setIconSize(muteIconOn->size());
+ ///mute->setIconSize(muteIconOn->size());
mute->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool)));
@@ -918,7 +918,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
solo->setIcon(t->solo() ? QIcon(*soloblksqIconOn) : QIcon(*soloblksqIconOff));
else
solo->setIcon(t->solo() ? QIcon(*soloIconOn) : QIcon(*soloIconOff));
- solo->setIconSize(soloIconOn->size());
+ ///solo->setIconSize(soloIconOn->size());
solo->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
connect(solo, SIGNAL(clicked(bool)), SLOT(soloToggled(bool)));
if (type == MusECore::Track::AUDIO_OUTPUT) {
@@ -938,7 +938,7 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
off->setToolTip(tr("off"));
off->setChecked(t->off());
off->setIcon(t->off() ? QIcon(*exit1Icon) : QIcon(*exitIcon));
- off->setIconSize(exit1Icon->size());
+ ///off->setIconSize(exit1Icon->size());
connect(off, SIGNAL(clicked(bool)), SLOT(offToggled(bool)));
grid->addWidget(off, _curGridRow, 0);
@@ -955,8 +955,10 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
if (type != MusECore::Track::AUDIO_AUX) {
iR = new QToolButton();
iR->setFont(MusEGlobal::config.fonts[1]);
- iR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
- iR->setText(tr("iR"));
+ iR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum));
+ ///iR->setText(tr("iR"));
+ iR->setIcon(QIcon(*routesInIcon));
+ iR->setIconSize(routesInIcon->size());
iR->setCheckable(false);
iR->setToolTip(tr("input routing"));
grid->addWidget(iR, _curGridRow, 0);
@@ -965,8 +967,10 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
oR = new QToolButton();
oR->setFont(MusEGlobal::config.fonts[1]);
- oR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
- oR->setText(tr("oR"));
+ oR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum));
+ ///oR->setText(tr("oR"));
+ oR->setIcon(QIcon(*routesOutIcon));
+ oR->setIconSize(routesOutIcon->size());
oR->setCheckable(false);
oR->setToolTip(tr("output routing"));
grid->addWidget(oR, _curGridRow++, 1);
@@ -1045,9 +1049,11 @@ AudioStrip::AudioStrip(QWidget* parent, MusECore::AudioTrack* at)
void AudioStrip::iRoutePressed()
{
- MusEGui::RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
- iR->setDown(false);
+ //MusEGui::RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
+ RoutePopupMenu* pup = new RoutePopupMenu();
pup->exec(QCursor::pos(), track, false);
+ delete pup;
+ iR->setDown(false);
}
//---------------------------------------------------------
@@ -1056,9 +1062,11 @@ void AudioStrip::iRoutePressed()
void AudioStrip::oRoutePressed()
{
- MusEGui::RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
- oR->setDown(false);
+ //MusEGui::RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
+ RoutePopupMenu* pup = new RoutePopupMenu();
pup->exec(QCursor::pos(), track, true);
+ delete pup;
+ oR->setDown(false);
}
} // namespace MusEGui
diff --git a/muse2/muse/mixer/mstrip.cpp b/muse2/muse/mixer/mstrip.cpp
index dc495aa6..031eaa4b 100644
--- a/muse2/muse/mixer/mstrip.cpp
+++ b/muse2/muse/mixer/mstrip.cpp
@@ -300,7 +300,7 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t)
record->setToolTip(tr("record"));
record->setChecked(track->recordFlag());
record->setIcon(track->recordFlag() ? QIcon(*record_on_Icon) : QIcon(*record_off_Icon));
- record->setIconSize(record_on_Icon->size());
+ ///record->setIconSize(record_on_Icon->size());
connect(record, SIGNAL(clicked(bool)), SLOT(recordToggled(bool)));
mute = new QToolButton();
@@ -308,7 +308,7 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t)
mute->setToolTip(tr("mute"));
mute->setChecked(track->mute());
mute->setIcon(track->mute() ? QIcon(*muteIconOff) : QIcon(*muteIconOn));
- mute->setIconSize(muteIconOn->size());
+ ///mute->setIconSize(muteIconOn->size());
mute->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
connect(mute, SIGNAL(clicked(bool)), SLOT(muteToggled(bool)));
@@ -322,7 +322,7 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t)
solo->setIcon(track->solo() ? QIcon(*soloblksqIconOn) : QIcon(*soloblksqIconOff));
else
solo->setIcon(track->solo() ? QIcon(*soloIconOn) : QIcon(*soloIconOff));
- solo->setIconSize(soloIconOn->size());
+ ///solo->setIconSize(soloIconOn->size());
connect(solo, SIGNAL(clicked(bool)), SLOT(soloToggled(bool)));
/*
@@ -368,7 +368,7 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t)
off->setToolTip(tr("off"));
off->setChecked(track->off());
off->setIcon(track->off() ? QIcon(*exit1Icon) : QIcon(*exitIcon));
- off->setIconSize(exit1Icon->size());
+ ///off->setIconSize(exit1Icon->size());
connect(off, SIGNAL(clicked(bool)), SLOT(offToggled(bool)));
grid->addWidget(off, _curGridRow, 0);
@@ -382,16 +382,20 @@ MidiStrip::MidiStrip(QWidget* parent, MusECore::MidiTrack* t)
iR = new QToolButton();
iR->setFont(MusEGlobal::config.fonts[1]);
- iR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
- iR->setText(tr("iR"));
+ iR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum));
+ ///iR->setText(tr("iR"));
+ iR->setIcon(QIcon(*routesMidiInIcon));
+ iR->setIconSize(routesMidiInIcon->size());
iR->setCheckable(false);
iR->setToolTip(tr("input routing"));
grid->addWidget(iR, _curGridRow, 0);
connect(iR, SIGNAL(pressed()), SLOT(iRoutePressed()));
oR = new QToolButton();
oR->setFont(MusEGlobal::config.fonts[1]);
- oR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
- oR->setText(tr("oR"));
+ oR->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum));
+ ///oR->setText(tr("oR"));
+ oR->setIcon(QIcon(*routesMidiOutIcon));
+ oR->setIconSize(routesMidiOutIcon->size());
oR->setCheckable(false);
// TODO: Works OK, but disabled for now, until we figure out what to do about multiple out routes and display values...
// Enabled (for Midi Port to Audio Input routing). p4.0.14 Tim.
@@ -994,9 +998,11 @@ void MidiStrip::setReverbSend(double val)
void MidiStrip::iRoutePressed()
{
- MusEGui::RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
- iR->setDown(false);
+ //MusEGui::RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
+ RoutePopupMenu* pup = new RoutePopupMenu();
pup->exec(QCursor::pos(), track, false);
+ delete pup;
+ iR->setDown(false);
}
//---------------------------------------------------------
@@ -1005,9 +1011,11 @@ void MidiStrip::iRoutePressed()
void MidiStrip::oRoutePressed()
{
- MusEGui::RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
- oR->setDown(false);
+ //MusEGui::RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
+ RoutePopupMenu* pup = new RoutePopupMenu();
pup->exec(QCursor::pos(), track, true);
+ delete pup;
+ oR->setDown(false);
}
} // namespace MusEGui
diff --git a/muse2/muse/node.cpp b/muse2/muse/node.cpp
index cb77f939..b6b40738 100644
--- a/muse2/muse/node.cpp
+++ b/muse2/muse/node.cpp
@@ -687,7 +687,7 @@ void AudioTrack::copyData(unsigned pos, int dstChannels, int srcStartChan, int s
for(int c = 0; c < dstChannels; ++c)
{
double v;
- if(srcStartChan > 2) // Don't apply pan or volume to extra channels above 2.
+ if(srcStartChan > 2 || _prefader) // Don't apply pan or volume to extra channels above 2. Or if prefader on.
//v = _volume;
v = 1.0;
else
@@ -711,7 +711,7 @@ void AudioTrack::copyData(unsigned pos, int dstChannels, int srcStartChan, int s
for(int c = 0; c < dstChannels; ++c)
{
double v;
- if(srcStartChan > 2) // Don't apply pan or volume to extra channels above 2.
+ if(srcStartChan > 2 || _prefader) // Don't apply pan or volume to extra channels above 2. Or if prefader on.
//v = _volume;
v = 1.0;
else
@@ -729,10 +729,10 @@ void AudioTrack::copyData(unsigned pos, int dstChannels, int srcStartChan, int s
}
else if(srcChans == 2 && dstChannels == 1)
{
- //double v1 = (srcStartChan > 2 ? _volume : vol[srcStartChan]); // Don't apply pan to extra channels above 2.
+ //double v1 = (srcStartChan > 2 ? _volume : vol[srcStartChan]); //
//double v2 = (srcStartChan > 2 ? _volume : vol[srcStartChan + 1]); //
- double v1 = (srcStartChan > 2 ? 1.0 : vol[srcStartChan]); // Don't apply pan or volume to extra channels above 2.
- double v2 = (srcStartChan > 2 ? 1.0 : vol[srcStartChan + 1]); //
+ double v1 = ((srcStartChan > 2 || _prefader) ? 1.0 : vol[srcStartChan]); // Don't apply pan or volume to extra channels above 2. Or if prefader on.
+ double v2 = ((srcStartChan > 2 || _prefader) ? 1.0 : vol[srcStartChan + 1]); //
float* dp = dstBuffer[0];
float* sp1 = buffer[srcStartChan];
float* sp2 = buffer[srcStartChan + 1];
@@ -1034,7 +1034,7 @@ void AudioTrack::addData(unsigned pos, int dstChannels, int srcStartChan, int sr
for(int c = 0; c < dstChannels; ++c)
{
double v;
- if(srcStartChan > 2) // Don't apply pan or volume to extra channels above 2.
+ if(srcStartChan > 2 || _prefader) // Don't apply pan or volume to extra channels above 2. Or if prefader on.
//v = _volume;
v = 1.0;
else
@@ -1058,7 +1058,7 @@ void AudioTrack::addData(unsigned pos, int dstChannels, int srcStartChan, int sr
for(int c = 0; c < dstChannels; ++c)
{
double v;
- if(srcStartChan > 2) // Don't apply pan or volume to extra channels above 2.
+ if(srcStartChan > 2 || _prefader) // Don't apply pan or volume to extra channels above 2. Or if prefader on.
//v = _volume;
v = 1.0;
else
@@ -1078,8 +1078,8 @@ void AudioTrack::addData(unsigned pos, int dstChannels, int srcStartChan, int sr
{
//double v1 = (srcStartChan > 2 ? _volume : vol[srcStartChan]); // Don't apply pan to extra channels above 2.
//double v2 = (srcStartChan > 2 ? _volume : vol[srcStartChan + 1]); //
- double v1 = (srcStartChan > 2 ? 1.0 : vol[srcStartChan]); // Don't apply pan or volume to extra channels above 2.
- double v2 = (srcStartChan > 2 ? 1.0 : vol[srcStartChan + 1]); //
+ double v1 = ((srcStartChan > 2 || _prefader) ? 1.0 : vol[srcStartChan]); // Don't apply pan or volume to extra channels above 2. Or if prefader on.
+ double v2 = ((srcStartChan > 2 || _prefader) ? 1.0 : vol[srcStartChan + 1]); //
float* sp1 = buffer[srcStartChan];
float* sp2 = buffer[srcStartChan + 1];
float* dp = dstBuffer[0];
@@ -1095,7 +1095,7 @@ void AudioTrack::addData(unsigned pos, int dstChannels, int srcStartChan, int sr
void AudioTrack::readVolume(Xml& xml)
{
- int ch = 0;
+ //int ch = 0;
for (;;) {
Xml::Token token = xml.parse();
switch (token) {
@@ -1110,7 +1110,8 @@ void AudioTrack::readVolume(Xml& xml)
break;
case Xml::Attribut:
if (xml.s1() == "ch")
- ch = xml.s2().toInt();
+ //ch = xml.s2().toInt();
+ xml.s2();
break;
case Xml::TagEnd:
if (xml.s1() == "volume")
diff --git a/muse2/muse/plugin.cpp b/muse2/muse/plugin.cpp
index 227a9daf..e7e5c1f8 100644
--- a/muse2/muse/plugin.cpp
+++ b/muse2/muse/plugin.cpp
@@ -37,6 +37,7 @@
#include <QGridLayout>
#include <QGroupBox>
#include <QHBoxLayout>
+#include <QHeaderView>
#include <QLabel>
#include <QMainWindow>
#include <QMessageBox>
@@ -45,13 +46,13 @@
#include <QSignalMapper>
#include <QSizePolicy>
#include <QScrollArea>
+#include <QSpacerItem>
#include <QTimer>
#include <QToolBar>
#include <QToolButton>
#include <QTreeWidget>
#include <QVBoxLayout>
#include <QWhatsThis>
-#include <QHeaderView>
#include "globals.h"
#include "globaldefs.h"
@@ -100,7 +101,10 @@ static const char* MusEGlobal::preset_file_save_pattern[] = {
namespace MusEGui {
int PluginDialog::selectedPlugType = 0;
QStringList PluginDialog::sortItems = QStringList();
-
+///int PluginDialog::sortColumn = 0;
+///Qt::SortOrder PluginDialog::sortOrder = Qt::AscendingOrder;
+QRect PluginDialog::geometrySave = QRect();
+QByteArray PluginDialog::listSave = QByteArray();
}
namespace MusECore {
@@ -3145,11 +3149,18 @@ PluginDialog::PluginDialog(QWidget* parent)
: QDialog(parent)
{
setWindowTitle(tr("MusE: select plugin"));
+
+ if(!geometrySave.isNull())
+ setGeometry(geometrySave);
+
QVBoxLayout* layout = new QVBoxLayout(this);
pList = new QTreeWidget(this);
pList->setColumnCount(11);
- pList->setSortingEnabled(true);
+ // "Note: In order to avoid performance issues, it is recommended that sorting
+ // is enabled after inserting the items into the tree. Alternatively, you could
+ // also insert the items into a list before inserting the items into the tree. "
+ //pList->setSortingEnabled(true);
QStringList headerLabels;
headerLabels << tr("Lib");
headerLabels << tr("Label");
@@ -3163,25 +3174,17 @@ PluginDialog::PluginDialog(QWidget* parent)
headerLabels << tr("Maker");
headerLabels << tr("Copyright");
- int sizes[] = { 110, 110, 0, 30, 30, 30, 30, 30, 40, 110, 110 };
- for (int i = 0; i < 11; ++i) {
- if (sizes[i] == 0) {
- pList->header()->setResizeMode(i, QHeaderView::Stretch);
- }
- else {
- if (sizes[i] <= 40) // hack alert!
- pList->header()->setResizeMode(i, QHeaderView::Custom);
- pList->header()->resizeSection(i, sizes[i]);
- }
- }
-
pList->setHeaderLabels(headerLabels);
pList->setSelectionBehavior(QAbstractItemView::SelectRows);
pList->setSelectionMode(QAbstractItemView::SingleSelection);
pList->setAlternatingRowColors(true);
-
- fillPlugs(selectedPlugType);
+ pList->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+ //fillPlugs(selectedPlugType);
+ //pList->setSortingEnabled(true);
+ //pList->sortByColumn(sortColumn, sortOrder);
+
layout->addWidget(pList);
//---------------------------------------------------
@@ -3191,42 +3194,56 @@ PluginDialog::PluginDialog(QWidget* parent)
QBoxLayout* w5 = new QHBoxLayout;
layout->addLayout(w5);
+ QBoxLayout* ok_lo = new QVBoxLayout;
+ w5->addLayout(ok_lo);
+
okB = new QPushButton(tr("Ok"), this);
okB->setDefault(true);
QPushButton* cancelB = new QPushButton(tr("Cancel"), this);
okB->setFixedWidth(80);
okB->setEnabled(false);
cancelB->setFixedWidth(80);
- w5->addWidget(okB);
- w5->addSpacing(12);
- w5->addWidget(cancelB);
-
- QGroupBox* plugSelGroup = new QGroupBox;
+ //ok_lo->addStretch(4);
+ //ok_lo->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Maximum));
+ ok_lo->addWidget(okB);
+ ok_lo->addSpacing(8);
+ ok_lo->addWidget(cancelB);
+ //ok_lo->addStretch(4);
+ //ok_lo->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Maximum));
+
+ QGroupBox* plugSelGroup = new QGroupBox(this);
plugSelGroup->setTitle("Show plugs:");
- QHBoxLayout* psl = new QHBoxLayout;
+ plugSelGroup->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+ //QHBoxLayout* psl = new QHBoxLayout;
+ QGridLayout* psl = new QGridLayout;
+ //psl->setRowStretch(0, 0);
plugSelGroup->setLayout(psl);
QButtonGroup* plugSel = new QButtonGroup(plugSelGroup);
- onlySM = new QRadioButton;
+ onlySM = new QRadioButton(this);
onlySM->setText(tr("Mono and Stereo"));
onlySM->setCheckable(true);
plugSel->addButton(onlySM);
- psl->addWidget(onlySM);
- onlyS = new QRadioButton;
+ //psl->addWidget(onlySM);
+ psl->addWidget(onlySM, 1, 0);
+ onlyS = new QRadioButton(this);
onlyS->setText(tr("Stereo"));
onlyS->setCheckable(true);
plugSel->addButton(onlyS);
- psl->addWidget(onlyS);
- onlyM = new QRadioButton;
+ //psl->addWidget(onlyS);
+ psl->addWidget(onlyS, 0, 1);
+ onlyM = new QRadioButton(this);
onlyM->setText(tr("Mono"));
onlyM->setCheckable(true);
plugSel->addButton(onlyM);
- psl->addWidget(onlyM);
- allPlug = new QRadioButton;
+ //psl->addWidget(onlyM);
+ psl->addWidget(onlyM, 0, 0);
+ allPlug = new QRadioButton(this);
allPlug->setText(tr("Show All"));
allPlug->setCheckable(true);
plugSel->addButton(allPlug);
- psl->addWidget(allPlug);
+ //psl->addWidget(allPlug);
+ psl->addWidget(allPlug, 1, 1);
plugSel->setExclusive(true);
switch(selectedPlugType) {
@@ -3240,14 +3257,18 @@ PluginDialog::PluginDialog(QWidget* parent)
"Note that using mono plugins on stereo tracks is not a problem, two will be used in parallell.<br>"
"Also beware that the 'all' alternative includes plugins that probably not are usable by MusE."));
- w5->addSpacing(12);
+ w5->addSpacing(8);
w5->addWidget(plugSelGroup);
- w5->addSpacing(12);
+ w5->addSpacing(8);
- QLabel *sortLabel = new QLabel;
+ QBoxLayout* srch_lo = new QVBoxLayout;
+ w5->addLayout(srch_lo);
+
+ QLabel *sortLabel = new QLabel(this);
sortLabel->setText(tr("Search in 'Label' and 'Name':"));
- w5->addWidget(sortLabel);
- w5->addSpacing(2);
+ srch_lo->addSpacing(8);
+ srch_lo->addWidget(sortLabel);
+ srch_lo->addSpacing(8);
sortBox = new QComboBox(this);
sortBox->setEditable(true);
@@ -3255,20 +3276,41 @@ PluginDialog::PluginDialog(QWidget* parent)
sortBox->addItems(sortItems);
sortBox->setMinimumSize(100, 10);
- w5->addWidget(sortBox);
- w5->addStretch(-1);
+ srch_lo->addWidget(sortBox);
+ //srch_lo->addStretch();
+ // FIXME: Adding this makes the whole bottom hlayout expand. Would like some space between lineedit and bottom.
+ // Same thing if spacers added to group box or Ok Cancel box.
+ //srch_lo->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Maximum));
- if (!sortBox->currentText().isEmpty())
- fillPlugs(sortBox->currentText());
+ fillPlugs();
+
+ pList->setSortingEnabled(true);
+
+ if(listSave.isEmpty())
+ {
+ //int sizes[] = { 110, 110, 0, 30, 30, 30, 30, 30, 50, 110, 110 };
+ int sizes[] = { 110, 110, 110, 30, 30, 30, 30, 30, 50, 110, 110 };
+ for (int i = 0; i < 11; ++i) {
+ //if (sizes[i] == 0) {
+ // pList->header()->setResizeMode(i, QHeaderView::Stretch);
+ // }
+ //else {
+ if (sizes[i] <= 50) // hack alert!
+ pList->header()->setResizeMode(i, QHeaderView::Fixed);
+ pList->header()->resizeSection(i, sizes[i]);
+ // }
+ }
+ pList->sortByColumn(0, Qt::AscendingOrder);
+ }
else
- fillPlugs(selectedPlugType);
+ pList->header()->restoreState(listSave);
connect(pList, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), SLOT(accept()));
connect(pList, SIGNAL(itemClicked(QTreeWidgetItem*,int)), SLOT(enableOkB()));
connect(cancelB, SIGNAL(clicked()), SLOT(reject()));
connect(okB, SIGNAL(clicked()), SLOT(accept()));
connect(plugSel, SIGNAL(buttonClicked(QAbstractButton*)), SLOT(fillPlugs(QAbstractButton*)));
- connect(sortBox, SIGNAL(editTextChanged(const QString&)),SLOT(fillPlugs(const QString&)));
+ connect(sortBox, SIGNAL(editTextChanged(const QString&)),SLOT(fillPlugs()));
sortBox->setFocus();
}
@@ -3295,39 +3337,74 @@ MusECore::Plugin* PluginDialog::value()
}
//---------------------------------------------------------
+// saveSettings
+//---------------------------------------------------------
+
+void PluginDialog::saveSettings()
+{
+ if (!sortBox->currentText().isEmpty()) {
+ bool found = false;
+ foreach (QString item, sortItems)
+ if(item == sortBox->currentText()) {
+ found = true;
+ break;
+ }
+ if(!found)
+ sortItems.push_front(sortBox->currentText());
+ }
+
+ ///sortColumn = pList->sortColumn();
+ QHeaderView* hdr = pList->header();
+ if(hdr)
+ {
+ ///sortOrder = hdr->sortIndicatorOrder();
+ listSave = hdr->saveState();
+ }
+ geometrySave = geometry();
+}
+
+//---------------------------------------------------------
// accept
//---------------------------------------------------------
void PluginDialog::accept()
{
- if (!sortBox->currentText().isEmpty()) {
- foreach (QString item, sortItems)
- if(item == sortBox->currentText()) {
- QDialog::accept();
- return;
- }
- sortItems.push_front(sortBox->currentText());
- }
+ saveSettings();
QDialog::accept();
}
//---------------------------------------------------------
+// reject
+//---------------------------------------------------------
+
+void PluginDialog::reject()
+{
+ saveSettings();
+ QDialog::reject();
+}
+
+//---------------------------------------------------------
// fillPlugs
//---------------------------------------------------------
void PluginDialog::fillPlugs(QAbstractButton* ab)
{
if (ab == allPlug)
- fillPlugs(SEL_ALL);
+ //fillPlugs(SEL_ALL);
+ selectedPlugType = SEL_ALL;
else if (ab == onlyM)
- fillPlugs(SEL_M);
+ //fillPlugs(SEL_M);
+ selectedPlugType = SEL_M;
else if (ab == onlyS)
- fillPlugs(SEL_S);
+ //fillPlugs(SEL_S);
+ selectedPlugType = SEL_S;
else if (ab == onlySM)
- fillPlugs(SEL_SM);
+ //fillPlugs(SEL_SM);
+ selectedPlugType = SEL_SM;
+ fillPlugs();
}
-void PluginDialog::fillPlugs(int nbr)
+void PluginDialog::fillPlugs()
{
pList->clear();
for (MusECore::iPlugin i = MusEGlobal::plugins.begin(); i != MusEGlobal::plugins.end(); ++i) {
@@ -3339,8 +3416,13 @@ void PluginDialog::fillPlugs(int nbr)
unsigned long ao = i->outports();
unsigned long ci = i->controlInPorts();
unsigned long co = i->controlOutPorts();
+ bool found = false;
+ QString sb_txt = sortBox->currentText().toLower();
+ if(sb_txt.isEmpty() || i->label().toLower().contains(sb_txt) || i->name().toLower().contains(sb_txt))
+ found = true;
+
bool addFlag = false;
- switch (nbr) {
+ switch (selectedPlugType) {
case SEL_SM: // stereo & mono
if ((ai == 1 || ai == 2) && (ao == 1 || ao ==2)) {
addFlag = true;
@@ -3360,45 +3442,7 @@ void PluginDialog::fillPlugs(int nbr)
addFlag = true;
break;
}
- if (addFlag) {
- QTreeWidgetItem* item = new QTreeWidgetItem;
- item->setText(0, i->lib());
- item->setText(1, i->label());
- item->setText(2, i->name());
- item->setText(3, QString().setNum(ai));
- item->setText(4, QString().setNum(ao));
- item->setText(5, QString().setNum(ci));
- item->setText(6, QString().setNum(co));
- item->setText(7, QString().setNum(i->inPlaceCapable()));
- item->setText(8, QString().setNum(i->id()));
- item->setText(9, i->maker());
- item->setText(10, i->copyright());
- pList->addTopLevelItem(item);
- }
- }
- selectedPlugType = nbr;
-}
-
-void PluginDialog::fillPlugs(const QString &sortValue)
-{
- pList->clear();
- for (MusECore::iPlugin i = MusEGlobal::plugins.begin(); i != MusEGlobal::plugins.end(); ++i) {
- //int ai = i->inports();
- //int ao = i->outports();
- //int ci = i->controlInPorts();
- //int co = i->controlOutPorts();
- unsigned long ai = i->inports(); // p4.0.21
- unsigned long ao = i->outports();
- unsigned long ci = i->controlInPorts();
- unsigned long co = i->controlOutPorts();
-
- bool addFlag = false;
-
- if (i->label().toLower().contains(sortValue.toLower()))
- addFlag = true;
- else if (i->name().toLower().contains(sortValue.toLower()))
- addFlag = true;
- if (addFlag) {
+ if (found && addFlag) {
QTreeWidgetItem* item = new QTreeWidgetItem;
item->setText(0, i->lib());
item->setText(1, i->label());
@@ -3415,7 +3459,7 @@ void PluginDialog::fillPlugs(const QString &sortValue)
}
}
}
-
+
//---------------------------------------------------------
// getPlugin
//---------------------------------------------------------
@@ -3423,9 +3467,12 @@ void PluginDialog::fillPlugs(const QString &sortValue)
MusECore::Plugin* PluginDialog::getPlugin(QWidget* parent)
{
PluginDialog* dialog = new PluginDialog(parent);
- if (dialog->exec())
- return dialog->value();
- return 0;
+ MusECore::Plugin* p = 0;
+ int rv = dialog->exec();
+ if(rv)
+ p = dialog->value();
+ delete dialog;
+ return p;
}
// TODO: We need to use .qrc files to use icons in WhatsThis bubbles. See Qt
diff --git a/muse2/muse/plugin.h b/muse2/muse/plugin.h
index 044fd863..717dc281 100644
--- a/muse2/muse/plugin.h
+++ b/muse2/muse/plugin.h
@@ -60,6 +60,8 @@ class QScrollArea;
class QToolButton;
class QToolButton;
class QTreeWidget;
+class QRect;
+class QByteArray;
namespace MusEGui {
class PluginGui;
@@ -578,25 +580,28 @@ class PluginGui : public QMainWindow {
enum { SEL_SM, SEL_S, SEL_M, SEL_ALL };
class PluginDialog : public QDialog {
+ Q_OBJECT
+
QTreeWidget* pList;
QRadioButton* allPlug;
QRadioButton* onlyM;
QRadioButton* onlyS;
QRadioButton* onlySM;
QPushButton *okB;
-
- Q_OBJECT
+ void saveSettings();
public:
PluginDialog(QWidget* parent=0);
static MusECore::Plugin* getPlugin(QWidget* parent);
MusECore::Plugin* value();
- void accept();
public slots:
+ void accept();
+ void reject();
void fillPlugs(QAbstractButton*);
- void fillPlugs(int i);
- void fillPlugs(const QString& sortValue);
+ //void fillPlugs(int i);
+ //void fillPlugs(const QString& sortValue);
+ void fillPlugs();
private slots:
void enableOkB();
@@ -605,6 +610,10 @@ class PluginDialog : public QDialog {
QComboBox *sortBox;
static int selectedPlugType;
static QStringList sortItems;
+ //static int sortColumn;
+ //static Qt::SortOrder sortOrder;
+ static QRect geometrySave;
+ static QByteArray listSave;
};
}
diff --git a/muse2/muse/widgets/CMakeLists.txt b/muse2/muse/widgets/CMakeLists.txt
index e5353465..bf71f51e 100644
--- a/muse2/muse/widgets/CMakeLists.txt
+++ b/muse2/muse/widgets/CMakeLists.txt
@@ -40,6 +40,7 @@ QT4_WRAP_CPP (widget_mocs
combobox.h
comment.h
ctrlcombo.h
+ custom_widget_actions.h
dentry.h
didyouknow.h
doublelabel.h
@@ -66,6 +67,7 @@ QT4_WRAP_CPP (widget_mocs
pasteeventsdialog.h
pitchedit.h
pitchlabel.h
+ pixmap_button.h
popupmenu.h
# posedit.h
poslabel.h
@@ -142,6 +144,7 @@ file (GLOB widgets_source_files
combobox.cpp
comment.cpp
ctrlcombo.cpp
+ custom_widget_actions.cpp
dentry.cpp
dimap.cpp
doublelabel.cpp
@@ -170,6 +173,7 @@ file (GLOB widgets_source_files
pasteeventsdialog.cpp
pitchedit.cpp
pitchlabel.cpp
+ pixmap_button.cpp
popupmenu.cpp
# posedit.cpp
poslabel.cpp
diff --git a/muse2/muse/widgets/custom_widget_actions.cpp b/muse2/muse/widgets/custom_widget_actions.cpp
new file mode 100644
index 00000000..952f5083
--- /dev/null
+++ b/muse2/muse/widgets/custom_widget_actions.cpp
@@ -0,0 +1,196 @@
+//=============================================================================
+// MusE
+// Linux Music Editor
+// custom_widget_actions.cpp
+// (C) Copyright 2011 Tim E. Real (terminator356 on users.sourceforge.net)
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; version 2 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//=============================================================================
+
+#include <QLabel>
+#include <QHBoxLayout>
+#include <QSignalMapper>
+#include <QPainter>
+#include <QPaintEvent>
+
+#include "icons.h"
+#include "pixmap_button.h"
+#include "custom_widget_actions.h"
+
+namespace MusEGui {
+
+//---------------------------------------------------------
+// PixmapButtonsHeaderWidgetAction
+//---------------------------------------------------------
+
+PixmapButtonsHeaderWidgetAction::PixmapButtonsHeaderWidgetAction(const QString& text, QPixmap* ref_pixmap, int channels, QWidget* parent)
+ : QWidgetAction(parent)
+{
+ _refPixmap = ref_pixmap;
+ _channels = channels;
+ _text = text;
+ // Just to be safe, set to -1 instead of default 0.
+ setData(-1);
+}
+
+QWidget* PixmapButtonsHeaderWidgetAction::createWidget(QWidget* parent)
+{
+ QWidget* lw = new QWidget(parent);
+ QHBoxLayout* layout = new QHBoxLayout(lw);
+
+ layout->setSpacing(0);
+
+ QLabel* lbl = new QLabel(_text, lw);
+ lbl->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+ lbl->setAlignment(Qt::AlignCenter);
+ lbl->setAutoFillBackground(true);
+ //QPalette palette;
+ //palette.setColor(label->backgroundRole(), c);
+ //lbl->setPalette(palette);
+ lbl->setBackgroundRole(QPalette::Dark);
+ layout->addWidget(lbl);
+
+ layout->addSpacing(8);
+ //layout->addStretch();
+
+ QSignalMapper* mapper = new QSignalMapper(this);
+
+ PixmapButton* pb = new PixmapButton(toggle_small_Icon, toggle_small_Icon, 2, lw, QString("T")); // Margin = 2
+ //mapper->setMapping(pb, _channels); // Set to one past end.
+ layout->addWidget(pb);
+ layout->addSpacing(6);
+ //connect(pb, SIGNAL(clicked(bool)), mapper, SLOT(map()));
+
+ for(int i = 0; i < _channels; ++i)
+ {
+ PixmapButton* b = new PixmapButton(_refPixmap, _refPixmap, 2, lw, QString::number(i + 1)); // Margin = 2
+ mapper->setMapping(b, i);
+ connect(b, SIGNAL(pressed()), mapper, SLOT(map()));
+ if((i != 0) && (i % 4 == 0))
+ layout->addSpacing(6);
+ layout->addWidget(b);
+ }
+
+ connect(mapper, SIGNAL(mapped(int)), this, SLOT(chanClickMap(int)));
+
+ return lw;
+}
+
+void PixmapButtonsHeaderWidgetAction::chanClickMap(int /*idx*/)
+{
+ // TODO: Toggle vertical columns... p4.0.42
+
+ trigger();
+}
+
+
+//---------------------------------------------------------
+// PixmapButtonsWidgetAction
+//---------------------------------------------------------
+
+PixmapButtonsWidgetAction::PixmapButtonsWidgetAction(const QString& text, QPixmap* on_pixmap, QPixmap* off_pixmap, int channels, int initial, QWidget* parent)
+ : QWidgetAction(parent)
+ {
+ _onPixmap = on_pixmap;
+ _offPixmap = off_pixmap;
+ _channels = channels;
+ _current = initial;
+ _text = text;
+ // Just to be safe, set to -1 instead of default 0.
+ setData(-1);
+ }
+
+QWidget* PixmapButtonsWidgetAction::createWidget(QWidget *parent)
+{
+ QWidget* lw = new QWidget(parent);
+ QHBoxLayout* layout = new QHBoxLayout(lw);
+
+ layout->setSpacing(0);
+
+ QLabel* lbl = new QLabel(_text, lw);
+ lbl->setAlignment(Qt::AlignCenter);
+ //lbl->setAutoFillBackground(true);
+ //QPalette palette;
+ //palette.setColor(label->backgroundRole(), c);
+ //lbl->setPalette(palette);
+ //lbl->setBackgroundRole(QPalette::Dark);
+ layout->addWidget(lbl);
+
+ layout->addSpacing(8);
+ layout->addStretch();
+
+ QSignalMapper* mapper = new QSignalMapper(this);
+
+ PixmapButton* pb = new PixmapButton(toggle_small_Icon, toggle_small_Icon, 2, lw); // Margin = 2
+ mapper->setMapping(pb, _channels); // Set to one past end.
+ layout->addWidget(pb);
+ layout->addSpacing(6);
+ connect(pb, SIGNAL(pressed()), mapper, SLOT(map()));
+
+ for(int i = 0; i < _channels; ++i)
+ {
+ bool set = _current & (1 << i);
+ PixmapButton* b = new PixmapButton(_onPixmap, _offPixmap, 2, lw); // Margin = 2
+ _chan_buttons.append(b);
+ b->setCheckable(true);
+ b->setDown(set);
+ mapper->setMapping(b, i);
+ connect(b, SIGNAL(toggled(bool)), mapper, SLOT(map()));
+ if((i != 0) && (i % 4 == 0))
+ layout->addSpacing(6);
+ layout->addWidget(b);
+ }
+
+ connect(mapper, SIGNAL(mapped(int)), this, SLOT(chanClickMap(int)));
+
+ return lw;
+}
+
+void PixmapButtonsWidgetAction::chanClickMap(int idx)
+{
+ if(idx == _channels) // One past end = Toggle all button.
+ {
+ int allch = (1 << _channels) - 1;
+ if((_current & allch) == allch)
+ _current = 0;
+ else
+ _current = allch;
+ // Set and redraw the buttons.
+ for(int i = 0; i < _channels; ++i)
+ _chan_buttons.at(i)->setDown(_current != 0);
+ }
+ else
+ {
+ int c = 0;
+ for(int i = 0; i < _channels; ++i)
+ {
+ if(_chan_buttons.at(i)->isChecked())
+ c |= (1 << i);
+ }
+ _current = c;
+ }
+
+ trigger();
+}
+
+void PixmapButtonsWidgetAction::setCurrentState(int state)
+{
+ _current = state;
+ // Set and redraw the buttons.
+ for(int i = 0; i < _channels; ++i)
+ _chan_buttons.at(i)->setDown((_current & (1 << i)) != 0);
+}
+
+} // namespace MusEGui
diff --git a/muse2/muse/widgets/custom_widget_actions.h b/muse2/muse/widgets/custom_widget_actions.h
new file mode 100644
index 00000000..c70da12d
--- /dev/null
+++ b/muse2/muse/widgets/custom_widget_actions.h
@@ -0,0 +1,86 @@
+//=========================================================
+// MusE
+// Linux Music Editor
+// custom_widget_actions.h
+// (C) Copyright 2011 Tim E. Real (terminator356 on users.sourceforge.net)
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; version 2 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//
+//=========================================================
+
+#ifndef __CUSTOM_WIDGET_ACTIONS_H__
+#define __CUSTOM_WIDGET_ACTIONS_H__
+
+#include <QWidgetAction>
+#include <QList>
+
+class QMouseEvent;
+class QPaintEvent;
+class QPixmap;
+
+namespace MusEGui {
+
+class PixmapButton;
+
+//---------------------------------------------------------
+// PixmapButtonsHeaderWidgetAction
+//---------------------------------------------------------
+
+class PixmapButtonsHeaderWidgetAction : public QWidgetAction {
+ Q_OBJECT
+ private:
+
+ QPixmap* _refPixmap;
+ QString _text;
+ int _channels;
+
+ private slots:
+ void chanClickMap(int);
+
+ public:
+ PixmapButtonsHeaderWidgetAction (const QString& text, QPixmap* ref_pixmap, int channels, QWidget* parent = 0);
+ QWidget* createWidget(QWidget* parent);
+ };
+//---------------------------------------------------------
+// PixmapButtonsWidgetAction
+//---------------------------------------------------------
+
+class PixmapButtonsWidgetAction : public QWidgetAction {
+ Q_OBJECT
+ private:
+
+ QString _text;
+ int _channels;
+ int _current;
+ QPixmap* _onPixmap;
+ QPixmap* _offPixmap;
+ QList<PixmapButton*> _chan_buttons;
+
+ private slots:
+ void chanClickMap(int);
+
+ public:
+ PixmapButtonsWidgetAction(const QString& text,
+ QPixmap* on_pixmap, QPixmap* off_pixmap,
+ int channels, int initial,
+ QWidget* parent = 0);
+
+ QWidget* createWidget(QWidget* parent);
+ int currentState() const { return _current; }
+ void setCurrentState(int state);
+ };
+
+} // namespace MusEGui
+#endif // __CUSTOM_WIDGET_ACTIONS_H__
diff --git a/muse2/muse/widgets/doublelabel.cpp b/muse2/muse/widgets/doublelabel.cpp
index dbf7e035..a4b4c9c7 100644
--- a/muse2/muse/widgets/doublelabel.cpp
+++ b/muse2/muse/widgets/doublelabel.cpp
@@ -180,7 +180,7 @@ void DoubleLabel::setPrecision(int v)
QSize DoubleLabel::sizeHint() const
{
QFontMetrics fm = fontMetrics();
- int h = fm.height() + 4;
+ int h = fm.height() + 5;
int n = _precision;
++n; // For some reason I have to add one digit. Shouldn't have to.
diff --git a/muse2/muse/widgets/mtrackinfo.cpp b/muse2/muse/widgets/mtrackinfo.cpp
index 7952308e..f9d0e5a9 100644
--- a/muse2/muse/widgets/mtrackinfo.cpp
+++ b/muse2/muse/widgets/mtrackinfo.cpp
@@ -99,13 +99,23 @@ MidiTrackInfo::MidiTrackInfo(QWidget* parent, MusECore::Track* sel_track) : QWid
pan = -65;
volume = -1;
- setFont(MusEGlobal::config.fonts[2]);
+ setFont(MusEGlobal::config.fonts[1]);
//iChanDetectLabel->setPixmap(*darkgreendotIcon);
iChanDetectLabel->setPixmap(*darkRedLedIcon);
recEchoButton->setIcon((selected && ((MusECore::MidiTrack*)selected)->recEcho()) ? QIcon(*midiThruOnIcon) : QIcon(*midiThruOffIcon));
recEchoButton->setIconSize(midiThruOnIcon->size());
+ //recEchoButton->setOffPixmap(midiThruOffIcon);
+ //recEchoButton->setOnPixmap(midiThruOnIcon);
+
+ iRButton->setIcon(QIcon(*routesMidiInIcon));
+ iRButton->setIconSize(routesMidiInIcon->size());
+ //iRButton->setOffPixmap(routesMidiInIcon);
+
+ oRButton->setIcon(QIcon(*routesMidiOutIcon));
+ oRButton->setIconSize(routesMidiOutIcon->size());
+ //oRButton->setOffPixmap(routesMidiOutIcon);
// MusE-2: AlignCenter and WordBreak are set in the ui(3) file, but not supported by QLabel. Turn them on here.
trackNameLabel->setAlignment(Qt::AlignCenter);
@@ -159,7 +169,7 @@ MidiTrackInfo::MidiTrackInfo(QWidget* parent, MusECore::Track* sel_track) : QWid
connect(iPatch, SIGNAL(released()), SLOT(instrPopup()));
- ///pop = new QMenu(iPatch);
+ //pop = new QMenu(iPatch);
//pop->setCheckable(false); // not needed in Qt4
// Removed by Tim. p3.3.9
@@ -529,7 +539,7 @@ void MidiTrackInfo::configChanged()
// canvas->setBg(QPixmap(MusEGlobal::config.canvasBgPixmap));
//}
- setFont(MusEGlobal::config.fonts[2]);
+ setFont(MusEGlobal::config.fonts[1]);
//updateTrackInfo(type);
}
@@ -671,9 +681,11 @@ void MidiTrackInfo::inRoutesPressed()
if(!selected->isMidiTrack())
return;
- RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
- iRButton->setDown(false);
+ //RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
+ RoutePopupMenu* pup = new RoutePopupMenu();
pup->exec(QCursor::pos(), selected, false);
+ delete pup;
+ iRButton->setDown(false);
}
//---------------------------------------------------------
@@ -687,9 +699,11 @@ void MidiTrackInfo::outRoutesPressed()
if(!selected->isMidiTrack())
return;
- RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
- oRButton->setDown(false);
+ //RoutePopupMenu* pup = MusEGlobal::muse->getRoutingPopupMenu();
+ RoutePopupMenu* pup = new RoutePopupMenu();
pup->exec(QCursor::pos(), selected, true);
+ delete pup;
+ oRButton->setDown(false);
}
//---------------------------------------------------------
diff --git a/muse2/muse/widgets/mtrackinfobase.ui b/muse2/muse/widgets/mtrackinfobase.ui
index 4a4b9c37..0bf58d76 100644
--- a/muse2/muse/widgets/mtrackinfobase.ui
+++ b/muse2/muse/widgets/mtrackinfobase.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>98</width>
- <height>447</height>
+ <width>93</width>
+ <height>417</height>
</rect>
</property>
<property name="sizePolicy">
@@ -59,7 +59,7 @@
<property name="spacing">
<number>0</number>
</property>
- <item row="0" column="0" colspan="3">
+ <item row="0" column="0" colspan="2">
<widget class="QLabel" name="trackNameLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Minimum">
@@ -72,7 +72,7 @@
</property>
</widget>
</item>
- <item row="1" column="0" colspan="3">
+ <item row="1" column="0" colspan="2">
<widget class="QComboBox" name="iOutput">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Fixed">
@@ -110,7 +110,7 @@
</property>
</widget>
</item>
- <item row="2" column="2">
+ <item row="2" column="1">
<widget class="QLabel" name="TextLabel2">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -140,7 +140,7 @@
<item>
<widget class="QToolButton" name="iRButton">
<property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -149,33 +149,16 @@
<string>input routing</string>
</property>
<property name="text">
- <string>iR</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="oRButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>output routing</string>
+ <string/>
</property>
- <property name="text">
- <string>oR</string>
+ <property name="iconSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
</property>
</widget>
</item>
- </layout>
- </item>
- <item row="3" column="2">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <property name="spacing">
- <number>0</number>
- </property>
<item>
<widget class="QLabel" name="iChanDetectLabel">
<property name="sizePolicy">
@@ -192,6 +175,9 @@
program change, and pitchbend (but not sysex or realtime) events
on the selected channels, on the selected midi ports.</string>
</property>
+ <property name="lineWidth">
+ <number>0</number>
+ </property>
<property name="text">
<string>W</string>
</property>
@@ -202,7 +188,7 @@
<bool>false</bool>
</property>
<property name="margin">
- <number>2</number>
+ <number>1</number>
</property>
<property name="indent">
<number>-1</number>
@@ -212,7 +198,7 @@
<item>
<widget class="QToolButton" name="recEchoButton">
<property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -223,12 +209,31 @@
<property name="whatsThis">
<string>Pass input events through ('thru') to output.</string>
</property>
+ <property name="text">
+ <string/>
+ </property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
+ <widget class="QToolButton" name="oRButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>output routing</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
<spacer name="echoSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -271,7 +276,7 @@
</property>
</widget>
</item>
- <item row="4" column="2">
+ <item row="4" column="1" rowspan="2">
<widget class="QLabel" name="TextLabel9">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -290,7 +295,7 @@
</property>
</widget>
</item>
- <item row="5" column="0">
+ <item row="5" column="0" rowspan="2">
<widget class="MusEGui::SpinBox" name="iVerz">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -312,7 +317,7 @@
</property>
</widget>
</item>
- <item row="5" column="2">
+ <item row="6" column="1">
<widget class="QLabel" name="TextLabel10">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -331,7 +336,7 @@
</property>
</widget>
</item>
- <item row="6" column="0">
+ <item row="7" column="0">
<widget class="MusEGui::SpinBox" name="iLen">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
@@ -356,7 +361,7 @@
</property>
</widget>
</item>
- <item row="6" column="2">
+ <item row="7" column="1">
<widget class="QLabel" name="TextLabel11">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -375,7 +380,7 @@
</property>
</widget>
</item>
- <item row="7" column="0">
+ <item row="8" column="0">
<widget class="MusEGui::SpinBox" name="iAnschl">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -403,7 +408,7 @@
</property>
</widget>
</item>
- <item row="7" column="2">
+ <item row="8" column="1">
<widget class="QLabel" name="TextLabel12">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -422,7 +427,7 @@
</property>
</widget>
</item>
- <item row="8" column="0">
+ <item row="9" column="0">
<widget class="MusEGui::SpinBox" name="iKompr">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
@@ -450,7 +455,7 @@
</property>
</widget>
</item>
- <item row="8" column="2">
+ <item row="9" column="1">
<widget class="QLabel" name="TextLabel13">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -469,7 +474,7 @@
</property>
</widget>
</item>
- <item row="9" column="0" colspan="3">
+ <item row="10" column="0" colspan="2">
<widget class="QLabel" name="TextLabel1_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Maximum">
@@ -500,7 +505,7 @@
</property>
</widget>
</item>
- <item row="10" column="0" colspan="3">
+ <item row="11" column="0" colspan="2">
<widget class="QPushButton" name="iPatch">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Fixed">
@@ -516,7 +521,7 @@
</property>
</widget>
</item>
- <item row="11" column="0">
+ <item row="12" column="0">
<widget class="QLabel" name="textLabel1">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -535,7 +540,7 @@
</property>
</widget>
</item>
- <item row="11" column="1" colspan="2">
+ <item row="12" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>0</number>
@@ -574,7 +579,7 @@
</item>
</layout>
</item>
- <item row="12" column="0">
+ <item row="13" column="0">
<widget class="MusEGui::SpinBox" name="iHBank">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -602,7 +607,7 @@
</property>
</widget>
</item>
- <item row="12" column="1" colspan="2">
+ <item row="13" column="1">
<widget class="QLabel" name="TextLabel4">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -627,7 +632,7 @@
</property>
</widget>
</item>
- <item row="13" column="0">
+ <item row="14" column="0">
<widget class="MusEGui::SpinBox" name="iLBank">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -655,7 +660,7 @@
</property>
</widget>
</item>
- <item row="13" column="1" colspan="2">
+ <item row="14" column="1">
<widget class="QLabel" name="TextLabel5">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -680,7 +685,7 @@
</property>
</widget>
</item>
- <item row="14" column="0">
+ <item row="15" column="0">
<widget class="MusEGui::SpinBox" name="iProgram">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -708,7 +713,7 @@
</property>
</widget>
</item>
- <item row="14" column="1" colspan="2">
+ <item row="15" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="spacing">
<number>0</number>
@@ -747,7 +752,7 @@
</item>
</layout>
</item>
- <item row="15" column="0">
+ <item row="16" column="0">
<widget class="MusEGui::SpinBox" name="iLautst">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -775,7 +780,7 @@
</property>
</widget>
</item>
- <item row="15" column="1" colspan="2">
+ <item row="16" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="spacing">
<number>0</number>
@@ -814,7 +819,7 @@
</item>
</layout>
</item>
- <item row="16" column="0">
+ <item row="17" column="0">
<widget class="MusEGui::SpinBox" name="iPan">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -845,7 +850,7 @@
</property>
</widget>
</item>
- <item row="16" column="1" colspan="2">
+ <item row="17" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<property name="spacing">
<number>0</number>
@@ -884,7 +889,7 @@
</item>
</layout>
</item>
- <item row="17" column="2">
+ <item row="18" column="0">
<spacer name="spacer5">
<property name="orientation">
<enum>Qt::Vertical</enum>
diff --git a/muse2/muse/widgets/mtscale.cpp b/muse2/muse/widgets/mtscale.cpp
index 6211574d..3131adcc 100644
--- a/muse2/muse/widgets/mtscale.cpp
+++ b/muse2/muse/widgets/mtscale.cpp
@@ -235,7 +235,7 @@ void MTScale::pdraw(QPainter& p, const QRect& r)
int y = 12;
p.setPen(Qt::black);
- p.setFont(MusEGlobal::config.fonts[4]);
+ p.setFont(MusEGlobal::config.fonts[5]);
p.drawLine(r.x(), y+1, r.x() + r.width(), y+1);
QRect tr(r);
tr.setHeight(12);
@@ -425,7 +425,7 @@ void MTScale::pdraw(QPainter& p, const QRect& r)
else {
num = beat + 1;
y1 = y + 7;
- p.setFont(MusEGlobal::config.fonts[1]);
+ p.setFont(MusEGlobal::config.fonts[4]);
r.setY(y+3);
}
s.setNum(num);
diff --git a/muse2/muse/widgets/mtscale_flo.cpp b/muse2/muse/widgets/mtscale_flo.cpp
index c54ef1ad..5cf070f6 100644
--- a/muse2/muse/widgets/mtscale_flo.cpp
+++ b/muse2/muse/widgets/mtscale_flo.cpp
@@ -194,7 +194,7 @@ void MTScaleFlo::draw(QPainter& p, const QRect& r)
int y = 12;
p.setPen(Qt::black);
- p.setFont(MusEGlobal::config.fonts[4]);
+ p.setFont(MusEGlobal::config.fonts[5]);
p.drawLine(r.x(), y+1, r.x() + r.width(), y+1);
QRect tr(r);
tr.setHeight(12);
@@ -319,7 +319,7 @@ void MTScaleFlo::draw(QPainter& p, const QRect& r)
else {
num = beat + 1;
y1 = y + 7;
- p.setFont(MusEGlobal::config.fonts[1]);
+ p.setFont(MusEGlobal::config.fonts[4]);
r.setY(y+3);
}
s.setNum(num);
diff --git a/muse2/muse/widgets/musewidgetsplug.cpp b/muse2/muse/widgets/musewidgetsplug.cpp
index 32a886fa..5267436f 100644
--- a/muse2/muse/widgets/musewidgetsplug.cpp
+++ b/muse2/muse/widgets/musewidgetsplug.cpp
@@ -117,11 +117,11 @@ MusEGlobal::GlobalConfigValues config = {
QColor(200, 200, 200), // waveEditBackgroundColor;
{
QFont(QString("arial"), 10, QFont::Normal),
- QFont(QString("arial"), 8, QFont::Normal),
+ QFont(QString("arial"), 7, QFont::Normal), // Mixer strips and midi track info panel
QFont(QString("arial"), 10, QFont::Normal),
QFont(QString("arial"), 10, QFont::Bold),
- QFont(QString("arial"), 8, QFont::Bold), // timescale numbers
- QFont(QString("Lucidatypewriter"), 14, QFont::Bold),
+ QFont(QString("arial"), 8, QFont::Normal), // Small numbers: Timescale and markers, part name overlay
+ QFont(QString("arial"), 8, QFont::Bold), // Small bold numbers such as marker text
QFont(QString("arial"), 8, QFont::Bold, true) // Mixer strip labels. Looks and fits better with bold + italic than bold alone,
// at the price of only few more pixels than Normal mode.
},
@@ -175,8 +175,6 @@ MusEGlobal::GlobalConfigValues config = {
QRect(0, 0, 400, 300), // GeometryMain;
QRect(0, 0, 200, 100), // GeometryTransport;
QRect(0, 0, 600, 200), // GeometryBigTime;
- QRect(0, 0, 400, 300), // GeometryPianoroll;
- QRect(0, 0, 400, 300), // GeometryDrumedit;
//QRect(0, 0, 300, 500), // GeometryMixer; // Obsolete
{
QString("Mixer A"),
@@ -194,14 +192,15 @@ MusEGlobal::GlobalConfigValues config = {
false, // BigTimeVisible;
false, // mixer1Visible;
false, // mixer2Visible;
-
false, // markerVisible; // This line was missing 2007-01-08 (willyfoobar)
+ true, // arrangerVisible;
true, // showSplashScreen
1, // canvasShowPartType 1 - names, 2 events
5, // canvasShowPartEvent
false, // canvasShowGrid;
QString(""), // canvasBgPixmap;
- QString(""), // styleSheetFile
+ QStringList(), // canvasCustomBgList
+ QString(""), // default styleSheetFile - For built-in set to ":/style.qss"
QString(""), // style
QString(""), // externalWavEditor //this line was missing 2007-01-08 (willyfoobar)
false, // useOldStyleStopShortCut
@@ -211,15 +210,17 @@ MusEGlobal::GlobalConfigValues config = {
true, // showDidYouKnow
false, // vstInPlace Enable VST in-place processing
44100, // Dummy audio preferred sample rate
- 512 // Dummy audio buffer size
+ 512, // Dummy audio buffer size
QString("./"), // projectBaseFolder
true, // projectStoreInFolder
true, // useProjectSaveDialog
64, // minControlProcessPeriod
false, // popupsDefaultStayOpen
false, // leftMouseButtonCanDecrease
- false, // rangeMarkerWithoutMMBCheckBox
- MusECore::DONT_REC_MUTED_OR_HIDDEN
+ false, // rangeMarkerWithoutMMB
+ MusECore::DONT_REC_MUTED_OR_HIDDEN,
+ true, // addHiddenTracks
+ true // unhideTracks
};
//---------------------------------------------------------
diff --git a/muse2/muse/widgets/pixmap_button.cpp b/muse2/muse/widgets/pixmap_button.cpp
new file mode 100644
index 00000000..6b706474
--- /dev/null
+++ b/muse2/muse/widgets/pixmap_button.cpp
@@ -0,0 +1,174 @@
+//=============================================================================
+// MusE
+// Linux Music Editor
+// pixmap_button.cpp
+// (C) Copyright 2011 Tim E. Real (terminator356 on users.sourceforge.net)
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; version 2 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//=============================================================================
+
+#include <QString>
+#include <QWidget>
+#include <QSize>
+#include <QFont>
+#include <QPainter>
+#include <QPixmap>
+#include <QPaintEvent>
+#include <QMouseEvent>
+
+#include "pixmap_button.h"
+
+namespace MusEGui {
+
+PixmapButton::PixmapButton(QWidget* parent)
+ : QWidget(parent)
+{
+ _onPixmap = 0;
+ _offPixmap = 0;
+ _margin = 0;
+ _checked = false;
+ _checkable = false;
+
+ QFont fnt = font();
+ fnt.setPointSize(8);
+ setFont(fnt);
+}
+
+PixmapButton::PixmapButton(QPixmap* on_pixmap, QPixmap* off_pixmap, int margin, QWidget* parent, const QString& text)
+ : QWidget(parent)
+{
+ _text = text;
+ _onPixmap = on_pixmap;
+ _offPixmap = off_pixmap;
+ _margin = margin;
+ _checked = false;
+ _checkable = false;
+ if(_offPixmap)
+ setMinimumSize(_offPixmap->size().width() + 2*_margin, _offPixmap->size().height() + 2*_margin);
+ else
+ setMinimumSize(10 + 2*_margin, 10 + 2*_margin);
+ //font().s
+
+ QFont fnt = font();
+ fnt.setPointSize(8);
+ setFont(fnt);
+}
+
+QSize PixmapButton::minimumSizeHint () const
+{
+ return QSize(10, 10);
+}
+
+void PixmapButton::setMargin(int v)
+{
+ _margin = v;
+ if(_offPixmap)
+ setMinimumSize(_offPixmap->size().width() + 2*_margin, _offPixmap->size().height() + 2*_margin);
+ update();
+}
+
+void PixmapButton::setOffPixmap(QPixmap* pm)
+{
+ _offPixmap = pm;
+ if(_offPixmap)
+ setMinimumSize(_offPixmap->size().width() + 2*_margin, _offPixmap->size().height() + 2*_margin);
+ else
+ setMinimumSize(10 + 2*_margin, 10 + 2*_margin);
+ update();
+}
+
+void PixmapButton::setOnPixmap(QPixmap* pm)
+{
+ _onPixmap = pm;
+ update();
+}
+
+void PixmapButton::setCheckable(bool v)
+{
+ _checkable = v;
+ if(!_checkable)
+ _checked = false;
+ update();
+}
+
+void PixmapButton::setChecked(bool v)
+{
+ if(!_checkable)
+ return;
+ if(_checked == v)
+ return;
+ _checked = v;
+ update();
+ emit toggled(_checked);
+}
+
+void PixmapButton::setDown(bool v)
+{
+ if(!_checkable)
+ return;
+ if(_checked == v)
+ return;
+ _checked = v;
+ update();
+}
+
+void PixmapButton::paintEvent(QPaintEvent* e)
+{
+ QWidget::paintEvent(e);
+ QPainter p(this);
+ int w2 = width() / 2;
+ int h2 = height() / 2;
+ int mw = _offPixmap->size().width();
+ int mh = _offPixmap->size().height();
+ int mw2 = mw / 2;
+ int mh2 = mh / 2;
+ if(!_text.isEmpty())
+ //p.drawText(w2 - mw2, h2 - mh2, mw, mh, *pm);
+ p.drawText(_margin, height() - _margin, _text);
+ else
+ {
+ QPixmap* pm = _checked ? _onPixmap : _offPixmap;
+ if(pm)
+ p.drawPixmap(w2 - mw2, h2 - mh2, mw, mh, *pm);
+ }
+}
+
+void PixmapButton::mousePressEvent(QMouseEvent* e)
+{
+ //if(e->button() != Qt::LeftButton)
+ // return;
+ if(_checkable)
+ _checked = !_checked;
+ update();
+
+ emit pressed();
+ if(_checkable)
+ emit toggled(_checked);
+
+ //e->setAccepted(true); // This makes menu not close when mouse is released. May be desireable with many small buttons...
+ QWidget::mousePressEvent(e);
+}
+
+void PixmapButton::mouseReleaseEvent(QMouseEvent* e)
+{
+ //if(e->button() != Qt::LeftButton)
+ // return;
+ emit clicked(_checked);
+
+ //e->setAccepted(true); // This makes menu not close when mouse is released. May be desireable with many small buttons...
+ QWidget::mouseReleaseEvent(e);
+}
+
+} // MusEGui \ No newline at end of file
diff --git a/muse2/muse/widgets/pixmap_button.h b/muse2/muse/widgets/pixmap_button.h
new file mode 100644
index 00000000..448b17cb
--- /dev/null
+++ b/muse2/muse/widgets/pixmap_button.h
@@ -0,0 +1,87 @@
+//=========================================================
+// MusE
+// Linux Music Editor
+// pixmap_button.h
+// (C) Copyright 2011 Tim E. Real (terminator356 on users.sourceforge.net)
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; version 2 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//
+//=========================================================
+
+#ifndef __PIXMAP_BUTTON_H__
+#define __PIXMAP_BUTTON_H__
+
+#include <QWidget>
+
+class QMouseEvent;
+class QPaintEvent;
+class QPixmap;
+class QString;
+
+namespace MusEGui {
+
+//---------------------------------------------------------
+// PixmapButton
+//---------------------------------------------------------
+
+class PixmapButton : public QWidget
+{
+ Q_OBJECT
+
+ Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable)
+ Q_PROPERTY(bool checked READ isChecked WRITE setChecked)
+ //Q_PROPERTY(QPixmap* offPixmap READ offPixmap WRITE setOffPixmap)
+ //Q_PROPERTY(QPixmap* onPixmap READ onPixmap WRITE setOnPixmap)
+ Q_PROPERTY(int margin READ margin WRITE setMargin)
+
+ private:
+ QString _text;
+ bool _checkable;
+ bool _checked;
+ int _margin;
+ QPixmap* _onPixmap;
+ QPixmap* _offPixmap;
+
+ protected:
+ virtual void paintEvent(QPaintEvent* );
+ virtual void mousePressEvent(QMouseEvent* );
+ virtual void mouseReleaseEvent(QMouseEvent* );
+
+ signals:
+ void clicked(bool checked = false);
+ void toggled(bool checked = false);
+ void pressed();
+
+ public:
+ PixmapButton(QWidget* parent = 0);
+ PixmapButton(QPixmap* on_pixmap, QPixmap* off_pixmap, int margin, QWidget* parent = 0, const QString& text = QString());
+ virtual QSize minimumSizeHint () const;
+ virtual bool margin() const { return _margin; }
+ virtual void setMargin(int v);
+ virtual bool isChecked() const { return _checked; }
+ virtual void setChecked(bool);
+ virtual bool isDown() const { return _checked; }
+ virtual void setDown(bool);
+ virtual bool isCheckable() const { return _checkable; }
+ virtual void setCheckable(bool);
+ virtual QPixmap* offPixmap() const { return _offPixmap; }
+ virtual void setOffPixmap(QPixmap*);
+ virtual QPixmap* onPixmap() const { return _onPixmap; }
+ virtual void setOnPixmap(QPixmap*);
+};
+
+
+} // MusEGui
+#endif // __PIXMAP_BUTTON_H__ \ No newline at end of file
diff --git a/muse2/muse/widgets/popupmenu.cpp b/muse2/muse/widgets/popupmenu.cpp
index af870975..a34418a4 100644
--- a/muse2/muse/widgets/popupmenu.cpp
+++ b/muse2/muse/widgets/popupmenu.cpp
@@ -33,7 +33,7 @@
#include <QApplication>
//#include <QTimer>
-#include <stdio.h>
+//#include <stdio.h>
//#include <QStandardItemModel>
#include "popupmenu.h"
@@ -70,13 +70,10 @@ PopupMenu::PopupMenu(const QString& title, QWidget* parent, bool stayOpen)
init();
}
-PopupMenu::~PopupMenu()
-{
- //printf("PopupMenu::~PopupMenu\n");
-}
-
void PopupMenu::init()
{
+ //printf("PopupMenu::init this:%p\n", this);
+
// Menus will trigger! Set to make sure our trigger handlers ignore menus.
menuAction()->setData(-1);
@@ -92,8 +89,14 @@ void PopupMenu::init()
#endif // POPUP_MENU_DISABLE_AUTO_SCROLL
}
+// NOTE: Tested all RoutePopupMenu and PopupMenu dtors and a couple of action dtors from our
+// PixmapButtonsHeaderWidgetAction and PixmapButtonsWidgetAction:
+// This does not appear to be required any more. All submenus and actions are being deleted now. p4.0.43
+/*
void PopupMenu::clear()
{
+ //printf("PopupMenu::clear this:%p\n", this);
+
QList<QAction*> list = actions();
for(int i = 0; i < list.size(); ++i)
{
@@ -103,6 +106,7 @@ void PopupMenu::clear()
{
menu->clear(); // Recursive.
act->setMenu(0); // CHECK: Is this OK?
+ //printf(" deleting menu:%p\n", menu);
delete menu;
}
}
@@ -115,6 +119,7 @@ void PopupMenu::clear()
connect(timer, SIGNAL(timeout()), SLOT(timerHandler()));
#endif // POPUP_MENU_DISABLE_AUTO_SCROLL
}
+*/
void PopupMenu::clearAllChecks() const
{
diff --git a/muse2/muse/widgets/popupmenu.h b/muse2/muse/widgets/popupmenu.h
index 7fc07698..1848d3af 100644
--- a/muse2/muse/widgets/popupmenu.h
+++ b/muse2/muse/widgets/popupmenu.h
@@ -75,8 +75,7 @@ class PopupMenu : public QMenu
PopupMenu(bool stayOpen);
PopupMenu(QWidget* parent=0, bool stayOpen = false);
PopupMenu(const QString& title, QWidget* parent = 0, bool stayOpen = false);
- ~PopupMenu();
- void clear();
+ ///void clear();
QAction* findActionFromData(const QVariant&) const;
bool stayOpen() const { return _stayOpen; }
void clearAllChecks() const;
diff --git a/muse2/muse/widgets/routepopup.cpp b/muse2/muse/widgets/routepopup.cpp
index 0f1f8264..3e2ad008 100644
--- a/muse2/muse/widgets/routepopup.cpp
+++ b/muse2/muse/widgets/routepopup.cpp
@@ -34,6 +34,10 @@
#include "menutitleitem.h"
#include "popupmenu.h"
+#include "custom_widget_actions.h"
+#include "globaldefs.h"
+#define _USE_CUSTOM_WIDGET_ACTIONS_
+
namespace MusEGui {
//---------------------------------------------------------
@@ -617,7 +621,22 @@ int RoutePopupMenu::nonSyntiTrackAddSyntis(MusECore::AudioTrack* t, PopupMenu* l
int RoutePopupMenu::addMidiPorts(MusECore::AudioTrack* t, PopupMenu* pup, int id, bool isOutput)
{
+
+#ifndef _USE_CUSTOM_WIDGET_ACTIONS_
+
QAction* act;
+
+#endif
+
+#ifdef _USE_CUSTOM_WIDGET_ACTIONS_
+
+ PixmapButtonsHeaderWidgetAction* wa_hdr = new PixmapButtonsHeaderWidgetAction("Output port/device", darkRedLedIcon, MIDI_CHANNELS, pup);
+ pup->addAction(wa_hdr);
+ ++id;
+#else
+ pup->addAction(new MenuTitleItem("Output port/device", pup));
+#endif
+
for(int i = 0; i < MIDI_PORTS; ++i)
{
MusECore::MidiPort* mp = &MusEGlobal::midiPorts[i];
@@ -626,19 +645,16 @@ int RoutePopupMenu::addMidiPorts(MusECore::AudioTrack* t, PopupMenu* pup, int id
// This is desirable, but could lead to 'hidden' routes unless we add more support
// such as removing the existing routes when user changes flags.
// So for now, just list all valid ports whether read or write.
- if(!md)
- continue;
- //if(!(md->rwFlags() & (isOutput ? 1 : 2)))
+ //if(!md)
// continue;
+ if(!md || !(md->rwFlags() & (isOutput ? 2 : 1))) // If this is an input click we are looking for midi outputs here.
+ continue;
// Do not list synth devices!
if(md->isSynti())
continue;
- MusECore::RouteList* rl = isOutput ? t->outRoutes() : t->inRoutes();
-
- PopupMenu* subp = new PopupMenu(pup, true);
- subp->setTitle(md->name());
+ MusECore::RouteList* rl = isOutput ? t->outRoutes() : t->inRoutes();
int chanmask = 0;
// To reduce number of routes required, from one per channel to just one containing a channel mask.
@@ -653,6 +669,21 @@ int RoutePopupMenu::addMidiPorts(MusECore::AudioTrack* t, PopupMenu* pup, int id
}
}
+#ifdef _USE_CUSTOM_WIDGET_ACTIONS_
+
+ PixmapButtonsWidgetAction* wa = new PixmapButtonsWidgetAction(QString::number(i + 1) + ":" + md->name(),
+ redLedIcon, darkRedLedIcon,MIDI_CHANNELS, chanmask, pup);
+ MusECore::Route srcRoute(i, 0); // Ignore the routing channels - our action holds the channels.
+ //wa->setData(id++);
+ wa->setData(qVariantFromValue(srcRoute));
+ pup->addAction(wa);
+ ++id;
+
+#else
+
+ PopupMenu* subp = new PopupMenu(pup, true);
+ subp->setTitle(md->name());
+
for(int ch = 0; ch < MIDI_CHANNELS; ++ch)
{
act = subp->addAction(QString("Channel %1").arg(ch+1));
@@ -677,6 +708,9 @@ int RoutePopupMenu::addMidiPorts(MusECore::AudioTrack* t, PopupMenu* pup, int id
++id;
pup->addMenu(subp);
+
+#endif // _USE_CUSTOM_WIDGET_ACTIONS_
+
}
return id;
}
@@ -687,29 +721,22 @@ int RoutePopupMenu::addMidiPorts(MusECore::AudioTrack* t, PopupMenu* pup, int id
//======================
RoutePopupMenu::RoutePopupMenu(QWidget* parent, MusECore::Track* track, bool isOutput)
- : _track(track), _isOutMenu(isOutput)
+ //: _track(track), _isOutMenu(isOutput)
+ : PopupMenu(parent, true), _track(track), _isOutMenu(isOutput)
{
- _pup = new PopupMenu(parent, true);
init();
}
RoutePopupMenu::RoutePopupMenu(const QString& title, QWidget* parent, MusECore::Track* track, bool isOutput)
- : _track(track), _isOutMenu(isOutput)
+ //: _track(track), _isOutMenu(isOutput)
+ : PopupMenu(title, parent, true), _track(track), _isOutMenu(isOutput)
{
- _pup = new PopupMenu(title, parent, true);
init();
}
-RoutePopupMenu::~RoutePopupMenu()
-{
- //printf("RoutePopupMenu::~RoutePopupMenu\n");
- // Make sure to clear which clears and deletes any sub popups.
- _pup->clear();
- delete _pup;
-}
-
void RoutePopupMenu::init()
{
+ //printf("RoutePopupMenu::init this:%p\n", this);
connect(MusEGlobal::song, SIGNAL(songChanged(int)), SLOT(songChanged(int)));
}
@@ -726,15 +753,19 @@ void RoutePopupMenu::updateRouteMenus()
// In case for some reason a route could not be added (or removed).
// Then the item will be properly un-checked (or checked) here.
+ // TODO Fix this up a bit. It doesn't quite respond to complete removal, and other situations are a bit odd.
+ // Best to ignore it for now since it only half-works. p4.0.42
+
+/*
//printf("RoutePopupMenu::updateRouteMenus\n");
- if(!_track || !_pup || _pup->actions().isEmpty() || !_pup->isVisible())
+ if(!_track || actions().isEmpty() || !isVisible())
return;
MusECore::RouteList* rl = _isOutMenu ? _track->outRoutes() : _track->inRoutes();
// Clear all the action check marks.
- _pup->clearAllChecks();
+ clearAllChecks();
// Take care of Midi Port to Audio Input routes first...
if(_isOutMenu && _track->isMidiTrack())
@@ -754,10 +785,13 @@ void RoutePopupMenu::updateRouteMenus()
if(ir->channel & chbits)
{
MusECore::Route r(ir->track, chbits);
- //printf("RoutePopupMenu::updateRouteMenus MusECore::MidiPort to AudioInput chbits:%d\n", chbits);
- QAction* act = _pup->findActionFromData(qVariantFromValue(r));
+ //printf("RoutePopupMenu::updateRouteMenus MusECore::MidiPort to AudioInput chbits:%d\n", chbits); //
+ QAction* act = findActionFromData(qVariantFromValue(r));
if(act)
+ {
+ //printf(" ... Found\n"); //
act->setChecked(true);
+ }
}
}
}
@@ -771,6 +805,25 @@ void RoutePopupMenu::updateRouteMenus()
// Do MidiTrack to MidiPort routes...
if(irl->type == MusECore::Route::MIDI_PORT_ROUTE)
{
+
+#ifdef _USE_CUSTOM_WIDGET_ACTIONS_
+
+ // Widget action handles channels. Look for route with channels ignored and set to zero.
+ MusECore::Route r(irl->midiPort, 0);
+ QAction* act = findActionFromData(qVariantFromValue(r));
+ if(act)
+ {
+ //printf("RoutePopupMenu::updateRouteMenus found MidiTrack to MidiPort irl type:%d\n", irl->type); //
+ // Check for custom widget actions first.
+ PixmapButtonsWidgetAction* mc_wa = dynamic_cast<PixmapButtonsWidgetAction*>(act);
+ if(mc_wa)
+ {
+ //printf(" ... Found custom, setting current state\n"); //
+ mc_wa->setCurrentState(irl->channel); // Set all channels at once.
+ }
+ }
+
+#else
//printf("RoutePopupMenu::updateRouteMenus MIDI_PORT_ROUTE\n");
for(int ch = 0; ch < MIDI_CHANNELS; ++ch)
{
@@ -778,33 +831,67 @@ void RoutePopupMenu::updateRouteMenus()
if(irl->channel & chbits)
{
MusECore::Route r(irl->midiPort, chbits);
- QAction* act = _pup->findActionFromData(qVariantFromValue(r));
+ //printf("RoutePopupMenu::updateRouteMenus MidiTrack to MidiPort irl type:%d\n", irl->type); //
+ // If act is a PixmapButtonsWidgetAction, route channel is ignored and is zero.
+ QAction* act = findActionFromData(qVariantFromValue(r));
if(act)
+ {
+ //printf(" ... Found\n"); //
act->setChecked(true);
+ }
}
}
+#endif // _USE_CUSTOM_WIDGET_ACTIONS_
+
}
else
// Do all other routes...
{
- //printf("RoutePopupMenu::updateRouteMenus other irl type:%d\n", irl->type);
- QAction* act = _pup->findActionFromData(qVariantFromValue(*irl));
+
+#ifdef _USE_CUSTOM_WIDGET_ACTIONS_
+
+ // Do MidiPort to MidiTrack routes...
+ if(irl->type == MusECore::Route::TRACK_ROUTE && irl->track && irl->track->type() == MusECore::Track::AUDIO_INPUT)
+ {
+ // Widget action handles channels. Look for route with channels ignored and set to zero.
+ MusECore::Route r(irl->track, 0);
+ QAction* act = findActionFromData(qVariantFromValue(r));
+ if(act)
+ {
+ // Check for custom widget actions first.
+ PixmapButtonsWidgetAction* mc_wa = dynamic_cast<PixmapButtonsWidgetAction*>(act);
+ if(mc_wa)
+ {
+ //printf("RoutePopupMenu::updateRouteMenus found custom irl type:%d\n", irl->type); //
+ mc_wa->setCurrentState(irl->channel); // Set all channels at once.
+ continue;
+ }
+ }
+ }
+
+#endif // _USE_CUSTOM_WIDGET_ACTIONS_
+
+ printf("RoutePopupMenu::updateRouteMenus other irl type:%d\n", irl->type); // REMOVE TIm.
if(act)
+ {
+ //printf("RoutePopupMenu::updateRouteMenus found other irl type:%d\n", irl->type); //
act->setChecked(true);
+ }
}
}
+*/
}
void RoutePopupMenu::popupActivated(QAction* action)
{
- if(!action || !_track || !_pup || _pup->actions().isEmpty())
+ if(!action || !_track || actions().isEmpty())
return;
if(_track->isMidiTrack())
{
MusECore::RouteList* rl = _isOutMenu ? _track->outRoutes() : _track->inRoutes();
- // Take care of Route data items first...
+ // Take care of Route data items first...
if(qVariantCanConvert<MusECore::Route>(action->data()))
{
MusECore::Route aRoute = action->data().value<MusECore::Route>();
@@ -836,13 +923,10 @@ void RoutePopupMenu::popupActivated(QAction* action)
MusECore::RouteList* mprl = _isOutMenu ? mp->outRoutes() : mp->inRoutes();
MusECore::ciRoute ir = mprl->begin();
for (; ir != mprl->end(); ++ir)
- {
- if(ir->type == MusECore::Route::TRACK_ROUTE && ir->track == aRoute.track) // Is there already a route to this port?
- {
- chmask = ir->channel; // Grab the channel mask.
- break;
+ if(ir->type == MusECore::Route::TRACK_ROUTE && ir->track == aRoute.track) { // Is there already a route to this port?
+ chmask = ir->channel; // Grab the channel mask.
+ break;
}
- }
if ((chmask & chbit) == chbit) // Is the channel's bit(s) set?
{
// disconnect
@@ -866,56 +950,113 @@ void RoutePopupMenu::popupActivated(QAction* action)
}
return;
}
+ // Support Audio Input track to Midi Port routes.
else if(aRoute.type == MusECore::Route::MIDI_PORT_ROUTE)
{
- int chbit = aRoute.channel;
- MusECore::Route bRoute(_track, chbit);
- int mdidx = aRoute.midiPort;
-
- MusECore::MidiPort* mp = &MusEGlobal::midiPorts[mdidx];
- MusECore::MidiDevice* md = mp->device();
- //if(!md) // Rem. Allow connections to ports with no device.
- // return;
-
- //if(!(md->rwFlags() & 2))
- //if(!(md->rwFlags() & (gIsOutRoutingPopupMenu ? 1 : 2)))
- if(md && !(md->rwFlags() & (_isOutMenu ? 1 : 2)))
- return;
-
- int chmask = 0;
- MusECore::ciRoute iir = rl->begin();
- for (; iir != rl->end(); ++iir)
+ // Check for custom midi channel select action.
+ PixmapButtonsWidgetAction* cs_wa = dynamic_cast<PixmapButtonsWidgetAction*>(action);
+ if(cs_wa)
{
- if(iir->type == MusECore::Route::MIDI_PORT_ROUTE && iir->midiPort == mdidx) // Is there already a route to this port?
+ MusECore::Route aRoute = action->data().value<MusECore::Route>();
+ int chbits = cs_wa->currentState();
+ aRoute.channel = chbits; // Restore the desired route channels from the custom widget action state.
+
+ int mdidx = aRoute.midiPort;
+ MusECore::MidiPort* mp = &MusEGlobal::midiPorts[mdidx];
+
+ MusECore::MidiDevice* md = mp->device();
+ //if(!md) // Rem. Allow connections to ports with no device.
+ // return;
+
+ //if(!(md->rwFlags() & 2))
+ //if(!(md->rwFlags() & (gIsOutRoutingPopupMenu ? 1 : 2)))
+ if(md && !(md->rwFlags() & (_isOutMenu ? 1 : 2)))
+ return;
+
+ int chmask = 0;
+ MusECore::ciRoute iir = rl->begin();
+ for (; iir != rl->end(); ++iir)
+ if(iir->type == MusECore::Route::MIDI_PORT_ROUTE && iir->midiPort == mdidx) { // Is there already a route to this port?
+ chmask = iir->channel; // Grab the channel mask.
+ break;
+ }
+
+ // Only if something changed...
+ if(chmask != chbits)
{
- chmask = iir->channel; // Grab the channel mask.
- break;
- }
- }
- if ((chmask & chbit) == chbit) // Is the channel's bit(s) set?
- {
- // disconnect
- if(_isOutMenu)
- MusEGlobal::audio->msgRemoveRoute(bRoute, aRoute);
- else
- MusEGlobal::audio->msgRemoveRoute(aRoute, bRoute);
+ if(chmask != 0)
+ {
+ MusECore::Route bRoute(_track, chmask);
+ // Disconnect all existing channels.
+ if(_isOutMenu)
+ MusEGlobal::audio->msgRemoveRoute(bRoute, *iir);
+ else
+ MusEGlobal::audio->msgRemoveRoute(*iir, bRoute);
+ }
+ if(chbits != 0)
+ {
+ // Connect desired channels.
+ MusECore::Route bRoute(_track, chbits);
+ if(_isOutMenu)
+ MusEGlobal::audio->msgAddRoute(bRoute, aRoute);
+ else
+ MusEGlobal::audio->msgAddRoute(aRoute, bRoute);
+ }
+ MusEGlobal::audio->msgUpdateSoloStates();
+ MusEGlobal::song->update(SC_ROUTE);
+ }
+ //return;
}
- else
+ else
{
- // connect
- if(_isOutMenu)
- MusEGlobal::audio->msgAddRoute(bRoute, aRoute);
- else
- MusEGlobal::audio->msgAddRoute(aRoute, bRoute);
+ int chbit = aRoute.channel;
+ MusECore::Route bRoute(_track, chbit);
+ int mdidx = aRoute.midiPort;
+
+ MusECore::MidiPort* mp = &MusEGlobal::midiPorts[mdidx];
+ MusECore::MidiDevice* md = mp->device();
+ //if(!md) // Rem. Allow connections to ports with no device.
+ // return;
+
+ //if(!(md->rwFlags() & 2))
+ //if(!(md->rwFlags() & (gIsOutRoutingPopupMenu ? 1 : 2)))
+ if(md && !(md->rwFlags() & (_isOutMenu ? 1 : 2)))
+ return;
+
+ int chmask = 0;
+ MusECore::ciRoute iir = rl->begin();
+ for (; iir != rl->end(); ++iir)
+ {
+ if(iir->type == MusECore::Route::MIDI_PORT_ROUTE && iir->midiPort == mdidx) // Is there already a route to this port?
+ {
+ chmask = iir->channel; // Grab the channel mask.
+ break;
+ }
+ }
+ if ((chmask & chbit) == chbit) // Is the channel's bit(s) set?
+ {
+ // disconnect
+ if(_isOutMenu)
+ MusEGlobal::audio->msgRemoveRoute(bRoute, aRoute);
+ else
+ MusEGlobal::audio->msgRemoveRoute(aRoute, bRoute);
+ }
+ else
+ {
+ // connect
+ if(_isOutMenu)
+ MusEGlobal::audio->msgAddRoute(bRoute, aRoute);
+ else
+ MusEGlobal::audio->msgAddRoute(aRoute, bRoute);
+ }
+
+ MusEGlobal::audio->msgUpdateSoloStates();
+ MusEGlobal::song->update(SC_ROUTE);
}
-
- MusEGlobal::audio->msgUpdateSoloStates();
- MusEGlobal::song->update(SC_ROUTE);
}
}
- else
// ... now take care of integer data items.
- if(qVariantCanConvert<int>(action->data()))
+ else if(qVariantCanConvert<int>(action->data()))
{
int n = action->data().value<int>();
if(!_isOutMenu && n == 0)
@@ -961,34 +1102,73 @@ void RoutePopupMenu::popupActivated(QAction* action)
// Support Midi Port to Audio Input routes.
if(_track->type() == MusECore::Track::AUDIO_INPUT && srcRoute.type == MusECore::Route::MIDI_PORT_ROUTE)
{
- int chbit = srcRoute.channel;
- MusECore::Route dstRoute(t, chbit);
- int mdidx = srcRoute.midiPort;
- int chmask = 0;
- MusECore::ciRoute iir = rl->begin();
- for (; iir != rl->end(); ++iir)
+ // Check for custom midi channel select action.
+ PixmapButtonsWidgetAction* cs_wa = dynamic_cast<PixmapButtonsWidgetAction*>(action);
+ if(cs_wa)
{
- if(iir->type == MusECore::Route::MIDI_PORT_ROUTE && iir->midiPort == mdidx) // Is there already a route to this port?
+ int chbits = cs_wa->currentState();
+ srcRoute.channel = chbits; // Restore the desired route channels from the custom widget action state.
+ int mdidx = srcRoute.midiPort;
+
+ int chmask = 0;
+ MusECore::ciRoute iir = rl->begin();
+ for (; iir != rl->end(); ++iir)
+ if(iir->type == MusECore::Route::MIDI_PORT_ROUTE && iir->midiPort == mdidx) { // Is there already a route to this port?
+ chmask = iir->channel; // Grab the channel mask.
+ break;
+ }
+
+ // Only if something changed...
+ if(chmask != chbits)
{
- chmask = iir->channel; // Grab the channel mask.
- break;
- }
- }
-
- if ((chmask & chbit) == chbit) // Is the channel's bit(s) set?
- {
- //printf("routingPopupMenuActivated: removing src route ch:%d dst route ch:%d\n", srcRoute.channel, dstRoute.channel);
- MusEGlobal::audio->msgRemoveRoute(srcRoute, dstRoute);
+ if(chmask != 0)
+ {
+ // Disconnect all existing channels.
+ MusECore::Route dstRoute(t, chmask);
+ MusEGlobal::audio->msgRemoveRoute(*iir, dstRoute);
+ }
+ if(chbits != 0)
+ {
+ // Connect desired channels.
+ MusECore::Route dstRoute(t, chbits);
+ MusEGlobal::audio->msgAddRoute(srcRoute, dstRoute);
+ }
+ MusEGlobal::audio->msgUpdateSoloStates();
+ MusEGlobal::song->update(SC_ROUTE);
+ }
+ return;
}
- else
+ else
{
- //printf("routingPopupMenuActivated: adding src route ch:%d dst route ch:%d\n", srcRoute.channel, dstRoute.channel);
- MusEGlobal::audio->msgAddRoute(srcRoute, dstRoute);
- }
-
- MusEGlobal::audio->msgUpdateSoloStates();
- MusEGlobal::song->update(SC_ROUTE);
- return;
+ int chbit = srcRoute.channel;
+ MusECore::Route dstRoute(t, chbit);
+ int mdidx = srcRoute.midiPort;
+ int chmask = 0;
+ MusECore::ciRoute iir = rl->begin();
+ for (; iir != rl->end(); ++iir)
+ {
+ if(iir->type == MusECore::Route::MIDI_PORT_ROUTE && iir->midiPort == mdidx) // Is there already a route to this port?
+ {
+ chmask = iir->channel; // Grab the channel mask.
+ break;
+ }
+ }
+
+ if ((chmask & chbit) == chbit) // Is the channel's bit(s) set?
+ {
+ //printf("routingPopupMenuActivated: removing src route ch:%d dst route ch:%d\n", srcRoute.channel, dstRoute.channel);
+ MusEGlobal::audio->msgRemoveRoute(srcRoute, dstRoute);
+ }
+ else
+ {
+ //printf("routingPopupMenuActivated: adding src route ch:%d dst route ch:%d\n", srcRoute.channel, dstRoute.channel);
+ MusEGlobal::audio->msgAddRoute(srcRoute, dstRoute);
+ }
+
+ MusEGlobal::audio->msgUpdateSoloStates();
+ MusEGlobal::song->update(SC_ROUTE);
+ return;
+ }
}
MusECore::Route dstRoute(t, srcRoute.channel, srcRoute.channels);
@@ -1020,13 +1200,13 @@ void RoutePopupMenu::popupActivated(QAction* action)
void RoutePopupMenu::prepare()
{
- _pup->disconnect();
- _pup->clear();
+ ///disconnect();
+ ///clear();
if(!_track)
return;
- connect(_pup, SIGNAL(triggered(QAction*)), SLOT(popupActivated(QAction*)));
+ connect(this, SIGNAL(triggered(QAction*)), SLOT(popupActivated(QAction*)));
if(_track->isMidiTrack())
{
@@ -1055,11 +1235,11 @@ void RoutePopupMenu::prepare()
//if(!md)
// continue;
- _pup->addSeparator();
- _pup->addAction(new MenuTitleItem(tr("Soloing chain"), _pup));
- PopupMenu* subp = new PopupMenu(_pup, true);
+ addSeparator();
+ addAction(new MenuTitleItem(tr("Soloing chain"), this));
+ PopupMenu* subp = new PopupMenu(this, true);
subp->setTitle(tr("Audio returns"));
- _pup->addMenu(subp);
+ addMenu(subp);
MusECore::InputList* al = MusEGlobal::song->inputs();
for (MusECore::ciAudioInput i = al->begin(); i != al->end(); ++i)
@@ -1096,19 +1276,26 @@ void RoutePopupMenu::prepare()
}
if(pi == MIDI_PORTS)
{
- act = _pup->addAction(tr("Warning: No input devices!"));
+ act = addAction(tr("Warning: No input devices!"));
act->setCheckable(false);
act->setData(-1);
- _pup->addSeparator();
+ addSeparator();
}
- act = _pup->addAction(QIcon(*settings_midiport_softsynthsIcon), tr("Open midi config..."));
+ act = addAction(QIcon(*settings_midiport_softsynthsIcon), tr("Open midi config..."));
act->setCheckable(false);
act->setData(gid);
- _pup->addSeparator();
+ addSeparator();
++gid;
- _pup->addAction(new MenuTitleItem("Input port/device", _pup));
-
+#ifdef _USE_CUSTOM_WIDGET_ACTIONS_
+
+ PixmapButtonsHeaderWidgetAction* wa_hdr = new PixmapButtonsHeaderWidgetAction("Input port/device", darkRedLedIcon, MIDI_CHANNELS, this);
+ addAction(wa_hdr);
+ ++gid;
+#else
+ addAction(new MenuTitleItem("Input port/device", this));
+#endif
+
for(int i = 0; i < MIDI_PORTS; ++i)
{
// NOTE: Could possibly list all devices, bypassing ports, but no, let's stick with ports.
@@ -1142,7 +1329,19 @@ void RoutePopupMenu::prepare()
if(!md && ir == rl->end())
continue;
- PopupMenu* subp = new PopupMenu(_pup, true);
+#ifdef _USE_CUSTOM_WIDGET_ACTIONS_
+
+ PixmapButtonsWidgetAction* wa = new PixmapButtonsWidgetAction(QString::number(i + 1) + ":" + md->name(),
+ redLedIcon, darkRedLedIcon, MIDI_CHANNELS, chanmask, this);
+ MusECore::Route srcRoute(i, 0); // Ignore the routing channels - our action holds the channels.
+ //wa->setData(id++);
+ wa->setData(qVariantFromValue(srcRoute));
+ addAction(wa);
+ ++gid;
+
+#else
+
+ PopupMenu* subp = new PopupMenu(this, true);
subp->setTitle(QString("%1:").arg(i+1) + (md ? md->name() : tr("<none>")));
for(int ch = 0; ch < MIDI_CHANNELS; ++ch)
@@ -1162,7 +1361,10 @@ void RoutePopupMenu::prepare()
MusECore::Route togRoute(i, (1 << MIDI_CHANNELS) - 1); // Set all channel bits.
act->setData(qVariantFromValue(togRoute));
++gid;
- _pup->addMenu(subp);
+ addMenu(subp);
+
+#endif // _USE_CUSTOM_WIDGET_ACTIONS_
+
}
#if 0
@@ -1242,18 +1444,18 @@ void RoutePopupMenu::prepare()
{
char buffer[128];
snprintf(buffer, 128, "%s %d", tr("Channel").toLatin1().constData(), i+1);
- MenuTitleItem* titel = new MenuTitleItem(QString(buffer), _pup);
- _pup->addAction(titel);
+ MenuTitleItem* titel = new MenuTitleItem(QString(buffer), this);
+ addAction(titel);
if(!MusEGlobal::checkAudioDevice())
{
- _pup->clear();
+ clear();
return;
}
std::list<QString> ol = MusEGlobal::audioDevice->inputPorts();
for(std::list<QString>::iterator ip = ol.begin(); ip != ol.end(); ++ip)
{
- act = _pup->addAction(*ip);
+ act = addAction(*ip);
act->setCheckable(true);
MusECore::Route dst(*ip, true, i, MusECore::Route::JACK_ROUTE);
@@ -1269,42 +1471,42 @@ void RoutePopupMenu::prepare()
}
}
if(i+1 != channel)
- _pup->addSeparator();
+ addSeparator();
}
//
// Display using separate menu for audio inputs:
//
- _pup->addSeparator();
- _pup->addAction(new MenuTitleItem(tr("Soloing chain"), _pup));
- PopupMenu* subp = new PopupMenu(_pup, true);
+ addSeparator();
+ addAction(new MenuTitleItem(tr("Soloing chain"), this));
+ PopupMenu* subp = new PopupMenu(this, true);
subp->setTitle(tr("Audio returns"));
- _pup->addMenu(subp);
+ addMenu(subp);
gid = addInPorts(t, subp, gid, -1, -1, true);
//
// Display all in the same menu:
//
- //_pup->addSeparator();
- //MenuTitleItem* title = new MenuTitleItem(tr("Audio returns"), _pup);
- //_pup->addAction(title);
- //gid = addInPorts(t, _pup, gid, -1, -1, true);
+ //addSeparator();
+ //MenuTitleItem* title = new MenuTitleItem(tr("Audio returns"), this);
+ //addAction(title);
+ //gid = addInPorts(t, this, gid, -1, -1, true);
}
break;
case MusECore::Track::AUDIO_SOFTSYNTH:
- gid = addMultiChannelPorts(t, _pup, gid, true);
+ gid = addMultiChannelPorts(t, this, gid, true);
break;
case MusECore::Track::AUDIO_INPUT:
case MusECore::Track::WAVE:
case MusECore::Track::AUDIO_GROUP:
case MusECore::Track::AUDIO_AUX:
- gid = addWavePorts( t, _pup, gid, -1, -1, true);
- gid = addOutPorts( t, _pup, gid, -1, -1, true);
- gid = addGroupPorts( t, _pup, gid, -1, -1, true);
- gid = nonSyntiTrackAddSyntis(t, _pup, gid, true);
+ gid = addWavePorts( t, this, gid, -1, -1, true);
+ gid = addOutPorts( t, this, gid, -1, -1, true);
+ gid = addGroupPorts( t, this, gid, -1, -1, true);
+ gid = nonSyntiTrackAddSyntis(t, this, gid, true);
break;
default:
- _pup->clear();
+ clear();
return;
}
}
@@ -1327,18 +1529,18 @@ void RoutePopupMenu::prepare()
{
char buffer[128];
snprintf(buffer, 128, "%s %d", tr("Channel").toLatin1().constData(), i+1);
- MenuTitleItem* titel = new MenuTitleItem(QString(buffer), _pup);
- _pup->addAction(titel);
+ MenuTitleItem* titel = new MenuTitleItem(QString(buffer), this);
+ addAction(titel);
if(!MusEGlobal::checkAudioDevice())
{
- _pup->clear();
+ clear();
return;
}
std::list<QString> ol = MusEGlobal::audioDevice->outputPorts();
for(std::list<QString>::iterator ip = ol.begin(); ip != ol.end(); ++ip)
{
- act = _pup->addAction(*ip);
+ act = addAction(*ip);
act->setCheckable(true);
MusECore::Route dst(*ip, true, i, MusECore::Route::JACK_ROUTE);
@@ -1354,59 +1556,59 @@ void RoutePopupMenu::prepare()
}
}
if(i+1 != channel)
- _pup->addSeparator();
+ addSeparator();
}
//
// Display using separate menus for midi ports and audio outputs:
//
- _pup->addSeparator();
- _pup->addAction(new MenuTitleItem(tr("Soloing chain"), _pup));
- PopupMenu* subp = new PopupMenu(_pup, true);
+ addSeparator();
+ addAction(new MenuTitleItem(tr("Soloing chain"), this));
+ PopupMenu* subp = new PopupMenu(this, true);
subp->setTitle(tr("Audio sends"));
- _pup->addMenu(subp);
+ addMenu(subp);
gid = addOutPorts(t, subp, gid, -1, -1, false);
- subp = new PopupMenu(_pup, true);
+ subp = new PopupMenu(this, true);
subp->setTitle(tr("Midi port sends"));
- _pup->addMenu(subp);
+ addMenu(subp);
addMidiPorts(t, subp, gid, false);
//
// Display all in the same menu:
//
- //_pup->addAction(new MenuTitleItem(tr("Audio sends"), _pup));
- //gid = addOutPorts(t, _pup, gid, -1, -1, false);
- //_pup->addSeparator();
- //_pup->addAction(new MenuTitleItem(tr("Midi sends"), _pup));
- //addMidiPorts(t, _pup, gid, false);
+ //addAction(new MenuTitleItem(tr("Audio sends"), this));
+ //gid = addOutPorts(t, this, gid, -1, -1, false);
+ //addSeparator();
+ //addAction(new MenuTitleItem(tr("Midi sends"), this));
+ //addMidiPorts(t, this, gid, false);
}
break;
case MusECore::Track::AUDIO_OUTPUT:
- gid = addWavePorts( t, _pup, gid, -1, -1, false);
- gid = addInPorts( t, _pup, gid, -1, -1, false);
- gid = addGroupPorts(t, _pup, gid, -1, -1, false);
- gid = addAuxPorts( t, _pup, gid, -1, -1, false);
- gid = nonSyntiTrackAddSyntis(t, _pup, gid, false);
+ gid = addWavePorts( t, this, gid, -1, -1, false);
+ gid = addInPorts( t, this, gid, -1, -1, false);
+ gid = addGroupPorts(t, this, gid, -1, -1, false);
+ gid = addAuxPorts( t, this, gid, -1, -1, false);
+ gid = nonSyntiTrackAddSyntis(t, this, gid, false);
break;
case MusECore::Track::WAVE:
- gid = addWavePorts( t, _pup, gid, -1, -1, false);
- gid = addInPorts( t, _pup, gid, -1, -1, false);
- gid = addGroupPorts(t, _pup, gid, -1, -1, false);
- gid = addAuxPorts( t, _pup, gid, -1, -1, false);
- gid = nonSyntiTrackAddSyntis(t, _pup, gid, false);
+ gid = addWavePorts( t, this, gid, -1, -1, false);
+ gid = addInPorts( t, this, gid, -1, -1, false);
+ gid = addGroupPorts(t, this, gid, -1, -1, false);
+ gid = addAuxPorts( t, this, gid, -1, -1, false);
+ gid = nonSyntiTrackAddSyntis(t, this, gid, false);
break;
case MusECore::Track::AUDIO_GROUP:
- gid = addWavePorts( t, _pup, gid, -1, -1, false);
- gid = addInPorts( t, _pup, gid, -1, -1, false);
- gid = addGroupPorts(t, _pup, gid, -1, -1, false);
- gid = addAuxPorts( t, _pup, gid, -1, -1, false);
- gid = nonSyntiTrackAddSyntis(t, _pup, gid, false);
+ gid = addWavePorts( t, this, gid, -1, -1, false);
+ gid = addInPorts( t, this, gid, -1, -1, false);
+ gid = addGroupPorts(t, this, gid, -1, -1, false);
+ gid = addAuxPorts( t, this, gid, -1, -1, false);
+ gid = nonSyntiTrackAddSyntis(t, this, gid, false);
break;
case MusECore::Track::AUDIO_SOFTSYNTH:
- gid = addMultiChannelPorts(t, _pup, gid, false);
+ gid = addMultiChannelPorts(t, this, gid, false);
break;
default:
- _pup->clear();
+ clear();
return;
}
}
@@ -1421,7 +1623,7 @@ void RoutePopupMenu::exec(MusECore::Track* track, bool isOutput)
_isOutMenu = isOutput;
}
prepare();
- _pup->exec();
+ PopupMenu::exec();
}
void RoutePopupMenu::exec(const QPoint& p, MusECore::Track* track, bool isOutput)
@@ -1432,7 +1634,7 @@ void RoutePopupMenu::exec(const QPoint& p, MusECore::Track* track, bool isOutput
_isOutMenu = isOutput;
}
prepare();
- _pup->exec(p);
+ PopupMenu::exec(p);
}
void RoutePopupMenu::popup(const QPoint& p, MusECore::Track* track, bool isOutput)
@@ -1443,7 +1645,7 @@ void RoutePopupMenu::popup(const QPoint& p, MusECore::Track* track, bool isOutpu
_isOutMenu = isOutput;
}
prepare();
- _pup->popup(p);
+ PopupMenu::popup(p);
}
} // namespace MusEGui
diff --git a/muse2/muse/widgets/routepopup.h b/muse2/muse/widgets/routepopup.h
index 842ba130..e4ecde4c 100644
--- a/muse2/muse/widgets/routepopup.h
+++ b/muse2/muse/widgets/routepopup.h
@@ -23,7 +23,8 @@
#ifndef __ROUTEPOPUPMENU_H__
#define __ROUTEPOPUPMENU_H__
-#include <QObject>
+//#include <QObject>
+#include "popupmenu.h"
namespace MusECore {
class AudioTrack;
@@ -37,13 +38,14 @@ class QPoint;
namespace MusEGui {
-class PopupMenu;
+//class PopupMenu;
-class RoutePopupMenu : public QObject
+//class RoutePopupMenu : public QObject
+class RoutePopupMenu : public PopupMenu
{
Q_OBJECT
- PopupMenu* _pup;
+ //PopupMenu* _pup;
MusECore::Track* _track;
// Whether the route popup was shown by clicking the output routes button, or input routes button.
bool _isOutMenu;
@@ -70,7 +72,6 @@ class RoutePopupMenu : public QObject
public:
RoutePopupMenu(QWidget* parent = 0, MusECore::Track* track = 0, bool isOutput = false);
RoutePopupMenu(const QString& title, QWidget* parent = 0, MusECore::Track* track = 0, bool isOutput = false);
- ~RoutePopupMenu();
void updateRouteMenus();
void exec(MusECore::Track* track = 0, bool isOutput = false);
diff --git a/muse2/share/locale/muse_de.ts b/muse2/share/locale/muse_de.ts
index 5b827ede..be59c783 100644
--- a/muse2/share/locale/muse_de.ts
+++ b/muse2/share/locale/muse_de.ts
@@ -219,7 +219,7 @@ click on part to mute/unmute</source>
<translation type="obsolete">Alle Dateien (*)</translation>
</message>
<message>
- <location filename="../../muse/helper.cpp" line="+189"/>
+ <location filename="../../muse/helper.cpp" line="+200"/>
<source>Add Midi Track</source>
<translation>Midispur hinzufügen</translation>
</message>
@@ -295,7 +295,7 @@ click on part to mute/unmute</source>
<translation type="obsolete">JACK:</translation>
</message>
<message>
- <location filename="../../muse/midiport.cpp" line="+1190"/>
+ <location filename="../../muse/midiport.cpp" line="+1194"/>
<source>Route</source>
<translation>Signalfluss</translation>
</message>
@@ -330,7 +330,7 @@ click on part to mute/unmute</source>
<translation type="obsolete">Anschlag</translation>
</message>
<message>
- <location line="-857"/>
+ <location line="-861"/>
<source>Warning: No output devices!</source>
<translation>Warnung: Keine Ausgangsgeräte!</translation>
</message>
@@ -340,7 +340,7 @@ click on part to mute/unmute</source>
<translation>Öffne MIDI-Konfig...</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+27"/>
<source>Empty ports</source>
<translation>Leere Ports</translation>
</message>
@@ -10120,45 +10120,72 @@ Knopf.</translation>
hier nicht definiert ist.</translation>
</message>
<message>
- <location line="+1"/>
<source>For small controls like mixer strips.
Also timescale small numbers, arranger part name overlay,
and effects rack.</source>
- <translation>Für kleine Bedienelemente, wie Mixer-Strips.
+ <translation type="obsolete">Für kleine Bedienelemente, wie Mixer-Strips.
Auch die kleinen Timescale-Nummern, Arranger-Partnamen
und der Effekteinschub.</translation>
</message>
<message>
- <location line="+1"/>
<source>Midi track info panel. Transport controls.</source>
- <translation>MIDI Spurinfo. Transportkontrollen.</translation>
+ <translation type="obsolete">MIDI Spurinfo. Transportkontrollen.</translation>
</message>
<message>
- <location line="+1"/>
<source>Controller graph and S/X buttons. Large numbers for time
and tempo scale, and time signature.</source>
- <translation>Controller-Graph und S/X Knöpfe. Große Zahlen für
+ <translation type="obsolete">Controller-Graph und S/X Knöpfe. Große Zahlen für
Zeit- und Tempo-Skala und Taktsignaturen.</translation>
</message>
<message>
- <location line="+1"/>
<source>Time scale markers.</source>
- <translation>Zeitskala-Marker.</translation>
+ <translation type="obsolete">Zeitskala-Marker.</translation>
</message>
<message>
- <location line="+1"/>
<source>List editor: meta event edit dialog multi-line edit box.</source>
- <translation>Listeneditor: Metaevent-Bearbeitungsdialog-Box.</translation>
+ <translation type="obsolete">Listeneditor: Metaevent-Bearbeitungsdialog-Box.</translation>
</message>
<message>
- <location line="+1"/>
<source>Mixer label font. Auto-font-sizing up to chosen font size.
Word-breaking but only with spaces.</source>
- <translation>Mixerschriftart. Automatisches Vergrößern bis zur gewählten
+ <translation type="obsolete">Mixerschriftart. Automatisches Vergrößern bis zur gewählten
Größe. Zeilenumbruch aber nur mit Leerzeichen.</translation>
</message>
<message>
<location line="+1"/>
+ <source>Mixer strips and effects racks. Midi track info panel.
+Midi control panel entry box.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Transport controls.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Time scale upper, and time signature.
+Controller graph and S/X buttons.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Time scale lower, and arranger part name overlay.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Tempo scale, and markers.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Mixer labels. Auto-font-sizing up to chosen font size.
+Word-breaking but only with spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Maximum mixer label auto-font-sizing font size.</source>
<translation>Maximale Mixer-Schriftgröße.</translation>
</message>
@@ -12190,19 +12217,19 @@ click on part to mute/unmute</source>
<name>MusEGui::MPConfig</name>
<message>
<location filename="../../muse/confmport.cpp" line="+101"/>
- <location line="+176"/>
+ <location line="+179"/>
<source>Default input connections</source>
<translation>Standard-Eingangsverbindungen</translation>
</message>
<message>
- <location line="-175"/>
+ <location line="-178"/>
<location line="+66"/>
<source>Are you sure you want to apply to all existing midi tracks now?</source>
<translation>Sind Sie sicher, dass Sie das auf alle existierenden MIDI-Spuren anwenden wollen?</translation>
</message>
<message>
<location line="-1"/>
- <location line="+148"/>
+ <location line="+151"/>
<source>Default output connections</source>
<translation>Standard-Ausgangsverbindungen</translation>
</message>
@@ -12226,18 +12253,18 @@ Möchten Sie sie jetzt auf alle existierende MIDI-Spuren anwenden?</translation>
</message>
<message>
<location line="+72"/>
- <location line="+859"/>
+ <location line="+957"/>
<source>in</source>
<translation>ein</translation>
</message>
<message>
- <location line="-836"/>
- <location line="+827"/>
+ <location line="-934"/>
+ <location line="+925"/>
<source>out</source>
<translation>aus</translation>
</message>
<message>
- <location line="-771"/>
+ <location line="-869"/>
<source>Show first aliases</source>
<translation>Zeige erste Aliase</translation>
</message>
@@ -12272,7 +12299,7 @@ Möchten Sie sie jetzt auf alle existierende MIDI-Spuren anwenden?</translation>
<translation>Jack-Gerät erstellen</translation>
</message>
<message>
- <location line="+229"/>
+ <location line="+326"/>
<location line="+29"/>
<source>Port Number</source>
<translation>Anschlussnummer</translation>
@@ -12388,7 +12415,7 @@ Möchten Sie sie jetzt auf alle existierende MIDI-Spuren anwenden?</translation>
<translation>Status: Ergebnis vom Öffnen des Gerätes</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="+42"/>
<source>Port</source>
<translation>Anschluss</translation>
</message>
@@ -13099,7 +13126,7 @@ Sync-Einstellungen anwenden?</translation>
<name>MusEGui::MidiTrackInfo</name>
<message>
<location filename="../../muse/widgets/mtrackinfo.cpp" line="+335"/>
- <location line="+1068"/>
+ <location line="+1083"/>
<source>&lt;unknown&gt;</source>
<translation>&lt;unbekannt&gt;</translation>
</message>
@@ -13124,7 +13151,7 @@ Sync-Einstellungen anwenden?</translation>
<context>
<name>MusEGui::MusE</name>
<message>
- <location filename="../../muse/app.cpp" line="+141"/>
+ <location filename="../../muse/app.cpp" line="+144"/>
<location line="+16"/>
<source>Failed to start audio!</source>
<translation>Audio konnte nicht gestartet werden!</translation>
@@ -13291,13 +13318,13 @@ Sync-Einstellungen anwenden?</translation>
</message>
<message>
<location line="+2"/>
- <location line="+1039"/>
- <location line="+1257"/>
+ <location line="+1091"/>
+ <location line="+1248"/>
<source>&amp;Save</source>
<translation>&amp;Speichern</translation>
</message>
<message>
- <location line="-2294"/>
+ <location line="-2337"/>
<location line="+3"/>
<source>Click this button to save the song you are editing. You will be prompted for a file name.
You can also select the Save command from the File menu.</source>
@@ -13621,7 +13648,7 @@ Alternativ das Lied mit dem Befehl &quot;Sichern&quot; im Menü &quot;Datei&quot
<translation>&amp;Hilfe</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+340"/>
<source>Cannot read template</source>
<translation>Vorlage nicht lesbar</translation>
</message>
@@ -13642,13 +13669,13 @@ Alternativ das Lied mit dem Befehl &quot;Sichern&quot; im Menü &quot;Datei&quot
</message>
<message>
<location line="+134"/>
- <location line="+440"/>
- <location line="+915"/>
+ <location line="+432"/>
+ <location line="+916"/>
<source>MusE: Song: %1</source>
<translation>MusE: Lied: %1</translation>
</message>
<message>
- <location line="-1321"/>
+ <location line="-1314"/>
<source>MusE: load project</source>
<translation>Muse: Projekt laden</translation>
</message>
@@ -13658,7 +13685,7 @@ Alternativ das Lied mit dem Befehl &quot;Sichern&quot; im Menü &quot;Datei&quot
<translation>Muse: Vorlage laden</translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+66"/>
<source>MusE: Write File failed</source>
<translation>MusE: Datei schreiben schlug fehl</translation>
</message>
@@ -13671,17 +13698,17 @@ Aktuelles Projekt sichern?</translation>
</message>
<message>
<location line="+2"/>
- <location line="+1257"/>
+ <location line="+1248"/>
<source>S&amp;kip</source>
<translation>&amp;Überspringen</translation>
</message>
<message>
- <location line="-1257"/>
+ <location line="-1248"/>
<source>&amp;Cancel</source>
<translation>&amp;Abbrechen</translation>
</message>
<message>
- <location line="+264"/>
+ <location line="+254"/>
<source>MusE: Save As</source>
<translation>MusE: Speichern unter</translation>
</message>
@@ -13692,7 +13719,7 @@ Aktuelles Projekt sichern?</translation>
<translation>Es gibt nichts zu editieren</translation>
</message>
<message>
- <location line="+494"/>
+ <location line="+495"/>
<location line="+10"/>
<location line="+31"/>
<location line="+34"/>
@@ -14464,7 +14491,7 @@ Wahrscheinlich hat die ausgewählte Spur den falschen Typ.</numerusform>
<context>
<name>MusEGui::ProjectCreateImpl</name>
<message>
- <location filename="../../muse/widgets/projectcreateimpl.cpp" line="+83"/>
+ <location filename="../../muse/widgets/projectcreateimpl.cpp" line="+105"/>
<source>Select directory</source>
<translation>Verzeichnis auswählen</translation>
</message>
@@ -14472,32 +14499,32 @@ Wahrscheinlich hat die ausgewählte Spur den falschen Typ.</numerusform>
<context>
<name>MusEGui::RoutePopupMenu</name>
<message>
- <location filename="../../muse/widgets/routepopup.cpp" line="+230"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="+234"/>
<location line="+2"/>
<location line="+132"/>
<location line="+78"/>
<location line="+57"/>
<location line="+60"/>
- <location line="+685"/>
+ <location line="+883"/>
<location line="+85"/>
<source>Channel</source>
<translation>Kanal</translation>
</message>
<message>
- <location line="-270"/>
- <location line="+220"/>
+ <location line="-292"/>
+ <location line="+242"/>
<location line="+85"/>
<source>Soloing chain</source>
<translation>Solo-Kette</translation>
</message>
<message>
- <location line="-303"/>
- <location line="+220"/>
+ <location line="-325"/>
+ <location line="+242"/>
<source>Audio returns</source>
<translation>Audio-Rückkanäle</translation>
</message>
<message>
- <location line="-182"/>
+ <location line="-204"/>
<source>Warning: No input devices!</source>
<translation>Warnung: Keine Eingangsgeräte!</translation>
</message>
@@ -14507,18 +14534,18 @@ Wahrscheinlich hat die ausgewählte Spur den falschen Typ.</numerusform>
<translation>Öffne MIDI-Konfig...</translation>
</message>
<message>
- <location line="+42"/>
- <location line="+33"/>
+ <location line="+61"/>
+ <location line="+36"/>
<source>&lt;none&gt;</source>
<translation>&lt;kein&gt;</translation>
</message>
<message>
- <location line="-19"/>
+ <location line="-22"/>
<source>Toggle all</source>
<translation>Alles umwählen</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>More...</source>
<translation>Mehr...</translation>
</message>
@@ -14942,29 +14969,29 @@ Titel ist nicht einzigartig</translation>
</message>
<message>
<location line="+310"/>
- <location line="+1161"/>
+ <location line="+1163"/>
<source>Update drummap?</source>
<translation>Drumbelegung aktualisieren?</translation>
</message>
<message>
- <location line="-1160"/>
+ <location line="-1162"/>
<source>Do you want to use same port for all instruments in the drummap?</source>
<translation>Möchten Sie für alle Instrumente der Drumbelegung den selben Anschluss verwenden?</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1161"/>
+ <location line="+1163"/>
<source>&amp;Yes</source>
<translation>&amp;Ja</translation>
</message>
<message>
- <location line="-1161"/>
- <location line="+1161"/>
+ <location line="-1163"/>
+ <location line="+1163"/>
<source>&amp;No</source>
<translation>&amp;Nein</translation>
</message>
<message>
- <location line="-1086"/>
+ <location line="-1088"/>
<location line="+55"/>
<source>show gui</source>
<translation>GUI anzeigen</translation>
@@ -14976,7 +15003,7 @@ Titel ist nicht einzigartig</translation>
<translation>Native GUI anzeigen</translation>
</message>
<message>
- <location line="+347"/>
+ <location line="+348"/>
<source>Treble clef</source>
<translation>Violinschlüssel</translation>
</message>
@@ -14996,7 +15023,7 @@ Titel ist nicht einzigartig</translation>
<translation>Sichtbare Automatisierung</translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+138"/>
<source>Delete Track</source>
<translation>Spur löschen</translation>
</message>
@@ -15026,7 +15053,7 @@ Titel ist nicht einzigartig</translation>
<translation>Möchten Sie für alle Instrumente der Drumbelegung den selben Anschluss und Kanal verwenden?</translation>
</message>
<message>
- <location line="-1250"/>
+ <location line="-1252"/>
<source>Unused Devices</source>
<translation>Ungenutzte Geräte</translation>
</message>
diff --git a/muse2/share/locale/muse_en.ts b/muse2/share/locale/muse_en.ts
index 867761ce..613e78e8 100644
--- a/muse2/share/locale/muse_en.ts
+++ b/muse2/share/locale/muse_en.ts
@@ -4,57 +4,57 @@
<context>
<name>@default</name>
<message>
- <location filename="../../muse/helper.cpp" line="185"/>
+ <location filename="../../muse/helper.cpp" line="200"/>
<source>Add Midi Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/helper.cpp" line="191"/>
+ <location filename="../../muse/helper.cpp" line="206"/>
<source>Add Drum Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/helper.cpp" line="197"/>
+ <location filename="../../muse/helper.cpp" line="212"/>
<source>Add Wave Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/helper.cpp" line="204"/>
+ <location filename="../../muse/helper.cpp" line="219"/>
<source>Add Audio Output</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/helper.cpp" line="211"/>
+ <location filename="../../muse/helper.cpp" line="226"/>
<source>Add Audio Group</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/helper.cpp" line="218"/>
+ <location filename="../../muse/helper.cpp" line="233"/>
<source>Add Audio Input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/helper.cpp" line="225"/>
+ <location filename="../../muse/helper.cpp" line="240"/>
<source>Add Aux Send</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/helper.cpp" line="234"/>
+ <location filename="../../muse/helper.cpp" line="249"/>
<source>Add Synth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/midiport.cpp" line="1190"/>
+ <location filename="../../muse/midiport.cpp" line="1194"/>
<source>Route</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/midiport.cpp" line="1197"/>
+ <location filename="../../muse/midiport.cpp" line="1201"/>
<source>dest</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/midiport.cpp" line="1198"/>
+ <location filename="../../muse/midiport.cpp" line="1202"/>
<source> name=&quot;%1&quot;/</source>
<translation type="unfinished"></translation>
</message>
@@ -69,17 +69,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/midiport.cpp" line="369"/>
+ <location filename="../../muse/midiport.cpp" line="373"/>
<source>Empty ports</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/midiport.cpp" line="391"/>
+ <location filename="../../muse/midiport.cpp" line="395"/>
<source>&lt;none&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/midiport.cpp" line="1192"/>
+ <location filename="../../muse/midiport.cpp" line="1196"/>
<source> channelMask=&quot;%1&quot;</source>
<translation type="unfinished"></translation>
</message>
@@ -3598,204 +3598,219 @@ Songdata</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../muse/widgets/gensetbase.ui" line="36"/>
+ <source>Project directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../../muse/widgets/gensetbase.ui" line="42"/>
+ <source>Projects:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../muse/widgets/gensetbase.ui" line="55"/>
+ <source>...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../muse/widgets/gensetbase.ui" line="71"/>
<source>Views</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="48"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="95"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="132"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="276"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="332"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="77"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="124"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="161"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="305"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="361"/>
<source>y-pos</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="58"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="115"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="162"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="169"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="87"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="144"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="191"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="198"/>
<source>show</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="65"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="105"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="122"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="286"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="342"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="94"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="134"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="151"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="315"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="371"/>
<source>x-pos</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="75"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="152"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="256"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="312"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="104"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="181"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="285"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="341"/>
<source>height</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="85"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="142"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="266"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="322"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="114"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="171"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="295"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="351"/>
<source>width</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="182"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="211"/>
<source>Mixer A</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="198"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="227"/>
<source>Mixer B</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="214"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="243"/>
<source>Big Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="230"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="259"/>
<source>Main Window</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="246"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="275"/>
<source>Transport</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="302"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="358"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="374"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="390"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="406"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="331"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="387"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="403"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="419"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="435"/>
<source>set current values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="305"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="361"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="377"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="393"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="409"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="334"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="390"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="406"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="422"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="438"/>
<source>Cur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="419"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="448"/>
<source>Start Muse</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="445"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="474"/>
<source>start song:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="460"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="489"/>
<source>Start song</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="466"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="495"/>
<source>start with last song</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="482"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="511"/>
<source>start with template: default.med</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="492"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="521"/>
<source>start with song</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="502"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="531"/>
<source>On Launch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="508"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="537"/>
<source>show splash screen</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="515"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="544"/>
<source>show &quot;Did you know?&quot; dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="544"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="573"/>
<source>Audio</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="550"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="579"/>
<source>Mixer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="571"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="610"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="600"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="639"/>
<source>dB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="590"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="619"/>
<source>min. Meter Value</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="600"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="629"/>
<source>min. Slider Val</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="629"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="658"/>
<source>Try to use Jack Freewheel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="646"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="675"/>
<source>Speeds bounce operations</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="649"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="678"/>
<source>Use Jack Freewheel mode if possible.
This dramatically speeds bounce operations.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="660"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="689"/>
<source>Enable denormal protection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="670"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="699"/>
<source>Enable output limiter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="687"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="716"/>
<source>VST in-place</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="697"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="726"/>
<source>Enable VST in-place processing (restart required)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="700"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="729"/>
<source>Enable VST in-place processing. Turn this off if
VST Ladspa effect rack plugins do not work or
feedback loudly, even if they are supposed to
@@ -3803,18 +3818,18 @@ This dramatically speeds bounce operations.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="713"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="742"/>
<source>Minimum control period</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="720"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="749"/>
<source>Minimum audio controller process period (samples).
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="724"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="753"/>
<source>Minimum audio controller process period (samples).
Adjusts responsiveness of audio controls and
controller graphs. Set a low value for fast, smooth
@@ -3823,270 +3838,265 @@ Adjusts responsiveness of audio controls and
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="735"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="764"/>
<source>1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="740"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="769"/>
<source>2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="745"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="774"/>
<source>4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="750"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="779"/>
<source>8</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="755"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="949"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="784"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="978"/>
<source>16</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="760"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="954"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="789"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="983"/>
<source>32</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="765"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="959"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="794"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="988"/>
<source>64</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="770"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="964"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="799"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="993"/>
<source>128</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="775"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="969"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="804"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="998"/>
<source>256</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="780"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="974"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="809"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1003"/>
<source>512</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="785"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="979"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="1026"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="814"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1008"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1055"/>
<source>1024</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="790"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="984"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="1031"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="819"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1013"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1060"/>
<source>2048</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="801"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="830"/>
<source>External Waveditor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="826"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="855"/>
<source>External Waveditor command</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="870"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="899"/>
<source>Note: External editor opened from the internal editor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="885"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="914"/>
<source>Dummy Audio Driver (settings require restart)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="906"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="935"/>
<source>Sample rate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="916"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="945"/>
<source>Hz</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="935"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="964"/>
<source>Period size (Frames per period):</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="945"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="974"/>
<source>Shorter periods give better midi playback resolution.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="996"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1025"/>
<source>Midi</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1008"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1037"/>
<source>Ticks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1014"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1043"/>
<source>RTC Resolution
(Ticks/Sec)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1036"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1065"/>
<source>4096</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1041"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1070"/>
<source>8192</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1046"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1075"/>
<source>16384</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1051"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1080"/>
<source>32768</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1059"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1088"/>
<source>Midi Resolution
(Ticks/Quarternote)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1074"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="1137"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1103"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1166"/>
<source>48</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1079"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="1142"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1108"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1171"/>
<source>96</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1084"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="1147"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1113"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1176"/>
<source>192</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1089"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="1152"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1118"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1181"/>
<source>384</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1094"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="1157"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1123"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1186"/>
<source>768</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1099"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="1162"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1128"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1191"/>
<source>1536</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1104"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="1167"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1133"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1196"/>
<source>3072</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1109"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="1172"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1138"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1201"/>
<source>6144</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1114"/>
- <location filename="../../muse/widgets/gensetbase.ui" line="1177"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1143"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1206"/>
<source>12288</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1122"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1151"/>
<source>Displayed Resolution
(Ticks/Quarternote)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1185"/>
- <source>Instruments Directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1226"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1231"/>
<source>GUI Behaviour</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1238"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1243"/>
<source>Behavior</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1244"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1249"/>
<source>GUI Refresh Rate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1254"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1259"/>
<source>/sec</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1270"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1275"/>
<source>Use old-style stop shortcut:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1293"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1298"/>
<source>Move single armed track with selection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1316"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1321"/>
<source>Use project save dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1342"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1347"/>
<source>Some popup menus stay open (else hold Ctrl)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1355"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1360"/>
<source>Allows some popup menus to stay open.
Otherwise, hold Ctrl to keep them open.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1366"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1371"/>
<source>In some areas, the middle mouse button decreases
values, while the right button increases. Users without a
middle mouse button can select this option to make the
@@ -4094,67 +4104,67 @@ left button behave like the middle button in such areas.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1372"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1377"/>
<source>Use left mouse button for decreasing values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1405"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1410"/>
<source>Shift + Right click sets left range marker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1432"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1437"/>
<source>Allow adding hidden tracks in track list menu</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1439"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1444"/>
<source>Unhide tracks when adding hidden tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1457"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1462"/>
<source>GUI Style</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1463"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1468"/>
<source>MDI-subwindowness and sharing menus</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1474"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1479"/>
<source>Presets:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1481"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1486"/>
<source>traditional MusE SDI</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1488"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1493"/>
<source>Cakewalk-like MDI</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1495"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1500"/>
<source>Borland-/Mac-like MDI</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1551"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1556"/>
<source>&amp;Apply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1558"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1563"/>
<source>&amp;Ok</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/gensetbase.ui" line="1568"/>
+ <location filename="../../muse/widgets/gensetbase.ui" line="1573"/>
<source>&amp;Cancel</source>
<translation type="unfinished"></translation>
</message>
@@ -5959,6 +5969,14 @@ click on the Restart button.</source>
</message>
</context>
<context>
+ <name>MusEGui</name>
+ <message>
+ <location filename="../../muse/helper.cpp" line="305"/>
+ <source>Select project directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>MusEGui::Appearance</name>
<message>
<location filename="../../muse/appearance.cpp" line="132"/>
@@ -5968,35 +5986,34 @@ click on the Restart button.</source>
</message>
<message>
<location filename="../../muse/appearance.cpp" line="133"/>
- <source>For small controls like mixer strips.
-Also timescale small numbers, arranger part name overlay,
- and effects rack.</source>
+ <source>Mixer strips and effects racks. Midi track info panel.
+Midi control panel entry box.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../muse/appearance.cpp" line="134"/>
- <source>Midi track info panel. Transport controls.</source>
+ <source>Transport controls.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../muse/appearance.cpp" line="135"/>
- <source>Controller graph and S/X buttons. Large numbers for time
- and tempo scale, and time signature.</source>
+ <source>Time scale upper, and time signature.
+Controller graph and S/X buttons.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../muse/appearance.cpp" line="136"/>
- <source>Time scale markers.</source>
+ <source>Time scale lower, and arranger part name overlay.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../muse/appearance.cpp" line="137"/>
- <source>List editor: meta event edit dialog multi-line edit box.</source>
+ <source>Tempo scale, and markers.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../muse/appearance.cpp" line="138"/>
- <source>Mixer label font. Auto-font-sizing up to chosen font size.
+ <source>Mixer labels. Auto-font-sizing up to chosen font size.
Word-breaking but only with spaces.</source>
<translation type="unfinished"></translation>
</message>
@@ -7339,147 +7356,118 @@ Right-click to show GUI.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="411"/>
- <location filename="../../muse/instruments/editinstrument.cpp" line="423"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="454"/>
<location filename="../../muse/instruments/editinstrument.cpp" line="703"/>
- <location filename="../../muse/instruments/editinstrument.cpp" line="715"/>
- <source>MusE:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="412"/>
- <location filename="../../muse/instruments/editinstrument.cpp" line="704"/>
- <source>The user instrument directory
-%1
-does not exist yet. Create it now?
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="413"/>
- <location filename="../../muse/instruments/editinstrument.cpp" line="705"/>
- <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="423"/>
- <location filename="../../muse/instruments/editinstrument.cpp" line="715"/>
- <source>Unable to create user instrument directory &apos;%1&apos;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="471"/>
- <location filename="../../muse/instruments/editinstrument.cpp" line="737"/>
<source>MusE: Save Instrument Definition</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="472"/>
- <location filename="../../muse/instruments/editinstrument.cpp" line="738"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="455"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="704"/>
<source>Instrument Definition (*.idf)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="584"/>
- <location filename="../../muse/instruments/editinstrument.cpp" line="613"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="567"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="596"/>
<source>MusE: Save instrument as</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="584"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="567"/>
<source>Enter a new unique instrument name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="614"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="597"/>
<source>The user instrument &apos;%1&apos; already exists. This will overwrite its .idf instrument file.
Are you sure?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="1140"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="1106"/>
<source>MusE: Bad instrument name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="1141"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="1107"/>
<source>Please choose a unique instrument name.
(The name might be used by a hidden instrument.)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="1277"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="1243"/>
<source>MusE: Bad patch name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="1278"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="1244"/>
<source>Please choose a unique patch name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="1300"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="1266"/>
<source>MusE: Bad patchgroup name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="1301"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="1267"/>
<source>Please choose a unique patchgroup name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="1827"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="1793"/>
<source>MusE: Bad controller name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="1828"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="1794"/>
<source>Please choose a unique controller name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="3115"/>
- <location filename="../../muse/instruments/editinstrument.cpp" line="3127"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="3081"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="3093"/>
<source>MusE: Cannot add common controller</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="3116"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="3082"/>
<source>A controller named &apos;%1&apos; already exists.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="3128"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="3094"/>
<source>A controller number %1 already exists.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="3411"/>
- <location filename="../../muse/instruments/editinstrument.cpp" line="3416"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="3377"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="3382"/>
<source>MusE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="3412"/>
- <location filename="../../muse/instruments/editinstrument.cpp" line="3417"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="3378"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="3383"/>
<source>The current Instrument contains unsaved data
Save Current Instrument?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="3414"/>
- <location filename="../../muse/instruments/editinstrument.cpp" line="3419"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="3380"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="3385"/>
<source>&amp;Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="3414"/>
- <location filename="../../muse/instruments/editinstrument.cpp" line="3419"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="3380"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="3385"/>
<source>&amp;Nosave</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/instruments/editinstrument.cpp" line="3414"/>
+ <location filename="../../muse/instruments/editinstrument.cpp" line="3380"/>
<source>&amp;Abort</source>
<translation type="unfinished"></translation>
</message>
@@ -7730,14 +7718,6 @@ click on part to mute/unmute</source>
</message>
</context>
<context>
- <name>MusEGui::GlobalSettingsConfig</name>
- <message>
- <location filename="../../muse/widgets/genset.cpp" line="561"/>
- <source>Selects instruments directory</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>MusEGui::Header</name>
<message>
<location filename="../../muse/widgets/header.cpp" line="164"/>
@@ -8015,7 +7995,7 @@ click on part to mute/unmute</source>
<name>MusEGui::MPConfig</name>
<message>
<location filename="../../muse/confmport.cpp" line="101"/>
- <location filename="../../muse/confmport.cpp" line="277"/>
+ <location filename="../../muse/confmport.cpp" line="280"/>
<source>Default input connections</source>
<translation type="unfinished"></translation>
</message>
@@ -8027,245 +8007,245 @@ click on part to mute/unmute</source>
</message>
<message>
<location filename="../../muse/confmport.cpp" line="167"/>
- <location filename="../../muse/confmport.cpp" line="315"/>
+ <location filename="../../muse/confmport.cpp" line="318"/>
<source>Default output connections</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="278"/>
- <location filename="../../muse/confmport.cpp" line="316"/>
+ <location filename="../../muse/confmport.cpp" line="281"/>
+ <location filename="../../muse/confmport.cpp" line="319"/>
<source>Setting will apply to new midi tracks.
Do you want to apply to all existing midi tracks now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="355"/>
+ <location filename="../../muse/confmport.cpp" line="358"/>
<source>MusE: bad device name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="356"/>
+ <location filename="../../muse/confmport.cpp" line="359"/>
<source>please choose a unique device name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="428"/>
- <location filename="../../muse/confmport.cpp" line="1287"/>
+ <location filename="../../muse/confmport.cpp" line="431"/>
+ <location filename="../../muse/confmport.cpp" line="1388"/>
<source>in</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="451"/>
- <location filename="../../muse/confmport.cpp" line="1278"/>
+ <location filename="../../muse/confmport.cpp" line="454"/>
+ <location filename="../../muse/confmport.cpp" line="1379"/>
<source>out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="507"/>
+ <location filename="../../muse/confmport.cpp" line="510"/>
<source>Show first aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="513"/>
+ <location filename="../../muse/confmport.cpp" line="516"/>
<source>Show second aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="643"/>
- <location filename="../../muse/confmport.cpp" line="685"/>
+ <location filename="../../muse/confmport.cpp" line="646"/>
+ <location filename="../../muse/confmport.cpp" line="688"/>
<source>Toggle all</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="647"/>
- <location filename="../../muse/confmport.cpp" line="690"/>
+ <location filename="../../muse/confmport.cpp" line="650"/>
+ <location filename="../../muse/confmport.cpp" line="693"/>
<source>Change all tracks now</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="733"/>
+ <location filename="../../muse/confmport.cpp" line="736"/>
<source>Create Jack device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="962"/>
- <location filename="../../muse/confmport.cpp" line="991"/>
+ <location filename="../../muse/confmport.cpp" line="1062"/>
+ <location filename="../../muse/confmport.cpp" line="1091"/>
<source>Port Number</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="963"/>
+ <location filename="../../muse/confmport.cpp" line="1063"/>
<source>Enable gui</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="964"/>
+ <location filename="../../muse/confmport.cpp" line="1064"/>
<source>Enable reading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="965"/>
+ <location filename="../../muse/confmport.cpp" line="1065"/>
<source>Enable writing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="966"/>
+ <location filename="../../muse/confmport.cpp" line="1066"/>
<source>Port instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="967"/>
+ <location filename="../../muse/confmport.cpp" line="1067"/>
<source>Midi device name. Click to edit (Jack)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="969"/>
+ <location filename="../../muse/confmport.cpp" line="1069"/>
<source>Connections from Jack Midi outputs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="970"/>
+ <location filename="../../muse/confmport.cpp" line="1070"/>
<source>Connections to Jack Midi inputs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="971"/>
+ <location filename="../../muse/confmport.cpp" line="1071"/>
<source>Auto-connect these channels to new midi tracks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="974"/>
+ <location filename="../../muse/confmport.cpp" line="1074"/>
<source>Auto-connect new midi tracks to these channels</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="976"/>
+ <location filename="../../muse/confmport.cpp" line="1076"/>
<source>Auto-connect new midi tracks to this channel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="978"/>
+ <location filename="../../muse/confmport.cpp" line="1078"/>
<source>Device state</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="993"/>
+ <location filename="../../muse/confmport.cpp" line="1093"/>
<source>Enable gui for device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="995"/>
+ <location filename="../../muse/confmport.cpp" line="1095"/>
<source>Enable reading from device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="997"/>
+ <location filename="../../muse/confmport.cpp" line="1097"/>
<source>Enable writing to device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="999"/>
+ <location filename="../../muse/confmport.cpp" line="1099"/>
<source>Name of the midi device associated with this port number. Click to edit Jack midi name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1002"/>
+ <location filename="../../muse/confmport.cpp" line="1102"/>
<source>Instrument connected to port</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1006"/>
+ <location filename="../../muse/confmport.cpp" line="1106"/>
<source>Connections from Jack Midi output ports</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1008"/>
+ <location filename="../../muse/confmport.cpp" line="1108"/>
<source>Connections to Jack Midi input ports</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1017"/>
+ <location filename="../../muse/confmport.cpp" line="1117"/>
<source>Auto-connect these channels, on this port, to new midi tracks.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1021"/>
+ <location filename="../../muse/confmport.cpp" line="1121"/>
<source>Connect new midi tracks to these channels, on this port.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1023"/>
+ <location filename="../../muse/confmport.cpp" line="1123"/>
<source>Connect new midi tracks to this channel, on this port.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1026"/>
+ <location filename="../../muse/confmport.cpp" line="1126"/>
<source>State: result of opening the device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1067"/>
+ <location filename="../../muse/confmport.cpp" line="1168"/>
<source>Port</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1068"/>
+ <location filename="../../muse/confmport.cpp" line="1169"/>
<source>GUI</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1069"/>
+ <location filename="../../muse/confmport.cpp" line="1170"/>
<source>I</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1070"/>
+ <location filename="../../muse/confmport.cpp" line="1171"/>
<source>O</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1071"/>
+ <location filename="../../muse/confmport.cpp" line="1172"/>
<source>Instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1072"/>
+ <location filename="../../muse/confmport.cpp" line="1173"/>
<source>Device Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1073"/>
+ <location filename="../../muse/confmport.cpp" line="1174"/>
<source>In routes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1074"/>
+ <location filename="../../muse/confmport.cpp" line="1175"/>
<source>Out routes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1075"/>
+ <location filename="../../muse/confmport.cpp" line="1176"/>
<source>Def in ch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1076"/>
+ <location filename="../../muse/confmport.cpp" line="1177"/>
<source>Def out ch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1077"/>
+ <location filename="../../muse/confmport.cpp" line="1178"/>
<source>State</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1161"/>
+ <location filename="../../muse/confmport.cpp" line="1262"/>
<source>&lt;unknown&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/confmport.cpp" line="1248"/>
- <location filename="../../muse/confmport.cpp" line="1319"/>
+ <location filename="../../muse/confmport.cpp" line="1349"/>
+ <location filename="../../muse/confmport.cpp" line="1420"/>
<source>&lt;none&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -8885,7 +8865,7 @@ Apply sync settings?</source>
<name>MusEGui::MidiTrackInfo</name>
<message>
<location filename="../../muse/widgets/mtrackinfo.cpp" line="335"/>
- <location filename="../../muse/widgets/mtrackinfo.cpp" line="1403"/>
+ <location filename="../../muse/widgets/mtrackinfo.cpp" line="1418"/>
<source>&lt;unknown&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -8910,639 +8890,638 @@ Apply sync settings?</source>
<context>
<name>MusEGui::MusE</name>
<message>
- <location filename="../../muse/app.cpp" line="137"/>
- <location filename="../../muse/app.cpp" line="153"/>
+ <location filename="../../muse/app.cpp" line="144"/>
+ <location filename="../../muse/app.cpp" line="160"/>
<source>Failed to start audio!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="138"/>
+ <location filename="../../muse/app.cpp" line="145"/>
<source>Was not able to start audio, check if jack is running.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="154"/>
+ <location filename="../../muse/app.cpp" line="161"/>
<source>Timeout waiting for audio to run. Check if jack is running.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="374"/>
+ <location filename="../../muse/app.cpp" line="370"/>
<source>Und&amp;o</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="376"/>
+ <location filename="../../muse/app.cpp" line="372"/>
<source>Re&amp;do</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="379"/>
+ <location filename="../../muse/app.cpp" line="375"/>
<source>undo last change to song</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="380"/>
+ <location filename="../../muse/app.cpp" line="376"/>
<source>redo last undo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="394"/>
+ <location filename="../../muse/app.cpp" line="390"/>
<source>Loop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="397"/>
+ <location filename="../../muse/app.cpp" line="393"/>
<source>loop between left mark and right mark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="401"/>
+ <location filename="../../muse/app.cpp" line="397"/>
<source>Punchin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="404"/>
+ <location filename="../../muse/app.cpp" line="400"/>
<source>record starts at left mark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="408"/>
+ <location filename="../../muse/app.cpp" line="404"/>
<source>Punchout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="411"/>
+ <location filename="../../muse/app.cpp" line="407"/>
<source>record stops at right mark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="419"/>
+ <location filename="../../muse/app.cpp" line="415"/>
<source>Start</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="421"/>
+ <location filename="../../muse/app.cpp" line="417"/>
<source>rewind to start position</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="425"/>
+ <location filename="../../muse/app.cpp" line="421"/>
<source>Rewind</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="427"/>
+ <location filename="../../muse/app.cpp" line="423"/>
<source>rewind current position</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="431"/>
+ <location filename="../../muse/app.cpp" line="427"/>
<source>Forward</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="433"/>
+ <location filename="../../muse/app.cpp" line="429"/>
<source>move current position</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="437"/>
+ <location filename="../../muse/app.cpp" line="433"/>
<source>Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="440"/>
+ <location filename="../../muse/app.cpp" line="436"/>
<source>stop sequencer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="445"/>
+ <location filename="../../muse/app.cpp" line="441"/>
<source>Play</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="448"/>
+ <location filename="../../muse/app.cpp" line="444"/>
<source>start sequencer play</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="453"/>
+ <location filename="../../muse/app.cpp" line="449"/>
<source>Record</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="455"/>
+ <location filename="../../muse/app.cpp" line="451"/>
<source>to record press record and then play</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="459"/>
- <location filename="../../muse/app.cpp" line="697"/>
+ <location filename="../../muse/app.cpp" line="455"/>
+ <location filename="../../muse/app.cpp" line="693"/>
<source>Panic</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="461"/>
+ <location filename="../../muse/app.cpp" line="457"/>
<source>send note off to all midi channels</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="471"/>
+ <location filename="../../muse/app.cpp" line="467"/>
<source>&amp;New</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="472"/>
- <location filename="../../muse/app.cpp" line="473"/>
+ <location filename="../../muse/app.cpp" line="468"/>
+ <location filename="../../muse/app.cpp" line="469"/>
<source>Create New Song</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="475"/>
+ <location filename="../../muse/app.cpp" line="471"/>
<source>&amp;Open</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="477"/>
- <location filename="../../muse/app.cpp" line="479"/>
+ <location filename="../../muse/app.cpp" line="473"/>
+ <location filename="../../muse/app.cpp" line="475"/>
<source>Click this button to open a &lt;em&gt;new song&lt;/em&gt;.&lt;br&gt;You can also select the &lt;b&gt;Open command&lt;/b&gt; from the File menu.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="482"/>
+ <location filename="../../muse/app.cpp" line="478"/>
<source>Open &amp;Recent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="484"/>
- <location filename="../../muse/app.cpp" line="1514"/>
- <location filename="../../muse/app.cpp" line="2769"/>
+ <location filename="../../muse/app.cpp" line="480"/>
+ <location filename="../../muse/app.cpp" line="1571"/>
+ <location filename="../../muse/app.cpp" line="2819"/>
<source>&amp;Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="486"/>
- <location filename="../../muse/app.cpp" line="489"/>
+ <location filename="../../muse/app.cpp" line="482"/>
+ <location filename="../../muse/app.cpp" line="485"/>
<source>Click this button to save the song you are editing. You will be prompted for a file name.
You can also select the Save command from the File menu.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="493"/>
+ <location filename="../../muse/app.cpp" line="489"/>
<source>Save &amp;As</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="495"/>
+ <location filename="../../muse/app.cpp" line="491"/>
<source>Import Midifile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="496"/>
+ <location filename="../../muse/app.cpp" line="492"/>
<source>Export Midifile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="497"/>
+ <location filename="../../muse/app.cpp" line="493"/>
<source>Import Part</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="499"/>
+ <location filename="../../muse/app.cpp" line="495"/>
<location filename="../../muse/wave.cpp" line="1158"/>
<source>Import Wave File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="500"/>
+ <location filename="../../muse/app.cpp" line="496"/>
<source>Find unused wave files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="502"/>
+ <location filename="../../muse/app.cpp" line="498"/>
<source>&amp;Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="504"/>
+ <location filename="../../muse/app.cpp" line="500"/>
<source>Song Info</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="507"/>
+ <location filename="../../muse/app.cpp" line="503"/>
<source>Transport Panel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="509"/>
+ <location filename="../../muse/app.cpp" line="505"/>
<source>Bigtime Window</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="511"/>
+ <location filename="../../muse/app.cpp" line="507"/>
<source>Mixer A</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="513"/>
+ <location filename="../../muse/app.cpp" line="509"/>
<source>Mixer B</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="515"/>
+ <location filename="../../muse/app.cpp" line="511"/>
<source>Cliplist</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="517"/>
+ <location filename="../../muse/app.cpp" line="513"/>
<source>Marker View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="519"/>
+ <location filename="../../muse/app.cpp" line="515"/>
<source>Arranger View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="521"/>
+ <location filename="../../muse/app.cpp" line="517"/>
<source>Fullscreen</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="526"/>
+ <location filename="../../muse/app.cpp" line="522"/>
<source>&amp;Plugins</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="527"/>
+ <location filename="../../muse/app.cpp" line="523"/>
<source>Edit Instrument</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="528"/>
+ <location filename="../../muse/app.cpp" line="524"/>
<source>Input Plugins</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="530"/>
+ <location filename="../../muse/app.cpp" line="526"/>
<source>Transpose</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="531"/>
+ <location filename="../../muse/app.cpp" line="527"/>
<source>Midi Input Transform</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="532"/>
+ <location filename="../../muse/app.cpp" line="528"/>
<source>Midi Input Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="533"/>
+ <location filename="../../muse/app.cpp" line="529"/>
<source>Midi Remote Control</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="535"/>
+ <location filename="../../muse/app.cpp" line="531"/>
<source>Rhythm Generator</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="537"/>
+ <location filename="../../muse/app.cpp" line="533"/>
<source>Reset Instr.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="538"/>
+ <location filename="../../muse/app.cpp" line="534"/>
<source>Init Instr.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="539"/>
+ <location filename="../../muse/app.cpp" line="535"/>
<source>Local Off</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="542"/>
+ <location filename="../../muse/app.cpp" line="538"/>
<source>Bounce to Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="543"/>
+ <location filename="../../muse/app.cpp" line="539"/>
<source>Bounce to File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="544"/>
+ <location filename="../../muse/app.cpp" line="540"/>
<source>Restart Audio</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="547"/>
+ <location filename="../../muse/app.cpp" line="543"/>
<source>Mixer Automation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="549"/>
+ <location filename="../../muse/app.cpp" line="545"/>
<source>Take Snapshot</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="550"/>
+ <location filename="../../muse/app.cpp" line="546"/>
<source>Clear Automation Data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="555"/>
+ <location filename="../../muse/app.cpp" line="551"/>
<source>Cascade</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="556"/>
+ <location filename="../../muse/app.cpp" line="552"/>
<source>Tile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="557"/>
+ <location filename="../../muse/app.cpp" line="553"/>
<source>In rows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="558"/>
+ <location filename="../../muse/app.cpp" line="554"/>
<source>In columns</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="562"/>
+ <location filename="../../muse/app.cpp" line="558"/>
<source>Global Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="563"/>
+ <location filename="../../muse/app.cpp" line="559"/>
<source>Configure Shortcuts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="564"/>
+ <location filename="../../muse/app.cpp" line="560"/>
<source>Follow Song</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="565"/>
+ <location filename="../../muse/app.cpp" line="561"/>
<source>Don&apos;t Follow Song</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="567"/>
+ <location filename="../../muse/app.cpp" line="563"/>
<source>Follow Page</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="570"/>
+ <location filename="../../muse/app.cpp" line="566"/>
<source>Follow Continuous</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="573"/>
+ <location filename="../../muse/app.cpp" line="569"/>
<source>Metronome</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="574"/>
+ <location filename="../../muse/app.cpp" line="570"/>
<source>Midi Sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="575"/>
+ <location filename="../../muse/app.cpp" line="571"/>
<source>Midi File Import/Export</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="576"/>
+ <location filename="../../muse/app.cpp" line="572"/>
<source>Appearance Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="577"/>
+ <location filename="../../muse/app.cpp" line="573"/>
<source>Midi Ports / Soft Synth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="580"/>
+ <location filename="../../muse/app.cpp" line="576"/>
<source>&amp;Manual</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="581"/>
+ <location filename="../../muse/app.cpp" line="577"/>
<source>&amp;MusE Homepage</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="582"/>
+ <location filename="../../muse/app.cpp" line="578"/>
<source>&amp;Report Bug...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="583"/>
+ <location filename="../../muse/app.cpp" line="579"/>
<source>&amp;About MusE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="682"/>
+ <location filename="../../muse/app.cpp" line="678"/>
<source>File Buttons</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="689"/>
+ <location filename="../../muse/app.cpp" line="685"/>
<source>Undo/Redo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="693"/>
+ <location filename="../../muse/app.cpp" line="689"/>
<source>Transport</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="748"/>
+ <location filename="../../muse/app.cpp" line="745"/>
<source>&amp;File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="777"/>
+ <location filename="../../muse/app.cpp" line="774"/>
<source>&amp;View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="796"/>
+ <location filename="../../muse/app.cpp" line="793"/>
<source>&amp;Midi</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="825"/>
+ <location filename="../../muse/app.cpp" line="822"/>
<source>&amp;Audio</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="839"/>
+ <location filename="../../muse/app.cpp" line="836"/>
<source>A&amp;utomation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="852"/>
+ <location filename="../../muse/app.cpp" line="849"/>
<source>&amp;Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="865"/>
+ <location filename="../../muse/app.cpp" line="862"/>
<source>MusE Se&amp;ttings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="888"/>
+ <location filename="../../muse/app.cpp" line="885"/>
<source>&amp;Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="1177"/>
+ <location filename="../../muse/app.cpp" line="1225"/>
<source>Cannot read template</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="1208"/>
+ <location filename="../../muse/app.cpp" line="1257"/>
<source>File open error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="1221"/>
+ <location filename="../../muse/app.cpp" line="1270"/>
<source>File read error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="1234"/>
+ <location filename="../../muse/app.cpp" line="1283"/>
<source>Unknown File Format: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="1364"/>
- <location filename="../../muse/app.cpp" line="1801"/>
- <location filename="../../muse/app.cpp" line="2715"/>
+ <location filename="../../muse/app.cpp" line="1417"/>
+ <location filename="../../muse/app.cpp" line="1849"/>
+ <location filename="../../muse/app.cpp" line="2765"/>
<source>MusE: Song: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="1398"/>
+ <location filename="../../muse/app.cpp" line="1451"/>
<source>MusE: load project</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="1412"/>
+ <location filename="../../muse/app.cpp" line="1465"/>
<source>MusE: load template</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="1474"/>
+ <location filename="../../muse/app.cpp" line="1531"/>
<source>MusE: Write File failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="1512"/>
+ <location filename="../../muse/app.cpp" line="1569"/>
<source>The current Project contains unsaved data
Save Current Project?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="1514"/>
- <location filename="../../muse/app.cpp" line="2769"/>
+ <location filename="../../muse/app.cpp" line="1571"/>
+ <location filename="../../muse/app.cpp" line="2819"/>
<source>S&amp;kip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="1514"/>
+ <location filename="../../muse/app.cpp" line="1571"/>
<source>&amp;Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="1779"/>
- <location filename="../../muse/app.cpp" line="1792"/>
+ <location filename="../../muse/app.cpp" line="1825"/>
<source>MusE: Save As</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="1849"/>
- <location filename="../../muse/app.cpp" line="2009"/>
+ <location filename="../../muse/app.cpp" line="1897"/>
+ <location filename="../../muse/app.cpp" line="2057"/>
<source>Nothing to edit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="2503"/>
- <location filename="../../muse/app.cpp" line="2513"/>
- <location filename="../../muse/app.cpp" line="2544"/>
- <location filename="../../muse/app.cpp" line="2578"/>
- <location filename="../../muse/app.cpp" line="2586"/>
+ <location filename="../../muse/app.cpp" line="2552"/>
+ <location filename="../../muse/app.cpp" line="2562"/>
+ <location filename="../../muse/app.cpp" line="2593"/>
+ <location filename="../../muse/app.cpp" line="2627"/>
+ <location filename="../../muse/app.cpp" line="2635"/>
<source>MusE: Bounce to Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="2504"/>
+ <location filename="../../muse/app.cpp" line="2553"/>
<source>No wave tracks found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="2514"/>
- <location filename="../../muse/app.cpp" line="2619"/>
+ <location filename="../../muse/app.cpp" line="2563"/>
+ <location filename="../../muse/app.cpp" line="2668"/>
<source>No audio output tracks found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="2545"/>
+ <location filename="../../muse/app.cpp" line="2594"/>
<source>Select one audio output track,
and one target wave track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="2579"/>
+ <location filename="../../muse/app.cpp" line="2628"/>
<source>Select one target wave track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="2587"/>
+ <location filename="../../muse/app.cpp" line="2636"/>
<source>Select one target wave track,
and one audio output track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="2618"/>
- <location filename="../../muse/app.cpp" line="2643"/>
+ <location filename="../../muse/app.cpp" line="2667"/>
+ <location filename="../../muse/app.cpp" line="2692"/>
<source>MusE: Bounce to File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="2644"/>
+ <location filename="../../muse/app.cpp" line="2693"/>
<source>Select one audio output track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="2683"/>
+ <location filename="../../muse/app.cpp" line="2732"/>
<source>MusE: Bounce</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="2684"/>
+ <location filename="../../muse/app.cpp" line="2733"/>
<source>set left/right marker for bounce range</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="2766"/>
+ <location filename="../../muse/app.cpp" line="2816"/>
<source>The current Project contains unsaved data
Load overwrites current Project:
Save Current Project?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/app.cpp" line="2769"/>
+ <location filename="../../muse/app.cpp" line="2819"/>
<location filename="../../muse/importmidi.cpp" line="85"/>
<source>&amp;Abort</source>
<translation type="unfinished"></translation>
@@ -10094,102 +10073,102 @@ Likely the selected track is the wrong type.</numerusform>
<context>
<name>MusEGui::PluginDialog</name>
<message>
- <location filename="../../muse/plugin.cpp" line="3137"/>
+ <location filename="../../muse/plugin.cpp" line="3147"/>
<source>MusE: select plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3144"/>
+ <location filename="../../muse/plugin.cpp" line="3154"/>
<source>Lib</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3145"/>
+ <location filename="../../muse/plugin.cpp" line="3155"/>
<source>Label</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3146"/>
+ <location filename="../../muse/plugin.cpp" line="3156"/>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3147"/>
+ <location filename="../../muse/plugin.cpp" line="3157"/>
<source>AI</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3148"/>
+ <location filename="../../muse/plugin.cpp" line="3158"/>
<source>AO</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3149"/>
+ <location filename="../../muse/plugin.cpp" line="3159"/>
<source>CI</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3150"/>
+ <location filename="../../muse/plugin.cpp" line="3160"/>
<source>CO</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3151"/>
+ <location filename="../../muse/plugin.cpp" line="3161"/>
<source>IP</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3152"/>
+ <location filename="../../muse/plugin.cpp" line="3162"/>
<source>id</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3153"/>
+ <location filename="../../muse/plugin.cpp" line="3163"/>
<source>Maker</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3154"/>
+ <location filename="../../muse/plugin.cpp" line="3164"/>
<source>Copyright</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3184"/>
+ <location filename="../../muse/plugin.cpp" line="3194"/>
<source>Ok</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3186"/>
+ <location filename="../../muse/plugin.cpp" line="3196"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3201"/>
+ <location filename="../../muse/plugin.cpp" line="3211"/>
<source>Mono and Stereo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3206"/>
+ <location filename="../../muse/plugin.cpp" line="3216"/>
<source>Stereo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3211"/>
+ <location filename="../../muse/plugin.cpp" line="3221"/>
<source>Mono</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3216"/>
+ <location filename="../../muse/plugin.cpp" line="3226"/>
<source>Show All</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3229"/>
+ <location filename="../../muse/plugin.cpp" line="3239"/>
<source>Select which types of plugins should be visible in the list.&lt;br&gt;Note that using mono plugins on stereo tracks is not a problem, two will be used in parallell.&lt;br&gt;Also beware that the &apos;all&apos; alternative includes plugins that probably not are usable by MusE.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3238"/>
+ <location filename="../../muse/plugin.cpp" line="3248"/>
<source>Search in &apos;Label&apos; and &apos;Name&apos;:</source>
<translation type="unfinished"></translation>
</message>
@@ -10197,102 +10176,110 @@ Likely the selected track is the wrong type.</numerusform>
<context>
<name>MusEGui::PluginGui</name>
<message>
- <location filename="../../muse/plugin.cpp" line="3445"/>
+ <location filename="../../muse/plugin.cpp" line="3456"/>
<source>File Buttons</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3447"/>
+ <location filename="../../muse/plugin.cpp" line="3458"/>
<source>Load Preset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3451"/>
+ <location filename="../../muse/plugin.cpp" line="3462"/>
<source>Save Preset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="3457"/>
- <location filename="../../muse/plugin.cpp" line="3460"/>
+ <location filename="../../muse/plugin.cpp" line="3468"/>
+ <location filename="../../muse/plugin.cpp" line="3471"/>
<source>bypass plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="4014"/>
+ <location filename="../../muse/plugin.cpp" line="4025"/>
<source>MusE: load preset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="4039"/>
+ <location filename="../../muse/plugin.cpp" line="4050"/>
<source>Error reading preset. Might not be right type for this plugin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/plugin.cpp" line="4080"/>
+ <location filename="../../muse/plugin.cpp" line="4091"/>
<source>MusE: save preset</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>MusEGui::ProjectCreateImpl</name>
+ <message>
+ <location filename="../../muse/widgets/projectcreateimpl.cpp" line="105"/>
+ <source>Select directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>MusEGui::RoutePopupMenu</name>
<message>
- <location filename="../../muse/widgets/routepopup.cpp" line="230"/>
- <location filename="../../muse/widgets/routepopup.cpp" line="232"/>
- <location filename="../../muse/widgets/routepopup.cpp" line="364"/>
- <location filename="../../muse/widgets/routepopup.cpp" line="442"/>
- <location filename="../../muse/widgets/routepopup.cpp" line="499"/>
- <location filename="../../muse/widgets/routepopup.cpp" line="559"/>
- <location filename="../../muse/widgets/routepopup.cpp" line="1244"/>
- <location filename="../../muse/widgets/routepopup.cpp" line="1329"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="234"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="236"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="368"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="446"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="503"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="563"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="1446"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="1531"/>
<source>Channel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/routepopup.cpp" line="1059"/>
- <location filename="../../muse/widgets/routepopup.cpp" line="1279"/>
- <location filename="../../muse/widgets/routepopup.cpp" line="1364"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="1239"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="1481"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="1566"/>
<source>Soloing chain</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/routepopup.cpp" line="1061"/>
- <location filename="../../muse/widgets/routepopup.cpp" line="1281"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="1241"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="1483"/>
<source>Audio returns</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/routepopup.cpp" line="1099"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="1279"/>
<source>Warning: No input devices!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/routepopup.cpp" line="1104"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="1284"/>
<source>Open midi config...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/routepopup.cpp" line="1146"/>
- <location filename="../../muse/widgets/routepopup.cpp" line="1179"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="1345"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="1381"/>
<source>&lt;none&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/routepopup.cpp" line="1160"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="1359"/>
<source>Toggle all</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/routepopup.cpp" line="1171"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="1373"/>
<source>More...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/routepopup.cpp" line="1366"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="1568"/>
<source>Audio sends</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/routepopup.cpp" line="1370"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="1572"/>
<source>Midi port sends</source>
<translation type="unfinished"></translation>
</message>
@@ -10663,122 +10650,132 @@ the selected title is not unique</source>
<context>
<name>MusEGui::TList</name>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="373"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="374"/>
<source>&lt;none&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="404"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="396"/>
+ <source>visible</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../muse/arranger/tlist.cpp" line="405"/>
<source>no clef</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="406"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="407"/>
<source>Treble</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="408"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="409"/>
<source>Bass</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="410"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="411"/>
<source>Grand</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="457"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="458"/>
<source>MusE: bad trackname</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="458"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="459"/>
<source>please choose a unique track name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="630"/>
- <location filename="../../muse/arranger/tlist.cpp" line="1779"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="681"/>
+ <source>Unused Devices</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../muse/arranger/tlist.cpp" line="769"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="1932"/>
<source>Update drummap?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="631"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="770"/>
<source>Do you want to use same port for all instruments in the drummap?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="632"/>
- <location filename="../../muse/arranger/tlist.cpp" line="1781"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="771"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="1934"/>
<source>&amp;Yes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="632"/>
- <location filename="../../muse/arranger/tlist.cpp" line="1781"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="771"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="1934"/>
<source>&amp;No</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="707"/>
- <location filename="../../muse/arranger/tlist.cpp" line="762"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="846"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="901"/>
<source>show gui</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="716"/>
- <location filename="../../muse/arranger/tlist.cpp" line="771"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="855"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="910"/>
<source>show native gui</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="1117"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="1258"/>
<source>Treble clef</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="1118"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="1259"/>
<source>Bass clef</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="1119"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="1260"/>
<source>Grand Staff</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="1149"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="1290"/>
<source>Viewable automation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="1280"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="1428"/>
<source>Delete Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="1281"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="1429"/>
<source>Track Comment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="1284"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="1432"/>
<source>Insert Track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="1729"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="1882"/>
<source>Midi</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="1730"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="1883"/>
<source>Drum</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="1780"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="1933"/>
<source>Do you want to use same port and channel for all instruments in the drummap?</source>
<translation type="unfinished"></translation>
</message>
@@ -11573,27 +11570,44 @@ to be expanded by more than </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/projectcreate.ui" line="22"/>
+ <location filename="../../muse/widgets/projectcreate.ui" line="24"/>
+ <source>Projects folder:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../muse/widgets/projectcreate.ui" line="38"/>
+ <location filename="../../muse/widgets/projectcreate.ui" line="158"/>
+ <location filename="../../muse/widgets/projectcreate.ui" line="165"/>
+ <source>...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../muse/widgets/projectcreate.ui" line="56"/>
<source>Project Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/projectcreate.ui" line="54"/>
- <source>Project Path to song file:</source>
+ <location filename="../../muse/widgets/projectcreate.ui" line="66"/>
+ <source>Project is a Template</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/projectcreate.ui" line="74"/>
- <source>Create project folder (recommended for audio projects)</source>
+ <location filename="../../muse/widgets/projectcreate.ui" line="93"/>
+ <source>Project song file type:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/projectcreate.ui" line="92"/>
- <source>Browse</source>
+ <location filename="../../muse/widgets/projectcreate.ui" line="120"/>
+ <source>Project Path to song file:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/projectcreate.ui" line="101"/>
+ <location filename="../../muse/widgets/projectcreate.ui" line="140"/>
+ <source>Create project folder (recommended for audio projects)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../muse/widgets/projectcreate.ui" line="174"/>
<source>Song information:</source>
<translation type="unfinished"></translation>
</message>
@@ -11677,26 +11691,26 @@ Create it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/filedialog.cpp" line="489"/>
+ <location filename="../../muse/widgets/filedialog.cpp" line="463"/>
<source>File
%1
exists. Overwrite?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/filedialog.cpp" line="522"/>
+ <location filename="../../muse/widgets/filedialog.cpp" line="498"/>
<source>Open File
%1
failed: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/filedialog.cpp" line="503"/>
+ <location filename="../../muse/widgets/filedialog.cpp" line="477"/>
<source>MusE: write</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/widgets/filedialog.cpp" line="523"/>
+ <location filename="../../muse/widgets/filedialog.cpp" line="499"/>
<source>MusE: Open File</source>
<translation type="unfinished"></translation>
</message>
@@ -12721,14 +12735,14 @@ Robert Jonsson
<location filename="../../muse/globals.cpp" line="147"/>
<location filename="../../muse/globals.cpp" line="158"/>
<location filename="../../muse/globals.cpp" line="165"/>
- <location filename="../../muse/globals.cpp" line="174"/>
- <location filename="../../muse/globals.cpp" line="189"/>
- <location filename="../../muse/globals.cpp" line="196"/>
- <location filename="../../muse/globals.cpp" line="210"/>
- <location filename="../../muse/globals.cpp" line="218"/>
+ <location filename="../../muse/globals.cpp" line="180"/>
+ <location filename="../../muse/globals.cpp" line="195"/>
+ <location filename="../../muse/globals.cpp" line="202"/>
+ <location filename="../../muse/globals.cpp" line="216"/>
<location filename="../../muse/globals.cpp" line="224"/>
- <location filename="../../muse/globals.cpp" line="232"/>
- <location filename="../../muse/globals.cpp" line="240"/>
+ <location filename="../../muse/globals.cpp" line="230"/>
+ <location filename="../../muse/globals.cpp" line="238"/>
+ <location filename="../../muse/globals.cpp" line="246"/>
<source>All Files (*)</source>
<translation type="unfinished"></translation>
</message>
@@ -12755,18 +12769,21 @@ Robert Jonsson
<message>
<location filename="../../muse/globals.cpp" line="154"/>
<location filename="../../muse/globals.cpp" line="162"/>
+ <location filename="../../muse/globals.cpp" line="169"/>
<source>Uncompressed med Files (*.med)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../muse/globals.cpp" line="155"/>
<location filename="../../muse/globals.cpp" line="163"/>
+ <location filename="../../muse/globals.cpp" line="170"/>
<source>gzip compressed med Files (*.med.gz)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../muse/globals.cpp" line="156"/>
<location filename="../../muse/globals.cpp" line="164"/>
+ <location filename="../../muse/globals.cpp" line="171"/>
<source>bzip2 compressed med Files (*.med.bz2)</source>
<translation type="unfinished"></translation>
</message>
@@ -12776,97 +12793,97 @@ Robert Jonsson
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="170"/>
+ <location filename="../../muse/globals.cpp" line="176"/>
<source>(*.jpg *.gif *.png)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="171"/>
+ <location filename="../../muse/globals.cpp" line="177"/>
<source>(*.jpg)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="172"/>
+ <location filename="../../muse/globals.cpp" line="178"/>
<source>(*.gif)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="173"/>
+ <location filename="../../muse/globals.cpp" line="179"/>
<source>(*.png)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="188"/>
+ <location filename="../../muse/globals.cpp" line="194"/>
<source>part Files (*.mpt *.mpt.gz *.mpt.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="193"/>
+ <location filename="../../muse/globals.cpp" line="199"/>
<source>part Files (*.mpt)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="194"/>
+ <location filename="../../muse/globals.cpp" line="200"/>
<source>gzip compressed part Files (*.mpt.gz)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="195"/>
+ <location filename="../../muse/globals.cpp" line="201"/>
<source>bzip2 compressed part Files (*.mpt.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="209"/>
+ <location filename="../../muse/globals.cpp" line="215"/>
<source>Presets (*.pre *.pre.gz *.pre.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="215"/>
+ <location filename="../../muse/globals.cpp" line="221"/>
<source>Presets (*.pre)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="216"/>
+ <location filename="../../muse/globals.cpp" line="222"/>
<source>gzip compressed presets (*.pre.gz)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="217"/>
+ <location filename="../../muse/globals.cpp" line="223"/>
<source>bzip2 compressed presets (*.pre.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="223"/>
+ <location filename="../../muse/globals.cpp" line="229"/>
<source>Presets (*.map *.map.gz *.map.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="229"/>
+ <location filename="../../muse/globals.cpp" line="235"/>
<source>Presets (*.map)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="230"/>
+ <location filename="../../muse/globals.cpp" line="236"/>
<source>gzip compressed presets (*.map.gz)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="231"/>
+ <location filename="../../muse/globals.cpp" line="237"/>
<source>bzip2 compressed presets (*.map.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="237"/>
+ <location filename="../../muse/globals.cpp" line="243"/>
<source>Wave/Binary (*.wav *.ogg *.bin)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="238"/>
+ <location filename="../../muse/globals.cpp" line="244"/>
<source>Wave (*.wav *.ogg)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/globals.cpp" line="239"/>
+ <location filename="../../muse/globals.cpp" line="245"/>
<source>Binary (*.bin)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/muse2/share/locale/muse_es.ts b/muse2/share/locale/muse_es.ts
index 7a380e3f..d5509dc9 100644
--- a/muse2/share/locale/muse_es.ts
+++ b/muse2/share/locale/muse_es.ts
@@ -208,22 +208,22 @@ haz click en una parte para silenciar/des-silenciar</translation>
<translation type="obsolete">Todos los archivos (*)</translation>
</message>
<message>
- <location filename="../../muse/helper.cpp" line="+295"/>
+ <location filename="../../muse/helper.cpp" line="+200"/>
<source>Add Midi Track</source>
<translation>Agregar pista MIDI</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+6"/>
<source>Add Drum Track</source>
<translation>Agregar pista de percusión</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+6"/>
<source>Add Wave Track</source>
<translation>Agregar pista de audio</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Add Audio Output</source>
<translation>Agregar salida de audio</translation>
</message>
@@ -243,12 +243,12 @@ haz click en una parte para silenciar/des-silenciar</translation>
<translation>Agregar envio auxiliar</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Add Synth</source>
<translation>Agregar sintetizador</translation>
</message>
<message>
- <location filename="../../muse/midiport.cpp" line="+1190"/>
+ <location filename="../../muse/midiport.cpp" line="+1194"/>
<source>Route</source>
<translation>Ruta</translation>
</message>
@@ -267,7 +267,7 @@ haz click en una parte para silenciar/des-silenciar</translation>
<translation type="obsolete">Velocidad</translation>
</message>
<message>
- <location line="-857"/>
+ <location line="-861"/>
<source>Warning: No output devices!</source>
<translation>Atencion: No hay salidas disponibles</translation>
</message>
@@ -277,7 +277,7 @@ haz click en una parte para silenciar/des-silenciar</translation>
<translation>Configurar MIDI...</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+27"/>
<source>Empty ports</source>
<translation>Puertos no asignados</translation>
</message>
@@ -4972,7 +4972,7 @@ Configuración</translation>
<translation>MusE: Configuración global globales</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+559"/>
<source>Audio</source>
<translation>Audio</translation>
</message>
@@ -5098,12 +5098,11 @@ Configuración</translation>
(Tics/segundo)</translation>
</message>
<message>
- <location line="+212"/>
<source>GUI</source>
- <translation>GUI</translation>
+ <translation type="obsolete">GUI</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+216"/>
<source>/sec</source>
<translation>/seg</translation>
</message>
@@ -5113,7 +5112,12 @@ Configuración</translation>
<translation>Velocidad de refresco de la interfáz</translation>
</message>
<message>
- <location line="+72"/>
+ <location line="-18"/>
+ <source>GUI Behaviour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+90"/>
<source>Use project save dialog</source>
<translation>Usar diálogo de guardado</translation>
</message>
@@ -5152,7 +5156,22 @@ el botón del medio.</translation>
<translation>Ctrl + clic derecho establece marcador de la izquierda.</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+27"/>
+ <source>Allow adding hidden tracks in track list menu</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Unhide tracks when adding hidden tracks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>GUI Style</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
<source>MDI-subwindowness and sharing menus</source>
<translation>MDI Sub ventanas y posición de menús</translation>
</message>
@@ -5196,12 +5215,12 @@ el botón del medio.</translation>
<translation type="obsolete">Navegador de ayuda:</translation>
</message>
<message>
- <location line="-1490"/>
+ <location line="-1543"/>
<source>Application</source>
<translation>Aplicación</translation>
</message>
<message>
- <location line="+389"/>
+ <location line="+418"/>
<source>Start Muse</source>
<translation>Inicio de MusE</translation>
</message>
@@ -5381,7 +5400,22 @@ el botón del medio.</translation>
<translation>16</translation>
</message>
<message>
- <location line="-719"/>
+ <location line="-942"/>
+ <source>Project directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Projects:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location line="+204"/>
<source>Main Window</source>
<translation>Ventana principal</translation>
</message>
@@ -5529,12 +5563,11 @@ Ajusta la sensibilidad de los controles de audio y
(Tics/Negra)</translation>
</message>
<message>
- <location line="+126"/>
<source>Instruments Directory</source>
- <translation>Carpeta de instrumentos</translation>
+ <translation type="obsolete">Carpeta de instrumentos</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+187"/>
<source>Use old-style stop shortcut:</source>
<translation>Atajo antiguo para detener</translation>
</message>
@@ -5544,12 +5577,12 @@ Ajusta la sensibilidad de los controles de audio y
<translation>Armar la pista con la selección (Grabar)</translation>
</message>
<message>
- <location line="-791"/>
+ <location line="-767"/>
<source>On Launch</source>
<translation>Lanzar al inicio</translation>
</message>
<message>
- <location line="+736"/>
+ <location line="+712"/>
<source>Behavior</source>
<translation>Comportamiento</translation>
</message>
@@ -7441,6 +7474,11 @@ Entradas habilitadas en la lista
<source>Send sync delay</source>
<translation>Enviar retraso de sincronización</translation>
</message>
+ <message>
+ <location line="+24"/>
+ <source>Note: Sync delay and MTC sync currently not fully implemeted</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MidiTrackInfoBase</name>
@@ -9438,7 +9476,7 @@ falló </translation>
<context>
<name>MusECore::Song</name>
<message>
- <location filename="../../muse/song.cpp" line="+2205"/>
+ <location filename="../../muse/song.cpp" line="+2233"/>
<source>Jack shutdown!</source>
<translation>Detener Jack</translation>
</message>
@@ -9534,7 +9572,7 @@ haga clic en el botón Reiniciar.</translation>
<translation>&amp;Cancelar</translation>
</message>
<message>
- <location line="+843"/>
+ <location line="+878"/>
<source>MusE - external script failed</source>
<translation>MusE - fallo de orden externa</translation>
</message>
@@ -9546,6 +9584,14 @@ haga clic en el botón Reiniciar.</translation>
</message>
</context>
<context>
+ <name>MusEGui</name>
+ <message>
+ <location filename="../../muse/helper.cpp" line="+56"/>
+ <source>Select project directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>MusEGui::Appearance</name>
<message>
<location filename="../../muse/appearance.cpp" line="+132"/>
@@ -9555,45 +9601,72 @@ haga clic en el botón Reiniciar.</translation>
defecto para los controles no estan definidas.</translation>
</message>
<message>
- <location line="+1"/>
<source>For small controls like mixer strips.
Also timescale small numbers, arranger part name overlay,
and effects rack.</source>
- <translation>Para los controles pequeños, como: bandas de mezclador.
+ <translation type="obsolete">Para los controles pequeños, como: bandas de mezclador.
escala de tiempo, superposición de nombre en la región,
y rack de efectos.</translation>
</message>
<message>
- <location line="+1"/>
<source>Midi track info panel. Transport controls.</source>
- <translation>Panel de información de la pista MIDI - Control del transporte</translation>
+ <translation type="obsolete">Panel de información de la pista MIDI - Control del transporte</translation>
</message>
<message>
- <location line="+1"/>
<source>Controller graph and S/X buttons. Large numbers for time
and tempo scale, and time signature.</source>
- <translation>Controlador de gráficos y botones S / X. Una gran cantidad
+ <translation type="obsolete">Controlador de gráficos y botones S / X. Una gran cantidad
de eventos de tempo y el tempo de la escala y compás.</translation>
</message>
<message>
- <location line="+1"/>
<source>Time scale markers.</source>
- <translation>Marcas de la escala de tiempo</translation>
+ <translation type="obsolete">Marcas de la escala de tiempo</translation>
</message>
<message>
- <location line="+1"/>
<source>List editor: meta event edit dialog multi-line edit box.</source>
- <translation>Editor de la lista: Editar meta evento de diálogo multi-línea</translation>
+ <translation type="obsolete">Editor de la lista: Editar meta evento de diálogo multi-línea</translation>
</message>
<message>
- <location line="+1"/>
<source>Mixer label font. Auto-font-sizing up to chosen font size.
Word-breaking but only with spaces.</source>
- <translation>Fuente de la etiqueta del mezclador. Auto dimensionado del tamaño de la fuente elegida.
+ <translation type="obsolete">Fuente de la etiqueta del mezclador. Auto dimensionado del tamaño de la fuente elegida.
La separación de palabras, pero sólo con espacios.</translation>
</message>
<message>
<location line="+1"/>
+ <source>Mixer strips and effects racks. Midi track info panel.
+Midi control panel entry box.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Transport controls.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Time scale upper, and time signature.
+Controller graph and S/X buttons.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Time scale lower, and arranger part name overlay.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Tempo scale, and markers.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Mixer labels. Auto-font-sizing up to chosen font size.
+Word-breaking but only with spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Maximum mixer label auto-font-sizing font size.</source>
<translation>Tamaño máximo de la fuente para etiqueta del mezclador.</translation>
</message>
@@ -9925,7 +9998,7 @@ Clic derecho para ver la interfaz</translation>
<translation>transporte</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>C&amp;ut</source>
<translation>C&amp;ortar</translation>
</message>
@@ -10030,14 +10103,22 @@ Clic derecho para ver la interfaz</translation>
<translation>Editor de partitura</translation>
</message>
<message>
- <location line="+3"/>
<source>all parts in one staff</source>
- <translation>Todas las regiones en un solo pentagrama</translation>
+ <translation type="obsolete">Todas las regiones en un solo pentagrama</translation>
</message>
<message>
- <location line="+1"/>
<source>one staff per part</source>
- <translation>Un pentagrama por región.</translation>
+ <translation type="obsolete">Un pentagrama por región.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>all tracks in one staff</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>one staff per track</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
@@ -10096,6 +10177,21 @@ Clic derecho para ver la interfaz</translation>
<translation>División global</translation>
</message>
<message>
+ <location line="+2"/>
+ <source>Global Cut - selected tracks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Global Insert - selected tracks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Global Split - selected tracks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location line="+8"/>
<source>&amp;Edit</source>
<translation>&amp;Editar</translation>
@@ -10106,7 +10202,7 @@ Clic derecho para ver la interfaz</translation>
<translation>E&amp;structura</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>Functions</source>
<translation>Funciones</translation>
</message>
@@ -10166,7 +10262,7 @@ Clic derecho para ver la interfaz</translation>
<translation>Comportamiento de ventana</translation>
</message>
<message>
- <location line="+311"/>
+ <location line="+314"/>
<location line="+6"/>
<source>New</source>
<translation>Nuevo</translation>
@@ -10233,7 +10329,7 @@ Clic derecho para ver la interfaz</translation>
<context>
<name>MusEGui::AudioStrip</name>
<message>
- <location filename="../../muse/mixer/astrip.cpp" line="+653"/>
+ <location filename="../../muse/mixer/astrip.cpp" line="+667"/>
<source>panorama</source>
<translation>panorama</translation>
</message>
@@ -10263,7 +10359,7 @@ Clic derecho para ver la interfaz</translation>
<translation>pre fader - port fader</translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+70"/>
<source>dB</source>
<translation>dB</translation>
</message>
@@ -10392,7 +10488,7 @@ Clic derecho para ver la interfaz</translation>
<context>
<name>MusEGui::ClipListEdit</name>
<message>
- <location filename="../../muse/cliplist/cliplist.cpp" line="+129"/>
+ <location filename="../../muse/cliplist/cliplist.cpp" line="+130"/>
<source>MusE: Clip List Editor</source>
<translation>MusE: Editor de lista de archivos de audio</translation>
</message>
@@ -10506,7 +10602,7 @@ Clic derecho para ver la interfaz</translation>
<context>
<name>MusEGui::DrumEdit</name>
<message>
- <location filename="../../muse/midiedit/drumedit.cpp" line="+113"/>
+ <location filename="../../muse/midiedit/drumedit.cpp" line="+114"/>
<location line="+21"/>
<source>mute instrument</source>
<translation>silenciar instrumento</translation>
@@ -10862,7 +10958,7 @@ Clic derecho para ver la interfaz</translation>
<translation>VL4</translation>
</message>
<message>
- <location line="+376"/>
+ <location line="+377"/>
<source>Muse: Load Drum Map</source>
<translation>MusE: Cargar mapa de percusión</translation>
</message>
@@ -10927,51 +11023,41 @@ Clic derecho para ver la interfaz</translation>
<translation>MusE: La captura del archivo ha fallado</translation>
</message>
<message>
- <location line="+32"/>
- <location line="+12"/>
- <location line="+280"/>
- <location line="+12"/>
<source>MusE:</source>
- <translation>MusE:</translation>
+ <translation type="obsolete">MusE:</translation>
</message>
<message>
- <location line="-303"/>
- <location line="+292"/>
<source>The user instrument directory
%1
does not exist yet. Create it now?
</source>
- <translation>El instrumento no existe en la carpeta
+ <translation type="obsolete">El instrumento no existe en la carpeta
%1
¿Desea crearlo ahora?
</translation>
</message>
<message>
- <location line="-291"/>
- <location line="+292"/>
<source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
- <translation>(Usted puede cambiar la carpeta del instrumento desde Ajustes-&gt;Configuración global-&gt;MIDI)</translation>
+ <translation type="obsolete">(Usted puede cambiar la carpeta del instrumento desde Ajustes-&gt;Configuración global-&gt;MIDI)</translation>
</message>
<message>
- <location line="-282"/>
- <location line="+292"/>
<source>Unable to create user instrument directory &apos;%1&apos;</source>
- <translation>No es posible crear el instrumento en la carpeta &apos;%1&apos;</translation>
+ <translation type="obsolete">No es posible crear el instrumento en la carpeta &apos;%1&apos;</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+266"/>
+ <location line="+75"/>
+ <location line="+249"/>
<source>MusE: Save Instrument Definition</source>
<translation>MusE: Guardar definicion de instrumento</translation>
</message>
<message>
- <location line="-265"/>
- <location line="+266"/>
+ <location line="-248"/>
+ <location line="+249"/>
<source>Instrument Definition (*.idf)</source>
<translation>Definicion de instrumento (*.idf)</translation>
</message>
<message>
- <location line="-154"/>
+ <location line="-137"/>
<location line="+29"/>
<source>MusE: Save instrument as</source>
<translation>MusE: Guardar instrumento como</translation>
@@ -10988,7 +11074,7 @@ Are you sure?</source>
<translation></translation>
</message>
<message>
- <location line="+526"/>
+ <location line="+509"/>
<source>MusE: Bad instrument name</source>
<translation>MusE: Nombre de instrumento invalido</translation>
</message>
@@ -11338,9 +11424,8 @@ haz click en una región para silenciar/des-silenciar</translation>
<context>
<name>MusEGui::GlobalSettingsConfig</name>
<message>
- <location filename="../../muse/widgets/genset.cpp" line="+552"/>
<source>Selects instruments directory</source>
- <translation>Seleccionar carpeta de instrumentos</translation>
+ <translation type="obsolete">Seleccionar carpeta de instrumentos</translation>
</message>
</context>
<context>
@@ -11354,7 +11439,7 @@ haz click en una región para silenciar/des-silenciar</translation>
<context>
<name>MusEGui::LMaster</name>
<message>
- <location filename="../../muse/master/lmaster.cpp" line="+157"/>
+ <location filename="../../muse/master/lmaster.cpp" line="+158"/>
<source>MusE: Mastertrack</source>
<translation>MusE: pista maestra</translation>
</message>
@@ -11469,7 +11554,7 @@ haz click en una región para silenciar/des-silenciar</translation>
<translation>Valor</translation>
</message>
<message>
- <location line="+390"/>
+ <location line="+391"/>
<source>Reposition of the initial tempo and signature events is not allowed</source>
<translation>Reposición del tempo inicial y la firma de eventos, no está permitido</translation>
</message>
@@ -11492,7 +11577,7 @@ haz click en una región para silenciar/des-silenciar</translation>
<context>
<name>MusEGui::ListEdit</name>
<message>
- <location filename="../../muse/liste/listedit.cpp" line="+476"/>
+ <location filename="../../muse/liste/listedit.cpp" line="+477"/>
<source>insert Note</source>
<translation>insertar Nota</translation>
</message>
@@ -11621,19 +11706,19 @@ haz click en una región para silenciar/des-silenciar</translation>
<name>MusEGui::MPConfig</name>
<message>
<location filename="../../muse/confmport.cpp" line="+101"/>
- <location line="+176"/>
+ <location line="+179"/>
<source>Default input connections</source>
<translation>Conexión de entrada predeterminada</translation>
</message>
<message>
- <location line="-175"/>
+ <location line="-178"/>
<location line="+66"/>
<source>Are you sure you want to apply to all existing midi tracks now?</source>
<translation>¿Seguro que desea aplicar a todas las pistas MIDI existentes?</translation>
</message>
<message>
<location line="-1"/>
- <location line="+148"/>
+ <location line="+151"/>
<source>Default output connections</source>
<translation>Conexión de salida predeterminada</translation>
</message>
@@ -11657,18 +11742,18 @@ Do you want to apply to all existing midi tracks now?</source>
</message>
<message>
<location line="+72"/>
- <location line="+860"/>
+ <location line="+957"/>
<source>in</source>
<translation>Entrada</translation>
</message>
<message>
- <location line="-837"/>
- <location line="+828"/>
+ <location line="-934"/>
+ <location line="+925"/>
<source>out</source>
<translation>Salida</translation>
</message>
<message>
- <location line="-772"/>
+ <location line="-869"/>
<source>Show first aliases</source>
<translation>Mostrar primero los álias</translation>
</message>
@@ -11695,7 +11780,7 @@ Do you want to apply to all existing midi tracks now?</source>
<translation>Crear conexión Jack</translation>
</message>
<message>
- <location line="+229"/>
+ <location line="+326"/>
<location line="+29"/>
<source>Port Number</source>
<translation>Número de puerto</translation>
@@ -11811,7 +11896,7 @@ Do you want to apply to all existing midi tracks now?</source>
<translation>Estado: resultado de abrir el puerto</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="+42"/>
<source>Port</source>
<translation>Puerto</translation>
</message>
@@ -11866,13 +11951,13 @@ Do you want to apply to all existing midi tracks now?</source>
<translation>Estado</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<source>&lt;unknown&gt;</source>
<translation>&lt;desconocido&gt;</translation>
</message>
<message>
<location line="+87"/>
- <location line="+74"/>
+ <location line="+71"/>
<source>&lt;none&gt;</source>
<translation>&lt;ningúno&gt;</translation>
</message>
@@ -11896,7 +11981,7 @@ Do you want to apply to all existing midi tracks now?</source>
<context>
<name>MusEGui::MarkerView</name>
<message>
- <location filename="../../muse/marker/markerview.cpp" line="+174"/>
+ <location filename="../../muse/marker/markerview.cpp" line="+175"/>
<source>MusE: Marker</source>
<translation>MusE: Marcador</translation>
</message>
@@ -11969,7 +12054,7 @@ Do you want to apply to all existing midi tracks now?</source>
<context>
<name>MusEGui::MasterEdit</name>
<message>
- <location filename="../../muse/master/masteredit.cpp" line="+106"/>
+ <location filename="../../muse/master/masteredit.cpp" line="+107"/>
<source>MusE: Mastertrack</source>
<translation>MusE: Pista maestra</translation>
</message>
@@ -12522,7 +12607,7 @@ Apply sync settings?</source>
<name>MusEGui::MidiTrackInfo</name>
<message>
<location filename="../../muse/widgets/mtrackinfo.cpp" line="+335"/>
- <location line="+1070"/>
+ <location line="+1083"/>
<source>&lt;unknown&gt;</source>
<translation>&lt;desconocido&gt;</translation>
</message>
@@ -12547,7 +12632,7 @@ Apply sync settings?</source>
<context>
<name>MusEGui::MusE</name>
<message>
- <location filename="../../muse/app.cpp" line="+137"/>
+ <location filename="../../muse/app.cpp" line="+144"/>
<location line="+16"/>
<source>Failed to start audio!</source>
<translation>Fallo al iniciar el audio</translation>
@@ -12566,7 +12651,7 @@ Apply sync settings?</source>
Comprobar si Jack está en ejecución</translation>
</message>
<message>
- <location line="+219"/>
+ <location line="+209"/>
<source>Und&amp;o</source>
<translation>Deshacer</translation>
</message>
@@ -12715,13 +12800,13 @@ Comprobar si Jack está en ejecución</translation>
</message>
<message>
<location line="+2"/>
- <location line="+1009"/>
- <location line="+1211"/>
+ <location line="+1091"/>
+ <location line="+1248"/>
<source>&amp;Save</source>
<translation>&amp;Guardar</translation>
</message>
<message>
- <location line="-2218"/>
+ <location line="-2337"/>
<location line="+3"/>
<source>Click this button to save the song you are editing. You will be prompted for a file name.
You can also select the Save command from the File menu.</source>
@@ -12750,7 +12835,7 @@ Puedes seleccionar también el comando Guardar del men de Archivo.</translation>
</message>
<message>
<location line="+2"/>
- <location filename="../../muse/wave.cpp" line="+1142"/>
+ <location filename="../../muse/wave.cpp" line="+1158"/>
<source>Import Wave File</source>
<translation>Importar archivo de audio</translation>
</message>
@@ -13005,7 +13090,7 @@ Puedes seleccionar también el comando Guardar del men de Archivo.</translation>
<translation>Transporte</translation>
</message>
<message>
- <location line="+55"/>
+ <location line="+56"/>
<source>&amp;File</source>
<translation>Sesión</translation>
</message>
@@ -13045,12 +13130,12 @@ Puedes seleccionar también el comando Guardar del men de Archivo.</translation>
<translation>A&amp;yuda</translation>
</message>
<message>
- <location line="+268"/>
+ <location line="+340"/>
<source>Cannot read template</source>
<translation>No se puede leer la plantilla</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>File open error</source>
<translation>Error al abrir el archivo</translation>
</message>
@@ -13065,14 +13150,14 @@ Puedes seleccionar también el comando Guardar del men de Archivo.</translation>
<translation>Formato de archivo desconocido: %1</translation>
</message>
<message>
- <location line="+130"/>
- <location line="+409"/>
- <location line="+898"/>
+ <location line="+134"/>
+ <location line="+432"/>
+ <location line="+916"/>
<source>MusE: Song: %1</source>
<translation>Sesión de MusE: %1</translation>
</message>
<message>
- <location line="-1273"/>
+ <location line="-1314"/>
<source>MusE: load project</source>
<translation>MusE: Carga sesión</translation>
</message>
@@ -13082,7 +13167,7 @@ Puedes seleccionar también el comando Guardar del men de Archivo.</translation>
<translation>MusE: cargar plantilla</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+66"/>
<source>MusE: Write File failed</source>
<translation>MusE: La captura del archivo ha fallado</translation>
</message>
@@ -13095,29 +13180,28 @@ Guardar la sesión actual?</translation>
</message>
<message>
<location line="+2"/>
- <location line="+1211"/>
+ <location line="+1248"/>
<source>S&amp;kip</source>
<translation>Ignorar</translation>
</message>
<message>
- <location line="-1211"/>
+ <location line="-1248"/>
<source>&amp;Cancel</source>
<translation>&amp;Cancelar</translation>
</message>
<message>
- <location line="+237"/>
- <location line="+13"/>
+ <location line="+254"/>
<source>MusE: Save As</source>
<translation>MusE: Guardar como</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+72"/>
<location line="+160"/>
<source>Nothing to edit</source>
<translation>Nada para editar</translation>
</message>
<message>
- <location line="+478"/>
+ <location line="+495"/>
<location line="+10"/>
<location line="+31"/>
<location line="+34"/>
@@ -13177,7 +13261,7 @@ y una salida de audio.</translation>
<translation>Fije marcadores derecho e izquierdo para el rango de rebote.</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+83"/>
<source>The current Project contains unsaved data
Load overwrites current Project:
Save Current Project?</source>
@@ -13187,7 +13271,7 @@ Guardar el proyecto actual?</translation>
</message>
<message>
<location line="+3"/>
- <location filename="../../muse/importmidi.cpp" line="+86"/>
+ <location filename="../../muse/importmidi.cpp" line="+85"/>
<source>&amp;Abort</source>
<translation>&amp;Abortar</translation>
</message>
@@ -13254,7 +13338,7 @@ failed: </source>
falló: </translation>
</message>
<message>
- <location line="+356"/>
+ <location line="+357"/>
<source>Import part is only valid for midi and wave tracks!</source>
<translation>Importar regiones es solo para pistas MIDI o de audio</translation>
</message>
@@ -13359,7 +13443,7 @@ El valor actual de la sesión es %2.
<translation>No se puede copiar/mover/clonar a un tipo diferente de pista</translation>
</message>
<message>
- <location line="+270"/>
+ <location line="+280"/>
<source>C&amp;ut</source>
<translation>C&amp;ortar</translation>
</message>
@@ -13438,7 +13522,7 @@ Files:</source>
Archivos:</translation>
</message>
<message numerus="yes">
- <location line="+2128"/>
+ <location line="+2136"/>
<source>%n part(s) out of %1 could not be pasted.
Likely the selected track is the wrong type.</source>
<translation>
@@ -13537,7 +13621,7 @@ Probablemente la pista seleccionada es del tipo incorrecto.</numerusform>
<context>
<name>MusEGui::PianoRoll</name>
<message>
- <location filename="../../muse/midiedit/pianoroll.cpp" line="+99"/>
+ <location filename="../../muse/midiedit/pianoroll.cpp" line="+100"/>
<source>&amp;Edit</source>
<translation>&amp;Editar</translation>
</message>
@@ -13740,7 +13824,7 @@ Probablemente la pista seleccionada es del tipo incorrecto.</numerusform>
<context>
<name>MusEGui::PluginDialog</name>
<message>
- <location filename="../../muse/plugin.cpp" line="+3141"/>
+ <location filename="../../muse/plugin.cpp" line="+3147"/>
<source>MusE: select plugin</source>
<translation>MusE: Selecciona el plugin</translation>
</message>
@@ -13843,7 +13927,7 @@ Probablemente la pista seleccionada es del tipo incorrecto.</numerusform>
<context>
<name>MusEGui::PluginGui</name>
<message>
- <location line="+207"/>
+ <location line="+208"/>
<source>File Buttons</source>
<translation>Botón de archivos</translation>
</message>
@@ -13880,34 +13964,42 @@ Probablemente la pista seleccionada es del tipo incorrecto.</numerusform>
</message>
</context>
<context>
+ <name>MusEGui::ProjectCreateImpl</name>
+ <message>
+ <location filename="../../muse/widgets/projectcreateimpl.cpp" line="+105"/>
+ <source>Select directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>MusEGui::RoutePopupMenu</name>
<message>
- <location filename="../../muse/widgets/routepopup.cpp" line="+223"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="+234"/>
<location line="+2"/>
- <location line="+125"/>
+ <location line="+132"/>
<location line="+78"/>
<location line="+57"/>
- <location line="+53"/>
- <location line="+682"/>
+ <location line="+60"/>
+ <location line="+883"/>
<location line="+85"/>
<source>Channel</source>
<translation>Canal</translation>
</message>
<message>
- <location line="-274"/>
- <location line="+224"/>
+ <location line="-292"/>
+ <location line="+242"/>
<location line="+85"/>
<source>Soloing chain</source>
<translation>Cadena de solos</translation>
</message>
<message>
- <location line="-307"/>
- <location line="+224"/>
+ <location line="-325"/>
+ <location line="+242"/>
<source>Audio returns</source>
<translation>Retornos de audio</translation>
</message>
<message>
- <location line="-185"/>
+ <location line="-204"/>
<source>Warning: No input devices!</source>
<translation>Atención: no hay entradas</translation>
</message>
@@ -13917,18 +14009,18 @@ Probablemente la pista seleccionada es del tipo incorrecto.</numerusform>
<translation>Abrir la configuraciòn MIDI</translation>
</message>
<message>
- <location line="+45"/>
- <location line="+33"/>
+ <location line="+61"/>
+ <location line="+36"/>
<source>&lt;none&gt;</source>
<translation>&lt;ningúno&gt;</translation>
</message>
<message>
- <location line="-19"/>
+ <location line="-22"/>
<source>Toggle all</source>
<translation>Cambiar todos</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>More...</source>
<translation>Mas...</translation>
</message>
@@ -13946,7 +14038,7 @@ Probablemente la pista seleccionada es del tipo incorrecto.</numerusform>
<context>
<name>MusEGui::ScoreCanvas</name>
<message>
- <location filename="../../muse/midiedit/scoreedit.cpp" line="+1247"/>
+ <location filename="../../muse/midiedit/scoreedit.cpp" line="+1313"/>
<source>Treble</source>
<translation>Agudos</translation>
</message>
@@ -13966,7 +14058,7 @@ Probablemente la pista seleccionada es del tipo incorrecto.</numerusform>
<translation>Remover partitura</translation>
</message>
<message>
- <location line="+2470"/>
+ <location line="+2471"/>
<source>Ambiguous part</source>
<translation>Parte ambígua</translation>
</message>
@@ -13989,7 +14081,7 @@ Probablemente la pista seleccionada es del tipo incorrecto.</numerusform>
<context>
<name>MusEGui::ScoreEdit</name>
<message>
- <location line="-3501"/>
+ <location line="-3557"/>
<source>Undo/Redo tools</source>
<translation>Herramientas Deshacer/Rehacer</translation>
</message>
@@ -14029,20 +14121,20 @@ Probablemente la pista seleccionada es del tipo incorrecto.</numerusform>
<translation>Pasado</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+42"/>
<location line="+1"/>
- <location line="+311"/>
+ <location line="+325"/>
<source>Apply to new notes:</source>
<translation>Se aplica a nuevas notas</translation>
</message>
<message>
- <location line="-310"/>
- <location line="+314"/>
+ <location line="-324"/>
+ <location line="+328"/>
<source>Apply to selected notes:</source>
<translation>Aplicar a las notas seleccionadas</translation>
</message>
<message>
- <location line="-307"/>
+ <location line="-321"/>
<source>Velocity:</source>
<translation>Velocidad:</translation>
</message>
@@ -14062,7 +14154,7 @@ Probablemente la pista seleccionada es del tipo incorrecto.</numerusform>
<translation>Cuantizado:</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Pixels per whole:</source>
<translation>Pixeles por entero:</translation>
</message>
@@ -14212,7 +14304,7 @@ Probablemente la pista seleccionada es del tipo incorrecto.</numerusform>
<translation>Región</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+24"/>
<source>Set up &amp;preamble</source>
<translation>Establecer encabezado</translation>
</message>
@@ -14232,7 +14324,7 @@ Probablemente la pista seleccionada es del tipo incorrecto.</numerusform>
<translation>Ajuste de nombre del pentagrama</translation>
</message>
<message>
- <location line="+221"/>
+ <location line="+224"/>
<location line="+1"/>
<source>Enter the new score title</source>
<translation>Ingrese el título de la nueva partitura</translation>
@@ -14300,14 +14392,27 @@ El título seleccionado ya existe.</translation>
</message>
</context>
<context>
+ <name>MusEGui::Strip</name>
+ <message>
+ <location filename="../../muse/mixer/strip.cpp" line="+314"/>
+ <source>Remove track?</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>MusEGui::TList</name>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="+373"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="+374"/>
<source>&lt;none&gt;</source>
<translation>&lt;ningúno&gt;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+22"/>
+ <source>visible</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
<source>no clef</source>
<translation>No hay clave</translation>
</message>
@@ -14337,30 +14442,35 @@ El título seleccionado ya existe.</translation>
<translation>Error: El nombre de pista ya existe</translation>
</message>
<message>
- <location line="+172"/>
- <location line="+1149"/>
+ <location line="+222"/>
+ <source>Unused Devices</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+88"/>
+ <location line="+1163"/>
<source>Update drummap?</source>
<translation>¿Actualizár mapa de percusión?</translation>
</message>
<message>
- <location line="-1148"/>
+ <location line="-1162"/>
<source>Do you want to use same port for all instruments in the drummap?</source>
<translation>¿Desea utilizar el mismo puerto para todos los instrumentos en el mapa de percusión?</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1149"/>
+ <location line="+1163"/>
<source>&amp;Yes</source>
<translation>Aceptar</translation>
</message>
<message>
- <location line="-1149"/>
- <location line="+1149"/>
+ <location line="-1163"/>
+ <location line="+1163"/>
<source>&amp;No</source>
<translation>Cancelar</translation>
</message>
<message>
- <location line="-1074"/>
+ <location line="-1088"/>
<location line="+55"/>
<source>show gui</source>
<translation>Ver interfáz</translation>
@@ -14372,7 +14482,7 @@ El título seleccionado ya existe.</translation>
<translation>Ver interfáz nativa</translation>
</message>
<message>
- <location line="+346"/>
+ <location line="+348"/>
<source>Treble clef</source>
<translation>Partitura de agudos</translation>
</message>
@@ -14392,7 +14502,7 @@ El título seleccionado ya existe.</translation>
<translation>Automatización visible</translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+138"/>
<source>Delete Track</source>
<translation>Borrar pista</translation>
</message>
@@ -14407,7 +14517,7 @@ El título seleccionado ya existe.</translation>
<translation>Insertar pista</translation>
</message>
<message>
- <location line="+445"/>
+ <location line="+450"/>
<source>Midi</source>
<translation>MIDI</translation>
</message>
@@ -14433,7 +14543,7 @@ El título seleccionado ya existe.</translation>
<context>
<name>MusEGui::Toolbar1</name>
<message>
- <location filename="../../muse/widgets/tb1.cpp" line="+48"/>
+ <location filename="../../muse/widgets/tb1.cpp" line="+47"/>
<location line="+1"/>
<location line="+1"/>
<source>Off</source>
@@ -14473,7 +14583,7 @@ El título seleccionado ya existe.</translation>
<translation>Pantalla completa</translation>
</message>
<message>
- <location line="+428"/>
+ <location line="+468"/>
<source>Piano roll</source>
<translation>Editor de matríz</translation>
</message>
@@ -14731,7 +14841,7 @@ El título seleccionado ya existe.</translation>
<context>
<name>MusEGui::VisibleTracks</name>
<message>
- <location filename="../../muse/widgets/visibletracks.cpp" line="+35"/>
+ <location filename="../../muse/widgets/visibletracks.cpp" line="+36"/>
<location line="+9"/>
<source>Show wave tracks</source>
<translation>Ver pistas de audio</translation>
@@ -16094,12 +16204,34 @@ una región no tiene que ser ampliada .</translation>
<translation>Crear sesión</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+10"/>
+ <source>Projects folder:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <location line="+120"/>
+ <location line="+7"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Project Name:</source>
<translation>Nombre del la sesión:</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+10"/>
+ <source>Project is a Template</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Project song file type:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+27"/>
<source>Project Path to song file:</source>
<translation>Ruta de la sesión:</translation>
</message>
@@ -16109,12 +16241,11 @@ una región no tiene que ser ampliada .</translation>
<translation>Crear carpeta para la sesión (recomendado para sesiones de audio)</translation>
</message>
<message>
- <location line="+18"/>
<source>Browse</source>
- <translation>Buscar</translation>
+ <translation type="obsolete">Buscar</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+34"/>
<source>Song information:</source>
<translation>Información de la sesión</translation>
</message>
@@ -16255,9 +16386,8 @@ actualmente sin uso</translation>
<context>
<name>QObject</name>
<message>
- <location filename="../../muse/helper.cpp" line="-61"/>
<source>Other</source>
- <translation>Otro</translation>
+ <translation type="obsolete">Otro</translation>
</message>
<message>
<location filename="../../muse/functions.cpp" line="+244"/>
@@ -16305,12 +16435,12 @@ actualmente sin uso</translation>
<translation>Nueva sesión</translation>
</message>
<message>
- <location filename="../../muse/wave.cpp" line="-990"/>
+ <location filename="../../muse/wave.cpp" line="-1006"/>
<source>create peakfile for </source>
<translation>Crear archivo de picos </translation>
</message>
<message>
- <location filename="../../muse/widgets/filedialog.cpp" line="+80"/>
+ <location filename="../../muse/widgets/filedialog.cpp" line="+81"/>
<source>MusE: get file name</source>
<translation>MusE: Obtener el nombre de archivo</translation>
</message>
@@ -16358,7 +16488,7 @@ no existe.
<translation>falló la creación de carpeta</translation>
</message>
<message>
- <location line="+396"/>
+ <location line="+373"/>
<source>File
%1
exists. Overwrite?</source>
@@ -16367,7 +16497,7 @@ exists. Overwrite?</source>
ya existe. ¿Desea sobreescribirlo?</translation>
</message>
<message>
- <location line="+33"/>
+ <location line="+35"/>
<source>Open File
%1
failed: %2</source>
@@ -16388,7 +16518,7 @@ exists</source>
existe</translation>
</message>
<message>
- <location line="-19"/>
+ <location line="-21"/>
<source>MusE: write</source>
<translation>MusE: Escribir</translation>
</message>
@@ -16412,13 +16542,13 @@ failed: </source>
falló </translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+22"/>
<source>MusE: Open File</source>
<translation>MusE: Abrir archivo</translation>
</message>
<message>
- <location filename="../../muse/route.cpp" line="+1044"/>
- <location line="+37"/>
+ <location filename="../../muse/route.cpp" line="+792"/>
+ <location line="+25"/>
<source>None</source>
<translation>Ningúno</translation>
</message>
@@ -17681,12 +17811,11 @@ en la lista de controles definidos por MusE</translation>
<context>
<name>SynthConfigBase</name>
<message>
- <location filename="../../muse/widgets/synthconfigbase.ui" line="+14"/>
<source>MusE: Synth Configuration</source>
- <translation>MusE: Configuración del Sintetizador virtual</translation>
+ <translation type="obsolete">MusE: Configuración del Sintetizador virtual</translation>
</message>
<message>
- <location line="+75"/>
+ <location filename="../../muse/widgets/synthconfigbase.ui" line="+94"/>
<source>Soft Synthesizer</source>
<translation>Sintetizador Virtual</translation>
</message>
@@ -17696,18 +17825,18 @@ en la lista de controles definidos por MusE</translation>
<translation>Archivo</translation>
</message>
<message>
- <location line="-115"/>
+ <location line="-120"/>
<source>Instances</source>
<translation>Copias</translation>
</message>
<message>
<location line="+10"/>
- <location line="+115"/>
+ <location line="+125"/>
<source>Name</source>
<translation>Nombre</translation>
</message>
<message>
- <location line="-17"/>
+ <location line="-22"/>
<source>list of available software synthesizers</source>
<translation>lista de sintetizadores de software dispoibles</translation>
</message>
@@ -17731,12 +17860,23 @@ en la lista de controles definidos por MusE</translation>
<translation>Puerto MIDI</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="-26"/>
+ <source>Midi Port and Soft Synth Configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <location line="+110"/>
+ <source>Type</source>
+ <translation type="unfinished">Tipo</translation>
+ </message>
+ <message>
+ <location line="-67"/>
<source>Midi connections</source>
<translation>Conexiones de MIDI</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+72"/>
<source>Inst</source>
<translation>Instrumento</translation>
</message>
@@ -18530,6 +18670,181 @@ Robert Jonsson
</message>
</context>
<context>
+ <name>file_patterns</name>
+ <message>
+ <location filename="../../muse/globals.cpp" line="+120"/>
+ <source>Midi/Kar (*.mid *.MID *.kar *.KAR *.mid.gz *.mid.bz2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Midi (*.mid *.MID *.mid.gz *.mid.bz2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Karaoke (*.kar *.KAR *.kar.gz *.kar.bz2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+24"/>
+ <location line="+11"/>
+ <location line="+7"/>
+ <location line="+15"/>
+ <location line="+15"/>
+ <location line="+7"/>
+ <location line="+14"/>
+ <location line="+8"/>
+ <location line="+6"/>
+ <location line="+8"/>
+ <location line="+8"/>
+ <source>All Files (*)</source>
+ <translation type="unfinished">Todos los archivos (*)</translation>
+ </message>
+ <message>
+ <location line="-101"/>
+ <source>Midi (*.mid)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Karaoke (*.kar)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>all known files (*.med *.med.gz *.med.bz2 *.mid *.midi *.kar)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>med Files (*.med *.med.gz *.med.bz2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+8"/>
+ <location line="+7"/>
+ <source>Uncompressed med Files (*.med)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <location line="+8"/>
+ <location line="+7"/>
+ <source>gzip compressed med Files (*.med.gz)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <location line="+8"/>
+ <location line="+7"/>
+ <source>bzip2 compressed med Files (*.med.bz2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-14"/>
+ <source>mid Files (*.mid *.midi *.kar *.MID *.MIDI *.KAR)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>(*.jpg *.gif *.png)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(*.jpg)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(*.gif)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(*.png)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>part Files (*.mpt *.mpt.gz *.mpt.bz2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>part Files (*.mpt)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>gzip compressed part Files (*.mpt.gz)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>bzip2 compressed part Files (*.mpt.bz2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Presets (*.pre *.pre.gz *.pre.bz2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Presets (*.pre)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>gzip compressed presets (*.pre.gz)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>bzip2 compressed presets (*.pre.bz2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Presets (*.map *.map.gz *.map.bz2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Presets (*.map)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>gzip compressed presets (*.map.gz)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>bzip2 compressed presets (*.map.bz2)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Wave/Binary (*.wav *.ogg *.bin)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Wave (*.wav *.ogg)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Binary (*.bin)</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>freeverb</name>
<message>
<location filename="../plugins/1050.ui" line="+20"/>
diff --git a/muse2/share/locale/muse_fr.ts b/muse2/share/locale/muse_fr.ts
index eb19761e..7880a360 100644
--- a/muse2/share/locale/muse_fr.ts
+++ b/muse2/share/locale/muse_fr.ts
@@ -226,7 +226,7 @@ cliquez sur une pièces pour la rendre muette ou pas.</translation>
<translation type="obsolete">Tous les Fichiers (*)</translation>
</message>
<message>
- <location filename="../../muse/helper.cpp" line="+185"/>
+ <location filename="../../muse/helper.cpp" line="+200"/>
<source>Add Midi Track</source>
<translation type="unfinished">Ajouter une Piste Midi</translation>
</message>
@@ -270,7 +270,7 @@ cliquez sur une pièces pour la rendre muette ou pas.</translation>
<translation type="obsolete">Mesure</translation>
</message>
<message>
- <location filename="../../muse/midiport.cpp" line="+1190"/>
+ <location filename="../../muse/midiport.cpp" line="+1194"/>
<source>Route</source>
<translation type="unfinished"></translation>
</message>
@@ -289,7 +289,7 @@ cliquez sur une pièces pour la rendre muette ou pas.</translation>
<translation type="obsolete">Vélocité</translation>
</message>
<message>
- <location line="-857"/>
+ <location line="-861"/>
<source>Warning: No output devices!</source>
<translation type="unfinished"></translation>
</message>
@@ -299,7 +299,7 @@ cliquez sur une pièces pour la rendre muette ou pas.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+27"/>
<source>Empty ports</source>
<translation type="unfinished"></translation>
</message>
@@ -4872,7 +4872,7 @@ Time)</translation>
<translation>MusE: Paramètres</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+559"/>
<source>Audio</source>
<translation>Audio</translation>
</message>
@@ -5002,7 +5002,7 @@ Time)</translation>
<translation type="obsolete">GUI</translation>
</message>
<message>
- <location line="+240"/>
+ <location line="+216"/>
<source>/sec</source>
<translation>/sec</translation>
</message>
@@ -5106,12 +5106,12 @@ left button behave like the middle button in such areas.</source>
<translation type="obsolete">Navigateur pour l&apos;aide:</translation>
</message>
<message>
- <location line="-1538"/>
+ <location line="-1543"/>
<source>Application</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+41"/>
<source>Views</source>
<translation type="unfinished"></translation>
</message>
@@ -5291,7 +5291,22 @@ left button behave like the middle button in such areas.</source>
<translation type="unfinished">16</translation>
</message>
<message>
- <location line="-719"/>
+ <location line="-942"/>
+ <source>Project directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Projects:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location line="+204"/>
<source>Main Window</source>
<translation type="unfinished"></translation>
</message>
@@ -5431,12 +5446,7 @@ Adjusts responsiveness of audio controls and
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+126"/>
- <source>Instruments Directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+41"/>
+ <location line="+143"/>
<source>GUI Behaviour</source>
<translation type="unfinished"></translation>
</message>
@@ -5451,12 +5461,12 @@ Adjusts responsiveness of audio controls and
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-791"/>
+ <location line="-767"/>
<source>On Launch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+736"/>
+ <location line="+712"/>
<source>Behavior</source>
<translation type="unfinished"></translation>
</message>
@@ -9266,6 +9276,14 @@ click on the Restart button.</source>
</message>
</context>
<context>
+ <name>MusEGui</name>
+ <message>
+ <location filename="../../muse/helper.cpp" line="+56"/>
+ <source>Select project directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>MusEGui::Appearance</name>
<message>
<location filename="../../muse/appearance.cpp" line="+132"/>
@@ -9275,35 +9293,34 @@ click on the Restart button.</source>
</message>
<message>
<location line="+1"/>
- <source>For small controls like mixer strips.
-Also timescale small numbers, arranger part name overlay,
- and effects rack.</source>
+ <source>Mixer strips and effects racks. Midi track info panel.
+Midi control panel entry box.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>Midi track info panel. Transport controls.</source>
+ <source>Transport controls.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>Controller graph and S/X buttons. Large numbers for time
- and tempo scale, and time signature.</source>
+ <source>Time scale upper, and time signature.
+Controller graph and S/X buttons.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>Time scale markers.</source>
+ <source>Time scale lower, and arranger part name overlay.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>List editor: meta event edit dialog multi-line edit box.</source>
+ <source>Tempo scale, and markers.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>Mixer label font. Auto-font-sizing up to chosen font size.
+ <source>Mixer labels. Auto-font-sizing up to chosen font size.
Word-breaking but only with spaces.</source>
<translation type="unfinished"></translation>
</message>
@@ -10647,48 +10664,19 @@ Right-click to show GUI.</source>
<translation type="unfinished">MusE: échec de l&apos;enregistrement</translation>
</message>
<message>
- <location line="+32"/>
- <location line="+12"/>
- <location line="+280"/>
- <location line="+12"/>
- <source>MusE:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-303"/>
- <location line="+292"/>
- <source>The user instrument directory
-%1
-does not exist yet. Create it now?
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-291"/>
- <location line="+292"/>
- <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-282"/>
- <location line="+292"/>
- <source>Unable to create user instrument directory &apos;%1&apos;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-244"/>
- <location line="+266"/>
+ <location line="+75"/>
+ <location line="+249"/>
<source>MusE: Save Instrument Definition</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-265"/>
- <location line="+266"/>
+ <location line="-248"/>
+ <location line="+249"/>
<source>Instrument Definition (*.idf)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-154"/>
+ <location line="-137"/>
<location line="+29"/>
<source>MusE: Save instrument as</source>
<translation type="unfinished"></translation>
@@ -10705,7 +10693,7 @@ Are you sure?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+526"/>
+ <location line="+509"/>
<source>MusE: Bad instrument name</source>
<translation type="unfinished"></translation>
</message>
@@ -11050,14 +11038,6 @@ cliquez sur une pièces pour la rendre muette ou pas.</translation>
</message>
</context>
<context>
- <name>MusEGui::GlobalSettingsConfig</name>
- <message>
- <location filename="../../muse/widgets/genset.cpp" line="+561"/>
- <source>Selects instruments directory</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>MusEGui::Header</name>
<message>
<location filename="../../muse/widgets/header.cpp" line="+164"/>
@@ -11336,19 +11316,19 @@ polyphonique</translation>
<name>MusEGui::MPConfig</name>
<message>
<location filename="../../muse/confmport.cpp" line="+101"/>
- <location line="+176"/>
+ <location line="+179"/>
<source>Default input connections</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-175"/>
+ <location line="-178"/>
<location line="+66"/>
<source>Are you sure you want to apply to all existing midi tracks now?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-1"/>
- <location line="+148"/>
+ <location line="+151"/>
<source>Default output connections</source>
<translation type="unfinished"></translation>
</message>
@@ -11371,18 +11351,18 @@ Do you want to apply to all existing midi tracks now?</source>
</message>
<message>
<location line="+72"/>
- <location line="+859"/>
+ <location line="+957"/>
<source>in</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-836"/>
- <location line="+827"/>
+ <location line="-934"/>
+ <location line="+925"/>
<source>out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-771"/>
+ <location line="-869"/>
<source>Show first aliases</source>
<translation type="unfinished"></translation>
</message>
@@ -11409,7 +11389,7 @@ Do you want to apply to all existing midi tracks now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+229"/>
+ <location line="+326"/>
<location line="+29"/>
<source>Port Number</source>
<translation type="unfinished">Numéro de port</translation>
@@ -11525,7 +11505,7 @@ Do you want to apply to all existing midi tracks now?</source>
<translation type="unfinished">Etat: résultat de l&apos;ouverture du port</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="+42"/>
<source>Port</source>
<translation type="unfinished">Port</translation>
</message>
@@ -12206,7 +12186,7 @@ Apply sync settings?</source>
<name>MusEGui::MidiTrackInfo</name>
<message>
<location filename="../../muse/widgets/mtrackinfo.cpp" line="+335"/>
- <location line="+1068"/>
+ <location line="+1083"/>
<source>&lt;unknown&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -12231,7 +12211,7 @@ Apply sync settings?</source>
<context>
<name>MusEGui::MusE</name>
<message>
- <location filename="../../muse/app.cpp" line="+137"/>
+ <location filename="../../muse/app.cpp" line="+144"/>
<location line="+16"/>
<source>Failed to start audio!</source>
<translation type="unfinished"></translation>
@@ -12249,7 +12229,7 @@ Apply sync settings?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+220"/>
+ <location line="+209"/>
<source>Und&amp;o</source>
<translation type="unfinished">&amp;Annuler</translation>
</message>
@@ -12402,13 +12382,13 @@ midi</translation>
</message>
<message>
<location line="+2"/>
- <location line="+1030"/>
- <location line="+1255"/>
+ <location line="+1091"/>
+ <location line="+1248"/>
<source>&amp;Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-2283"/>
+ <location line="-2337"/>
<location line="+3"/>
<source>Click this button to save the song you are editing. You will be prompted for a file name.
You can also select the Save command from the File menu.</source>
@@ -12691,7 +12671,7 @@ You can also select the Save command from the File menu.</source>
<translation type="unfinished">Transport</translation>
</message>
<message>
- <location line="+55"/>
+ <location line="+56"/>
<source>&amp;File</source>
<translation type="unfinished">&amp;Fichier</translation>
</message>
@@ -12731,12 +12711,12 @@ You can also select the Save command from the File menu.</source>
<translation type="unfinished">&amp;Aide</translation>
</message>
<message>
- <location line="+289"/>
+ <location line="+340"/>
<source>Cannot read template</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>File open error</source>
<translation type="unfinished"></translation>
</message>
@@ -12751,14 +12731,14 @@ You can also select the Save command from the File menu.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+130"/>
- <location line="+437"/>
- <location line="+914"/>
+ <location line="+134"/>
+ <location line="+432"/>
+ <location line="+916"/>
<source>MusE: Song: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1317"/>
+ <location line="-1314"/>
<source>MusE: load project</source>
<translation type="unfinished">Muse: charger Projet</translation>
</message>
@@ -12768,7 +12748,7 @@ You can also select the Save command from the File menu.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+66"/>
<source>MusE: Write File failed</source>
<translation type="unfinished">MusE: échec de l&apos;enregistrement</translation>
</message>
@@ -12781,29 +12761,28 @@ non encore sauvegardées. Enregistrer?</translation>
</message>
<message>
<location line="+2"/>
- <location line="+1255"/>
+ <location line="+1248"/>
<source>S&amp;kip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1255"/>
+ <location line="-1248"/>
<source>&amp;Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+265"/>
- <location line="+13"/>
+ <location line="+254"/>
<source>MusE: Save As</source>
<translation type="unfinished">MusE: enregistrer sous</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+72"/>
<location line="+160"/>
<source>Nothing to edit</source>
<translation type="unfinished">Rien � éditer</translation>
</message>
<message>
- <location line="+494"/>
+ <location line="+495"/>
<location line="+10"/>
<location line="+31"/>
<location line="+34"/>
@@ -12861,7 +12840,7 @@ and one audio output track</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+83"/>
<source>The current Project contains unsaved data
Load overwrites current Project:
Save Current Project?</source>
@@ -13412,7 +13391,7 @@ sélectionnées</translation>
<context>
<name>MusEGui::PluginDialog</name>
<message>
- <location filename="../../muse/plugin.cpp" line="+3137"/>
+ <location filename="../../muse/plugin.cpp" line="+3147"/>
<source>MusE: select plugin</source>
<translation type="unfinished">MusE: choisir plugin</translation>
</message>
@@ -13515,7 +13494,7 @@ sélectionnées</translation>
<context>
<name>MusEGui::PluginGui</name>
<message>
- <location line="+207"/>
+ <location line="+208"/>
<source>File Buttons</source>
<translation type="unfinished"></translation>
</message>
@@ -13552,34 +13531,42 @@ sélectionnées</translation>
</message>
</context>
<context>
+ <name>MusEGui::ProjectCreateImpl</name>
+ <message>
+ <location filename="../../muse/widgets/projectcreateimpl.cpp" line="+105"/>
+ <source>Select directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>MusEGui::RoutePopupMenu</name>
<message>
- <location filename="../../muse/widgets/routepopup.cpp" line="+230"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="+234"/>
<location line="+2"/>
<location line="+132"/>
<location line="+78"/>
<location line="+57"/>
<location line="+60"/>
- <location line="+685"/>
+ <location line="+883"/>
<location line="+85"/>
<source>Channel</source>
<translation type="unfinished">Canal</translation>
</message>
<message>
- <location line="-270"/>
- <location line="+220"/>
+ <location line="-292"/>
+ <location line="+242"/>
<location line="+85"/>
<source>Soloing chain</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-303"/>
- <location line="+220"/>
+ <location line="-325"/>
+ <location line="+242"/>
<source>Audio returns</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-182"/>
+ <location line="-204"/>
<source>Warning: No input devices!</source>
<translation type="unfinished"></translation>
</message>
@@ -13589,18 +13576,18 @@ sélectionnées</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+42"/>
- <location line="+33"/>
+ <location line="+61"/>
+ <location line="+36"/>
<source>&lt;none&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-19"/>
+ <location line="-22"/>
<source>Toggle all</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>More...</source>
<translation type="unfinished"></translation>
</message>
@@ -13981,12 +13968,17 @@ the selected title is not unique</source>
<context>
<name>MusEGui::TList</name>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="+373"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="+374"/>
<source>&lt;none&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+22"/>
+ <source>visible</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
<source>no clef</source>
<translation type="unfinished"></translation>
</message>
@@ -14016,30 +14008,35 @@ the selected title is not unique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+172"/>
- <location line="+1149"/>
+ <location line="+222"/>
+ <source>Unused Devices</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+88"/>
+ <location line="+1163"/>
<source>Update drummap?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1148"/>
+ <location line="-1162"/>
<source>Do you want to use same port for all instruments in the drummap?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <location line="+1149"/>
+ <location line="+1163"/>
<source>&amp;Yes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1149"/>
- <location line="+1149"/>
+ <location line="-1163"/>
+ <location line="+1163"/>
<source>&amp;No</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1074"/>
+ <location line="-1088"/>
<location line="+55"/>
<source>show gui</source>
<translation type="unfinished">montrer l&apos;interface</translation>
@@ -14051,7 +14048,7 @@ the selected title is not unique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+346"/>
+ <location line="+348"/>
<source>Treble clef</source>
<translation type="unfinished"></translation>
</message>
@@ -14071,7 +14068,7 @@ the selected title is not unique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+138"/>
<source>Delete Track</source>
<translation type="unfinished"></translation>
</message>
@@ -14086,7 +14083,7 @@ the selected title is not unique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+445"/>
+ <location line="+450"/>
<source>Midi</source>
<translation type="unfinished"></translation>
</message>
@@ -15735,27 +15732,44 @@ to be expanded by more than </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+10"/>
+ <source>Projects folder:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <location line="+120"/>
+ <location line="+7"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Project Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
- <source>Project Path to song file:</source>
+ <location line="+10"/>
+ <source>Project is a Template</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+20"/>
- <source>Create project folder (recommended for audio projects)</source>
+ <location line="+27"/>
+ <source>Project song file type:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+18"/>
- <source>Browse</source>
+ <location line="+27"/>
+ <source>Project Path to song file:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+20"/>
+ <source>Create project folder (recommended for audio projects)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
<source>Song information:</source>
<translation type="unfinished"></translation>
</message>
@@ -15994,14 +16008,14 @@ Create it?</source>
<translation>échec de la création du répertoire</translation>
</message>
<message>
- <location line="+399"/>
+ <location line="+373"/>
<source>File
%1
exists. Overwrite?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+33"/>
+ <location line="+35"/>
<source>Open File
%1
failed: %2</source>
@@ -16020,7 +16034,7 @@ exists</source>
existe</translation>
</message>
<message>
- <location line="-19"/>
+ <location line="-21"/>
<source>MusE: write</source>
<translation>MusE: écriture</translation>
</message>
@@ -16045,7 +16059,7 @@ failed: </source>
échec:</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+22"/>
<source>MusE: Open File</source>
<translation>MusE: Ouvrir un Fichier</translation>
</message>
@@ -18146,7 +18160,7 @@ Robert Jonsson
<location line="+24"/>
<location line="+11"/>
<location line="+7"/>
- <location line="+9"/>
+ <location line="+15"/>
<location line="+15"/>
<location line="+7"/>
<location line="+14"/>
@@ -18158,7 +18172,7 @@ Robert Jonsson
<translation type="unfinished">Tous les Fichiers (*)</translation>
</message>
<message>
- <location line="-95"/>
+ <location line="-101"/>
<source>Midi (*.mid)</source>
<translation type="unfinished"></translation>
</message>
@@ -18180,28 +18194,31 @@ Robert Jonsson
<message>
<location line="+1"/>
<location line="+8"/>
+ <location line="+7"/>
<source>Uncompressed med Files (*.med)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-7"/>
+ <location line="-14"/>
<location line="+8"/>
+ <location line="+7"/>
<source>gzip compressed med Files (*.med.gz)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-7"/>
+ <location line="-14"/>
<location line="+8"/>
+ <location line="+7"/>
<source>bzip2 compressed med Files (*.med.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-7"/>
+ <location line="-14"/>
<source>mid Files (*.mid *.midi *.kar *.MID *.MIDI *.KAR)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+19"/>
<source>(*.jpg *.gif *.png)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/muse2/share/locale/muse_pl.ts b/muse2/share/locale/muse_pl.ts
index 00fa0d2c..19ea4894 100644
--- a/muse2/share/locale/muse_pl.ts
+++ b/muse2/share/locale/muse_pl.ts
@@ -200,7 +200,7 @@ Kliknij na pojedynczy klocek aby go wyłączyć z odtwarzania.</translation>
<translation type="obsolete">Wszystkie Pliki (*)</translation>
</message>
<message>
- <location filename="../../muse/helper.cpp" line="+185"/>
+ <location filename="../../muse/helper.cpp" line="+200"/>
<source>Add Midi Track</source>
<translation type="unfinished">Dodaj Ślad Midi</translation>
</message>
@@ -244,7 +244,7 @@ Kliknij na pojedynczy klocek aby go wyłączyć z odtwarzania.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../muse/midiport.cpp" line="+1190"/>
+ <location filename="../../muse/midiport.cpp" line="+1194"/>
<source>Route</source>
<translation type="unfinished">Połącznie</translation>
</message>
@@ -259,7 +259,7 @@ Kliknij na pojedynczy klocek aby go wyłączyć z odtwarzania.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-857"/>
+ <location line="-861"/>
<source>Warning: No output devices!</source>
<translation type="unfinished"></translation>
</message>
@@ -269,7 +269,7 @@ Kliknij na pojedynczy klocek aby go wyłączyć z odtwarzania.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+27"/>
<source>Empty ports</source>
<translation type="unfinished"></translation>
</message>
@@ -4744,7 +4744,7 @@ Configuration</source>
<translation>MuzA: Globalne Ustawienia</translation>
</message>
<message>
- <location line="+530"/>
+ <location line="+559"/>
<source>Audio</source>
<translation>Audio</translation>
</message>
@@ -4875,7 +4875,7 @@ RTC (Rzeczywista Rozdzielczość Zegara)
<translation type="obsolete">Interfejs Użytkownika</translation>
</message>
<message>
- <location line="+240"/>
+ <location line="+216"/>
<source>/sec</source>
<translation>/sek.</translation>
</message>
@@ -4978,12 +4978,12 @@ left button behave like the middle button in such areas.</source>
<translation type="obsolete">Przeglądarka pomocy:</translation>
</message>
<message>
- <location line="-1538"/>
+ <location line="-1543"/>
<source>Application</source>
<translation>Zastosowanie</translation>
</message>
<message>
- <location line="+389"/>
+ <location line="+418"/>
<source>Start Muse</source>
<translation>Uruchamianie MuzA</translation>
</message>
@@ -5163,7 +5163,22 @@ left button behave like the middle button in such areas.</source>
<translation type="unfinished">16</translation>
</message>
<message>
- <location line="-719"/>
+ <location line="-942"/>
+ <source>Project directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Projects:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location line="+204"/>
<source>Main Window</source>
<translation type="unfinished"></translation>
</message>
@@ -5303,12 +5318,7 @@ Adjusts responsiveness of audio controls and
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+126"/>
- <source>Instruments Directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+41"/>
+ <location line="+143"/>
<source>GUI Behaviour</source>
<translation type="unfinished"></translation>
</message>
@@ -5323,12 +5333,12 @@ Adjusts responsiveness of audio controls and
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-791"/>
+ <location line="-767"/>
<source>On Launch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+736"/>
+ <location line="+712"/>
<source>Behavior</source>
<translation type="unfinished"></translation>
</message>
@@ -9247,6 +9257,14 @@ click on the Restart button.</source>
</message>
</context>
<context>
+ <name>MusEGui</name>
+ <message>
+ <location filename="../../muse/helper.cpp" line="+56"/>
+ <source>Select project directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>MusEGui::Appearance</name>
<message>
<location filename="../../muse/appearance.cpp" line="+132"/>
@@ -9256,35 +9274,34 @@ click on the Restart button.</source>
</message>
<message>
<location line="+1"/>
- <source>For small controls like mixer strips.
-Also timescale small numbers, arranger part name overlay,
- and effects rack.</source>
+ <source>Mixer strips and effects racks. Midi track info panel.
+Midi control panel entry box.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>Midi track info panel. Transport controls.</source>
+ <source>Transport controls.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>Controller graph and S/X buttons. Large numbers for time
- and tempo scale, and time signature.</source>
+ <source>Time scale upper, and time signature.
+Controller graph and S/X buttons.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>Time scale markers.</source>
+ <source>Time scale lower, and arranger part name overlay.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>List editor: meta event edit dialog multi-line edit box.</source>
+ <source>Tempo scale, and markers.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>Mixer label font. Auto-font-sizing up to chosen font size.
+ <source>Mixer labels. Auto-font-sizing up to chosen font size.
Word-breaking but only with spaces.</source>
<translation type="unfinished"></translation>
</message>
@@ -10627,48 +10644,19 @@ Right-click to show GUI.</source>
<translation type="unfinished">MuzA: Zapis pliku nie powiódł się</translation>
</message>
<message>
- <location line="+32"/>
- <location line="+12"/>
- <location line="+280"/>
- <location line="+12"/>
- <source>MusE:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-303"/>
- <location line="+292"/>
- <source>The user instrument directory
-%1
-does not exist yet. Create it now?
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-291"/>
- <location line="+292"/>
- <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-282"/>
- <location line="+292"/>
- <source>Unable to create user instrument directory &apos;%1&apos;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-244"/>
- <location line="+266"/>
+ <location line="+75"/>
+ <location line="+249"/>
<source>MusE: Save Instrument Definition</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-265"/>
- <location line="+266"/>
+ <location line="-248"/>
+ <location line="+249"/>
<source>Instrument Definition (*.idf)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-154"/>
+ <location line="-137"/>
<location line="+29"/>
<source>MusE: Save instrument as</source>
<translation type="unfinished"></translation>
@@ -10685,7 +10673,7 @@ Are you sure?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+526"/>
+ <location line="+509"/>
<source>MusE: Bad instrument name</source>
<translation type="unfinished"></translation>
</message>
@@ -11025,14 +11013,6 @@ Kliknij na pojedynczy klocek aby go wyłączyć z odtwarzania.</translation>
</message>
</context>
<context>
- <name>MusEGui::GlobalSettingsConfig</name>
- <message>
- <location filename="../../muse/widgets/genset.cpp" line="+561"/>
- <source>Selects instruments directory</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>MusEGui::Header</name>
<message>
<location filename="../../muse/widgets/header.cpp" line="+164"/>
@@ -11310,19 +11290,19 @@ Kliknij na pojedynczy klocek aby go wyłączyć z odtwarzania.</translation>
<name>MusEGui::MPConfig</name>
<message>
<location filename="../../muse/confmport.cpp" line="+101"/>
- <location line="+176"/>
+ <location line="+179"/>
<source>Default input connections</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-175"/>
+ <location line="-178"/>
<location line="+66"/>
<source>Are you sure you want to apply to all existing midi tracks now?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-1"/>
- <location line="+148"/>
+ <location line="+151"/>
<source>Default output connections</source>
<translation type="unfinished"></translation>
</message>
@@ -11345,18 +11325,18 @@ Do you want to apply to all existing midi tracks now?</source>
</message>
<message>
<location line="+72"/>
- <location line="+859"/>
+ <location line="+957"/>
<source>in</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-836"/>
- <location line="+827"/>
+ <location line="-934"/>
+ <location line="+925"/>
<source>out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-771"/>
+ <location line="-869"/>
<source>Show first aliases</source>
<translation type="unfinished"></translation>
</message>
@@ -11383,7 +11363,7 @@ Do you want to apply to all existing midi tracks now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+229"/>
+ <location line="+326"/>
<location line="+29"/>
<source>Port Number</source>
<translation type="unfinished">Numer portu</translation>
@@ -11499,7 +11479,7 @@ Do you want to apply to all existing midi tracks now?</source>
<translation type="unfinished">Status: rezultat otworzenia urządzenia</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="+42"/>
<source>Port</source>
<translation type="unfinished"></translation>
</message>
@@ -12180,7 +12160,7 @@ Apply sync settings?</source>
<name>MusEGui::MidiTrackInfo</name>
<message>
<location filename="../../muse/widgets/mtrackinfo.cpp" line="+335"/>
- <location line="+1068"/>
+ <location line="+1083"/>
<source>&lt;unknown&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -12205,7 +12185,7 @@ Apply sync settings?</source>
<context>
<name>MusEGui::MusE</name>
<message>
- <location filename="../../muse/app.cpp" line="+137"/>
+ <location filename="../../muse/app.cpp" line="+144"/>
<location line="+16"/>
<source>Failed to start audio!</source>
<translation type="unfinished"></translation>
@@ -12223,7 +12203,7 @@ Apply sync settings?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+220"/>
+ <location line="+209"/>
<source>Und&amp;o</source>
<translation type="unfinished">Co&amp;fnij</translation>
</message>
@@ -12373,13 +12353,13 @@ Apply sync settings?</source>
</message>
<message>
<location line="+2"/>
- <location line="+1030"/>
- <location line="+1255"/>
+ <location line="+1091"/>
+ <location line="+1248"/>
<source>&amp;Save</source>
<translation type="unfinished">&amp;Zapisz</translation>
</message>
<message>
- <location line="-2283"/>
+ <location line="-2337"/>
<location line="+3"/>
<source>Click this button to save the song you are editing. You will be prompted for a file name.
You can also select the Save command from the File menu.</source>
@@ -12665,7 +12645,7 @@ Zgrywanie śladu (bounce)</translation>
<translation type="unfinished">Panel transportu</translation>
</message>
<message>
- <location line="+55"/>
+ <location line="+56"/>
<source>&amp;File</source>
<translation type="unfinished">&amp;Plik</translation>
</message>
@@ -12705,12 +12685,12 @@ Zgrywanie śladu (bounce)</translation>
<translation type="unfinished">P&amp;omoc</translation>
</message>
<message>
- <location line="+289"/>
+ <location line="+340"/>
<source>Cannot read template</source>
<translation type="unfinished">Nie można odczytać pliku szablonu</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>File open error</source>
<translation type="unfinished">Błąd odczytu pliku</translation>
</message>
@@ -12725,14 +12705,14 @@ Zgrywanie śladu (bounce)</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+130"/>
- <location line="+437"/>
- <location line="+914"/>
+ <location line="+134"/>
+ <location line="+432"/>
+ <location line="+916"/>
<source>MusE: Song: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1317"/>
+ <location line="-1314"/>
<source>MusE: load project</source>
<translation type="unfinished">MuzA: ładuj utwór</translation>
</message>
@@ -12742,7 +12722,7 @@ Zgrywanie śladu (bounce)</translation>
<translation type="unfinished">MuzA: ładuj szablon</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+66"/>
<source>MusE: Write File failed</source>
<translation type="unfinished">MuzA: Zapis pliku nie powiódł się</translation>
</message>
@@ -12755,29 +12735,28 @@ Zapisać otwarty utwór?</translation>
</message>
<message>
<location line="+2"/>
- <location line="+1255"/>
+ <location line="+1248"/>
<source>S&amp;kip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1255"/>
+ <location line="-1248"/>
<source>&amp;Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+265"/>
- <location line="+13"/>
+ <location line="+254"/>
<source>MusE: Save As</source>
<translation type="unfinished">MuzA: Zapisz Jako</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+72"/>
<location line="+160"/>
<source>Nothing to edit</source>
<translation type="unfinished">Nie ma nic do edytowania</translation>
</message>
<message>
- <location line="+494"/>
+ <location line="+495"/>
<location line="+10"/>
<location line="+31"/>
<location line="+34"/>
@@ -12835,7 +12814,7 @@ and one audio output track</source>
<translation type="unfinished">ustaw lokatory do zgrania (bounce) danego zakresu</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+83"/>
<source>The current Project contains unsaved data
Load overwrites current Project:
Save Current Project?</source>
@@ -13382,7 +13361,7 @@ Likely the selected track is the wrong type.</source>
<context>
<name>MusEGui::PluginDialog</name>
<message>
- <location filename="../../muse/plugin.cpp" line="+3137"/>
+ <location filename="../../muse/plugin.cpp" line="+3147"/>
<source>MusE: select plugin</source>
<translation type="unfinished">MuzA: wybierz wtyczkę</translation>
</message>
@@ -13485,7 +13464,7 @@ Likely the selected track is the wrong type.</source>
<context>
<name>MusEGui::PluginGui</name>
<message>
- <location line="+207"/>
+ <location line="+208"/>
<source>File Buttons</source>
<translation type="unfinished">Przyciski Menu Plik</translation>
</message>
@@ -13522,34 +13501,42 @@ Likely the selected track is the wrong type.</source>
</message>
</context>
<context>
+ <name>MusEGui::ProjectCreateImpl</name>
+ <message>
+ <location filename="../../muse/widgets/projectcreateimpl.cpp" line="+105"/>
+ <source>Select directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>MusEGui::RoutePopupMenu</name>
<message>
- <location filename="../../muse/widgets/routepopup.cpp" line="+230"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="+234"/>
<location line="+2"/>
<location line="+132"/>
<location line="+78"/>
<location line="+57"/>
<location line="+60"/>
- <location line="+685"/>
+ <location line="+883"/>
<location line="+85"/>
<source>Channel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-270"/>
- <location line="+220"/>
+ <location line="-292"/>
+ <location line="+242"/>
<location line="+85"/>
<source>Soloing chain</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-303"/>
- <location line="+220"/>
+ <location line="-325"/>
+ <location line="+242"/>
<source>Audio returns</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-182"/>
+ <location line="-204"/>
<source>Warning: No input devices!</source>
<translation type="unfinished"></translation>
</message>
@@ -13559,18 +13546,18 @@ Likely the selected track is the wrong type.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+42"/>
- <location line="+33"/>
+ <location line="+61"/>
+ <location line="+36"/>
<source>&lt;none&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-19"/>
+ <location line="-22"/>
<source>Toggle all</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>More...</source>
<translation type="unfinished"></translation>
</message>
@@ -13951,12 +13938,17 @@ the selected title is not unique</source>
<context>
<name>MusEGui::TList</name>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="+373"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="+374"/>
<source>&lt;none&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+22"/>
+ <source>visible</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
<source>no clef</source>
<translation type="unfinished"></translation>
</message>
@@ -13986,30 +13978,35 @@ the selected title is not unique</source>
<translation type="unfinished">proszę wybrać niepowtarzalną nazwę dla śladu</translation>
</message>
<message>
- <location line="+172"/>
- <location line="+1149"/>
+ <location line="+222"/>
+ <source>Unused Devices</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+88"/>
+ <location line="+1163"/>
<source>Update drummap?</source>
<translation type="unfinished">Zaktualizować zestaw perkusyjny?</translation>
</message>
<message>
- <location line="-1148"/>
+ <location line="-1162"/>
<source>Do you want to use same port for all instruments in the drummap?</source>
<translation type="unfinished">Czy chcesz używać jednego portu midi dla wszystkich instrumentów w zestawie perkusyjnym?</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1149"/>
+ <location line="+1163"/>
<source>&amp;Yes</source>
<translation type="unfinished">&amp;Tak</translation>
</message>
<message>
- <location line="-1149"/>
- <location line="+1149"/>
+ <location line="-1163"/>
+ <location line="+1163"/>
<source>&amp;No</source>
<translation type="unfinished">&amp;Nie</translation>
</message>
<message>
- <location line="-1074"/>
+ <location line="-1088"/>
<location line="+55"/>
<source>show gui</source>
<translation type="unfinished">pokaż interfejs użytkownika</translation>
@@ -14021,7 +14018,7 @@ the selected title is not unique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+346"/>
+ <location line="+348"/>
<source>Treble clef</source>
<translation type="unfinished"></translation>
</message>
@@ -14041,7 +14038,7 @@ the selected title is not unique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+138"/>
<source>Delete Track</source>
<translation type="unfinished"></translation>
</message>
@@ -14056,7 +14053,7 @@ the selected title is not unique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+445"/>
+ <location line="+450"/>
<source>Midi</source>
<translation type="unfinished">Midi</translation>
</message>
@@ -15597,27 +15594,44 @@ to be expanded by more than </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+10"/>
+ <source>Projects folder:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <location line="+120"/>
+ <location line="+7"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Project Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
- <source>Project Path to song file:</source>
+ <location line="+10"/>
+ <source>Project is a Template</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+20"/>
- <source>Create project folder (recommended for audio projects)</source>
+ <location line="+27"/>
+ <source>Project song file type:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+18"/>
- <source>Browse</source>
+ <location line="+27"/>
+ <source>Project Path to song file:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+20"/>
+ <source>Create project folder (recommended for audio projects)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
<source>Song information:</source>
<translation type="unfinished"></translation>
</message>
@@ -15835,14 +15849,14 @@ Create it?</source>
<translation>tworzenie katalogu nie powiodło się</translation>
</message>
<message>
- <location line="+399"/>
+ <location line="+373"/>
<source>File
%1
exists. Overwrite?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+33"/>
+ <location line="+35"/>
<source>Open File
%1
failed: %2</source>
@@ -15859,7 +15873,7 @@ exists</source>
<translation type="obsolete">istnieje</translation>
</message>
<message>
- <location line="-19"/>
+ <location line="-21"/>
<source>MusE: write</source>
<translation type="unfinished">MuzA: zapis:</translation>
</message>
@@ -15882,7 +15896,7 @@ failed: </source>
<translation type="obsolete">nie udane</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+22"/>
<source>MusE: Open File</source>
<translation>MuzA: Otwórz plik</translation>
</message>
@@ -17812,7 +17826,7 @@ Robert Jonsson
<location line="+24"/>
<location line="+11"/>
<location line="+7"/>
- <location line="+9"/>
+ <location line="+15"/>
<location line="+15"/>
<location line="+7"/>
<location line="+14"/>
@@ -17824,7 +17838,7 @@ Robert Jonsson
<translation type="unfinished">Wszystkie Pliki (*)</translation>
</message>
<message>
- <location line="-95"/>
+ <location line="-101"/>
<source>Midi (*.mid)</source>
<translation type="unfinished"></translation>
</message>
@@ -17846,28 +17860,31 @@ Robert Jonsson
<message>
<location line="+1"/>
<location line="+8"/>
+ <location line="+7"/>
<source>Uncompressed med Files (*.med)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-7"/>
+ <location line="-14"/>
<location line="+8"/>
+ <location line="+7"/>
<source>gzip compressed med Files (*.med.gz)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-7"/>
+ <location line="-14"/>
<location line="+8"/>
+ <location line="+7"/>
<source>bzip2 compressed med Files (*.med.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-7"/>
+ <location line="-14"/>
<source>mid Files (*.mid *.midi *.kar *.MID *.MIDI *.KAR)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+19"/>
<source>(*.jpg *.gif *.png)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/muse2/share/locale/muse_ru.ts b/muse2/share/locale/muse_ru.ts
index 4510daa7..04c220ea 100644
--- a/muse2/share/locale/muse_ru.ts
+++ b/muse2/share/locale/muse_ru.ts
@@ -204,7 +204,7 @@ click on part to mute/unmute</source>
<translation type="obsolete">Все файлы (*)</translation>
</message>
<message>
- <location filename="../../muse/helper.cpp" line="+185"/>
+ <location filename="../../muse/helper.cpp" line="+200"/>
<source>Add Midi Track</source>
<translation type="unfinished">Добавить Midi Трек</translation>
</message>
@@ -280,7 +280,7 @@ click on part to mute/unmute</source>
<translation type="obsolete">JACK:</translation>
</message>
<message>
- <location filename="../../muse/midiport.cpp" line="+1190"/>
+ <location filename="../../muse/midiport.cpp" line="+1194"/>
<source>Route</source>
<translation>Маршрут</translation>
</message>
@@ -315,7 +315,7 @@ click on part to mute/unmute</source>
<translation type="obsolete">Скорость нажатия</translation>
</message>
<message>
- <location line="-857"/>
+ <location line="-861"/>
<source>Warning: No output devices!</source>
<translation type="unfinished"></translation>
</message>
@@ -325,7 +325,7 @@ click on part to mute/unmute</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+27"/>
<source>Empty ports</source>
<translation type="unfinished"></translation>
</message>
@@ -5440,7 +5440,7 @@ Configuration</source>
<translation>MusE: Общие настройки</translation>
</message>
<message>
- <location line="+1302"/>
+ <location line="+1307"/>
<source>Use project save dialog</source>
<translation type="unfinished"></translation>
</message>
@@ -5529,7 +5529,7 @@ left button behave like the middle button in such areas.</source>
<translation>&amp;Отмена</translation>
</message>
<message>
- <location line="-1024"/>
+ <location line="-1000"/>
<source>Audio</source>
<translation>Аудио</translation>
</message>
@@ -5663,7 +5663,7 @@ left button behave like the middle button in such areas.</source>
<translation type="obsolete">В чём читать справку:</translation>
</message>
<message>
- <location line="+230"/>
+ <location line="+206"/>
<source>GUI Refresh Rate</source>
<translation>Частота обновления ГИП</translation>
</message>
@@ -5673,12 +5673,12 @@ left button behave like the middle button in such areas.</source>
<translation>/сек</translation>
</message>
<message>
- <location line="-1224"/>
+ <location line="-1229"/>
<source>Application</source>
<translation>Приложение</translation>
</message>
<message>
- <location line="+389"/>
+ <location line="+418"/>
<source>Start Muse</source>
<translation>Запустить Muse</translation>
</message>
@@ -5898,7 +5898,22 @@ Shorter periods are desirable.</source>
<translation>16</translation>
</message>
<message>
- <location line="-719"/>
+ <location line="-942"/>
+ <source>Project directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Projects:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location line="+204"/>
<source>Main Window</source>
<translation type="unfinished"></translation>
</message>
@@ -6039,12 +6054,7 @@ Adjusts responsiveness of audio controls and
(Тиков/На четвертную ноту)</translation>
</message>
<message>
- <location line="+126"/>
- <source>Instruments Directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+41"/>
+ <location line="+143"/>
<source>GUI Behaviour</source>
<translation type="unfinished"></translation>
</message>
@@ -6059,12 +6069,12 @@ Adjusts responsiveness of audio controls and
<translation>Назначать &quot;для записи&quot; выбранный трек</translation>
</message>
<message>
- <location line="-791"/>
+ <location line="-767"/>
<source>On Launch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+736"/>
+ <location line="+712"/>
<source>Behavior</source>
<translation type="unfinished"></translation>
</message>
@@ -10968,6 +10978,14 @@ click on the Restart button.</source>
</message>
</context>
<context>
+ <name>MusEGui</name>
+ <message>
+ <location filename="../../muse/helper.cpp" line="+56"/>
+ <source>Select project directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>MusEGui::Appearance</name>
<message>
<location filename="../../muse/appearance.cpp" line="+132"/>
@@ -10977,44 +10995,71 @@ click on the Restart button.</source>
для всех средств управления, здесь не определены.</translation>
</message>
<message>
- <location line="+1"/>
<source>For small controls like mixer strips.
Also timescale small numbers, arranger part name overlay,
and effects rack.</source>
- <translation type="unfinished">Для небольших средств контроля, типа линеек микшера.
+ <translation type="obsolete">Для небольших средств контроля, типа линеек микшера.
Также для маленьких цифр на линейке времени, названий партий в компоновщике и рэка эффектов.</translation>
</message>
<message>
- <location line="+1"/>
<source>Midi track info panel. Transport controls.</source>
- <translation type="unfinished">Инфо-панель Midi-трека. Управление транспортом.</translation>
+ <translation type="obsolete">Инфо-панель Midi-трека. Управление транспортом.</translation>
</message>
<message>
- <location line="+1"/>
<source>Controller graph and S/X buttons. Large numbers for time
and tempo scale, and time signature.</source>
- <translation type="unfinished">Диаграмма контроллера и S/X кнопки. Большие цифры для
+ <translation type="obsolete">Диаграмма контроллера и S/X кнопки. Большие цифры для
линеек времени и темпа, а также для тактового размера.</translation>
</message>
<message>
- <location line="+1"/>
<source>Time scale markers.</source>
- <translation type="unfinished">Маркеры на линейке времени.</translation>
+ <translation type="obsolete">Маркеры на линейке времени.</translation>
</message>
<message>
- <location line="+1"/>
<source>List editor: meta event edit dialog multi-line edit box.</source>
- <translation type="unfinished">Редактор списка: редактирование мета-события многострочное окно редактирования. </translation>
+ <translation type="obsolete">Редактор списка: редактирование мета-события многострочное окно редактирования. </translation>
</message>
<message>
- <location line="+1"/>
<source>Mixer label font. Auto-font-sizing up to chosen font size.
Word-breaking but only with spaces.</source>
- <translation type="unfinished">Шрифт метки микшера. Автоматическое изменение размера шрифта до выбранного размера.
+ <translation type="obsolete">Шрифт метки микшера. Автоматическое изменение размера шрифта до выбранного размера.
Переносы только по пробелам.</translation>
</message>
<message>
<location line="+1"/>
+ <source>Mixer strips and effects racks. Midi track info panel.
+Midi control panel entry box.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Transport controls.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Time scale upper, and time signature.
+Controller graph and S/X buttons.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Time scale lower, and arranger part name overlay.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Tempo scale, and markers.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Mixer labels. Auto-font-sizing up to chosen font size.
+Word-breaking but only with spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Maximum mixer label auto-font-sizing font size.</source>
<translation type="unfinished">Максимальный размер автоматически изменяющегося шрифта метки микшера.</translation>
</message>
@@ -12364,48 +12409,23 @@ Right-click to show GUI.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
- <location line="+12"/>
- <location line="+280"/>
- <location line="+12"/>
<source>MusE:</source>
- <translation type="unfinished">MusE:</translation>
- </message>
- <message>
- <location line="-303"/>
- <location line="+292"/>
- <source>The user instrument directory
-%1
-does not exist yet. Create it now?
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-291"/>
- <location line="+292"/>
- <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-282"/>
- <location line="+292"/>
- <source>Unable to create user instrument directory &apos;%1&apos;</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">MusE:</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+266"/>
+ <location line="+75"/>
+ <location line="+249"/>
<source>MusE: Save Instrument Definition</source>
<translation type="unfinished">MusE: Сохранить Определение Инструмента</translation>
</message>
<message>
- <location line="-265"/>
- <location line="+266"/>
+ <location line="-248"/>
+ <location line="+249"/>
<source>Instrument Definition (*.idf)</source>
<translation type="unfinished">Определение инструмента (*.idf)</translation>
</message>
<message>
- <location line="-154"/>
+ <location line="-137"/>
<location line="+29"/>
<source>MusE: Save instrument as</source>
<translation type="unfinished">MusE: Сохранить инструмент как</translation>
@@ -12422,7 +12442,7 @@ Are you sure?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+526"/>
+ <location line="+509"/>
<source>MusE: Bad instrument name</source>
<translation type="unfinished">MusE: Неверное имя инструмента</translation>
</message>
@@ -12770,14 +12790,6 @@ click on part to mute/unmute</source>
</message>
</context>
<context>
- <name>MusEGui::GlobalSettingsConfig</name>
- <message>
- <location filename="../../muse/widgets/genset.cpp" line="+561"/>
- <source>Selects instruments directory</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>MusEGui::Header</name>
<message>
<location filename="../../muse/widgets/header.cpp" line="+164"/>
@@ -13055,19 +13067,19 @@ click on part to mute/unmute</source>
<name>MusEGui::MPConfig</name>
<message>
<location filename="../../muse/confmport.cpp" line="+101"/>
- <location line="+176"/>
+ <location line="+179"/>
<source>Default input connections</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-175"/>
+ <location line="-178"/>
<location line="+66"/>
<source>Are you sure you want to apply to all existing midi tracks now?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-1"/>
- <location line="+148"/>
+ <location line="+151"/>
<source>Default output connections</source>
<translation type="unfinished"></translation>
</message>
@@ -13090,18 +13102,18 @@ Do you want to apply to all existing midi tracks now?</source>
</message>
<message>
<location line="+72"/>
- <location line="+859"/>
+ <location line="+957"/>
<source>in</source>
<translation type="unfinished">в</translation>
</message>
<message>
- <location line="-836"/>
- <location line="+827"/>
+ <location line="-934"/>
+ <location line="+925"/>
<source>out</source>
<translation type="unfinished">вне (из)</translation>
</message>
<message>
- <location line="-771"/>
+ <location line="-869"/>
<source>Show first aliases</source>
<translation type="unfinished">Показать первые псевдонимы</translation>
</message>
@@ -13136,7 +13148,7 @@ Do you want to apply to all existing midi tracks now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+229"/>
+ <location line="+326"/>
<location line="+29"/>
<source>Port Number</source>
<translation type="unfinished">Номер порта</translation>
@@ -13252,7 +13264,7 @@ Do you want to apply to all existing midi tracks now?</source>
<translation type="unfinished">Состояние: результат открытия устройства</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="+42"/>
<source>Port</source>
<translation type="unfinished">Порт</translation>
</message>
@@ -13963,7 +13975,7 @@ Apply sync settings?</source>
<name>MusEGui::MidiTrackInfo</name>
<message>
<location filename="../../muse/widgets/mtrackinfo.cpp" line="+335"/>
- <location line="+1068"/>
+ <location line="+1083"/>
<source>&lt;unknown&gt;</source>
<translation type="unfinished">&lt;неизвестно&gt;</translation>
</message>
@@ -13988,7 +14000,7 @@ Apply sync settings?</source>
<context>
<name>MusEGui::MusE</name>
<message>
- <location filename="../../muse/app.cpp" line="+137"/>
+ <location filename="../../muse/app.cpp" line="+144"/>
<location line="+16"/>
<source>Failed to start audio!</source>
<translation type="unfinished">Не могу воспроизводить аудио!</translation>
@@ -14008,7 +14020,7 @@ Apply sync settings?</source>
</translation>
</message>
<message>
- <location line="+220"/>
+ <location line="+209"/>
<source>Und&amp;o</source>
<translation type="unfinished">&amp;Отменить действие</translation>
</message>
@@ -14157,13 +14169,13 @@ Apply sync settings?</source>
</message>
<message>
<location line="+2"/>
- <location line="+1030"/>
- <location line="+1255"/>
+ <location line="+1091"/>
+ <location line="+1248"/>
<source>&amp;Save</source>
<translation type="unfinished">&amp;Сохранить</translation>
</message>
<message>
- <location line="-2283"/>
+ <location line="-2337"/>
<location line="+3"/>
<source>Click this button to save the song you are editing. You will be prompted for a file name.
You can also select the Save command from the File menu.</source>
@@ -14447,7 +14459,7 @@ You can also select the Save command from the File menu.</source>
<translation type="unfinished">Транспорт</translation>
</message>
<message>
- <location line="+55"/>
+ <location line="+56"/>
<source>&amp;File</source>
<translation type="unfinished">&amp;Файл</translation>
</message>
@@ -14487,12 +14499,12 @@ You can also select the Save command from the File menu.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+289"/>
+ <location line="+340"/>
<source>Cannot read template</source>
<translation type="unfinished">Не могу прочитать шаблон</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>File open error</source>
<translation type="unfinished">Ошибка при открытии файла</translation>
</message>
@@ -14507,14 +14519,14 @@ You can also select the Save command from the File menu.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+130"/>
- <location line="+437"/>
- <location line="+914"/>
+ <location line="+134"/>
+ <location line="+432"/>
+ <location line="+916"/>
<source>MusE: Song: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1317"/>
+ <location line="-1314"/>
<source>MusE: load project</source>
<translation type="unfinished">MusE: Открыть проект</translation>
</message>
@@ -14524,7 +14536,7 @@ You can also select the Save command from the File menu.</source>
<translation type="unfinished">MusE: открыть шаблон</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+66"/>
<source>MusE: Write File failed</source>
<translation type="unfinished"></translation>
</message>
@@ -14537,29 +14549,28 @@ Save Current Project?</source>
</message>
<message>
<location line="+2"/>
- <location line="+1255"/>
+ <location line="+1248"/>
<source>S&amp;kip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1255"/>
+ <location line="-1248"/>
<source>&amp;Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+265"/>
- <location line="+13"/>
+ <location line="+254"/>
<source>MusE: Save As</source>
<translation type="unfinished">MusE: Сохранить как</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+72"/>
<location line="+160"/>
<source>Nothing to edit</source>
<translation type="unfinished">Нечего редактировать</translation>
</message>
<message>
- <location line="+494"/>
+ <location line="+495"/>
<location line="+10"/>
<location line="+31"/>
<location line="+34"/>
@@ -14619,7 +14630,7 @@ and one audio output track</source>
<translation type="unfinished">настройте левый/правый маркеры для установки диапазона сведения</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+83"/>
<source>The current Project contains unsaved data
Load overwrites current Project:
Save Current Project?</source>
@@ -15172,7 +15183,7 @@ Likely the selected track is the wrong type.</source>
<context>
<name>MusEGui::PluginDialog</name>
<message>
- <location filename="../../muse/plugin.cpp" line="+3137"/>
+ <location filename="../../muse/plugin.cpp" line="+3147"/>
<source>MusE: select plugin</source>
<translation type="unfinished">MusE: выбрать плагин</translation>
</message>
@@ -15275,7 +15286,7 @@ Likely the selected track is the wrong type.</source>
<context>
<name>MusEGui::PluginGui</name>
<message>
- <location line="+207"/>
+ <location line="+208"/>
<source>File Buttons</source>
<translation type="unfinished">Файловые кнопки</translation>
</message>
@@ -15312,34 +15323,42 @@ Likely the selected track is the wrong type.</source>
</message>
</context>
<context>
+ <name>MusEGui::ProjectCreateImpl</name>
+ <message>
+ <location filename="../../muse/widgets/projectcreateimpl.cpp" line="+105"/>
+ <source>Select directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>MusEGui::RoutePopupMenu</name>
<message>
- <location filename="../../muse/widgets/routepopup.cpp" line="+230"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="+234"/>
<location line="+2"/>
<location line="+132"/>
<location line="+78"/>
<location line="+57"/>
<location line="+60"/>
- <location line="+685"/>
+ <location line="+883"/>
<location line="+85"/>
<source>Channel</source>
<translation type="unfinished">Канал</translation>
</message>
<message>
- <location line="-270"/>
- <location line="+220"/>
+ <location line="-292"/>
+ <location line="+242"/>
<location line="+85"/>
<source>Soloing chain</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-303"/>
- <location line="+220"/>
+ <location line="-325"/>
+ <location line="+242"/>
<source>Audio returns</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-182"/>
+ <location line="-204"/>
<source>Warning: No input devices!</source>
<translation type="unfinished"></translation>
</message>
@@ -15349,18 +15368,18 @@ Likely the selected track is the wrong type.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+42"/>
- <location line="+33"/>
+ <location line="+61"/>
+ <location line="+36"/>
<source>&lt;none&gt;</source>
<translation type="unfinished">&lt;ничего&gt;</translation>
</message>
<message>
- <location line="-19"/>
+ <location line="-22"/>
<source>Toggle all</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>More...</source>
<translation type="unfinished"></translation>
</message>
@@ -15741,12 +15760,17 @@ the selected title is not unique</source>
<context>
<name>MusEGui::TList</name>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="+373"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="+374"/>
<source>&lt;none&gt;</source>
<translation type="unfinished">&lt;ничего&gt;</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+22"/>
+ <source>visible</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
<source>no clef</source>
<translation type="unfinished"></translation>
</message>
@@ -15776,30 +15800,35 @@ the selected title is not unique</source>
<translation type="unfinished">Выберите неповторяющееся имя для трека</translation>
</message>
<message>
- <location line="+172"/>
- <location line="+1149"/>
+ <location line="+222"/>
+ <source>Unused Devices</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+88"/>
+ <location line="+1163"/>
<source>Update drummap?</source>
<translation type="unfinished">Обновить карту ударных?</translation>
</message>
<message>
- <location line="-1148"/>
+ <location line="-1162"/>
<source>Do you want to use same port for all instruments in the drummap?</source>
<translation type="unfinished">Вы хотите использовать один и тот же порт для всех инструментов в списке ударных?</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1149"/>
+ <location line="+1163"/>
<source>&amp;Yes</source>
<translation type="unfinished">&amp;Да</translation>
</message>
<message>
- <location line="-1149"/>
- <location line="+1149"/>
+ <location line="-1163"/>
+ <location line="+1163"/>
<source>&amp;No</source>
<translation type="unfinished">&amp;Нет</translation>
</message>
<message>
- <location line="-1074"/>
+ <location line="-1088"/>
<location line="+55"/>
<source>show gui</source>
<translation type="unfinished">показать ГИП</translation>
@@ -15811,7 +15840,7 @@ the selected title is not unique</source>
<translation type="unfinished">показать ГИП</translation>
</message>
<message>
- <location line="+346"/>
+ <location line="+348"/>
<source>Treble clef</source>
<translation type="unfinished"></translation>
</message>
@@ -15831,7 +15860,7 @@ the selected title is not unique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+138"/>
<source>Delete Track</source>
<translation type="unfinished">Удалить трек</translation>
</message>
@@ -15846,7 +15875,7 @@ the selected title is not unique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+445"/>
+ <location line="+450"/>
<source>Midi</source>
<translation type="unfinished"></translation>
</message>
@@ -17937,27 +17966,44 @@ to be expanded by more than </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+10"/>
+ <source>Projects folder:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <location line="+120"/>
+ <location line="+7"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Project Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
- <source>Project Path to song file:</source>
+ <location line="+10"/>
+ <source>Project is a Template</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+20"/>
- <source>Create project folder (recommended for audio projects)</source>
+ <location line="+27"/>
+ <source>Project song file type:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+18"/>
- <source>Browse</source>
+ <location line="+27"/>
+ <source>Project Path to song file:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+20"/>
+ <source>Create project folder (recommended for audio projects)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
<source>Song information:</source>
<translation type="unfinished"></translation>
</message>
@@ -18189,14 +18235,14 @@ Create it?</source>
<translation>создание каталога не удалось</translation>
</message>
<message>
- <location line="+399"/>
+ <location line="+373"/>
<source>File
%1
exists. Overwrite?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+33"/>
+ <location line="+35"/>
<source>Open File
%1
failed: %2</source>
@@ -18214,7 +18260,7 @@ exists</source>
существует</translation>
</message>
<message>
- <location line="-19"/>
+ <location line="-21"/>
<source>MusE: write</source>
<translation>MusE: записать</translation>
</message>
@@ -18238,7 +18284,7 @@ failed: </source>
не удалось:</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+22"/>
<source>MusE: Open File</source>
<translation>MusE: Открыть файл</translation>
</message>
@@ -20466,7 +20512,7 @@ is set to a valid editor.</source>
<location line="+24"/>
<location line="+11"/>
<location line="+7"/>
- <location line="+9"/>
+ <location line="+15"/>
<location line="+15"/>
<location line="+7"/>
<location line="+14"/>
@@ -20478,7 +20524,7 @@ is set to a valid editor.</source>
<translation type="unfinished">Все файлы (*)</translation>
</message>
<message>
- <location line="-95"/>
+ <location line="-101"/>
<source>Midi (*.mid)</source>
<translation type="unfinished"></translation>
</message>
@@ -20500,28 +20546,31 @@ is set to a valid editor.</source>
<message>
<location line="+1"/>
<location line="+8"/>
+ <location line="+7"/>
<source>Uncompressed med Files (*.med)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-7"/>
+ <location line="-14"/>
<location line="+8"/>
+ <location line="+7"/>
<source>gzip compressed med Files (*.med.gz)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-7"/>
+ <location line="-14"/>
<location line="+8"/>
+ <location line="+7"/>
<source>bzip2 compressed med Files (*.med.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-7"/>
+ <location line="-14"/>
<source>mid Files (*.mid *.midi *.kar *.MID *.MIDI *.KAR)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+19"/>
<source>(*.jpg *.gif *.png)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/muse2/share/locale/muse_sv_SE.ts b/muse2/share/locale/muse_sv_SE.ts
index 0bf20ae7..5c5d4216 100644
--- a/muse2/share/locale/muse_sv_SE.ts
+++ b/muse2/share/locale/muse_sv_SE.ts
@@ -206,7 +206,7 @@ klicka på en part för att Tysta/Avtysta</translation>
<translation type="obsolete">Alla filer (*)</translation>
</message>
<message>
- <location filename="../../muse/helper.cpp" line="+185"/>
+ <location filename="../../muse/helper.cpp" line="+200"/>
<source>Add Midi Track</source>
<translation type="unfinished">Lägg till Midispår</translation>
</message>
@@ -254,7 +254,7 @@ klicka på en part för att Tysta/Avtysta</translation>
<translation type="obsolete">Takt</translation>
</message>
<message>
- <location filename="../../muse/midiport.cpp" line="+1190"/>
+ <location filename="../../muse/midiport.cpp" line="+1194"/>
<source>Route</source>
<translation type="unfinished"></translation>
</message>
@@ -273,7 +273,7 @@ klicka på en part för att Tysta/Avtysta</translation>
<translation type="obsolete">Hastighet</translation>
</message>
<message>
- <location line="-857"/>
+ <location line="-861"/>
<source>Warning: No output devices!</source>
<translation type="unfinished"></translation>
</message>
@@ -283,7 +283,7 @@ klicka på en part för att Tysta/Avtysta</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+27"/>
<source>Empty ports</source>
<translation type="unfinished"></translation>
</message>
@@ -4846,7 +4846,7 @@ Configuration</source>
<translation>MusE: Globala Inställningar</translation>
</message>
<message>
- <location line="+1302"/>
+ <location line="+1307"/>
<source>Use project save dialog</source>
<translation type="unfinished"></translation>
</message>
@@ -4935,7 +4935,7 @@ left button behave like the middle button in such areas.</source>
<translation>&amp;Avbryt</translation>
</message>
<message>
- <location line="-1024"/>
+ <location line="-1000"/>
<source>Audio</source>
<translation type="unfinished">Ljud</translation>
</message>
@@ -5061,7 +5061,7 @@ left button behave like the middle button in such areas.</source>
<translation type="obsolete">Hjälpläsare:</translation>
</message>
<message>
- <location line="+230"/>
+ <location line="+206"/>
<source>GUI Refresh Rate</source>
<translation>GUI-uppdateringsfrekvens</translation>
</message>
@@ -5071,12 +5071,12 @@ left button behave like the middle button in such areas.</source>
<translation>/sek</translation>
</message>
<message>
- <location line="-1224"/>
+ <location line="-1229"/>
<source>Application</source>
<translation type="unfinished">Applikation</translation>
</message>
<message>
- <location line="+389"/>
+ <location line="+418"/>
<source>Start Muse</source>
<translation type="unfinished">Starta MusE</translation>
</message>
@@ -5256,7 +5256,22 @@ left button behave like the middle button in such areas.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-719"/>
+ <location line="-942"/>
+ <source>Project directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Projects:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+204"/>
<source>Main Window</source>
<translation type="unfinished"></translation>
</message>
@@ -5396,12 +5411,7 @@ Adjusts responsiveness of audio controls and
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+126"/>
- <source>Instruments Directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+41"/>
+ <location line="+143"/>
<source>GUI Behaviour</source>
<translation type="unfinished"></translation>
</message>
@@ -5416,12 +5426,12 @@ Adjusts responsiveness of audio controls and
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-791"/>
+ <location line="-767"/>
<source>On Launch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+736"/>
+ <location line="+712"/>
<source>Behavior</source>
<translation type="unfinished"></translation>
</message>
@@ -9279,6 +9289,14 @@ click on the Restart button.</source>
</message>
</context>
<context>
+ <name>MusEGui</name>
+ <message>
+ <location filename="../../muse/helper.cpp" line="+56"/>
+ <source>Select project directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>MusEGui::Appearance</name>
<message>
<location filename="../../muse/appearance.cpp" line="+132"/>
@@ -9288,35 +9306,34 @@ click on the Restart button.</source>
</message>
<message>
<location line="+1"/>
- <source>For small controls like mixer strips.
-Also timescale small numbers, arranger part name overlay,
- and effects rack.</source>
+ <source>Mixer strips and effects racks. Midi track info panel.
+Midi control panel entry box.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>Midi track info panel. Transport controls.</source>
+ <source>Transport controls.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>Controller graph and S/X buttons. Large numbers for time
- and tempo scale, and time signature.</source>
+ <source>Time scale upper, and time signature.
+Controller graph and S/X buttons.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>Time scale markers.</source>
+ <source>Time scale lower, and arranger part name overlay.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>List editor: meta event edit dialog multi-line edit box.</source>
+ <source>Tempo scale, and markers.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
- <source>Mixer label font. Auto-font-sizing up to chosen font size.
+ <source>Mixer labels. Auto-font-sizing up to chosen font size.
Word-breaking but only with spaces.</source>
<translation type="unfinished"></translation>
</message>
@@ -10659,48 +10676,19 @@ Right-click to show GUI.</source>
<translation type="unfinished">MusE: Misslyckades med att skriva Fil</translation>
</message>
<message>
- <location line="+32"/>
- <location line="+12"/>
- <location line="+280"/>
- <location line="+12"/>
- <source>MusE:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-303"/>
- <location line="+292"/>
- <source>The user instrument directory
-%1
-does not exist yet. Create it now?
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-291"/>
- <location line="+292"/>
- <source>(You can change the user instruments directory at Settings-&gt;Global Settings-&gt;Midi)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-282"/>
- <location line="+292"/>
- <source>Unable to create user instrument directory &apos;%1&apos;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-244"/>
- <location line="+266"/>
+ <location line="+75"/>
+ <location line="+249"/>
<source>MusE: Save Instrument Definition</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-265"/>
- <location line="+266"/>
+ <location line="-248"/>
+ <location line="+249"/>
<source>Instrument Definition (*.idf)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-154"/>
+ <location line="-137"/>
<location line="+29"/>
<source>MusE: Save instrument as</source>
<translation type="unfinished"></translation>
@@ -10717,7 +10705,7 @@ Are you sure?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+526"/>
+ <location line="+509"/>
<source>MusE: Bad instrument name</source>
<translation type="unfinished"></translation>
</message>
@@ -11065,14 +11053,6 @@ klicka på en part för att Tysta/Avtysta</translation>
</message>
</context>
<context>
- <name>MusEGui::GlobalSettingsConfig</name>
- <message>
- <location filename="../../muse/widgets/genset.cpp" line="+561"/>
- <source>Selects instruments directory</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>MusEGui::Header</name>
<message>
<location filename="../../muse/widgets/header.cpp" line="+164"/>
@@ -11350,19 +11330,19 @@ klicka på en part för att Tysta/Avtysta</translation>
<name>MusEGui::MPConfig</name>
<message>
<location filename="../../muse/confmport.cpp" line="+101"/>
- <location line="+176"/>
+ <location line="+179"/>
<source>Default input connections</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-175"/>
+ <location line="-178"/>
<location line="+66"/>
<source>Are you sure you want to apply to all existing midi tracks now?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-1"/>
- <location line="+148"/>
+ <location line="+151"/>
<source>Default output connections</source>
<translation type="unfinished"></translation>
</message>
@@ -11385,18 +11365,18 @@ Do you want to apply to all existing midi tracks now?</source>
</message>
<message>
<location line="+72"/>
- <location line="+859"/>
+ <location line="+957"/>
<source>in</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-836"/>
- <location line="+827"/>
+ <location line="-934"/>
+ <location line="+925"/>
<source>out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-771"/>
+ <location line="-869"/>
<source>Show first aliases</source>
<translation type="unfinished"></translation>
</message>
@@ -11423,7 +11403,7 @@ Do you want to apply to all existing midi tracks now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+229"/>
+ <location line="+326"/>
<location line="+29"/>
<source>Port Number</source>
<translation type="unfinished">Portnummer</translation>
@@ -11539,7 +11519,7 @@ Do you want to apply to all existing midi tracks now?</source>
<translation type="unfinished">Status: resultat av öppning av enhet</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="+42"/>
<source>Port</source>
<translation type="unfinished"></translation>
</message>
@@ -12220,7 +12200,7 @@ Apply sync settings?</source>
<name>MusEGui::MidiTrackInfo</name>
<message>
<location filename="../../muse/widgets/mtrackinfo.cpp" line="+335"/>
- <location line="+1068"/>
+ <location line="+1083"/>
<source>&lt;unknown&gt;</source>
<translation type="unfinished"></translation>
</message>
@@ -12245,7 +12225,7 @@ Apply sync settings?</source>
<context>
<name>MusEGui::MusE</name>
<message>
- <location filename="../../muse/app.cpp" line="+137"/>
+ <location filename="../../muse/app.cpp" line="+144"/>
<location line="+16"/>
<source>Failed to start audio!</source>
<translation type="unfinished"></translation>
@@ -12263,7 +12243,7 @@ Apply sync settings?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+220"/>
+ <location line="+209"/>
<source>Und&amp;o</source>
<translation type="unfinished">&amp;Ångra</translation>
</message>
@@ -12412,13 +12392,13 @@ Apply sync settings?</source>
</message>
<message>
<location line="+2"/>
- <location line="+1030"/>
- <location line="+1255"/>
+ <location line="+1091"/>
+ <location line="+1248"/>
<source>&amp;Save</source>
<translation type="unfinished">&amp;Spara</translation>
</message>
<message>
- <location line="-2283"/>
+ <location line="-2337"/>
<location line="+3"/>
<source>Click this button to save the song you are editing. You will be prompted for a file name.
You can also select the Save command from the File menu.</source>
@@ -12702,7 +12682,7 @@ Du kan också välja menyalternativet Spara från Arkivmenyn.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+55"/>
+ <location line="+56"/>
<source>&amp;File</source>
<translation type="unfinished">&amp;Arkiv</translation>
</message>
@@ -12742,12 +12722,12 @@ Du kan också välja menyalternativet Spara från Arkivmenyn.</translation>
<translation type="unfinished">&amp;Hjälp</translation>
</message>
<message>
- <location line="+289"/>
+ <location line="+340"/>
<source>Cannot read template</source>
<translation type="unfinished">Kan inte läsa mall</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+32"/>
<source>File open error</source>
<translation type="unfinished">Fel vid öppning av fil</translation>
</message>
@@ -12762,14 +12742,14 @@ Du kan också välja menyalternativet Spara från Arkivmenyn.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+130"/>
- <location line="+437"/>
- <location line="+914"/>
+ <location line="+134"/>
+ <location line="+432"/>
+ <location line="+916"/>
<source>MusE: Song: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1317"/>
+ <location line="-1314"/>
<source>MusE: load project</source>
<translation type="unfinished">MusE: Öppna projekt</translation>
</message>
@@ -12779,7 +12759,7 @@ Du kan också välja menyalternativet Spara från Arkivmenyn.</translation>
<translation type="unfinished">MusE: ladda mall</translation>
</message>
<message>
- <location line="+62"/>
+ <location line="+66"/>
<source>MusE: Write File failed</source>
<translation type="unfinished">MusE: Misslyckades med att skriva Fil</translation>
</message>
@@ -12792,29 +12772,28 @@ Spara nuvarande Projekt?</translation>
</message>
<message>
<location line="+2"/>
- <location line="+1255"/>
+ <location line="+1248"/>
<source>S&amp;kip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1255"/>
+ <location line="-1248"/>
<source>&amp;Cancel</source>
<translation type="unfinished">&amp;Avbryt</translation>
</message>
<message>
- <location line="+265"/>
- <location line="+13"/>
+ <location line="+254"/>
<source>MusE: Save As</source>
<translation type="unfinished">MusE: Spara Som</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+72"/>
<location line="+160"/>
<source>Nothing to edit</source>
<translation type="unfinished">Inget att redigera</translation>
</message>
<message>
- <location line="+494"/>
+ <location line="+495"/>
<location line="+10"/>
<location line="+31"/>
<location line="+34"/>
@@ -12872,7 +12851,7 @@ and one audio output track</source>
<translation type="unfinished">sätt vänster och höger markör till bounce-område</translation>
</message>
<message>
- <location line="+82"/>
+ <location line="+83"/>
<source>The current Project contains unsaved data
Load overwrites current Project:
Save Current Project?</source>
@@ -13420,7 +13399,7 @@ Likely the selected track is the wrong type.</source>
<context>
<name>MusEGui::PluginDialog</name>
<message>
- <location filename="../../muse/plugin.cpp" line="+3137"/>
+ <location filename="../../muse/plugin.cpp" line="+3147"/>
<source>MusE: select plugin</source>
<translation type="unfinished">MusE: välj plugin</translation>
</message>
@@ -13523,7 +13502,7 @@ Likely the selected track is the wrong type.</source>
<context>
<name>MusEGui::PluginGui</name>
<message>
- <location line="+207"/>
+ <location line="+208"/>
<source>File Buttons</source>
<translation type="unfinished"></translation>
</message>
@@ -13560,34 +13539,42 @@ Likely the selected track is the wrong type.</source>
</message>
</context>
<context>
+ <name>MusEGui::ProjectCreateImpl</name>
+ <message>
+ <location filename="../../muse/widgets/projectcreateimpl.cpp" line="+105"/>
+ <source>Select directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>MusEGui::RoutePopupMenu</name>
<message>
- <location filename="../../muse/widgets/routepopup.cpp" line="+230"/>
+ <location filename="../../muse/widgets/routepopup.cpp" line="+234"/>
<location line="+2"/>
<location line="+132"/>
<location line="+78"/>
<location line="+57"/>
<location line="+60"/>
- <location line="+685"/>
+ <location line="+883"/>
<location line="+85"/>
<source>Channel</source>
<translation type="unfinished">Kanal</translation>
</message>
<message>
- <location line="-270"/>
- <location line="+220"/>
+ <location line="-292"/>
+ <location line="+242"/>
<location line="+85"/>
<source>Soloing chain</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-303"/>
- <location line="+220"/>
+ <location line="-325"/>
+ <location line="+242"/>
<source>Audio returns</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-182"/>
+ <location line="-204"/>
<source>Warning: No input devices!</source>
<translation type="unfinished"></translation>
</message>
@@ -13597,18 +13584,18 @@ Likely the selected track is the wrong type.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+42"/>
- <location line="+33"/>
+ <location line="+61"/>
+ <location line="+36"/>
<source>&lt;none&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-19"/>
+ <location line="-22"/>
<source>Toggle all</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>More...</source>
<translation type="unfinished"></translation>
</message>
@@ -13989,12 +13976,17 @@ the selected title is not unique</source>
<context>
<name>MusEGui::TList</name>
<message>
- <location filename="../../muse/arranger/tlist.cpp" line="+373"/>
+ <location filename="../../muse/arranger/tlist.cpp" line="+374"/>
<source>&lt;none&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+22"/>
+ <source>visible</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+9"/>
<source>no clef</source>
<translation type="unfinished"></translation>
</message>
@@ -14024,30 +14016,35 @@ the selected title is not unique</source>
<translation type="unfinished">vänligen välj ett unikt spårnamn</translation>
</message>
<message>
- <location line="+172"/>
- <location line="+1149"/>
+ <location line="+222"/>
+ <source>Unused Devices</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+88"/>
+ <location line="+1163"/>
<source>Update drummap?</source>
<translation type="unfinished">Updatera trum-map?</translation>
</message>
<message>
- <location line="-1148"/>
+ <location line="-1162"/>
<source>Do you want to use same port for all instruments in the drummap?</source>
<translation type="unfinished">Vill du använda samma port för alla instrument i trum-map:en?</translation>
</message>
<message>
<location line="+1"/>
- <location line="+1149"/>
+ <location line="+1163"/>
<source>&amp;Yes</source>
<translation type="unfinished">&amp;Ja</translation>
</message>
<message>
- <location line="-1149"/>
- <location line="+1149"/>
+ <location line="-1163"/>
+ <location line="+1163"/>
<source>&amp;No</source>
<translation type="unfinished">&amp;Nej</translation>
</message>
<message>
- <location line="-1074"/>
+ <location line="-1088"/>
<location line="+55"/>
<source>show gui</source>
<translation type="unfinished">visa gui</translation>
@@ -14059,7 +14056,7 @@ the selected title is not unique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+346"/>
+ <location line="+348"/>
<source>Treble clef</source>
<translation type="unfinished"></translation>
</message>
@@ -14079,7 +14076,7 @@ the selected title is not unique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+138"/>
<source>Delete Track</source>
<translation type="unfinished">Ta bort spår</translation>
</message>
@@ -14094,7 +14091,7 @@ the selected title is not unique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+445"/>
+ <location line="+450"/>
<source>Midi</source>
<translation type="unfinished">Midi</translation>
</message>
@@ -15648,27 +15645,44 @@ to be expanded by more than </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+10"/>
+ <source>Projects folder:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <location line="+120"/>
+ <location line="+7"/>
+ <source>...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Project Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
- <source>Project Path to song file:</source>
+ <location line="+10"/>
+ <source>Project is a Template</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+20"/>
- <source>Create project folder (recommended for audio projects)</source>
+ <location line="+27"/>
+ <source>Project song file type:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+18"/>
- <source>Browse</source>
+ <location line="+27"/>
+ <source>Project Path to song file:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+20"/>
+ <source>Create project folder (recommended for audio projects)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
<source>Song information:</source>
<translation type="unfinished"></translation>
</message>
@@ -15915,14 +15929,14 @@ Create it?</source>
<translation>misslyckades med att skapa katalog</translation>
</message>
<message>
- <location line="+399"/>
+ <location line="+373"/>
<source>File
%1
exists. Overwrite?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+33"/>
+ <location line="+35"/>
<source>Open File
%1
failed: %2</source>
@@ -15939,7 +15953,7 @@ exists</source>
<translation type="obsolete">existerar</translation>
</message>
<message>
- <location line="-19"/>
+ <location line="-21"/>
<source>MusE: write</source>
<translation>MusE: skriv</translation>
</message>
@@ -15963,7 +15977,7 @@ failed: </source>
misslyckades:</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+22"/>
<source>MusE: Open File</source>
<translation>MusE: Öppna fil</translation>
</message>
@@ -18061,7 +18075,7 @@ Saknat data tystas</translation>
<location line="+24"/>
<location line="+11"/>
<location line="+7"/>
- <location line="+9"/>
+ <location line="+15"/>
<location line="+15"/>
<location line="+7"/>
<location line="+14"/>
@@ -18073,7 +18087,7 @@ Saknat data tystas</translation>
<translation type="unfinished">Alla filer (*)</translation>
</message>
<message>
- <location line="-95"/>
+ <location line="-101"/>
<source>Midi (*.mid)</source>
<translation type="unfinished"></translation>
</message>
@@ -18095,28 +18109,31 @@ Saknat data tystas</translation>
<message>
<location line="+1"/>
<location line="+8"/>
+ <location line="+7"/>
<source>Uncompressed med Files (*.med)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-7"/>
+ <location line="-14"/>
<location line="+8"/>
+ <location line="+7"/>
<source>gzip compressed med Files (*.med.gz)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-7"/>
+ <location line="-14"/>
<location line="+8"/>
+ <location line="+7"/>
<source>bzip2 compressed med Files (*.med.bz2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-7"/>
+ <location line="-14"/>
<source>mid Files (*.mid *.midi *.kar *.MID *.MIDI *.KAR)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+19"/>
<source>(*.jpg *.gif *.png)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/muse2/share/templates/MusE.cfg b/muse2/share/templates/MusE.cfg
index b64d9029..ef4689a6 100644
--- a/muse2/share/templates/MusE.cfg
+++ b/muse2/share/templates/MusE.cfg
@@ -36,17 +36,17 @@
<midiFilterCtrl3>0</midiFilterCtrl3>
<midiFilterCtrl4>0</midiFilterCtrl4>
<theme></theme>
- <styleSheetFile>:/style.qss</styleSheetFile>
+ <styleSheetFile></styleSheetFile>
<externalWavEditor>sweep</externalWavEditor>
<useOldStyleStopShortCut>0</useOldStyleStopShortCut>
<moveArmedCheckBox>0</moveArmedCheckBox>
<popupsDefaultStayOpen>0</popupsDefaultStayOpen>
<font0>arial,10,-1,5,50,0,0,0,0,0</font0>
- <font1>arial,8,-1,5,50,0,0,0,0,0</font1>
+ <font1>arial,7,-1,5,50,0,0,0,0,0</font1>
<font2>arial,10,-1,5,50,0,0,0,0,0</font2>
<font3>arial,10,-1,5,75,0,0,0,0,0</font3>
- <font4>arial,8,-1,5,75,0,0,0,0,0</font4>
- <font5>Lucidatypewriter,14,-1,5,75,0,0,0,0,0</font5>
+ <font4>arial,8,-1,5,50,0,0,0,0,0</font4>
+ <font5>arial,8,-1,5,75,0,0,0,0,0</font5>
<font6>arial,8,-1,5,75,1,0,0,0,0</font6>
<globalAlphaBlend>190</globalAlphaBlend>
<palette0 r="255" g="255" b="255"></palette0>
diff --git a/muse2/synti/vam/COPYING b/muse2/synti/vam/COPYING
index dc63aaca..736846ae 100644
--- a/muse2/synti/vam/COPYING
+++ b/muse2/synti/vam/COPYING
@@ -3,7 +3,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 675 Mass Ave, Cambridge, MA 02139, USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -306,7 +306,8 @@ the "copyright" line and a pointer to where the full notice is found.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ USA
Also add information on how to contact you by electronic and paper mail.
diff --git a/muse2/xpm/midi_thru_off4.xpm b/muse2/xpm/midi_thru_off4.xpm
new file mode 100644
index 00000000..947191dc
--- /dev/null
+++ b/muse2/xpm/midi_thru_off4.xpm
@@ -0,0 +1,20 @@
+/* XPM */
+static const char * midi_thru_off4_xpm[] = {
+"13 13 4 1",
+" c None",
+". c #000000",
+"+ c #5E2B2B",
+"@ c #553E3E",
+" ",
+" . ",
+" .. ",
+" .+. ",
+"........++. ",
+".+++++++@++. ",
+".@@@@@@@@@++.",
+".@@@@@@@@@+. ",
+"........@+. ",
+" .+. ",
+" .. ",
+" . ",
+" "};
diff --git a/muse2/xpm/midi_thru_on4.xpm b/muse2/xpm/midi_thru_on4.xpm
new file mode 100644
index 00000000..91604db7
--- /dev/null
+++ b/muse2/xpm/midi_thru_on4.xpm
@@ -0,0 +1,20 @@
+/* XPM */
+static const char * midi_thru_on4_xpm[] = {
+"13 13 4 1",
+" c None",
+". c #000000",
+"+ c #FF0C0B",
+"@ c #F18888",
+" ",
+" . ",
+" .. ",
+" .+. ",
+"........++. ",
+".+++++++@++. ",
+".@@@@@@@@@++.",
+".@@@@@@@@@+. ",
+"........@+. ",
+" .+. ",
+" .. ",
+" . ",
+" "};
diff --git a/muse2/xpm/routing_input_button_slim_4.xpm b/muse2/xpm/routing_input_button_slim_4.xpm
new file mode 100644
index 00000000..4614a1c8
--- /dev/null
+++ b/muse2/xpm/routing_input_button_slim_4.xpm
@@ -0,0 +1,53 @@
+/* XPM */
+static const char * routing_input_button_slim_4_xpm[] = {
+"16 11 39 1",
+" c None",
+". c #1C1A16",
+"+ c #39342D",
+"@ c #2E2D2D",
+"# c #5D5C5B",
+"$ c #504A3E",
+"% c #313131",
+"& c #A29F99",
+"* c #7C786F",
+"= c #575553",
+"- c #534E42",
+"; c #191918",
+"> c #FFFFFF",
+", c #5D5D5C",
+"' c #FEFDFD",
+") c #696359",
+"! c #151310",
+"~ c #8E8980",
+"{ c #595041",
+"] c #28241D",
+"^ c #8A8479",
+"/ c #534C3F",
+"( c #14120E",
+"_ c #A0988D",
+": c #221F1A",
+"< c #585244",
+"[ c #5A5346",
+"} c #676053",
+"| c #100F0C",
+"1 c #91897D",
+"2 c #565045",
+"3 c #151414",
+"4 c #797367",
+"5 c #938E84",
+"6 c #0C0C0B",
+"7 c #656565",
+"8 c #B2ACA2",
+"9 c #070707",
+"0 c #0F0F0F",
+" ",
+".++ ",
+"@@#$ ",
+"%%&*****=*=* - ",
+";>>>>>>,>,>>$'>)",
+"!~{{{{]{]{{{>^{/",
+"({_____:_:__<{[}",
+"||1222223232 45 ",
+"6678 ",
+"900 ",
+" "};
diff --git a/muse2/xpm/routing_midi_input_button_slim.xpm b/muse2/xpm/routing_midi_input_button_slim.xpm
new file mode 100644
index 00000000..0f631c32
--- /dev/null
+++ b/muse2/xpm/routing_midi_input_button_slim.xpm
@@ -0,0 +1,58 @@
+/* XPM */
+static const char * routing_midi_input_button_slim_xpm[] = {
+"16 11 44 1",
+" c None",
+". c #1C1A16",
+"+ c #39342D",
+"@ c #211D18",
+"# c #2E2D2D",
+"$ c #5D5C5B",
+"% c #343332",
+"& c #504A3E",
+"* c #151414",
+"= c #313131",
+"- c #646464",
+"; c #434343",
+"> c #7C786F",
+", c #575553",
+"' c #000000",
+") c #262624",
+"! c #4D4C49",
+"~ c #343330",
+"{ c #FFFFFF",
+"] c #5D5D5C",
+"^ c #221F1A",
+"/ c #151310",
+"( c #2B2721",
+"_ c #16130F",
+": c #595041",
+"< c #28241D",
+"[ c #14120E",
+"} c #14120D",
+"| c #9C9489",
+"1 c #A0988D",
+"2 c #100F0C",
+"3 c #211E19",
+"4 c #0F0E0B",
+"5 c #565045",
+"6 c #413F3D",
+"7 c #0C0C0B",
+"8 c #191816",
+"9 c #171614",
+"0 c #100F0E",
+"a c #B2ACA2",
+"b c #070707",
+"c c #0F0F0F",
+"d c #0D0D0D",
+"e c #050505",
+" ",
+" .+++++@ ",
+" #$$$$$%&&&&* ",
+" =-----;>>>>,'* ",
+")!!!!!~{{{{]{'{^",
+"/(((((_::::<'''<",
+"[<<<<<}|111^{'{]",
+" 23333345555*{6 ",
+" 7888890aaaa^ ",
+" bccccde ",
+" "};
diff --git a/muse2/xpm/routing_midi_output_button_slim.xpm b/muse2/xpm/routing_midi_output_button_slim.xpm
new file mode 100644
index 00000000..c4141415
--- /dev/null
+++ b/muse2/xpm/routing_midi_output_button_slim.xpm
@@ -0,0 +1,58 @@
+/* XPM */
+static const char * routing_midi_output_button_slim_xpm[] = {
+"16 11 44 1",
+" c None",
+". c #211D18",
+"+ c #39342D",
+"@ c #1C1A16",
+"# c #151414",
+"$ c #504A3E",
+"% c #343332",
+"& c #5D5C5B",
+"* c #2E2D2D",
+"= c #000000",
+"- c #575553",
+"; c #7C786F",
+"> c #434343",
+", c #646464",
+"' c #313131",
+") c #221F1A",
+"! c #FFFFFF",
+"~ c #5D5D5C",
+"{ c #343330",
+"] c #4D4C49",
+"^ c #262624",
+"/ c #28241D",
+"( c #595041",
+"_ c #16130F",
+": c #2B2721",
+"< c #151310",
+"[ c #A0988D",
+"} c #9C9489",
+"| c #14120D",
+"1 c #14120E",
+"2 c #413F3D",
+"3 c #565045",
+"4 c #0F0E0B",
+"5 c #211E19",
+"6 c #100F0C",
+"7 c #B2ACA2",
+"8 c #100F0E",
+"9 c #171614",
+"0 c #191816",
+"a c #0C0C0B",
+"b c #050505",
+"c c #0D0D0D",
+"d c #0F0F0F",
+"e c #070707",
+" ",
+" .+++++@ ",
+" #$$$$%&&&&&* ",
+" #=-;;;;>,,,,,' ",
+")!=!~!!!!{]]]]]^",
+"/===/((((_:::::<",
+"~!=!)[[[}|/////1",
+" 2!#33334555556 ",
+" )7777890000a ",
+" bcdddde ",
+" "};
diff --git a/muse2/xpm/routing_output_button_slim_4.xpm b/muse2/xpm/routing_output_button_slim_4.xpm
new file mode 100644
index 00000000..6fecf815
--- /dev/null
+++ b/muse2/xpm/routing_output_button_slim_4.xpm
@@ -0,0 +1,53 @@
+/* XPM */
+static const char * routing_output_button_slim_4_xpm[] = {
+"16 11 39 1",
+" c None",
+". c #39342D",
+"+ c #1C1A16",
+"@ c #504A3E",
+"# c #5D5C5B",
+"$ c #2E2D2D",
+"% c #534E42",
+"& c #7C786F",
+"* c #575553",
+"= c #A29F99",
+"- c #313131",
+"; c #696359",
+"> c #FFFFFF",
+", c #FEFDFD",
+"' c #5D5D5C",
+") c #191918",
+"! c #534C3F",
+"~ c #595041",
+"{ c #8A8479",
+"] c #28241D",
+"^ c #8E8980",
+"/ c #151310",
+"( c #676053",
+"_ c #5A5346",
+": c #585244",
+"< c #A0988D",
+"[ c #221F1A",
+"} c #14120E",
+"| c #938E84",
+"1 c #797367",
+"2 c #565045",
+"3 c #151414",
+"4 c #91897D",
+"5 c #100F0C",
+"6 c #B2ACA2",
+"7 c #656565",
+"8 c #0C0C0B",
+"9 c #0F0F0F",
+"0 c #070707",
+" ",
+" ..+",
+" @#$$",
+" % &*&*&&&&&=--",
+";>,@>>'>'>>>>>>)",
+"!~{>~~~]~]~~~~^/",
+"(_~:<<[<[<<<<<~}",
+" |1 232322222455",
+" 6788",
+" 990",
+" "};
diff --git a/muse2/xpm/toggle_small.xpm b/muse2/xpm/toggle_small.xpm
new file mode 100644
index 00000000..470c64fc
--- /dev/null
+++ b/muse2/xpm/toggle_small.xpm
@@ -0,0 +1,15 @@
+/* XPM */
+static const char * toggle_small_xpm[] = {
+"9 9 2 1",
+" g None",
+". g #000000",
+" .. .. ",
+".... .. ",
+".... .. ",
+" .. .. ",
+" .. .. ",
+" .. .. ",
+" .. ....",
+" .. ....",
+" .. .. "};
+