From: terminator356 <ter...@us...> - 2009-05-03 04:14:06
|
Update of /cvsroot/lmuse/muse/muse/widgets In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31418/muse/widgets Modified Files: Tag: REL07 Makefile.am aboutbox.ui appearancebase.ui canvas.cpp configmidifilebase.ui gensetbase.ui midisync.ui midisyncimpl.cpp midisyncimpl.h mtrackinfobase.ui mtscale.cpp Log Message: See ChangeLog Index: aboutbox.ui =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/aboutbox.ui,v retrieving revision 1.9.2.17 retrieving revision 1.9.2.18 diff -C2 -d -r1.9.2.17 -r1.9.2.18 *** aboutbox.ui 5 Feb 2009 10:16:22 -0000 1.9.2.17 --- aboutbox.ui 3 May 2009 04:14:01 -0000 1.9.2.18 *************** *** 1,3 **** ! <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AboutBox</class> <widget class="QDialog"> --- 1,3 ---- ! <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>AboutBox</class> <widget class="QDialog"> Index: midisyncimpl.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/midisyncimpl.cpp,v retrieving revision 1.1.1.1.2.3 retrieving revision 1.1.1.1.2.4 diff -C2 -d -r1.1.1.1.2.3 -r1.1.1.1.2.4 *** midisyncimpl.cpp 1 Apr 2009 01:37:11 -0000 1.1.1.1.2.3 --- midisyncimpl.cpp 3 May 2009 04:14:01 -0000 1.1.1.1.2.4 *************** *** 359,374 **** { bool sdet = midiPorts[port].syncInfo().MCSyncDetect(); ! if(port == curMidiSyncInPort) { ! if(lvi->pixmap(DEVCOL_IN) != (sdet ? record1_Icon : dothIcon)) ! lvi->setPixmap(DEVCOL_IN, sdet ? *record1_Icon : *dothIcon); ! } ! else ! if(lvi->pixmap(DEVCOL_IN) != (sdet ? dotIcon : dothIcon)) ! lvi->setPixmap(DEVCOL_IN, sdet ? *dotIcon : *dothIcon); sdet = midiPorts[port].syncInfo().tickDetect(); ! if(lvi->pixmap(DEVCOL_TICKIN) != (sdet ? dotIcon : dothIcon)) ! lvi->setPixmap(DEVCOL_TICKIN, sdet ? *dotIcon : *dothIcon); } //MidiDevice* dev = lvi->device(); --- 359,423 ---- { bool sdet = midiPorts[port].syncInfo().MCSyncDetect(); ! if(sdet) { ! if(port == curMidiSyncInPort) ! { ! if(!lvi->_curDet) ! { ! // Added by Tim. p3.3.6 ! //printf("MidiSyncConfig::heartBeat setting current red icon\n"); + lvi->_curDet = true; + lvi->_inDet = false; + lvi->setPixmap(DEVCOL_IN, *record1_Icon); + } + } + else + if(!lvi->_inDet) + { + // Added by Tim. p3.3.6 + //printf("MidiSyncConfig::heartBeat setting non-current green icon\n"); + + lvi->_inDet = true; + lvi->_curDet = false; + lvi->setPixmap(DEVCOL_IN, *dotIcon); + } + } + else + { + if(lvi->_curDet || lvi->_inDet) + { + // Added by Tim. p3.3.6 + //printf("MidiSyncConfig::heartBeat setting off icon\n"); + + lvi->_curDet = false; + lvi->_inDet = false; + lvi->setPixmap(DEVCOL_IN, *dothIcon); + } + } + sdet = midiPorts[port].syncInfo().tickDetect(); ! if(sdet) ! { ! if(!lvi->_tickDet) ! { ! // Added by Tim. p3.3.6 ! //printf("MidiSyncConfig::heartBeat setting tick on icon\n"); ! ! lvi->_tickDet = true; ! lvi->setPixmap(DEVCOL_TICKIN, *dotIcon); ! } ! } ! else ! { ! if(lvi->_tickDet) ! { ! // Added by Tim. p3.3.6 ! //printf("MidiSyncConfig::heartBeat setting tick off icon\n"); ! ! lvi->_tickDet = false; ! lvi->setPixmap(DEVCOL_TICKIN, *dothIcon); ! } ! } } //MidiDevice* dev = lvi->device(); *************** *** 554,566 **** lvi->setText(DEVCOL_NAME, tr("<none>")); ! if(i == curMidiSyncInPort) ! //lvi->setPixmap(DEVCOL_IN, si.MCSyncDetect() ? *record1_Icon : *dothIcon); ! lvi->setPixmap(DEVCOL_IN, portsi.MCSyncDetect() ? *record1_Icon : *dothIcon); ! else ! //lvi->setPixmap(DEVCOL_IN, si.MCSyncDetect() ? *dotIcon : *dothIcon); ! lvi->setPixmap(DEVCOL_IN, portsi.MCSyncDetect() ? *dotIcon : *dothIcon); ! //lvi->setPixmap(DEVCOL_TICKIN, si.tickDetect() ? *dotIcon : *dothIcon); ! lvi->setPixmap(DEVCOL_TICKIN, portsi.tickDetect() ? *dotIcon : *dothIcon); //lvi->setText(DEVCOL_RID, QString().setNum(si.idIn()) ); --- 603,638 ---- lvi->setText(DEVCOL_NAME, tr("<none>")); ! if(portsi.MCSyncDetect()) ! { ! if(i == curMidiSyncInPort) ! { ! lvi->_curDet = true; ! lvi->_inDet = false; ! lvi->setPixmap(DEVCOL_IN, *record1_Icon); ! } ! else ! { ! lvi->_curDet = false; ! lvi->_inDet = true; ! lvi->setPixmap(DEVCOL_IN, *dotIcon); ! } ! } ! else ! { ! lvi->_curDet = false; ! lvi->_inDet = false; ! lvi->setPixmap(DEVCOL_IN, *dothIcon); ! } ! if(portsi.tickDetect()) ! { ! lvi->_tickDet = true; ! lvi->setPixmap(DEVCOL_TICKIN, *dotIcon); ! } ! else ! { ! lvi->_tickDet = false; ! lvi->setPixmap(DEVCOL_TICKIN, *dothIcon); ! } //lvi->setText(DEVCOL_RID, QString().setNum(si.idIn()) ); Index: canvas.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/Attic/canvas.cpp,v retrieving revision 1.10.2.16 retrieving revision 1.10.2.17 diff -C2 -d -r1.10.2.16 -r1.10.2.17 *** canvas.cpp 6 Apr 2009 01:24:55 -0000 1.10.2.16 --- canvas.cpp 3 May 2009 04:14:01 -0000 1.10.2.17 *************** *** 470,474 **** } bool shift = keyState & ShiftButton; ! //bool alt = keyState & AltButton; bool ctrl = keyState & ControlButton; start = event->pos(); --- 470,474 ---- } bool shift = keyState & ShiftButton; ! bool alt = keyState & AltButton; bool ctrl = keyState & ControlButton; start = event->pos(); *************** *** 562,576 **** } itemPressed(curItem); ! // Changed by T356. Alt is reserved for moving the whole window. Changed to Shift-Ctl. if (shift) ! { ! if (ctrl) ! drag = DRAG_CLONE_START; ! else ! drag = DRAG_COPY_START; ! } ! //else if (alt) { ! // drag = DRAG_CLONE_START; ! // } else if (ctrl) { //Select all on the same pitch (e.g. same y-value) deselectAll(); --- 562,581 ---- } itemPressed(curItem); ! // Changed by T356. Alt is default reserved for moving the whole window in KDE. Changed to Shift-Alt. ! // Hmm, nope, shift-alt is also reserved sometimes. Must find a way to bypass, ! // why make user turn off setting? Left alone for now... if (shift) ! drag = DRAG_COPY_START; ! else if (alt) { ! drag = DRAG_CLONE_START; ! } ! // ! //if (shift) ! //{ ! // if (alt) ! // drag = DRAG_CLONE_START; ! // else ! // drag = DRAG_COPY_START; ! //} else if (ctrl) { //Select all on the same pitch (e.g. same y-value) deselectAll(); Index: midisyncimpl.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/midisyncimpl.h,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -C2 -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 *** midisyncimpl.h 1 Apr 2009 01:37:11 -0000 1.1.1.1.2.2 --- midisyncimpl.h 3 May 2009 04:14:01 -0000 1.1.1.1.2.3 *************** *** 64,68 **** public: MidiSyncLViewItem(QListView* parent) ! : QListViewItem(parent) { _port = -1; } //: QListViewItem(parent) { _device = 0; } --- 64,68 ---- public: MidiSyncLViewItem(QListView* parent) ! : QListViewItem(parent) { _port = -1; _inDet = _curDet = _tickDet = false; } //: QListViewItem(parent) { _device = 0; } *************** *** 74,77 **** --- 74,80 ---- //int _port; + bool _inDet; + bool _curDet; + bool _tickDet; int _idOut; Index: configmidifilebase.ui =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/configmidifilebase.ui,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** configmidifilebase.ui 1 Apr 2009 01:37:11 -0000 1.2.2.1 --- configmidifilebase.ui 3 May 2009 04:14:01 -0000 1.2.2.2 *************** *** 1,3 **** ! <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConfigMidiFileBase</class> <widget class="QDialog"> --- 1,3 ---- ! <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ConfigMidiFileBase</class> <widget class="QDialog"> Index: gensetbase.ui =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/gensetbase.ui,v retrieving revision 1.8.2.4 retrieving revision 1.8.2.5 diff -C2 -d -r1.8.2.4 -r1.8.2.5 *** gensetbase.ui 28 Mar 2009 01:46:10 -0000 1.8.2.4 --- gensetbase.ui 3 May 2009 04:14:01 -0000 1.8.2.5 *************** *** 1,3 **** ! <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GlobalSettingsDialogBase</class> <widget class="QDialog"> --- 1,3 ---- ! <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>GlobalSettingsDialogBase</class> <widget class="QDialog"> Index: mtscale.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/Attic/mtscale.cpp,v retrieving revision 1.8.2.6 retrieving revision 1.8.2.7 diff -C2 -d -r1.8.2.6 -r1.8.2.7 *** mtscale.cpp 6 Apr 2009 01:24:55 -0000 1.8.2.6 --- mtscale.cpp 3 May 2009 04:14:01 -0000 1.8.2.7 *************** *** 279,282 **** --- 279,285 ---- // at bar 245 with magnification at max.), even with correct clipping region // applied to painter in View::paint(). Tim. Apr 5 2009 + // Quote: "Warning: Note that QPainter does not attempt to work around + // coordinate limitations in the underlying window system. Some platforms may + // behave incorrectly with coordinates as small as +/-4000." if(xp >= -32) p.drawPixmap(xp, 0, *flagIconS); Index: Makefile.am =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/Makefile.am,v retrieving revision 1.15.2.4 retrieving revision 1.15.2.5 diff -C2 -d -r1.15.2.4 -r1.15.2.5 *** Makefile.am 1 Apr 2009 07:03:32 -0000 1.15.2.4 --- Makefile.am 3 May 2009 04:14:01 -0000 1.15.2.5 *************** *** 1,5 **** include $(top_srcdir)/common.am ! musewidgetsplugin_so_CPPFLAGS = $(MUSECXXFLAGS) -c -fPIC -I.. -I$(top_srcdir)/synti \ -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_PLUGIN libwidgets_a_CPPFLAGS = $(MUSECXXFLAGS) -I.. -I$(top_srcdir)/synti --- 1,5 ---- include $(top_srcdir)/common.am ! musewidgetsplugin_so_CPPFLAGS = $(MUSECXXFLAGS) -fPIC -I.. -I$(top_srcdir)/synti \ -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_PLUGIN libwidgets_a_CPPFLAGS = $(MUSECXXFLAGS) -I.. -I$(top_srcdir)/synti Index: mtrackinfobase.ui =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/mtrackinfobase.ui,v retrieving revision 1.11.2.6 retrieving revision 1.11.2.7 diff -C2 -d -r1.11.2.6 -r1.11.2.7 *** mtrackinfobase.ui 4 Apr 2009 01:49:50 -0000 1.11.2.6 --- mtrackinfobase.ui 3 May 2009 04:14:01 -0000 1.11.2.7 *************** *** 529,533 **** </property> <property name="text"> ! <string>record:</string> </property> </widget> --- 529,536 ---- </property> <property name="text"> ! <string>Record:</string> ! </property> ! <property name="alignment"> ! <set>AlignVCenter|AlignRight</set> </property> </widget> *************** *** 593,599 **** --- 596,611 ---- </sizepolicy> </property> + <property name="lineWidth"> + <number>1</number> + </property> + <property name="margin"> + <number>0</number> + </property> <property name="text"> <string>H-Bank</string> </property> + <property name="indent"> + <number>2</number> + </property> </widget> <widget class="SpinBox" row="16" column="0"> *************** *** 638,642 **** </property> <property name="lineWidth"> ! <number>0</number> </property> <property name="margin"> --- 650,654 ---- </property> <property name="lineWidth"> ! <number>1</number> </property> <property name="margin"> *************** *** 678,699 **** </property> </widget> ! <widget class="QToolButton" row="17" column="1"> <property name="name"> ! <cstring>progRecButton</cstring> ! </property> ! <property name="sizePolicy"> ! <sizepolicy> ! <hsizetype>2</hsizetype> ! <vsizetype>5</vsizetype> ! <horstretch>0</horstretch> ! <verstretch>0</verstretch> ! </sizepolicy> ! </property> ! <property name="text"> ! <string>Prog.</string> ! </property> ! <property name="toolTip" stdset="0"> ! <string>Add bank + prog settings to song</string> </property> </widget> <widget class="SpinBox" row="18" column="0"> --- 690,744 ---- </property> </widget> ! <widget class="QLayoutWidget" row="17" column="1"> <property name="name"> ! <cstring>progLayout</cstring> </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>0</number> + </property> + <property name="spacing"> + <number>0</number> + </property> + <spacer> + <property name="name"> + <cstring>progSpacer</cstring> + </property> + <property name="orientation"> + <enum>Minimum</enum> + </property> + <property name="sizeType"> + <enum>Fixed</enum> + </property> + <property name="sizeHint"> + <size> + <width>7</width> + <height>10</height> + </size> + </property> + </spacer> + <widget class="QToolButton"> + <property name="name"> + <cstring>progRecButton</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>1</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Prog.</string> + </property> + <property name="toolTip" stdset="0"> + <string>Add bank + prog settings to song</string> + </property> + </widget> + </hbox> </widget> <widget class="SpinBox" row="18" column="0"> *************** *** 725,746 **** </property> </widget> ! <widget class="QToolButton" row="18" column="1"> <property name="name"> ! <cstring>volRecButton</cstring> ! </property> ! <property name="sizePolicy"> ! <sizepolicy> ! <hsizetype>2</hsizetype> ! <vsizetype>5</vsizetype> ! <horstretch>0</horstretch> ! <verstretch>0</verstretch> ! </sizepolicy> ! </property> ! <property name="text"> ! <string>Vol.</string> ! </property> ! <property name="toolTip" stdset="0"> ! <string>Add vol setting to song</string> </property> </widget> <widget class="SpinBox" row="19" column="0"> --- 770,824 ---- </property> </widget> ! <widget class="QLayoutWidget" row="18" column="1"> <property name="name"> ! <cstring>volLayout</cstring> </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>0</number> + </property> + <property name="spacing"> + <number>0</number> + </property> + <spacer> + <property name="name"> + <cstring>volSpacer</cstring> + </property> + <property name="orientation"> + <enum>Horizontal</enum> + </property> + <property name="sizeType"> + <enum>Minimum</enum> + </property> + <property name="sizeHint"> + <size> + <width>7</width> + <height>10</height> + </size> + </property> + </spacer> + <widget class="QToolButton"> + <property name="name"> + <cstring>volRecButton</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>1</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Vol.</string> + </property> + <property name="toolTip" stdset="0"> + <string>Add vol setting to song</string> + </property> + </widget> + </hbox> </widget> <widget class="SpinBox" row="19" column="0"> *************** *** 775,796 **** </property> </widget> ! <widget class="QToolButton" row="19" column="1"> <property name="name"> ! <cstring>panRecButton</cstring> ! </property> ! <property name="sizePolicy"> ! <sizepolicy> ! <hsizetype>2</hsizetype> ! <vsizetype>5</vsizetype> ! <horstretch>0</horstretch> ! <verstretch>0</verstretch> ! </sizepolicy> ! </property> ! <property name="text"> ! <string>Pan</string> ! </property> ! <property name="toolTip" stdset="0"> ! <string>Add pan setting to song</string> </property> </widget> <spacer row="20" column="0" rowspan="1" colspan="2"> --- 853,907 ---- </property> </widget> ! <widget class="QLayoutWidget" row="19" column="1"> <property name="name"> ! <cstring>panLayout</cstring> </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>0</number> + </property> + <property name="spacing"> + <number>0</number> + </property> + <spacer> + <property name="name"> + <cstring>panSpacer</cstring> + </property> + <property name="orientation"> + <enum>Horizontal</enum> + </property> + <property name="sizeType"> + <enum>Minimum</enum> + </property> + <property name="sizeHint"> + <size> + <width>7</width> + <height>10</height> + </size> + </property> + </spacer> + <widget class="QToolButton"> + <property name="name"> + <cstring>panRecButton</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>1</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Pan</string> + </property> + <property name="toolTip" stdset="0"> + <string>Add pan setting to song</string> + </property> + </widget> + </hbox> </widget> <spacer row="20" column="0" rowspan="1" colspan="2"> Index: appearancebase.ui =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/appearancebase.ui,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** appearancebase.ui 20 Dec 2003 10:09:24 -0000 1.3 --- appearancebase.ui 3 May 2009 04:14:01 -0000 1.3.2.1 *************** *** 219,222 **** --- 219,230 ---- </property> </widget> + <widget class="QPushButton"> + <property name="name"> + <cstring>clearBgButton</cstring> + </property> + <property name="text"> + <string>clear</string> + </property> + </widget> </hbox> </widget> Index: midisync.ui =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/midisync.ui,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** midisync.ui 28 Mar 2009 01:46:10 -0000 1.2.2.1 --- midisync.ui 3 May 2009 04:14:01 -0000 1.2.2.2 *************** *** 1,3 **** ! <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MidiSyncConfigBase</class> <comment>midi sync --- 1,3 ---- ! <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>MidiSyncConfigBase</class> <comment>midi sync |