more displayName updates, minor change to controller dialog

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

include/combobox_model.h

@@ -39,8 +39,8 @@ class comboBoxModel : public intModel
 {
 	Q_OBJECT
 public:
-	comboBoxModel( ::model * _parent = NULL ) :
-		intModel( 0, 0, 0, _parent )
+	comboBoxModel( ::model * _parent = NULL, const QString & _display_name = QString::null ) :
+		intModel( 0, 0, 0, _parent, _display_name )
 	{
 	}
 

include/controller_connection_dialog.h

@@ -41,6 +41,7 @@ class QScrollArea;
 class autoDetectMidiController;
 class comboBox;
 class groupBox;
+class tabWidget;
 class lcdSpinBox;
 class ledCheckBox;
 class midiPortMenu;
@@ -72,6 +73,7 @@ protected slots:
 
 
 private:
+	// Midi
 	groupBox * m_midiGroupBox;
 	lcdSpinBox * m_midiChannelSpinBox;
 	lcdSpinBox * m_midiControllerSpinBox;
@@ -79,9 +81,12 @@ private:
 	midiPortMenu * m_readablePorts;
 	boolModel m_midiAutoDetect;
 
+	// User
 	groupBox * m_userGroupBox;
 	comboBox * m_userController;
 
+	// Mapping
+	tabWidget * m_mappingBox;
 	QLineEdit * m_mappingFunction;
 
 	controller * m_controller;

include/instrument.h

@@ -106,6 +106,7 @@ public:
 		return( FALSE );
 	}
 
+	virtual QString fullDisplayName( void ) const;
 
 	// --------------------------------------------------------------------
 	// provided functions:

include/mv_base.h

@@ -53,6 +53,11 @@ public:
 		return( m_defaultConstructed );
 	}
 
+	inline model * parentModel( void ) const
+	{
+		return static_cast<model *>( parent() );
+	}
+
 	virtual QString displayName( void ) const
 	{
 		return QString();
@@ -62,6 +67,7 @@ public:
 	{
 	}
 
+	virtual QString fullDisplayName( void ) const;
 
 private:
 	bool m_defaultConstructed;