adjust for config widget changes

to match changes in 697aebc
LMMS · Jan 15, 2016 · cc6bf64 · cc6bf64
1 parent 2d79a36
commit cc6bf64
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 42 deletions.
diff --git a/include/MidiJack.h b/include/MidiJack.h
@@ -54,26 +54,18 @@ class MidiJack : public MidiClientRaw, public QThread
 
 	inline static QString name()
 	{
-		return( QT_TRANSLATE_NOOP( "setupWidget",
+		return( QT_TRANSLATE_NOOP( "MidiSetupWidget",
 			"Jack-MIDI" ) );
 	}
 
 	void JackMidiWrite(jack_nframes_t nframes);
 	void JackMidiRead(jack_nframes_t nframes);
 
 
-	class setupWidget : public MidiClientRaw::setupWidget
+	inline static QString configSection()
 	{
-	public:
-		setupWidget( QWidget * _parent );
-		virtual ~setupWidget();
-
-		virtual void saveSettings();
-
-	private:
-		QLineEdit * m_device;
-
-	} ;
+		return "MidiJack";
+	}
 
 
 protected:

diff --git a/src/core/midi/MidiJack.cpp b/src/core/midi/MidiJack.cpp
@@ -28,8 +28,8 @@
 
 #include <QCompleter>
 #include <QDirModel>
-#include <QLabel>
-#include <QLineEdit>
+//#include <QLabel>
+//#include <QLineEdit>
 #include <QMessageBox>
 #include <QTranslator>
 
@@ -213,31 +213,4 @@ void MidiJack::run()
 	}
 }
 
-MidiJack::setupWidget::setupWidget( QWidget * _parent ) :
-	MidiClientRaw::setupWidget( MidiJack::name(), _parent )
-{
-	m_device = new QLineEdit( MidiJack::probeDevice(), this );
-	m_device->setGeometry( 10, 20, 180, 20 );
-	QDirModel * model = new QDirModel( QStringList(),
-			QDir::AllDirs | QDir::System,
-			QDir::Name | QDir::DirsFirst,
-			this );
-	m_device->setCompleter(	new QCompleter( model, this ) );
-
-
-	QLabel * dev_lbl = new QLabel( tr( "CLIENT-NAME" ), this );
-	dev_lbl->setFont( pointSize<6>( dev_lbl->font() ) );
-	dev_lbl->setGeometry( 10, 40, 180, 10 );
-}
-
-MidiJack::setupWidget::~setupWidget()
-{
-}
-
-void MidiJack::setupWidget::saveSettings()
-{
-	ConfigManager::inst()->setValue( "midijack", "lmms",
-							m_device->text() );
-}
-
 #endif // LMMS_HAVE_JACK
diff --git a/src/gui/SetupDialog.cpp b/src/gui/SetupDialog.cpp
@@ -842,7 +842,7 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
 
 #ifdef LMMS_HAVE_JACK
 	m_midiIfaceSetupWidgets[MidiJack::name()] =
-					new MidiJack::setupWidget( msw );
+					MidiSetupWidget::create<MidiJack>( msw );
 #endif
 
 #ifdef LMMS_HAVE_OSS