From: werner s. <wsc...@us...> - 2005-01-18 12:27:02
|
Update of /cvsroot/lmuse/muse/muse/liste In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20557/muse/liste Modified Files: listedit.cpp listedit.h Log Message: gui updates & small fixes Index: listedit.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/liste/listedit.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** listedit.cpp 14 Jan 2005 21:28:56 -0000 1.30 --- listedit.cpp 18 Jan 2005 12:26:51 -0000 1.31 *************** *** 503,506 **** --- 503,515 ---- listTools->setLabel(tr("List Tools")); undoRedo->addTo(listTools); + QToolBar* tb = new QToolBar(this, "CurPart"); + new QLabel(tr("CurTrack:"), tb); + tb_t = new QLabel("----", tb); + tb_t->setFrameShape(QFrame::LineEditPanel); + tb_t->setLineWidth(2); + new QLabel(tr("CurPart:"), tb); + tb_p = new QLabel(tr("----"), tb); + tb_p->setFrameShape(QFrame::LineEditPanel); + tb_p->setLineWidth(2); setCentralWidget(new QWidget(this, "qt_central_widget")); *************** *** 924,928 **** QListViewItem* item = list->selectedItem(); if (item == 0 || item->rtti() < 1000) { ! curPart = 0; return; } --- 933,937 ---- QListViewItem* item = list->selectedItem(); if (item == 0 || item->rtti() < 1000) { ! curPartChanged(0); return; } *************** *** 935,944 **** case L_CAFTER: case L_META: ! curPart = (MidiPart*)(i->part()); break; case L_TIMESIG: case L_TEMPOSIG: case L_CTRL: ! curPart = 0; break; } --- 944,953 ---- case L_CAFTER: case L_META: ! curPartChanged((MidiPart*)(i->part())); break; case L_TIMESIG: case L_TEMPOSIG: case L_CTRL: ! curPartChanged(0); break; } *************** *** 1263,1264 **** --- 1272,1291 ---- } + //--------------------------------------------------------- + // curPartChanged + //--------------------------------------------------------- + + void ListEdit::curPartChanged(MidiPart* part) + { + curPart = part; + + if (curPart) { + tb_p->setText(curPart->name()); + tb_t->setText(curPart->track()->name()); + } + else { + tb_p->setText("----"); + tb_t->setText("----"); + } + } + Index: listedit.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/liste/listedit.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** listedit.h 13 Jan 2005 21:16:02 -0000 1.13 --- listedit.h 18 Jan 2005 12:26:51 -0000 1.14 *************** *** 143,146 **** --- 143,148 ---- QPopupMenu* menuEdit; QPopupMenu* menuView; + QLabel* tb_p; // current part + QLabel* tb_t; // current track MidiPart* curPart; *************** *** 158,161 **** --- 160,164 ---- void setEditorGeometry(); void genListsTrack(Track*, QListViewItem*); + void curPartChanged(MidiPart* part); private slots: |