X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Feditpopup.C;h=b12c5d07f6bf6e753177bb78070a1fd9d2bec451;hb=66e8a774858a7bfefc565d77cde63bbc15769991;hp=25931b5d42a8821443de286a97931fc9880b3278;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C index 25931b5d..b12c5d07 100644 --- a/cinelerra-5.1/cinelerra/editpopup.C +++ b/cinelerra-5.1/cinelerra/editpopup.C @@ -49,6 +49,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 +63,165 @@ 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; } -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-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-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-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); + 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); + if( mwindow->session->current_operation == DROP_TARGETING ) { + mwindow->session->current_operation = NO_OPERATION; + popup->gui->update_cursor(); } return 1; } @@ -447,8 +457,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;