shortcut refactor for songeditor (#3649)

* shortcut refactor for songeditor

* Ctrl-modifier for copy Tcos

* QAction()::trigger methode qt4 compatible
This commit is contained in:
Steffen Baranowsky
2017-08-27 12:23:08 +02:00
committed by GitHub
parent e387e77445
commit 9b5d3790b0
7 changed files with 159 additions and 105 deletions

View File

@@ -79,13 +79,13 @@ public:
virtual ~RubberBand();
QVector<selectableObject *> selectedObjects() const;
QVector<selectableObject *> selectableObjects() const;
protected:
virtual void resizeEvent( QResizeEvent * _re );
private:
QVector<selectableObject *> selectableObjects() const;
};

View File

@@ -29,6 +29,7 @@
#include <QVector>
#include "ActionGroup.h"
#include "Editor.h"
#include "TrackContainerView.h"
@@ -82,6 +83,7 @@ public slots:
void updatePosition( const MidiTime & t );
void updatePositionLine();
void selectAllTcos( bool select );
protected:
virtual void closeEvent( QCloseEvent * ce );
@@ -135,6 +137,7 @@ private:
bool m_smoothScroll;
EditMode m_mode;
EditMode m_ctrlMode; // mode they were in before they hit ctrl
friend class SongEditorWindow;
@@ -169,12 +172,17 @@ signals:
void resized();
private:
virtual void keyPressEvent( QKeyEvent * ke );
virtual void keyReleaseEvent( QKeyEvent * ke );
QAction* m_addBBTrackAction;
QAction* m_addSampleTrackAction;
QAction* m_addAutomationTrackAction;
ActionGroup * m_editModeGroup;
QAction* m_drawModeAction;
QAction* m_selectModeAction;
QAction* m_crtlAction;
ComboBox * m_zoomingComboBox;
};

View File

@@ -370,7 +370,6 @@ public slots:
void update();
void changePosition( const MidiTime & newPos = MidiTime( -1 ) );
protected:
virtual void dragEnterEvent( QDragEnterEvent * dee );
virtual void dropEvent( QDropEvent * de );

View File

@@ -85,11 +85,7 @@ public:
inline QVector<selectableObject *> selectedObjects()
{
if( allowRubberband() == true )
{
return( m_rubberBand->selectedObjects() );
}
return( QVector<selectableObject *>() );
return( m_rubberBand->selectedObjects() );
}
@@ -126,6 +122,8 @@ public:
}
RubberBand *rubberBand() const;
public slots:
void realignTracks();
TrackView * createTrackView( Track * _t );