global clipboard, groupbox automation, volume vector, several segfaults

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@486 0778d3d1-df1d-0410-868b-ea421aaaa00d

include/clipboard.h

@@ -1,7 +1,7 @@
 /*
  * clipboard.h - the clipboard for patterns, notes etc.
  *
- * Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -48,13 +48,24 @@
 
 class journallingObject;
 
-namespace clipboard
+class clipboard
 {
+public:
 	typedef QMap<QString, QDomElement> map;
-	extern map content;
 
-	void FASTCALL copy( journallingObject * _object );
-	const QDomElement * FASTCALL getContent( const QString & _node_name );
+	static void FASTCALL copy( journallingObject * _object );
+	static const QDomElement * FASTCALL getContent(
+						const QString & _node_name );
+
+	static const char * mimeType( void )
+	{
+		return( "application/x-lmms-clipboard" );
+	}
+
+
+private:
+	static map content;
+
 } ;
 
 #endif

include/file_browser.h

@@ -50,10 +50,16 @@
 #include "side_bar_widget.h"
 
 
+#ifndef QT3
+class QListViewItem;
+#else
+class Q3ListViewItem;
+#endif
+class QPixmap;
+
 class fileItem;
 class listView;
 class playHandle;
-class QPixmap;
 class trackContainer;
 
 
@@ -76,13 +82,10 @@ public slots:
 
 
 protected slots:
-#ifdef QT4
 	void contextMenuRequest( Q3ListViewItem * _i, const QPoint & _pos,
 								int _col );
-#else
 	void contextMenuRequest( QListViewItem * _i, const QPoint & _pos,
 								int _col );
-#endif
 	void sendToActiveInstrumentTrack( void );
 	void openInNewInstrumentTrackSE( void );
 	void openInNewInstrumentTrackBBE( void );
@@ -132,7 +135,16 @@ private:
 
 
 
-class directory : public Q3ListViewItem
+class directory :
+#ifndef QT3
+	public Q3ListViewItem
+// trick moc
+#if 0
+		,
+#endif
+#else
+	public QListViewItem
+#endif
 {
 public:
 	directory( Q3ListView * _parent, const QString & _filename,
@@ -186,13 +198,27 @@ private:
 
 
 
-class fileItem : public Q3ListViewItem
+class fileItem :
+#ifndef QT3
+	public Q3ListViewItem
+// trick moc
+#if 0
+		,
+#endif
+#else
+	public QListViewItem
+#endif
 {
 public:
 	fileItem( Q3ListView * _parent, const QString & _name,
 							const QString & _path );
+#ifndef QT3
 	fileItem( Q3ListViewItem * _parent, const QString & _name,
 							const QString & _path );
+#else
+	fileItem( QListViewItem * _parent, const QString & _name,
+							const QString & _path );
+#endif
 
 	inline QString fullName( void ) const
 	{

include/group_box.h

@@ -56,14 +56,20 @@ public:
 		return( m_led->isChecked() );
 	}
 
+	void saveSettings( QDomDocument & _doc, QDomElement & _this,
+							const QString & _name );
+	void loadSettings( const QDomElement & _this, const QString & _name );
+
 
 public slots:
 	void setState( bool _on, bool _anim = FALSE );
 	void animate( void );
 
+
 signals:
 	void toggled( bool _state );
 
+
 protected:
 	virtual void resizeEvent( QResizeEvent * _re );
 	virtual void mousePressEvent( QMouseEvent * _me );

include/main_window.h

@@ -48,6 +48,7 @@
 #endif
 
 
+class QAction;
 class QDomElement;
 class QGridLayout;
 class QSplashScreen;
@@ -108,6 +109,7 @@ public slots:
 		QWhatsThis::enterWhatsThisMode();
 	}
 	void createNewProject( void );
+	void createNewProjectFromTemplate( QAction * _idx );
 	void createNewProjectFromTemplate( int _idx );
 	void openProject( void );
 	bool saveProject( void );
@@ -174,6 +176,7 @@ private:
 private slots:
 	void browseHelp( void );
 	void fillTemplatesMenu( void );
+	void showTool( QAction * _idx );
 	void showTool( int _idx );
 
 } ;

include/mmp.h

@@ -39,6 +39,11 @@
 #endif
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif 
+
+
 #include "types.h"
 
 
@@ -52,6 +57,7 @@ public:
 		SONG_PROJECT_TEMPLATE,
 		INSTRUMENT_TRACK_SETTINGS,
 		DRAG_N_DROP_DATA,
+		CLIPBOARD_DATA,
 		JOURNAL_DATA,
 		EFFECT_SETTINGS,
 		VIDEO_PROJECT,		// might come later...

include/note.h

@@ -161,11 +161,16 @@ public:
 		return( m_panning );
 	}
 
-	inline virtual QString nodeName( void ) const
+	static QString classNodeName( void )
 	{
 		return( "note" );
 	}
 
+	inline virtual QString nodeName( void ) const
+	{
+		return( classNodeName() );
+	}
+
 	static midiTime FASTCALL quantized( const midiTime & _m,
 							const int _q_grid );
 
@@ -175,7 +180,6 @@ public:
 	}
 
 	void editDetuningPattern( void );
-	void detachCurrentDetuning( void );
 
 	bool hasDetuningInfo( void );
 

include/piano_roll.h

@@ -105,7 +105,7 @@ protected:
 	virtual bool x11Event( XEvent * _xe );
 #endif
 
-	int FASTCALL getKey( int _y );
+	int FASTCALL getKey( int _y ) const;
 	static inline void drawNoteRect( QPainter & _p, Uint16 _x, Uint16 _y,
 					Sint16 _width,
 					const bool _is_selected,
@@ -239,7 +239,6 @@ private:
 	int m_startKey;			// first key when drawing
 	int m_lastKey;
 
-	noteVector m_notesToCopy;
 	noteVector m_selNotesForMove;
 
 
@@ -249,6 +248,8 @@ private:
 	timeLine * m_timeLine;
 	bool m_scrollBack;
 
+	void copy_to_clipboard( const noteVector & _notes ) const;
+
 	void drawDetuningInfo( QPainter & _p, note * _n, Uint16 _x, Uint16 _y );
 	bool mouseOverNote( void );
 	note * noteUnderMouse( void );

include/piano_widget.h

@@ -94,9 +94,9 @@ protected:
 
 
 private:
-	int FASTCALL getKeyFromMouse( const QPoint & _p );
+	int FASTCALL getKeyFromMouse( const QPoint & _p ) const;
 	int FASTCALL getKeyFromKeyboard( int _k ) const;
-	int FASTCALL getKeyX( int _key_num );
+	int FASTCALL getKeyX( int _key_num ) const;
 
 	static QPixmap * s_whiteKeyPm;
 	static QPixmap * s_blackKeyPm;

include/preset_preview_play_handle.h

@@ -48,10 +48,12 @@ public:
 
 	virtual bool isFromTrack( const track * _track ) const;
 
+	static void init( void );
 	static void cleanUp( void );
 	static constNotePlayHandleVector nphsOfInstrumentTrack(
 						const instrumentTrack * _ct );
 
+
 private:
 	static previewTrackContainer * s_previewTC;
 

include/qt3support.h

@@ -53,7 +53,6 @@ class QColorGroup;
 
 
 typedef int csize;
-#define QListViewItem Q3ListViewItem
 
 #define vlist QList 
 #define vstack QStack
@@ -82,7 +81,6 @@ inline QString baseName( const QString & _file )
 #define QScrollArea QScrollView
 
 #define Q3ListView QListView
-#define Q3ListViewItem QListViewItem
 #define Q3ScrollView QScrollView
 
 #define QMatrix QWMatrix

include/surround_area.h

@@ -59,7 +59,7 @@ public:
 	surroundArea( QWidget * _parent, const QString & _name,
 							track * _track );
 	virtual ~surroundArea();
-	volumeVector getVolumeVector( float _v_scale = 0.0f ) const;
+	volumeVector getVolumeVector( float _v_scale ) const;
 	inline const QPoint & value( void ) const
 	{
 		return( m_sndSrcPos );
@@ -85,12 +85,8 @@ signals:
 
 
 private:
-	float FASTCALL getVolume( const QPoint & _speaker_pos,
-							float _v_scale ) const;
-
 	QPoint m_sndSrcPos;
 
-	static const QPoint s_defaultSpeakerPositions[SURROUND_CHANNELS];
 	static QPixmap * s_backgroundArtwork;
 
 	knob * m_position_x;