From fc7c7e9f8dc1e86efa19434c7f01d5ac24f7fc55 Mon Sep 17 00:00:00 2001 From: Robert Jonsson Date: Thu, 10 Feb 2011 19:27:17 +0000 Subject: deicsonze color init fix --- muse2/synti/deicsonze/deicsonzegui.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'muse2/synti') 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(*tColor)); setBackgroundColor(reinterpret_cast(*bColor)); setEditTextColor(reinterpret_cast(*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)); -- cgit v1.2.3