summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse2/muse/arranger/pcanvas.cpp6
-rw-r--r--muse2/synti/deicsonze/deicsonzegui.cpp17
2 files changed, 10 insertions, 13 deletions
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index 5658f7e6..7ffe2b42 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -776,7 +776,7 @@ QMenu* PartCanvas::genItemPopup(CItem* item)
act_pianoroll->setData(10);
QAction *act_mlist = partPopup->addAction(QIcon(*edit_listIcon), tr("list"));
act_mlist->setData(12);
- QAction *act_mexport = partPopup->addAction(tr("export"));
+ QAction *act_mexport = partPopup->addAction(tr("save part to disk"));
act_mexport->setData(16);
}
break;
@@ -785,14 +785,14 @@ QMenu* PartCanvas::genItemPopup(CItem* item)
act_dlist->setData(12);
QAction *act_drums = partPopup->addAction(QIcon(*edit_drummsIcon), tr("drums"));
act_drums->setData(13);
- QAction *act_dexport = partPopup->addAction(tr("export"));
+ QAction *act_dexport = partPopup->addAction(tr("save part to disk"));
act_dexport->setData(16);
}
break;
case Track::WAVE: {
QAction *act_wedit = partPopup->addAction(QIcon(*edit_waveIcon), tr("wave edit"));
act_wedit->setData(14);
- QAction *act_wexport = partPopup->addAction(tr("export"));
+ QAction *act_wexport = partPopup->addAction(tr("save part to disk"));
act_wexport->setData(16);
QAction *act_wfinfo = partPopup->addAction(tr("file info"));
act_wfinfo->setData(17);
diff --git a/muse2/synti/deicsonze/deicsonzegui.cpp b/muse2/synti/deicsonze/deicsonzegui.cpp
index 58aa5e41..3cae14f8 100644
--- a/muse2/synti/deicsonze/deicsonzegui.cpp
+++ b/muse2/synti/deicsonze/deicsonzegui.cpp
@@ -417,6 +417,12 @@ DeicsOnzeGui::DeicsOnzeGui(DeicsOnze* deicsOnze)
QSocketNotifier* s = new QSocketNotifier(readFd, QSocketNotifier::Read);
connect(s, SIGNAL(activated(int)), SLOT(readMessage(int)));
+ QString sharePath(museGlobalShare);
+ // Tim.
+ updateInitSetPath(sharePath + QString("/presets/deicsonze/SutulaBank.dei")); // Tim.
+ updateBackgroundPixPath(sharePath + QString("/wallpapers/paper2.jpg")); // Tim.
+ updateBackgroundPixCheckBox(false);
+
setTextColor(reinterpret_cast<const QColor &>(*tColor));
setBackgroundColor(reinterpret_cast<const QColor &>(*bColor));
setEditTextColor(reinterpret_cast<const QColor &>(*etColor));
@@ -439,16 +445,7 @@ DeicsOnzeGui::DeicsOnzeGui(DeicsOnze* deicsOnze)
_enabledPreset = true;
setEnabledPreset(false);
- // Tim.
- QString sharePath(museGlobalShare);
- updateInitSetPath
- (sharePath + QString("/presets/deicsonze/SutulaBank.dei")); // Tim.
-
- updateBackgroundPixPath
- (sharePath + QString("/wallpapers/paper2.jpg")); // Tim.
- updateBackgroundPixCheckBox(false);
- //applyBackgroundPix();
}
//-----------------------------------------------------------
@@ -1628,7 +1625,6 @@ void DeicsOnzeGui::processEvent(const MidiPlayEvent& ev) {
break;
case SYSEX_BACKGROUNDPIXPATH :
updateBackgroundPixPath(QString((char*)&data[1]));
- applyBackgroundPix();
break;
case SYSEX_UPDATESETGUI :
setSet();
@@ -4343,6 +4339,7 @@ void DeicsOnzeGui::updateBackgroundPixPath(QString s) {
imagePathLineEdit->blockSignals(false);
}
void DeicsOnzeGui::applyBackgroundPix() {
+ printf("applyBackgroundPix\n");
QPalette p = this->palette();
QPixmap pixmap = QPixmap(imagePathLineEdit->text());
p.setBrush((this)->backgroundRole(), QBrush(pixmap));