Sort effects in dialog

LMMS · Jun 11, 2016 · 467e846 · 467e846
1 parent 1abbbc2
commit 467e846
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/include/Plugin.h b/include/Plugin.h
@@ -104,6 +104,17 @@ class EXPORT Plugin : public Model, public JournallingObject
 					return desc != NULL && name.isNull() == false;
 				}
 
+				QString displayName() const
+				{
+					if( desc->subPluginFeatures )
+					{
+						return QString( "%1: %2" ).arg(
+							desc->displayName,
+							name );
+					}
+					return desc->displayName;
+				}
+
 				const Plugin::Descriptor* desc;
 				QString name;
 				AttributeMap attributes;
@@ -195,4 +206,11 @@ class EXPORT Plugin : public Model, public JournallingObject
 } ;
 
 
+inline bool operator<( const Plugin::Descriptor::SubPluginFeatures::Key & k1,
+			const Plugin::Descriptor::SubPluginFeatures::Key & k2 )
+{
+	return k1.displayName() < k2.displayName();
+}
+
+
 #endif
diff --git a/src/gui/EffectSelectDialog.cpp b/src/gui/EffectSelectDialog.cpp
@@ -69,19 +69,13 @@ EffectSelectDialog::EffectSelectDialog( QWidget * _parent ) :
 	}
 
 	m_effectKeys += subPluginEffectKeys;
+	qSort( m_effectKeys );
 
 	// and fill our source model
 	QStringList pluginNames;
 	for( EffectKeyList::ConstIterator it = m_effectKeys.begin(); it != m_effectKeys.end(); ++it )
 	{
-		if( ( *it ).desc->subPluginFeatures )
-		{
-			pluginNames += QString( "%1: %2" ).arg(  ( *it ).desc->displayName, ( *it ).name );
-		}
-		else
-		{
-			pluginNames += ( *it ).desc->displayName;
-		}
+		pluginNames += ( *it ).displayName();
 	}
 
 	int row = 0;