implement LeatusPenguin's excellent idea for the plugin manager window (#6916)

[ardour.git] / gtk2_ardour / plugin_selector.cc

diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index 144e17d8303ef0f00cfc131536147036703f90ba..08046143f5539414acd060080d3d1f6e5a2ebc20 100644 (file)
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -210,18 +210,29 @@ PluginSelector::PluginSelector (PluginManager& mgr)
 
        filter_frame->show_all ();
 
+       HBox* side_by_side = manage (new HBox);
+       VBox* right_side = manage (new VBox);
+
        table->attach (scroller, 0, 7, 0, 5);
        table->attach (*filter_frame, 0, 7, 6, 7, FILL|EXPAND, FILL, 5, 5);
-       table->attach(*btn_add, 1, 2, 7, 8, FILL, FILL, 5, 5);
-       table->attach(*btn_remove, 5, 6, 7, 8, FILL, FILL, 5, 5);
 
-       table->attach(ascroller, 0, 7, 8, 10);
+       right_side->pack_start (ascroller);
+
+       HBox* add_remove = manage (new HBox);
+       add_remove->pack_start (*btn_add, true, true);
+       add_remove->pack_start (*btn_remove, true, true);
+
+       right_side->pack_start (*add_remove, false, false);
+       right_side->set_size_request (200, -1);
+
+       side_by_side->pack_start (*table);
+       side_by_side->pack_start (*right_side);
 
        add_button (Stock::CLOSE, RESPONSE_CLOSE);
        add_button (_("Insert Plugin(s)"), RESPONSE_APPLY);
        set_default_response (RESPONSE_APPLY);
        set_response_sensitive (RESPONSE_APPLY, false);
-       get_vbox()->pack_start (*table);
+       get_vbox()->pack_start (*side_by_side);
 
        table->set_name("PluginSelectorTable");
        plugin_display.set_name("PluginSelectorDisplay");
@@ -330,6 +341,9 @@ PluginSelector::show_this_plugin (const PluginInfoPtr& info, const std::string&
                        case LXVST:
                                compstr = X_("LXVST");
                                break;
+                       case Lua:
+                               compstr = X_("Lua");
+                               break;
                        }
 
                } else if (mode == _("Author contains")) {
@@ -377,6 +391,7 @@ PluginSelector::refill ()
        vst_refiller (filterstr);
        lxvst_refiller (filterstr);
        au_refiller (filterstr);
+       lua_refiller (filterstr);
 
        in_row_change = false;
 }
@@ -400,18 +415,23 @@ PluginSelector::refiller (const PluginInfoList& plugs, const::std::string& filte
                        string creator = (*i)->creator;
                        string::size_type pos = 0;
 
-                       /* stupid LADSPA creator strings */
+                       if ((*i)->type == ARDOUR::LADSPA) {
+                               /* stupid LADSPA creator strings */
 #ifdef PLATFORM_WINDOWS
-                       while (pos < creator.length() && creator[pos] > -2 && creator[pos] < 256 && (isalnum (creator[pos]) || isspace (creator[pos]))) ++pos;
+                               while (pos < creator.length() && creator[pos] > -2 && creator[pos] < 256 && (isalnum (creator[pos]) || isspace (creator[pos]))) ++pos;
 #else
-                       while (pos < creator.length() && (isalnum (creator[pos]) || isspace (creator[pos]))) ++pos;
+                               while (pos < creator.length() && (isalnum (creator[pos]) || isspace (creator[pos]))) ++pos;
 #endif
+                       } else {
+                               pos = creator.length ();
+                       }
                        // If there were too few characters to create a
                        // meaningful name, mark this creator as 'Unknown'
-                       if (creator.length()<2 || pos<3)
+                       if (creator.length() < 2 || pos < 3) {
                                creator = "Unknown";
-                       else
+                       } else{
                                creator = creator.substr (0, pos);
+                       }
 
                        newrow[plugin_columns.creator] = creator;
 
@@ -443,6 +463,12 @@ PluginSelector::ladspa_refiller (const std::string& filterstr)
        refiller (manager.ladspa_plugin_info(), filterstr, "LADSPA");
 }
 
+void
+PluginSelector::lua_refiller (const std::string& filterstr)
+{
+       refiller (manager.lua_plugin_info(), filterstr, "Lua");
+}
+
 void
 PluginSelector::lv2_refiller (const std::string& filterstr)
 {
@@ -703,6 +729,7 @@ PluginSelector::build_plugin_menu ()
        PluginInfoList all_plugs;
 
        all_plugs.insert (all_plugs.end(), manager.ladspa_plugin_info().begin(), manager.ladspa_plugin_info().end());
+       all_plugs.insert (all_plugs.end(), manager.lua_plugin_info().begin(), manager.lua_plugin_info().end());
 #ifdef WINDOWS_VST_SUPPORT
        all_plugs.insert (all_plugs.end(), manager.windows_vst_plugin_info().begin(), manager.windows_vst_plugin_info().end());
 #endif
@@ -780,23 +807,25 @@ PluginSelector::create_by_creator_menu (ARDOUR::PluginInfoList& all_plugs)
                if (manager.get_status (*i) == PluginManager::Hidden) continue;
 
                string creator = (*i)->creator;
-
-               /* stupid LADSPA creator strings */
                string::size_type pos = 0;
+
+               if ((*i)->type == ARDOUR::LADSPA) {
+                       /* stupid LADSPA creator strings */
 #ifdef PLATFORM_WINDOWS
-               while (pos < creator.length() && creator[pos]>(-2) && creator[pos]<256 && (isprint (creator[pos]))) ++pos;
+                       while (pos < creator.length() && creator[pos] > -2 && creator[pos] < 256 && (isalnum (creator[pos]) || isspace (creator[pos]))) ++pos;
 #else
-               while (pos < creator.length() && (isalnum (creator[pos]) || isspace (creator[pos]))) ++pos;
+                       while (pos < creator.length() && (isalnum (creator[pos]) || isspace (creator[pos]))) ++pos;
 #endif
+               } else {
+                       pos = creator.length ();
+               }
 
-               // Check to see if we found any invalid characters.
-               if (creator.length() != pos) {
-                       // If there were too few characters to create a
-                       // meaningful name, mark this creator as 'Unknown'
-                       if (pos<3)
-                               creator = "Unknown?";
-                       else
-                               creator = creator.substr (0, pos);
+               // If there were too few characters to create a
+               // meaningful name, mark this creator as 'Unknown'
+               if (creator.length() < 2 || pos < 3) {
+                       creator = "Unknown";
+               } else{
+                       creator = creator.substr (0, pos);
                }
 
                SubmenuMap::iterator x;