Menu
▾
▴
[Lmuse-cvs-traffic] muse/muse/arranger arranger.cpp,1.69,1.70 arranger.h,1.34,1.35 configtrack.cpp,1.2,1.3 configtrackbase.ui,1.3,1.4 tlswidget.cpp,1.8,1.9 tlwidget.cpp,1.14,1.15 tlwlayout.cpp,1.4,1.5
|
From: werner s. <wsc...@us...> - 2005-01-18 15:33:49
|
Update of /cvsroot/lmuse/muse/muse/arranger In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31405/muse/arranger Modified Files: arranger.cpp arranger.h configtrack.cpp configtrackbase.ui tlswidget.cpp tlwidget.cpp tlwlayout.cpp Log Message: more fixes Index: tlwidget.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/arranger/tlwidget.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** tlwidget.cpp 18 Jan 2005 12:26:51 -0000 1.14 --- tlwidget.cpp 18 Jan 2005 15:33:33 -0000 1.15 *************** *** 21,26 **** #include "trackdrag.h" - static const int trackNameWidth = 80; - //--------------------------------------------------------- // TLLabel --- 21,24 ---- *************** *** 154,157 **** --- 152,156 ---- { l->clear(); + wlist.clear(); nameEdit = 0; outChannel = 0; *************** *** 176,183 **** case TR_NAME: nameEdit = new TLLineEdit(_track->name(), this); connect(nameEdit, SIGNAL(contentChanged(QString)), SLOT(nameChanged(QString))); connect(nameEdit, SIGNAL(mousePress()), SLOT(select())); connect(_track, SIGNAL(nameChanged(const QString&)), nameEdit, SLOT(setText(const QString&))); ! nameEdit->setFixedWidth(trackNameWidth); QToolTip::add(nameEdit, tr("Track Name")); l->add(nameEdit, grp); --- 175,183 ---- case TR_NAME: nameEdit = new TLLineEdit(_track->name(), this); + nameEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); connect(nameEdit, SIGNAL(contentChanged(QString)), SLOT(nameChanged(QString))); connect(nameEdit, SIGNAL(mousePress()), SLOT(select())); connect(_track, SIGNAL(nameChanged(const QString&)), nameEdit, SLOT(setText(const QString&))); ! nameEdit->setMinimumWidth(Arranger::trackNameWidth); QToolTip::add(nameEdit, tr("Track Name")); l->add(nameEdit, grp); Index: arranger.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/arranger/arranger.h,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** arranger.h 13 Jan 2005 21:16:00 -0000 1.34 --- arranger.h 18 Jan 2005 15:33:33 -0000 1.35 *************** *** 219,222 **** --- 219,223 ---- void readStatus(QDomNode); void writeStatus(Xml&); + static int trackNameWidth; protected: Index: tlswidget.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/arranger/tlswidget.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tlswidget.cpp 13 Jan 2005 21:16:00 -0000 1.8 --- tlswidget.cpp 18 Jan 2005 15:33:33 -0000 1.9 *************** *** 65,68 **** --- 65,69 ---- l->add(tl, 0); ctrlList = new QComboBox(false, this); + ctrlList->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); updateController(); ControllerNameList* cn = _track->controllerNames(); Index: configtrack.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/arranger/configtrack.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configtrack.cpp 1 Oct 2004 15:40:51 -0000 1.2 --- configtrack.cpp 18 Jan 2005 15:33:33 -0000 1.3 *************** *** 9,12 **** --- 9,13 ---- #include "configtrack.h" #include "trelement.h" + #include "arranger.h" //--------------------------------------------------------- *************** *** 43,46 **** --- 44,48 ---- list[tt] = glist[tt]; trackTypeChanged(curType); + trackNameSize->setValue(Arranger::trackNameWidth); } *************** *** 57,60 **** --- 59,63 ---- for (int tt = 0; tt < TRACK_TYPES; ++tt) glist[tt] = list[tt]; + Arranger::trackNameWidth = trackNameSize->value(); emit trackConfigChanged(); } Index: configtrackbase.ui =================================================================== RCS file: /cvsroot/lmuse/muse/muse/arranger/configtrackbase.ui,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configtrackbase.ui 7 Oct 2004 22:29:51 -0000 1.3 --- configtrackbase.ui 18 Jan 2005 15:33:33 -0000 1.4 *************** *** 1,3 **** ! <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ConfigTrackListBase</class> <widget class="QDialog"> --- 1,3 ---- ! <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConfigTrackListBase</class> <widget class="QDialog"> *************** *** 10,14 **** <y>0</y> <width>545</width> ! <height>432</height> </rect> </property> --- 10,14 ---- <y>0</y> <width>545</width> ! <height>352</height> </rect> </property> *************** *** 25,29 **** <widget class="QLayoutWidget"> <property name="name"> ! <cstring>layout6</cstring> </property> <hbox> --- 25,29 ---- <widget class="QLayoutWidget"> <property name="name"> ! <cstring>layout7</cstring> </property> <hbox> *************** *** 84,87 **** --- 84,104 ---- </property> </widget> + <spacer> + <property name="name"> + <cstring>spacer3</cstring> + </property> + <property name="orientation"> + <enum>Horizontal</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> </hbox> </widget> *************** *** 203,206 **** --- 220,266 ---- <widget class="QLayoutWidget"> <property name="name"> + <cstring>layout8</cstring> + </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel"> + <property name="name"> + <cstring>textLabel1_2</cstring> + </property> + <property name="text"> + <string>Track Name Size:</string> + </property> + </widget> + <widget class="QSpinBox"> + <property name="name"> + <cstring>trackNameSize</cstring> + </property> + <property name="minValue"> + <number>40</number> + </property> + </widget> + <spacer> + <property name="name"> + <cstring>spacer4</cstring> + </property> + <property name="orientation"> + <enum>Horizontal</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </hbox> + </widget> + <widget class="QLayoutWidget"> + <property name="name"> <cstring>Layout1</cstring> </property> Index: arranger.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/arranger/arranger.cpp,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** arranger.cpp 18 Jan 2005 12:26:51 -0000 1.69 --- arranger.cpp 18 Jan 2005 15:33:33 -0000 1.70 *************** *** 37,44 **** static const int rulerHeight = 28; // TRACK_ROW_HEIGHT; static const int infoHeight = 20; - //static const int trackInfoWidth = 70; static const int INFO_WIDTH = 125; static const int MAP_OFFSET = 20; //--------------------------------------------------------- // ArrangerTrack --- 37,45 ---- static const int rulerHeight = 28; // TRACK_ROW_HEIGHT; static const int infoHeight = 20; static const int INFO_WIDTH = 125; static const int MAP_OFFSET = 20; + int Arranger::trackNameWidth = 80; + //--------------------------------------------------------- // ArrangerTrack *************** *** 71,82 **** | Track::M_AUDIO_SOFTSYNTH), TrElement(TR_DRUMMAP, 2, "use drum map", Track::M_MIDI), ! TrElement(TR_MUTE, 2, "mute", -1), ! TrElement(TR_SOLO, 2, "solo", -1), ! TrElement(TR_MONITOR, 2, "monitor", Track::M_MIDI | Track::M_WAVE), ! TrElement(TR_AREAD, 3, "automation read", -1), ! TrElement(TR_AWRITE, 3, "automation write", -1), ! TrElement(TR_OCHANNEL, 4, "output channel", Track::M_MIDI), ! TrElement(TR_OPORT, 5, "output port", Track::M_MIDI), }; const int nTrElements = sizeof(trElements)/sizeof(*trElements); --- 72,83 ---- | Track::M_AUDIO_SOFTSYNTH), TrElement(TR_DRUMMAP, 2, "use drum map", Track::M_MIDI), ! TrElement(TR_MUTE, 3, "mute", -1), ! TrElement(TR_SOLO, 3, "solo", -1), ! TrElement(TR_MONITOR, 3, "monitor", Track::M_MIDI | Track::M_WAVE), ! TrElement(TR_AREAD, 4, "automation read", -1), ! TrElement(TR_AWRITE, 4, "automation write", -1), ! TrElement(TR_OCHANNEL, 5, "output channel", Track::M_MIDI), ! TrElement(TR_OPORT, 6, "output port", Track::M_MIDI), }; const int nTrElements = sizeof(trElements)/sizeof(*trElements); *************** *** 652,657 **** if (configTrackEditor == 0) { configTrackEditor = new ConfigTrackList(this); ! connect(configTrackEditor, SIGNAL(trackConfigChanged()), ! SIGNAL(configChanged())); } configTrackEditor->show(); --- 653,657 ---- if (configTrackEditor == 0) { configTrackEditor = new ConfigTrackList(this); ! connect(configTrackEditor, SIGNAL(trackConfigChanged()), SIGNAL(configChanged())); } configTrackEditor->show(); *************** *** 958,961 **** --- 958,964 ---- else if (tag == "vmag") vmag->setValue(i); + else if (tag == "namesize") { + Arranger::trackNameWidth = i; + } else printf("Arranger: unknown tag %s\n", tag.latin1()); *************** *** 971,974 **** --- 974,978 ---- { xml.tag("arranger"); + xml.intTag("namesize", Arranger::trackNameWidth); int idx = 0; *************** *** 1356,1362 **** shortcutsKbdMovement.setPart(nextRight); shortcutsKbdMovement.setPos(nextRight->tick(), nextRight->tick() + nextRight->lenTick()); int x = rmapx(shortcutsKbdMovement.getLpos()); ! /*if (offset < x) { setXOffset(x); }*/ --- 1360,1367 ---- shortcutsKbdMovement.setPart(nextRight); shortcutsKbdMovement.setPos(nextRight->tick(), nextRight->tick() + nextRight->lenTick()); + /* int x = rmapx(shortcutsKbdMovement.getLpos()); ! if (offset < x) { setXOffset(x); }*/ Index: tlwlayout.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/arranger/tlwlayout.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tlwlayout.cpp 18 Dec 2004 15:17:25 -0000 1.4 --- tlwlayout.cpp 18 Jan 2005 15:33:33 -0000 1.5 *************** *** 105,109 **** QLayout::setGeometry(rect); - // printf("layout %d\n", list.size()); if (list.empty()) return; --- 105,108 ---- *************** *** 114,118 **** int x2 = rect.width() + x; int y2 = rect.height() + y; ! // printf("layout\n"); std::vector<TLItem*>::iterator it = list.begin(); TLItem* item = *it++; --- 113,117 ---- int x2 = rect.width() + x; int y2 = rect.height() + y; ! std::vector<TLItem*>::iterator it = list.begin(); TLItem* item = *it++; *************** *** 121,159 **** for (; it != list.end();) { ! int curId = (*it)->groupId(); ! int gw = 0; ! ! // search for group end: ! std::vector<TLItem*>::iterator it2(it); ! for (; it2 != list.end(); ++it2) { ! TLItem* item = *it2; ! if (item->groupId() != curId) break; ! QSize s = item->minimumSize(); ! gw += s.width() + itemDistance; ! } ! // printf(" gw %d %d x:%d x2:%d\n", curId, gw, x+gw, x2); ! // does group fit on row? ! ! while (x + gw > x2) { ! y += TRACK_ROW_HEIGHT; ! if (y + TRACK_ROW_HEIGHT > y2) ! goto end; ! x = rect.x() + labelWidth + itemDistance; } ! // place group element on row ! for (; it != it2; ++it) { TLItem* item = *it; QSize s = item->minimumSize(); int w = s.width(); ! item->setGeometry(QRect(x, y, w, TRACK_ROW_HEIGHT-rowDist)); ! x += w + itemDistance; } ! x += groupDistance; } - end: for (; it != list.end(); ++it) { TLItem* item = *it; --- 120,173 ---- for (; it != list.end();) { ! // ! // how many elemnts fit on row? ! // ! int xx = x; std::vector<TLItem*>::iterator it2(it); ! while (it2 != list.end()) { ! int curId = (*it2)->groupId(); ! std::vector<TLItem*>::iterator it3(it2); ! for (; it3 != list.end(); ++it3) { ! TLItem* item = *it3; ! if (item->groupId() != curId) ! break; ! QSize s = item->minimumSize(); ! xx += s.width() + itemDistance; ! } ! xx -= itemDistance; ! if (xx > x2) break; ! it2 = it3; ! xx += groupDistance; } ! // ! // place row ! // ! int curId = (*it)->groupId(); ! xx = x; for (; it != it2; ++it) { TLItem* item = *it; + if (item->groupId() != curId) { + xx += groupDistance - itemDistance; + curId = item->groupId(); + } QSize s = item->minimumSize(); int w = s.width(); ! if ((it+1 == it2) && (item->expanding() & QSizePolicy::Horizontally)) { ! w = x2 - xx; ! if (item->sizeHint().width() < w) ! w = item->sizeHint().width(); ! } ! item->setGeometry(QRect(xx, y, w, TRACK_ROW_HEIGHT-rowDist)); ! xx += w + itemDistance; } ! // ! // next row ! // ! y += TRACK_ROW_HEIGHT; ! if (y + TRACK_ROW_HEIGHT > y2) ! break; } for (; it != list.end(); ++it) { TLItem* item = *it; |