add new boxblur plugin, mods to videoscope, fix segv for menu btns kfrm-tweak/kfrm...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / plugindialog.C

diff --git a/cinelerra-5.1/cinelerra/plugindialog.C b/cinelerra-5.1/cinelerra/plugindialog.C
index d9e73d39aa5e30cfaadf65d3b82a52437f2924c3..f9c24fffb9c41c8948f2b254e9b6dabbe8fde1c6 100644 (file)
--- a/cinelerra-5.1/cinelerra/plugindialog.C
+++ b/cinelerra-5.1/cinelerra/plugindialog.C
@@ -44,7 +44,8 @@ PluginDialogThread::PluginDialogThread(MWindow *mwindow)
  : BC_DialogThread()
 {
        this->mwindow = mwindow;
-       plugin = 0;
+       this->plugin_id = -1;
+       this->plugin_type = PLUGIN_NONE;
 }
 
 PluginDialogThread::~PluginDialogThread()
@@ -61,7 +62,6 @@ void PluginDialogThread::start_window(Track *track,
 //             mwindow->gui->lock_window("PluginDialogThread::start_window");
                this->track = track;
                this->data_type = data_type;
-               this->plugin = plugin;
                this->is_mainmenu = is_mainmenu;
                single_standalone = mwindow->edl->session->single_standalone;
 
@@ -70,6 +70,7 @@ void PluginDialogThread::start_window(Track *track,
                        plugin->calculate_title(plugin_title, 0);
                        this->shared_location = plugin->shared_location;
                        this->plugin_type = plugin->plugin_type;
+                       this->plugin_id = plugin->orig_id;
                }
                else
                {
@@ -77,6 +78,7 @@ void PluginDialogThread::start_window(Track *track,
                        this->shared_location.plugin = -1;
                        this->shared_location.module = -1;
                        this->plugin_type = PLUGIN_NONE;
+                       this->plugin_id = -1;
                }
 
                strcpy(this->window_title, title);
@@ -94,7 +96,7 @@ BC_Window* PluginDialogThread::new_gui()
                mwindow->session->plugindialog_w / 2;
        int y = mwindow->gui->get_abs_cursor_y(0) -
                mwindow->session->plugindialog_h / 2;
-       plugin_type = 0;
+       plugin_type = PLUGIN_NONE;
        PluginDialog *window = new PluginDialog(mwindow,
                this,
                window_title,
@@ -127,16 +129,10 @@ PluginDialog::PluginDialog(MWindow *mwindow,
        const char *window_title,
        int x,
        int y)
- : BC_Window(window_title,
-       x,
-       y,
+ : BC_Window(window_title, x, y,
        mwindow->session->plugindialog_w,
        mwindow->session->plugindialog_h,
-       510,
-       415,
-       1,
-       0,
-       1)
+       xS(510), yS(415), 1, 0, 1)
 {
        this->mwindow = mwindow;
        this->thread = thread;
@@ -164,6 +160,8 @@ PluginDialog::~PluginDialog()
 
 void PluginDialog::create_objects()
 {
+       int xs10 = xS(10);
+       int ys10 = yS(10), ys20 = yS(20);
 //     int use_default = 1;
        mwindow->theme->get_plugindialog_sizes();
        lock_window("PluginDialog::create_objects");
@@ -203,18 +201,14 @@ void PluginDialog::create_objects()
                module_data.append(new BC_ListBoxItem(track->title));
        }
 
-
-
-
-
 // Create widgets
        add_subwindow(standalone_title = new BC_Title(mwindow->theme->plugindialog_new_x,
-               mwindow->theme->plugindialog_new_y - 20,
+               mwindow->theme->plugindialog_new_y - ys20,
                _("Plugins:")));
        int x1 = mwindow->theme->plugindialog_new_x, y1 = mwindow->theme->plugindialog_new_y;
        int w1 = mwindow->theme->plugindialog_new_w, h1 = mwindow->theme->plugindialog_new_h;
        add_subwindow(search_text = new PluginDialogSearchText(this, x1, y1, w1));
-       int dy = search_text->get_h() + 10;
+       int dy = search_text->get_h() + ys10;
        y1 += dy;  h1 -= dy;
        load_plugin_list(0);
 
@@ -234,7 +228,7 @@ void PluginDialog::create_objects()
 //
 
        add_subwindow(shared_title = new BC_Title(mwindow->theme->plugindialog_shared_x,
-               mwindow->theme->plugindialog_shared_y - 20,
+               mwindow->theme->plugindialog_shared_y - ys20,
                _("Shared effects:")));
        add_subwindow(shared_list = new PluginDialogShared(this,
                &shared_data,
@@ -255,7 +249,7 @@ void PluginDialog::create_objects()
 //
 
        add_subwindow(module_title = new BC_Title(mwindow->theme->plugindialog_module_x,
-               mwindow->theme->plugindialog_module_y - 20,
+               mwindow->theme->plugindialog_module_y - ys20,
                _("Shared tracks:")));
        add_subwindow(module_list = new PluginDialogModules(this,
                &module_data,
@@ -285,13 +279,10 @@ void PluginDialog::create_objects()
 
        if(thread->is_mainmenu)
                add_subwindow(single_standalone = new PluginDialogSingle(this,
-                       mwindow->theme->plugindialog_new_x + BC_OKButton::calculate_w() + 10,
-                       mwindow->theme->plugindialog_new_y +
-                               mwindow->theme->plugindialog_new_h +
+                       mwindow->theme->plugindialog_new_x + BC_OKButton::calculate_w() + xs10,
+                       mwindow->theme->plugindialog_new_y + mwindow->theme->plugindialog_new_h +
                                get_text_height(MEDIUMFONT)));
 
-
-
        add_subwindow(ok_btn = new BC_OKButton(this));
        add_subwindow(can_btn = new BC_CancelButton(this));
        int aw = PluginDialogApply::calculate_w(this, _("Apply"));
@@ -309,17 +300,17 @@ void PluginDialog::create_objects()
 
 int PluginDialog::resize_event(int w, int h)
 {
+       int ys10 = yS(10), ys20 = yS(20);
        mwindow->session->plugindialog_w = w;
        mwindow->session->plugindialog_h = h;
        mwindow->theme->get_plugindialog_sizes();
 
-
        standalone_title->reposition_window(mwindow->theme->plugindialog_new_x,
-               mwindow->theme->plugindialog_new_y - 20);
+               mwindow->theme->plugindialog_new_y - ys20);
        int x1 = mwindow->theme->plugindialog_new_x, y1 = mwindow->theme->plugindialog_new_y;
        int w1 = mwindow->theme->plugindialog_new_w, h1 = mwindow->theme->plugindialog_new_h;
        search_text->reposition_window(x1, y1, w1);
-       int dy = search_text->get_h() + 10;
+       int dy = search_text->get_h() + ys10;
        y1 += dy;  h1 -= dy;
        standalone_list->reposition_window(x1, y1, w1, h1);
 
@@ -331,7 +322,7 @@ int PluginDialog::resize_event(int w, int h)
 //                     mwindow->theme->plugindialog_newattach_y);
 
        shared_title->reposition_window(mwindow->theme->plugindialog_shared_x,
-               mwindow->theme->plugindialog_shared_y - 20);
+               mwindow->theme->plugindialog_shared_y - ys20);
        shared_list->reposition_window(mwindow->theme->plugindialog_shared_x,
                mwindow->theme->plugindialog_shared_y,
                mwindow->theme->plugindialog_shared_w,
@@ -348,7 +339,7 @@ int PluginDialog::resize_event(int w, int h)
 
 
        module_title->reposition_window(mwindow->theme->plugindialog_module_x,
-               mwindow->theme->plugindialog_module_y - 20);
+               mwindow->theme->plugindialog_module_y - ys20);
        module_list->reposition_window(mwindow->theme->plugindialog_module_x,
                mwindow->theme->plugindialog_module_y,
                mwindow->theme->plugindialog_module_w,
@@ -363,7 +354,7 @@ int PluginDialog::resize_event(int w, int h)
 
        if(single_standalone)
                single_standalone->reposition_window(
-                       mwindow->theme->plugindialog_new_x + BC_OKButton::calculate_w() + 10,
+                       mwindow->theme->plugindialog_new_x + BC_OKButton::calculate_w() + ys10,
                        mwindow->theme->plugindialog_new_y + mwindow->theme->plugindialog_new_h +
                                get_text_height(MEDIUMFONT));
 
@@ -412,6 +403,21 @@ void PluginDialog::save_settings()
 }
 
 
+void PluginDialog::clear_selection()
+{
+       standalone_list->set_all_selected(&standalone_data, 0);
+       standalone_list->draw_items(1);
+       shared_list->set_all_selected(&shared_data, 0);
+       shared_list->draw_items(1);
+       module_list->set_all_selected(&module_data, 0);
+       module_list->draw_items(1);
+       selected_available = -1;
+       selected_shared = -1;
+       selected_modules = -1;
+       thread->plugin_id = -1;
+       thread->plugin_type = PLUGIN_NONE;
+}
+
 void PluginDialog::apply()
 {
        if( selected_available >= 0 ) {
@@ -439,17 +445,14 @@ void PluginDialogThread::apply()
                                data_type, plugin_type, single_standalone);
                }
                else {
+                       Plugin *plugin = mwindow->edl->tracks->plugin_exists(plugin_id);
                        if( plugin ) {
-                               if( mwindow->edl->tracks->plugin_exists(plugin) ) {
-                                       plugin->change_plugin(plugin_title,
-                                               &shared_location, plugin_type);
-                               }
+                               plugin->change_plugin(plugin_title,
+                                       &shared_location, plugin_type);
                        }
-                       else {
-                               if( mwindow->edl->tracks->track_exists(track) ) {
+                       else if( mwindow->edl->tracks->track_exists(track) ) {
                                        mwindow->insert_effect(plugin_title, &shared_location,
-                                               track, 0, 0, 0, plugin_type);
-                               }
+                                       track, 0, 0, 0, plugin_type);
                        }
                }
 
@@ -461,7 +464,7 @@ void PluginDialogThread::apply()
                mwindow->gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
                mwindow->gui->unlock_window();
        }
-       plugin = 0;
+       plugin_id = -1;
 }
 
 PluginDialogApply::PluginDialogApply(PluginDialog *dialog, int x, int y)
@@ -473,6 +476,7 @@ PluginDialogApply::PluginDialogApply(PluginDialog *dialog, int x, int y)
 int PluginDialogApply::handle_event()
 {
        dialog->apply();
+       dialog->clear_selection();
        return 1;
 }
 
@@ -483,7 +487,7 @@ int PluginDialogApply::handle_event()
 
 //
 // PluginDialogTextBox::PluginDialogTextBox(PluginDialog *dialog, char *text, int x, int y)
-//  : BC_TextBox(x, y, 200, 1, text)
+//  : BC_TextBox(x, y, xS(200), 1, text)
 // {
 //     this->dialog = dialog;
 // }
@@ -510,16 +514,6 @@ int PluginDialogApply::handle_event()
 
 
 
-
-
-
-
-
-
-
-
-
-
 PluginDialogNew::PluginDialogNew(PluginDialog *dialog,
        ArrayList<BC_ListBoxItem*> *standalone_data,
        int x, int y, int w, int h)
@@ -582,26 +576,10 @@ int PluginDialogNew::selection_changed()
 // }
 
 
-
-
-
-
-
-
-
-
 PluginDialogShared::PluginDialogShared(PluginDialog *dialog,
        ArrayList<BC_ListBoxItem*> *shared_data,
-       int x,
-       int y,
-       int w,
-       int h)
- : BC_ListBox(x,
-       y,
-       w,
-       h,
-       LISTBOX_TEXT,
-       shared_data)
+       int x, int y, int w, int h)
+ : BC_ListBox(x, y, w, h, LISTBOX_TEXT, shared_data)
 {
        this->dialog = dialog;
 }
@@ -673,16 +651,8 @@ int PluginDialogShared::selection_changed()
 
 PluginDialogModules::PluginDialogModules(PluginDialog *dialog,
        ArrayList<BC_ListBoxItem*> *module_data,
-       int x,
-       int y,
-       int w,
-       int h)
- : BC_ListBox(x,
-       y,
-       w,
-       h,
-       LISTBOX_TEXT,
-       module_data)
+       int x, int y, int w, int h)
+ : BC_ListBox(x, y, w, h, LISTBOX_TEXT, module_data)
 {
        this->dialog = dialog;
 }
@@ -737,9 +707,7 @@ int PluginDialogSearchText::handle_event()
 }
 
 PluginDialogSingle::PluginDialogSingle(PluginDialog *dialog, int x, int y)
- : BC_CheckBox(x,
-       y,
-       dialog->thread->single_standalone,
+ : BC_CheckBox(x, y, dialog->thread->single_standalone,
        _("Attach single standalone and share others"))
 {
        this->dialog = dialog;
@@ -785,15 +753,3 @@ int PluginDialogSingle::handle_event()
 // }
 //
 
-
-
-
-
-
-
-
-
-
-
-
-