singerbot proxy, fixed recently opened files, style sheet support

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

include/caption_menu.h

@@ -0,0 +1,45 @@
+/*
+ * caption_menu.h - context menu with a caption
+ *
+ * Copyright (c) 2007 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
+ *
+ * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+
+#ifndef _CAPTION_MENU_H
+#define _CAPTION_MENU_H
+
+
+#include <QtGui/QMenu>
+
+
+class captionMenu : public QMenu
+{
+	Q_OBJECT
+public:
+	captionMenu( const QString & _title, QWidget * _parent = 0 );
+	virtual ~captionMenu();
+
+} ;
+
+
+
+
+#endif

include/config_mgr.h

@@ -203,6 +203,8 @@ private:
 
 	void FASTCALL addPage( QWidget * _w, const QString & _title );
 
+	void loadStyleSheet( void );
+
 /*	static void processFilesRecursively( const QString & _src_dir,
 						const QString & _dst_dir,
 		void( * _proc_func )( const QString & _src, const QString &

include/file_browser.h

@@ -28,14 +28,13 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QMutex>
-class QColorGroup;
-#include <Qt3Support/Q3ListView>
+#include <QtGui/QTreeWidget>
 
 
 #include "side_bar_widget.h"
 
 
-class QListViewItem;
+class QColorGroup;
 class QPixmap;
 
 class fileItem;
@@ -62,24 +61,12 @@ public slots:
 	void reloadTree( void );
 
 
-protected slots:
-	void contextMenuRequest( Q3ListViewItem * _i, const QPoint & _pos,
-								int _col );
-	void contextMenuRequest( QListViewItem * _i, const QPoint & _pos,
-								int _col );
-	void sendToActiveInstrumentTrack( void );
-	void openInNewInstrumentTrackSE( void );
-	void openInNewInstrumentTrackBBE( void );
-
-
 private:
 	virtual void keyPressEvent( QKeyEvent * _ke );
 
 	void addItems( const QString & _path );
-	void openInNewInstrumentTrack( trackContainer * _tc );
 
 	listView * m_l;
-	fileItem * m_contextMenuItem;
 
 	QString m_directories;
 	QString m_filter;
@@ -90,7 +77,7 @@ private:
 
 
 
-class listView : public Q3ListView
+class listView : public QTreeWidget
 {
 	Q_OBJECT
 public:
@@ -99,10 +86,10 @@ public:
 
 
 protected:
-	virtual void contentsMouseDoubleClickEvent( QMouseEvent * _me );
-	virtual void contentsMousePressEvent( QMouseEvent * _me );
-	virtual void contentsMouseMoveEvent( QMouseEvent * _me );
-	virtual void contentsMouseReleaseEvent( QMouseEvent * _me );
+	virtual void contextMenuEvent( QContextMenuEvent * _e );
+	virtual void mousePressEvent( QMouseEvent * _me );
+	virtual void mouseMoveEvent( QMouseEvent * _me );
+	virtual void mouseReleaseEvent( QMouseEvent * _me );
 
 
 private:
@@ -112,21 +99,30 @@ private:
 	playHandle * m_previewPlayHandle;
 	QMutex m_pphMutex;
 
+	fileItem * m_contextMenuItem;
+
+	void openInNewInstrumentTrack( trackContainer * _tc );
+
+
+private slots:
+	void activateListItem( QTreeWidgetItem * _item, int _column );
+	void openInNewInstrumentTrackBBE( void );
+	void openInNewInstrumentTrackSE( void );
+	void sendToActiveInstrumentTrack( void );
+	void updateDirectory( QTreeWidgetItem * _item );
+
 } ;
 
 
 
 
-class directory : public Q3ListViewItem
+class directory : public QTreeWidgetItem
 {
 public:
-	directory( Q3ListView * _parent, const QString & _filename,
-			const QString & _path, const QString & _filter );
-	directory( directory * _parent, const QString & _filename,
-			const QString & _path, const QString & _filter );
+	directory( const QString & _filename, const QString & _path,
+						const QString & _filter );
 
-	void setOpen( bool );
-	void setup( void );
+	void update( void );
 
 	inline QString fullName( QString _path = QString::null )
 	{
@@ -139,11 +135,6 @@ public:
 							QDir::separator() );
 	}
 
-	inline const QPixmap * pixmap( int ) const
-	{
-		return( m_pix );
-	}
-
 	inline void addDirectory( const QString & _dir )
 	{
 		m_directories.push_back( _dir );
@@ -152,7 +143,6 @@ public:
 
 private:
 	void initPixmapStuff( void );
-	void setPixmap( const QPixmap * _px );
 
 	bool addItems( const QString & _path );
 
@@ -161,8 +151,6 @@ private:
 	static QPixmap * s_folderOpenedPixmap;
 	static QPixmap * s_folderLockedPixmap;
 
-	directory * m_p;
-	const QPixmap * m_pix;
 	QStringList m_directories;
 	QString m_filter;
 
@@ -171,12 +159,12 @@ private:
 
 
 
-class fileItem : public Q3ListViewItem
+class fileItem : public QTreeWidgetItem
 {
 public:
-	fileItem( Q3ListView * _parent, const QString & _name,
+	fileItem( QTreeWidget * _parent, const QString & _name,
 							const QString & _path );
-	fileItem( Q3ListViewItem * _parent, const QString & _name,
+	fileItem( QTreeWidgetItem * _parent, const QString & _name,
 							const QString & _path );
 
 	inline QString fullName( void ) const
@@ -184,10 +172,6 @@ public:
 		return( QDir::cleanPath( m_path ) + QDir::separator() +
 								text( 0 ) );
 	}
-	inline const QPixmap * pixmap( int ) const
-	{
-		return( m_pix );
-	}
 
 	enum fileTypes
 	{
@@ -215,7 +199,6 @@ private:
 	static QPixmap * s_flpFilePixmap;
 	static QPixmap * s_unknownFilePixmap;
 	
-	QPixmap * m_pix;
 	QString m_path;
 	fileTypes m_type;
 } ;

include/main_window.h

@@ -28,13 +28,13 @@
 
 #include <QtCore/QList>
 #include <QtGui/QMainWindow>
-#include <QtGui/QWorkspace>
 #include <QtGui/QWhatsThis>
 
 class QAction;
 class QDomElement;
 class QGridLayout;
 class QSplashScreen;
+class QWorkspace;
 
 class configManager;
 class tool;
@@ -94,8 +94,6 @@ public slots:
 	void createNewProject( void );
 	void createNewProjectFromTemplate( QAction * _idx );
 	void openProject( void );
-	void updateRecentlyOpenedProjectsMenu( void );
-	void openRecentlyOpenedProject( int );
 	bool saveProject( void );
 	bool saveProjectAs( void );
 	void showSettingsDialog( void );
@@ -158,7 +156,9 @@ private:
 private slots:
 	void browseHelp( void );
 	void fillTemplatesMenu( void );
+	void openRecentlyOpenedProject( QAction * _action );
 	void showTool( QAction * _idx );
+	void updateRecentlyOpenedProjectsMenu( void );
 
 } ;
 

include/mmp.h

@@ -57,6 +57,8 @@ public:
 	multimediaProject( projectTypes _project_type );
 	~multimediaProject();
 
+	QString nameWithExtension( const QString & _fn ) const;
+
 	bool writeFile( QString & _fn, bool _overwrite_check = TRUE );
 
 	inline QDomElement & content( void )

include/rack_plugin.h

@@ -26,13 +26,14 @@
 #define _RACK_PLUGIN_H
 
 #include <QtGui/QWidget>
-#include <QtGui/QGroupBox>
-#include <QtGui/QPushButton>
-#include <QtGui/QLabel>
 
 #include "journalling_object.h"
 
 
+class QGroupBox;
+class QLabel;
+class QPushButton;
+
 class audioPort;
 class effect;
 class effectControlDialog;