Menu
▾
▴
[Lmuse-cvs-traffic] muse/synti/deicsonze deicsonzegui.cpp,1.12,1.13 deicsonzegui.h,1.11,1.12 deicsonzeguibase.ui,1.11,1.12 deicsonzepreset.cpp,1.7,1.8
|
From: werner s. <wsc...@us...> - 2005-12-15 16:01:44
|
Update of /cvsroot/lmuse/muse/synti/deicsonze In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9286/synti/deicsonze Modified Files: deicsonzegui.cpp deicsonzegui.h deicsonzeguibase.ui deicsonzepreset.cpp Log Message: this is mainly a maintenance update, splitting some files to modularise things Index: deicsonzegui.h =================================================================== RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonzegui.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** deicsonzegui.h 4 Nov 2005 12:04:07 -0000 1.11 --- deicsonzegui.h 15 Dec 2005 16:01:22 -0000 1.12 *************** *** 80,103 **** class QFrameEnvelope; ! class QListViewCategory:public QListWidgetItem { public: Category* _category; ! QListViewCategory(QListWidget* p, QString shbank, QString l, Category* c) ! :QListWidgetItem(p, shbank, l) {_category=c;}; }; ! class QListViewSubcategory:public QListWidgetItem { public: Subcategory* _subcategory; ! QListViewSubcategory(QListWidget* p, QString slbank, QString l, Subcategory* s) ! :QListWidgetItem(p, slbank, l) {_subcategory=s;}; }; ! class QListViewPreset:public QListWidgetItem { public: Preset* _preset; ! QListViewPreset(QListWidget* pa, QString sprog, QString l, Preset* p) ! :QListWidgetItem(pa, sprog, l) {_preset=p;}; }; --- 80,115 ---- class QFrameEnvelope; ! class QListViewCategory:public QTreeWidgetItem { public: Category* _category; ! QListViewCategory(QTreeWidget* p, QString shbank, QString l, Category* c) ! :QTreeWidgetItem(p) { ! setText(0, shbank); ! setText(1, l); ! _category=c; ! }; }; ! class QListViewSubcategory:public QTreeWidgetItem { public: Subcategory* _subcategory; ! QListViewSubcategory(QTreeWidget* p, QString slbank, QString l, Subcategory* s) ! :QTreeWidgetItem(p) { ! setText(0, slbank); ! setText(1, l); ! _subcategory=s; ! }; }; ! class QListViewPreset:public QTreeWidgetItem { public: Preset* _preset; ! QListViewPreset(QTreeWidget* pa, QString sprog, QString l, Preset* p) ! :QTreeWidgetItem(pa) { ! setText(0, sprog); ! setText(1, l); ! _preset=p; ! }; }; Index: deicsonzepreset.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonzepreset.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** deicsonzepreset.cpp 4 Nov 2005 12:04:07 -0000 1.7 --- deicsonzepreset.cpp 15 Dec 2005 16:01:22 -0000 1.8 *************** *** 635,638 **** --- 635,639 ---- //--------------------------------------------------------- void Preset::readPreset(QDomNode presetNode) { + #if 0 //TODO while(!presetNode.isNull()) { QDomElement presetEl = presetNode.toElement(); *************** *** 884,887 **** --- 885,889 ---- presetNode = presetNode.nextSibling(); } + #endif } Index: deicsonzegui.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonzegui.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** deicsonzegui.cpp 4 Nov 2005 12:04:07 -0000 1.12 --- deicsonzegui.cpp 15 Dec 2005 16:01:22 -0000 1.13 *************** *** 355,360 **** setEditBackgroundColor(reinterpret_cast<const QColor &>(*curColor)); } ! colorFrame->setPaletteBackgroundColor ! (reinterpret_cast<const QColor &>(*curColor)); } } --- 355,360 ---- setEditBackgroundColor(reinterpret_cast<const QColor &>(*curColor)); } ! // colorFrame->setPaletteBackgroundColor ! // (reinterpret_cast<const QColor &>(*curColor)); } } *************** *** 379,384 **** setEditBackgroundColor(reinterpret_cast<const QColor &>(*curColor)); } ! colorFrame->setPaletteBackgroundColor ! (reinterpret_cast<const QColor &>(*curColor)); } } --- 379,384 ---- setEditBackgroundColor(reinterpret_cast<const QColor &>(*curColor)); } ! // colorFrame->setPaletteBackgroundColor ! // (reinterpret_cast<const QColor &>(*curColor)); } } *************** *** 403,408 **** setEditBackgroundColor(reinterpret_cast<const QColor &>(*curColor)); } ! colorFrame->setPaletteBackgroundColor ! (reinterpret_cast<const QColor &>(*curColor)); } } --- 403,408 ---- setEditBackgroundColor(reinterpret_cast<const QColor &>(*curColor)); } ! // colorFrame->setPaletteBackgroundColor ! // (reinterpret_cast<const QColor &>(*curColor)); } } *************** *** 435,450 **** blueSpinBox->setValue(curColor->blue()); blueSpinBox->blockSignals(false); ! colorFrame->setPaletteBackgroundColor ! (reinterpret_cast<const QColor &>(*curColor)); } void DeicsOnzeGui::setTextColor(const QColor & c) { ! this->setPaletteForegroundColor(c); ! deicsOnzeTabWidget->setPaletteForegroundColor(c); } void DeicsOnzeGui::setBackgroundColor(const QColor & c) { ! this->setPaletteBackgroundColor(c); ! deicsOnzeTabWidget->setPaletteBackgroundColor(c); } void DeicsOnzeGui::setEditTextColor(const QColor & c) { colorListBox->setPaletteForegroundColor(c); redSpinBox->setPaletteForegroundColor(c); --- 435,451 ---- blueSpinBox->setValue(curColor->blue()); blueSpinBox->blockSignals(false); ! // colorFrame->setPaletteBackgroundColor ! // (reinterpret_cast<const QColor &>(*curColor)); } void DeicsOnzeGui::setTextColor(const QColor & c) { ! // this->setPaletteForegroundColor(c); ! // deicsOnzeTabWidget->setPaletteForegroundColor(c); } void DeicsOnzeGui::setBackgroundColor(const QColor & c) { ! // this->setPaletteBackgroundColor(c); ! // deicsOnzeTabWidget->setPaletteBackgroundColor(c); } void DeicsOnzeGui::setEditTextColor(const QColor & c) { + #if 0 colorListBox->setPaletteForegroundColor(c); redSpinBox->setPaletteForegroundColor(c); *************** *** 548,553 **** --- 549,556 ---- subcategoryListView->setPaletteForegroundColor(c); presetListView->setPaletteForegroundColor(c); + #endif } void DeicsOnzeGui::setEditBackgroundColor(const QColor & c) { + #if 0 colorListBox->setPaletteBackgroundColor(c); redSpinBox->setPaletteBackgroundColor(c); *************** *** 656,659 **** --- 659,663 ---- subcategoryListView->setPaletteBackgroundColor(c); presetListView->setPaletteBackgroundColor(c); + #endif } Index: deicsonzeguibase.ui =================================================================== RCS file: /cvsroot/lmuse/muse/synti/deicsonze/deicsonzeguibase.ui,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** deicsonzeguibase.ui 4 Nov 2005 12:04:07 -0000 1.11 --- deicsonzeguibase.ui 15 Dec 2005 16:01:22 -0000 1.12 *************** *** 70,109 **** <number>6</number> </property> - <item row="1" column="2" colspan="2" > - <widget class="QListWidget" name="subcategoryListView" > - <property name="font" > - <font> - <family>Zero Threes</family> - <pointsize>8</pointsize> - <weight>50</weight> - <italic>false</italic> - <bold>false</bold> - <underline>false</underline> - <strikeout>false</strikeout> - </font> - </property> - <property name="frameShadow" > - <enum>QFrame::Sunken</enum> - </property> - </widget> - </item> - <item row="1" column="4" colspan="2" > - <widget class="QListWidget" name="presetListView" > - <property name="font" > - <font> - <family>Zero Threes</family> - <pointsize>8</pointsize> - <weight>50</weight> - <italic>false</italic> - <bold>false</bold> - <underline>false</underline> - <strikeout>false</strikeout> - </font> - </property> - <property name="frameShadow" > - <enum>QFrame::Sunken</enum> - </property> - </widget> - </item> <item row="0" column="0" > <widget class="QSpinBox" name="hbankSpinBox" > --- 70,73 ---- *************** *** 284,303 **** </item> <item row="1" column="0" colspan="2" > ! <widget class="QListWidget" name="categoryListView" > ! <property name="font" > ! <font> ! <family>Zero Threes</family> ! <pointsize>8</pointsize> ! <weight>50</weight> ! <italic>false</italic> ! <bold>false</bold> ! <underline>false</underline> ! <strikeout>false</strikeout> ! </font> ! </property> ! <property name="frameShadow" > ! <enum>QFrame::Sunken</enum> ! </property> ! </widget> </item> </layout> --- 248,258 ---- </item> <item row="1" column="0" colspan="2" > ! <widget class="QTreeWidget" name="categoryListView" /> ! </item> ! <item row="1" column="4" colspan="2" > ! <widget class="QTreeWidget" name="presetListView" /> ! </item> ! <item row="1" column="2" colspan="2" > ! <widget class="QTreeWidget" name="subcategoryListView" /> </item> </layout> *************** *** 1362,1366 **** <property name="font" > <font> ! <family></family> <pointsize>12</pointsize> <weight>50</weight> --- 1317,1321 ---- <property name="font" > <font> ! <family>Teen</family> <pointsize>12</pointsize> <weight>50</weight> *************** *** 1414,1418 **** <property name="font" > <font> ! <family></family> <pointsize>12</pointsize> <weight>50</weight> --- 1369,1373 ---- <property name="font" > <font> ! <family>Teen</family> <pointsize>12</pointsize> <weight>50</weight> *************** *** 2112,2116 **** <property name="font" > <font> ! <family></family> <pointsize>12</pointsize> <weight>50</weight> --- 2067,2071 ---- <property name="font" > <font> ! <family>Teen</family> <pointsize>12</pointsize> <weight>50</weight> *************** *** 2706,2710 **** <property name="font" > <font> ! <family></family> <pointsize>12</pointsize> <weight>50</weight> --- 2661,2665 ---- <property name="font" > <font> ! <family>Teen</family> <pointsize>12</pointsize> <weight>50</weight> *************** *** 2987,2991 **** <property name="font" > <font> ! <family></family> <pointsize>12</pointsize> <weight>50</weight> --- 2942,2946 ---- <property name="font" > <font> ! <family>Teen</family> <pointsize>12</pointsize> <weight>50</weight> *************** *** 3390,3394 **** <property name="font" > <font> ! <family></family> <pointsize>12</pointsize> <weight>50</weight> --- 3345,3349 ---- <property name="font" > <font> ! <family>Teen</family> <pointsize>12</pointsize> <weight>50</weight> *************** *** 3865,3869 **** <property name="font" > <font> ! <family></family> <pointsize>12</pointsize> <weight>50</weight> --- 3820,3824 ---- <property name="font" > <font> ! <family>Teen</family> <pointsize>12</pointsize> <weight>50</weight> *************** *** 4456,4460 **** <property name="font" > <font> ! <family></family> <pointsize>12</pointsize> <weight>50</weight> --- 4411,4415 ---- <property name="font" > <font> ! <family>Teen</family> <pointsize>12</pointsize> <weight>50</weight> *************** *** 6836,6840 **** <tabstops> <tabstop>deicsOnzeTabWidget</tabstop> - <tabstop>categoryListView</tabstop> <tabstop>presetLineEdit</tabstop> <tabstop>masterVolSlider</tabstop> --- 6791,6794 ---- *************** *** 6890,6895 **** <tabstop>lbankSpinBox</tabstop> <tabstop>progSpinBox</tabstop> - <tabstop>subcategoryListView</tabstop> - <tabstop>presetListView</tabstop> <tabstop>masterVolSpinBox</tabstop> <tabstop>feedbackSpinBox</tabstop> --- 6844,6847 ---- |