hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

QMdiArea, first attempt

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@597 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Paul Giblock
2007-11-18 13:15:13 +00:00
parent 45f6e8717e
commit ca18ad46dd
26 changed files with 170 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/instrument_track.h
View File

@@ -30,6 +30,7 @@
#include <QtGui/QApplication>
#include <QtGui/QPushButton>
#include <QtGui/QPainter>
#include <QtGui/QMdiSubWindow>
#include "midi_event_processor.h"
#include "mixer.h"
@@ -54,7 +55,7 @@ class surroundArea;
class volumeKnob;
class instrumentTrack : public QWidget, public track, public midiEventProcessor
class instrumentTrack : public QMdiSubWindow, public track, public midiEventProcessor
{
Q_OBJECT
public:

6
include/main_window.h
View File

@@ -34,7 +34,7 @@ class QAction;
class QDomElement;
class QGridLayout;
class QSplashScreen;
class QWorkspace;
class QMdiArea;
class configManager;
class tool;
@@ -45,7 +45,7 @@ class mainWindow : public QMainWindow
{
Q_OBJECT
public:
inline QWorkspace * workspace( void )
inline QMdiArea * workspace( void )
{
return( m_workspace );
}
@@ -124,7 +124,7 @@ private:
void finalize( void );
QWorkspace * m_workspace;
QMdiArea * m_workspace;
QWidget * m_toolBar;
QGridLayout * m_toolBarLayout;

2
include/rack_plugin.h
View File

@@ -33,6 +33,7 @@
class QGroupBox;
class QLabel;
class QPushButton;
class QMdiSubWindow;
class audioPort;
class effect;
@@ -94,6 +95,7 @@ private:
QGroupBox * m_controls;
QLabel * m_label;
QPushButton * m_editButton;
QMdiSubWindow *m_subWindow;
effect * m_effect;
effectControlDialog * m_controlView;
track * m_track;

21
include/track_container.h
View File

@@ -29,7 +29,7 @@
#include <QtGui/QScrollArea>
#include <QtCore/QVector>
#include <QtGui/QMainWindow>
#include <QtGui/QWidget>
#include "track.h"
@@ -42,7 +42,7 @@ const Uint16 DEFAULT_SCROLLBAR_SIZE = 16;
class trackContainer : public QMainWindow, public journallingObject
class trackContainer : public QWidget, public journallingObject
{
Q_OBJECT
public:
@@ -54,6 +54,15 @@ public:
return( m_scrollArea );
}
#warning centralWidget is obsolete
QWidget * centralWidget() const {
return (QWidget*)this;
}
void setCentralWidget( QWidget *cw ) {
//m_centralWidget = cw;
}
virtual void FASTCALL saveSettings( QDomDocument & _doc,
QDomElement & _parent );
@@ -98,7 +107,6 @@ public:
const trackWidget * trackWidgetAt( const int _y ) const;
virtual bool allowRubberband( void ) const;
inline bool rubberBandActive( void ) const
@@ -131,11 +139,15 @@ protected:
virtual void dragEnterEvent( QDragEnterEvent * _dee );
virtual void dropEvent( QDropEvent * _de );
virtual void mousePressEvent( QMouseEvent * _me );
virtual void mousePressEvent( QMouseEvent * _me );
virtual void mouseMoveEvent( QMouseEvent * _me );
virtual void mouseReleaseEvent( QMouseEvent * _me );
virtual void resizeEvent( QResizeEvent * );
void addToWorkspace();
constTrackVector tracks( void ) const;
virtual QRect scrollAreaRect( void ) const
@@ -145,7 +157,6 @@ protected:
midiTime m_currentPosition;
protected slots:
void updateScrollArea( void );