[Traverso-commit] traverso src/core/Song.h src/core/ViewPort.cpp ...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/12 10:30:53

Modified files:
        src/core       : Song.h ViewPort.cpp 
        src/traverso/songcanvas: SongView.h 
        src/traverso   : traverso.qrc 
        src/traverso/widgets: InfoWidgets.cpp InfoWidgets.h 
Added files:
        resources/images: player_play.png player_stop.png 

Log message:
        * more 'mouse clicking' support: Playhead indicator has play/stop icon, 
and is clickable :-(
        * moved menu translation item from SongView to Song

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/images/player_play.png?cvsroot=traverso&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/images/player_stop.png?cvsroot=traverso&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.h?cvsroot=traverso&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ViewPort.cpp?cvsroot=traverso&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.h?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/traverso.qrc?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.h?cvsroot=traverso&r1=1.7&r2=1.8

Patches:
Index: src/core/Song.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- src/core/Song.h     11 Apr 2007 15:56:35 -0000      1.43
+++ src/core/Song.h     12 Apr 2007 10:30:53 -0000      1.44
@@ -56,6 +56,8 @@
        Q_CLASSINFO("toggle_solo", tr("Solo: On/Off"))
        Q_CLASSINFO("toggle_mute", tr("Mute: On/Off"))
        Q_CLASSINFO("toggle_arm", tr("Arm: On/Off"))
+       Q_CLASSINFO("set_editing_mode", tr("Mode: Edit"))
+       Q_CLASSINFO("set_effects_mode", tr("Mode: Curve"))
 
 public:
 

Index: src/core/ViewPort.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ViewPort.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/core/ViewPort.cpp       11 Apr 2007 21:19:18 -0000      1.11
+++ src/core/ViewPort.cpp       12 Apr 2007 10:30:53 -0000      1.12
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: ViewPort.cpp,v 1.11 2007/04/11 21:19:18 r_sijrier Exp $
+$Id: ViewPort.cpp,v 1.12 2007/04/12 10:30:53 r_sijrier Exp $
 */
 
 #include <QMouseEvent>

Index: src/traverso/songcanvas/SongView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/traverso/songcanvas/SongView.h  11 Apr 2007 15:56:35 -0000      1.19
+++ src/traverso/songcanvas/SongView.h  12 Apr 2007 10:30:53 -0000      1.20
@@ -55,8 +55,6 @@
        Q_CLASSINFO("goto_end", tr("To end"))
        Q_CLASSINFO("play_cursor_move", tr("Playcursor: Move"))
        Q_CLASSINFO("work_cursor_move", tr("Workcursor: Move"))
-       Q_CLASSINFO("set_editing_mode", tr("Mode: Edit"))
-       Q_CLASSINFO("set_curve_mode", tr("Mode: Curve"))
        Q_CLASSINFO("add_marker", tr("Add Marker"))
        Q_CLASSINFO("playhead_to_workcursor", tr("Playcursor: To workcursor"))
 

Index: src/traverso/traverso.qrc
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/traverso.qrc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- src/traverso/traverso.qrc   11 Apr 2007 15:34:39 -0000      1.13
+++ src/traverso/traverso.qrc   12 Apr 2007 10:30:53 -0000      1.14
@@ -28,6 +28,8 @@
                <file alias="driver">../../resources/images/driver.png</file>
                <file 
alias="memorysmall">../../resources/images/memory.png</file>
                <file 
alias="appearance">../../resources/images/appearance.png</file>
+               <file 
alias="playstart">../../resources/images/player_play.png</file>
+               <file 
alias="playstop">../../resources/images/player_stop.png</file>
                <file 
alias="projectmanagement">../../resources/images/icons/32X32/projects.png</file>
                <file 
alias="songmanagement">../../resources/images/icons/32X32/songs.png</file>
                <file 
alias="audiosourcesmanagement">../../resources/images/icons/32X32/audiosources.png</file>

Index: src/traverso/widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/traverso/widgets/InfoWidgets.cpp        11 Apr 2007 15:56:35 -0000      
1.9
+++ src/traverso/widgets/InfoWidgets.cpp        12 Apr 2007 10:30:53 -0000      
1.10
@@ -386,6 +386,8 @@
        : InfoWidget(parent)
 {
        setAutoFillBackground(false);
+       setToolTip(tr("Start/stop playback. You should use the SpaceBar! ;-)"));
+       setMinimumWidth(110);
        connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(update()));
 }
 
