X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Feditpopup.C;h=cbc57606b3fac5139769e18178882e55b6ac51e8;hp=25931b5d42a8821443de286a97931fc9880b3278;hb=d5d61fcb8b007418eb9f481ae61be2b4f738cd5b;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1 diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C index 25931b5d..cbc57606 100644 --- a/cinelerra-5.1/cinelerra/editpopup.C +++ b/cinelerra-5.1/cinelerra/editpopup.C @@ -38,6 +38,7 @@ #include "mwindowgui.h" #include "plugindialog.h" #include "resizetrackthread.h" +#include "theme.h" #include "track.h" #include "tracks.h" #include "trackcanvas.h" @@ -49,6 +50,12 @@ EditPopup::EditPopup(MWindow *mwindow, MWindowGUI *gui) { this->mwindow = mwindow; this->gui = gui; + + track = 0; + edit = 0; + plugin = 0; + pluginset = 0; + position = 0; } EditPopup::~EditPopup() @@ -57,161 +64,170 @@ EditPopup::~EditPopup() void EditPopup::create_objects() { - add_item(new EditAttachEffect(mwindow, this)); - add_item(new EditMoveTrackUp(mwindow, this)); - add_item(new EditMoveTrackDown(mwindow, this)); - add_item(new EditPopupDeleteTrack(mwindow, this)); - add_item(new EditPopupAddTrack(mwindow, this)); + add_item(new EditPopupClearSelect(mwindow, this)); + add_item(new EditPopupCopy(mwindow, this)); + add_item(new EditPopupCut(mwindow, this)); + add_item(new EditPopupMute(mwindow, this)); + add_item(new EditPopupCopyPack(mwindow, this)); + add_item(new EditPopupCutPack(mwindow, this)); + add_item(new EditPopupMutePack(mwindow, this)); + add_item(new EditPopupPaste(mwindow, this)); + add_item(new EditPopupOverwrite(mwindow, this)); add_item(new EditPopupFindAsset(mwindow, this)); - add_item(new EditPopupTitle(mwindow, this)); add_item(new EditPopupShow(mwindow, this)); - resize_option = 0; - matchsize_option = 0; + add_item(new EditPopupUserTitle(mwindow, this)); + add_item(new EditPopupTitleColor(mwindow, this)); } -int EditPopup::update(Track *track, Edit *edit) +int EditPopup::activate_menu(Track *track, Edit *edit, + PluginSet *pluginset, Plugin *plugin, double position) { - this->edit = edit; this->track = track; - - if(track->data_type == TRACK_VIDEO && !resize_option) - { - add_item(resize_option = new EditPopupResize(mwindow, this)); - add_item(matchsize_option = new EditPopupMatchSize(mwindow, this)); - } - else - if(track->data_type == TRACK_AUDIO && resize_option) - { - del_item(resize_option); resize_option = 0; - del_item(matchsize_option); matchsize_option = 0; - } - return 0; + this->edit = edit; + this->pluginset = pluginset; + this->plugin = plugin; + this->position = position; + return BC_PopupMenu::activate_menu(); } - -EditAttachEffect::EditAttachEffect(MWindow *mwindow, EditPopup *popup) - : BC_MenuItem(_("Attach effect...")) +EditPopupClearSelect::EditPopupClearSelect(MWindow *mwindow, EditPopup *popup) + : BC_MenuItem(_("Clear Select"),_("Ctrl-Shift-A"),'A') { this->mwindow = mwindow; this->popup = popup; - dialog_thread = new PluginDialogThread(mwindow); + set_ctrl(1); + set_shift(1); } -EditAttachEffect::~EditAttachEffect() +int EditPopupClearSelect::handle_event() { - delete dialog_thread; + mwindow->edl->tracks->clear_selected_edits(); + popup->gui->draw_overlays(1); + return 1; } -int EditAttachEffect::handle_event() +EditPopupCopy::EditPopupCopy(MWindow *mwindow, EditPopup *popup) + : BC_MenuItem(_("Copy"),_("Ctrl-c"),'c') { - dialog_thread->start_window(popup->track, - 0, _(PROGRAM_NAME ": Attach Effect"), - 0, popup->track->data_type); - return 1; + this->mwindow = mwindow; + this->popup = popup; + set_ctrl(1); } +int EditPopupCopy::handle_event() +{ + mwindow->selected_to_clipboard(0); + return 1; +} -EditMoveTrackUp::EditMoveTrackUp(MWindow *mwindow, EditPopup *popup) - : BC_MenuItem(_("Move up")) +EditPopupCopyPack::EditPopupCopyPack(MWindow *mwindow, EditPopup *popup) + : BC_MenuItem(_("Copy pack"),_("Ctrl-Shift-C"),'C') { this->mwindow = mwindow; this->popup = popup; + set_ctrl(1); + set_shift(1); } -EditMoveTrackUp::~EditMoveTrackUp() -{ -} -int EditMoveTrackUp::handle_event() + +int EditPopupCopyPack::handle_event() { - mwindow->move_track_up(popup->track); + mwindow->selected_to_clipboard(1); return 1; } - - -EditMoveTrackDown::EditMoveTrackDown(MWindow *mwindow, EditPopup *popup) - : BC_MenuItem(_("Move down")) +EditPopupCut::EditPopupCut(MWindow *mwindow, EditPopup *popup) + : BC_MenuItem(_("Cut"),_("Ctrl-x"),'x') { this->mwindow = mwindow; this->popup = popup; + set_ctrl(1); } -EditMoveTrackDown::~EditMoveTrackDown() -{ -} -int EditMoveTrackDown::handle_event() + +int EditPopupCut::handle_event() { - mwindow->move_track_down(popup->track); + mwindow->cut_selected_edits(1, 0); return 1; } - -EditPopupResize::EditPopupResize(MWindow *mwindow, EditPopup *popup) - : BC_MenuItem(_("Resize track...")) +EditPopupCutPack::EditPopupCutPack(MWindow *mwindow, EditPopup *popup) + : BC_MenuItem(_("Cut pack"),_("Ctrl-z"),'z') { this->mwindow = mwindow; this->popup = popup; - dialog_thread = new ResizeTrackThread(mwindow); -} -EditPopupResize::~EditPopupResize() -{ - delete dialog_thread; + set_ctrl(1); } -int EditPopupResize::handle_event() +int EditPopupCutPack::handle_event() { - dialog_thread->start_window(popup->track); + mwindow->cut_selected_edits(1, 1); return 1; } - -EditPopupMatchSize::EditPopupMatchSize(MWindow *mwindow, EditPopup *popup) - : BC_MenuItem(_("Match output size")) +EditPopupMute::EditPopupMute(MWindow *mwindow, EditPopup *popup) + : BC_MenuItem(_("Mute"),_("Ctrl-m"),'m') { this->mwindow = mwindow; this->popup = popup; + set_ctrl(1); } -EditPopupMatchSize::~EditPopupMatchSize() + +int EditPopupMute::handle_event() { + mwindow->cut_selected_edits(0, 0); + return 1; } -int EditPopupMatchSize::handle_event() +EditPopupMutePack::EditPopupMutePack(MWindow *mwindow, EditPopup *popup) + : BC_MenuItem(_("Mute pack"),_("Ctrl-Shift-M"),'M') { - mwindow->match_output_size(popup->track); - return 1; + this->mwindow = mwindow; + this->popup = popup; + set_ctrl(1); + set_shift(1); } +int EditPopupMutePack::handle_event() +{ + mwindow->cut_selected_edits(0, 1); + return 1; +} -EditPopupDeleteTrack::EditPopupDeleteTrack(MWindow *mwindow, EditPopup *popup) - : BC_MenuItem(_("Delete track")) +EditPopupPaste::EditPopupPaste(MWindow *mwindow, EditPopup *popup) + : BC_MenuItem(_("Paste"),_("Ctrl-v"),'v') { this->mwindow = mwindow; this->popup = popup; + set_ctrl(1); } -int EditPopupDeleteTrack::handle_event() + +int EditPopupPaste::handle_event() { - mwindow->delete_track(popup->track); + mwindow->paste(popup->position, popup->track, 0, 0); + mwindow->edl->tracks->clear_selected_edits(); + popup->gui->draw_overlays(1); + if( mwindow->session->current_operation == DROP_TARGETING ) { + mwindow->session->current_operation = NO_OPERATION; + popup->gui->update_cursor(); + } return 1; } - -EditPopupAddTrack::EditPopupAddTrack(MWindow *mwindow, EditPopup *popup) - : BC_MenuItem(_("Add track")) +EditPopupOverwrite::EditPopupOverwrite(MWindow *mwindow, EditPopup *popup) + : BC_MenuItem(_("Overwrite"),_("Ctrl-b"),'b') { this->mwindow = mwindow; this->popup = popup; + set_ctrl(1); } -int EditPopupAddTrack::handle_event() +int EditPopupOverwrite::handle_event() { - switch( popup->track->data_type ) { - case TRACK_AUDIO: - mwindow->add_audio_track_entry(1, popup->track); - break; - case TRACK_VIDEO: - mwindow->add_video_track_entry(popup->track); - break; - case TRACK_SUBTITLE: - mwindow->add_subttl_track_entry(popup->track); - break; + mwindow->paste(popup->position, popup->track, 0, -1); + mwindow->edl->tracks->clear_selected_edits(); + popup->gui->draw_overlays(1); + if( mwindow->session->current_operation == DROP_TARGETING ) { + mwindow->session->current_operation = NO_OPERATION; + popup->gui->update_cursor(); } return 1; } @@ -257,20 +273,20 @@ int EditPopupFindAsset::handle_event() } -EditPopupTitle::EditPopupTitle(MWindow *mwindow, EditPopup *popup) +EditPopupUserTitle::EditPopupUserTitle(MWindow *mwindow, EditPopup *popup) : BC_MenuItem(_("User title...")) { this->mwindow = mwindow; this->popup = popup; - dialog_thread = new EditTitleDialogThread(this); + dialog_thread = new EditUserTitleDialogThread(this); } -EditPopupTitle::~EditPopupTitle() +EditPopupUserTitle::~EditPopupUserTitle() { delete dialog_thread; } -int EditPopupTitle::handle_event() +int EditPopupUserTitle::handle_event() { if( popup->edit ) { dialog_thread->close_window(); @@ -281,49 +297,64 @@ int EditPopupTitle::handle_event() return 1; } -void EditTitleDialogThread::start(int wx, int wy) +void EditUserTitleDialogThread::start(int wx, int wy) { this->wx = wx; this->wy = wy; BC_DialogThread::start(); } -EditTitleDialogThread::EditTitleDialogThread(EditPopupTitle *edit_title) +EditUserTitleDialogThread::EditUserTitleDialogThread(EditPopupUserTitle *edit_title) { this->edit_title = edit_title; window = 0; } -EditTitleDialogThread::~EditTitleDialogThread() +EditUserTitleDialogThread::~EditUserTitleDialogThread() { close_window(); } -BC_Window* EditTitleDialogThread::new_gui() +BC_Window* EditUserTitleDialogThread::new_gui() { MWindow *mwindow = edit_title->mwindow; EditPopup *popup = edit_title->popup; - window = new EditPopupTitleWindow(mwindow, popup, wx, wy); + window = new EditPopupUserTitleWindow(mwindow, popup, wx, wy); window->create_objects(); return window; } -void EditTitleDialogThread::handle_close_event(int result) +void EditUserTitleDialogThread::handle_close_event(int result) { window = 0; } -void EditTitleDialogThread::handle_done_event(int result) +void EditUserTitleDialogThread::handle_done_event(int result) { if( result ) return; MWindow *mwindow = edit_title->mwindow; EditPopup *popup = edit_title->popup; - strcpy(popup->edit->user_title, window->title_text->get_text()); - mwindow->gui->lock_window("EditTitleDialogThread::handle_done_event"); + EDL *edl = mwindow->edl; + const char *text = window->title_text->get_text(); + int count = 0; + for( Track *track=edl->tracks->first; track; track=track->next ) { + if( !track->record ) continue; + for( Edit *edit=track->edits->first; edit; edit=edit->next ) { + if( !edit->is_selected ) continue; + strcpy(edit->user_title, text); + ++count; + } + } + if( count ) + edl->tracks->clear_selected_edits(); + else if( popup->edit ) { + strcpy(popup->edit->user_title, text); + } + mwindow->gui->lock_window("EditUserTitleDialogThread::handle_done_event"); mwindow->gui->draw_canvas(1, 0); mwindow->gui->flash_canvas(1); mwindow->gui->unlock_window(); } -EditPopupTitleWindow::EditPopupTitleWindow(MWindow *mwindow, +EditPopupUserTitleWindow::EditPopupUserTitleWindow(MWindow *mwindow, EditPopup *popup, int wx, int wy) : BC_Window(_(PROGRAM_NAME ": Set edit title"), wx, wy, 300, 130, 300, 130, 0, 0, 1) @@ -333,17 +364,19 @@ EditPopupTitleWindow::EditPopupTitleWindow(MWindow *mwindow, strcpy(new_text, !popup->edit ? "" : popup->edit->user_title); } -EditPopupTitleWindow::~EditPopupTitleWindow() +EditPopupUserTitleWindow::~EditPopupUserTitleWindow() { } -void EditPopupTitleWindow::create_objects() +void EditPopupUserTitleWindow::create_objects() { - lock_window("EditPopupTitleWindow::create_objects"); - int x = 10, y = 10; - add_subwindow(new BC_Title(x, y, _("User title:"))); - title_text = new EditPopupTitleText(this, mwindow, x+15, y+20, new_text); + lock_window("EditPopupUserTitleWindow::create_objects"); + int x = 10, y = 10, x1; + BC_Title *title = new BC_Title(x1=x, y, _("User title:")); + add_subwindow(title); x1 += title->get_w() + 10; + title_text = new EditPopupUserTitleText(this, mwindow, x1, y, new_text); add_subwindow(title_text); + add_tool(new BC_OKButton(this)); add_tool(new BC_CancelButton(this)); @@ -354,19 +387,19 @@ void EditPopupTitleWindow::create_objects() } -EditPopupTitleText::EditPopupTitleText(EditPopupTitleWindow *window, +EditPopupUserTitleText::EditPopupUserTitleText(EditPopupUserTitleWindow *window, MWindow *mwindow, int x, int y, const char *text) - : BC_TextBox(x, y, 250, 1, text) + : BC_TextBox(x, y, window->get_w()-x-15, 1, text) { this->window = window; this->mwindow = mwindow; } -EditPopupTitleText::~EditPopupTitleText() +EditPopupUserTitleText::~EditPopupUserTitleText() { } -int EditPopupTitleText::handle_event() +int EditPopupUserTitleText::handle_event() { if( get_keypress() == RETURN ) window->set_done(0); @@ -374,6 +407,93 @@ int EditPopupTitleText::handle_event() } +EditPopupTitleColor::EditPopupTitleColor(MWindow *mwindow, EditPopup *popup) + : BC_MenuItem(_("Bar Color...")) +{ + this->mwindow = mwindow; + this->popup = popup; + color_picker = 0; +} +EditPopupTitleColor::~EditPopupTitleColor() +{ + delete color_picker; +} + +int EditPopupTitleColor::handle_event() +{ + if( popup->edit ) { + int color = popup->mwindow->get_title_color(popup->edit); + if( !color ) color = popup->mwindow->theme->get_color_title_bg(); + delete color_picker; + color_picker = new EditTitleColorPicker(popup, color); + int alpha = (~color>>24) & 0xff; + color_picker->start_window(color & 0xffffff, alpha, 1); + } + return 1; +} + +EditTitleColorDefault::EditTitleColorDefault( + EditTitleColorPicker *color_picker, int x, int y) + : BC_GenericButton(x, y, _("default")) +{ + this->color_picker = color_picker; +} + +int EditTitleColorDefault::handle_event() +{ + color_picker->color = 0; + color_picker->update_gui(0, 0); + return 1; +} + +EditTitleColorPicker::EditTitleColorPicker(EditPopup *popup, int color) + : ColorPicker(1, _("Bar Color")) +{ + this->popup = popup; + this->color = color; +} +EditTitleColorPicker::~EditTitleColorPicker() +{ +} +void EditTitleColorPicker::create_objects(ColorWindow *gui) +{ + int y = gui->get_h() - BC_CancelButton::calculate_h() + 10; + int x = gui->get_w() - BC_CancelButton::calculate_w() - 10; + x -= BC_GenericButton::calculate_w(gui, _("default")) + 15; + gui->add_subwindow(new EditTitleColorDefault(this, x, y)); +} + +int EditTitleColorPicker::handle_new_color(int color, int alpha) +{ + this->color = color | (~alpha << 24); + return 1; +} + +void EditTitleColorPicker::handle_done_event(int result) +{ + if( !result ) { + EDL *edl = popup->mwindow->edl; + int count = 0; + for( Track *track=edl->tracks->first; track; track=track->next ) { + if( !track->record ) continue; + for( Edit *edit=track->edits->first; edit; edit=edit->next ) { + if( !edit->is_selected ) continue; + edit->color = color; + ++count; + } + } + if( count ) + edl->tracks->clear_selected_edits(); + else + popup->edit->color = color; + } + MWindowGUI *mwindow_gui = popup->mwindow->gui; + mwindow_gui->lock_window("GWindowColorUpdate::run"); + mwindow_gui->draw_trackmovement(); + mwindow_gui->unlock_window(); +} + + EditPopupShow::EditPopupShow(MWindow *mwindow, EditPopup *popup) : BC_MenuItem(_("Show edit")) { @@ -447,8 +567,8 @@ void EditPopupShowWindow::create_objects() int x = 10, y = 10; BC_Title *title; char text[BCTEXTLEN]; - Track *track = popup->track; Edit *edit = popup->edit; + Track *track = edit->track; sprintf(text, _("Track %d:"), mwindow->edl->tracks->number_of(track)+1); add_subwindow(title = new BC_Title(x, y, text)); int x1 = x + title->get_w() + 10;