@@ -405,12 +407,15 @@
        
        if (!m_song) {
                stop_smpte_update_timer();
+               m_playpixmap = QPixmap();
                return;
        }
        
        connect(m_song, SIGNAL(transferStopped()), this, 
SLOT(stop_smpte_update_timer()));
        connect(m_song, SIGNAL(transferStarted()), this, 
SLOT(start_smpte_update_timer()));
        
+       m_playpixmap = find_pixmap(":/playstart");
+       
        update();
 }
 
@@ -438,7 +443,9 @@
        painter.setFont(QFont("Bitstream Vera Sans", 13));
        painter.setPen(fontcolor);
        
-       painter.drawText(QRect(0, 4, width() - 6, height() - 6), 
Qt::AlignCenter, currentsmpte);
+       painter.fillRect(0, 0, width(), height(), QColor(247, 246, 255));
+       painter.drawPixmap(4, 6, m_playpixmap);
+       painter.drawText(QRect(12, 4, width() - 6, height() - 6), 
Qt::AlignCenter, currentsmpte);
 }
 
 void PlayHeadInfo::start_smpte_update_timer( )
@@ -447,22 +454,36 @@
        painter.setRenderHints(QPainter::Antialiasing);
        painter.drawRoundRect(0, 0, width(), height(), 20);*/
        
+       m_playpixmap = find_pixmap(":/playstop");
        m_updateTimer.start(150);
 }
 
 void PlayHeadInfo::stop_smpte_update_timer( )
 {
        m_updateTimer.stop();
+       m_playpixmap = find_pixmap(":/playstart");
        update();
 }
 
 QSize PlayHeadInfo::sizeHint() const
 {
-       return QSize(140, INFOBAR_HEIGH_HOR_ORIENTATION);
+       return QSize(120, INFOBAR_HEIGH_HOR_ORIENTATION);
+}
+
+void PlayHeadInfo::mousePressEvent(QMouseEvent * event)
+{
+       if (! m_song) {
+               return;
+       }
+       
+       if (event->button() == Qt::LeftButton) {
+               m_song->go();
+       }
 }
 
 
 
+
 InfoToolBar::InfoToolBar(QWidget * parent)
        : QToolBar(parent)
 {
@@ -569,16 +590,18 @@
        
        QHBoxLayout* lay = new QHBoxLayout(this);
                
-       lay->addWidget(m_mode);
+       lay->addWidget(undobutton);
+       lay->addWidget(redobutton);
+       lay->addStretch(1);
        lay->addWidget(m_snap);
        lay->addWidget(m_follow);
        lay->addWidget(m_record);
+       lay->addStretch(1);
        lay->addWidget(m_playhead);
-       lay->addWidget(m_selector);
        lay->addStretch(5);
+       lay->addWidget(m_mode);
+       lay->addWidget(m_selector);
 //     lay->addSpacing(12);
-       lay->addWidget(undobutton);
-       lay->addWidget(redobutton);
                
        setLayout(lay);
        lay->setMargin(0);

Index: src/traverso/widgets/InfoWidgets.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/traverso/widgets/InfoWidgets.h  11 Apr 2007 15:56:35 -0000      1.7
+++ src/traverso/widgets/InfoWidgets.h  12 Apr 2007 10:30:53 -0000      1.8
@@ -169,11 +169,13 @@
        ~PlayHeadInfo() {};
 
 protected:
+       void mousePressEvent ( QMouseEvent * event );
        void paintEvent( QPaintEvent* e);
        QSize sizeHint() const; 
        
 private:
        QTimer m_updateTimer;
+       QPixmap m_playpixmap;
 
 protected slots:
        void set_project(Project* );

Index: resources/images/player_play.png
===================================================================
RCS file: resources/images/player_play.png
diff -N resources/images/player_play.png
Binary files /dev/null and /tmp/cvsCHDfW3 differ

Index: resources/images/player_stop.png
===================================================================
RCS file: resources/images/player_stop.png
diff -N resources/images/player_stop.png
Binary files /dev/null and /tmp/cvsVjbqm7 differ