X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Feditpopup.C;h=5fcd8152485f90d156c90d0d3a25b8790055c9d4;hb=b30123c9534e8df8da1694d40396d86396bf1c08;hp=2f130edecf8f4f3f08db2a5dd1de3b5f810c40c1;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C index 2f130ede..5fcd8152 100644 --- a/cinelerra-5.1/cinelerra/editpopup.C +++ b/cinelerra-5.1/cinelerra/editpopup.C @@ -2,26 +2,36 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ +#include "asset.h" +#include "assets.h" +#include "awindow.h" +#include "awindowgui.h" #include "edit.h" #include "editpopup.h" +#include "edl.h" +#include "edlsession.h" +#include "file.h" +#include "keys.h" #include "language.h" +#include "localsession.h" +#include "mainerror.h" #include "mainsession.h" #include "mwindow.h" #include "mwindowgui.h" @@ -31,15 +41,10 @@ #include "tracks.h" #include "trackcanvas.h" - #include EditPopup::EditPopup(MWindow *mwindow, MWindowGUI *gui) - : BC_PopupMenu(0, - 0, - 0, - "", - 0) + : BC_PopupMenu(0, 0, 0, "", 0) { this->mwindow = mwindow; this->gui = gui; @@ -56,8 +61,10 @@ void EditPopup::create_objects() add_item(new EditMoveTrackDown(mwindow, this)); add_item(new EditPopupDeleteTrack(mwindow, this)); add_item(new EditPopupAddTrack(mwindow, this)); -// add_item(new EditPopupTitle(mwindow, this)); + add_item(new EditPopupFindAsset(mwindow, this)); + add_item(new EditPopupTitle(mwindow, this)); resize_option = 0; + matchsize_option = 0; } int EditPopup::update(Track *track, Edit *edit) @@ -73,22 +80,13 @@ int EditPopup::update(Track *track, Edit *edit) else if(track->data_type == TRACK_AUDIO && resize_option) { - remove_item(resize_option); - remove_item(matchsize_option); - resize_option = 0; - matchsize_option = 0; + del_item(resize_option); resize_option = 0; + del_item(matchsize_option); matchsize_option = 0; } return 0; } - - - - - - - EditAttachEffect::EditAttachEffect(MWindow *mwindow, EditPopup *popup) : BC_MenuItem(_("Attach effect...")) { @@ -105,10 +103,8 @@ EditAttachEffect::~EditAttachEffect() int EditAttachEffect::handle_event() { dialog_thread->start_window(popup->track, - 0, - _(PROGRAM_NAME ": Attach Effect"), - 0, - popup->track->data_type); + 0, _(PROGRAM_NAME ": Attach Effect"), + 0, popup->track->data_type); return 1; } @@ -146,8 +142,6 @@ int EditMoveTrackDown::handle_event() } - - EditPopupResize::EditPopupResize(MWindow *mwindow, EditPopup *popup) : BC_MenuItem(_("Resize track...")) { @@ -167,10 +161,6 @@ int EditPopupResize::handle_event() } - - - - EditPopupMatchSize::EditPopupMatchSize(MWindow *mwindow, EditPopup *popup) : BC_MenuItem(_("Match output size")) { @@ -188,11 +178,6 @@ int EditPopupMatchSize::handle_event() } - - - - - EditPopupDeleteTrack::EditPopupDeleteTrack(MWindow *mwindow, EditPopup *popup) : BC_MenuItem(_("Delete track")) { @@ -206,10 +191,6 @@ int EditPopupDeleteTrack::handle_event() } - - - - EditPopupAddTrack::EditPopupAddTrack(MWindow *mwindow, EditPopup *popup) : BC_MenuItem(_("Add track")) { @@ -233,9 +214,45 @@ int EditPopupAddTrack::handle_event() return 1; } +EditPopupFindAsset::EditPopupFindAsset(MWindow *mwindow, EditPopup *popup) + : BC_MenuItem(_("Find in Resources")) +{ + this->mwindow = mwindow; + this->popup = popup; +} - - +int EditPopupFindAsset::handle_event() +{ + Edit *edit = popup->edit; + if( edit ) { + Indexable *idxbl = (Indexable *)edit->asset; + if( !idxbl ) idxbl = (Indexable *)edit->nested_edl; + if( idxbl ) { + AWindowGUI *agui = mwindow->awindow->gui; + agui->lock_window("EditPopupFindAsset::handle_event"); + AssetPicon *picon = 0; + for( int i=0, n=agui->assets.size(); iassets[i]; + int found = ap->indexable && ( idxbl == ap->indexable || + !strcmp(idxbl->path, ap->indexable->path) ); + if( found && !picon ) picon = ap; + ap->set_selected(found); + } + if( picon ) { + int selected_folder = picon->indexable->awindow_folder; + mwindow->edl->session->awindow_folder = selected_folder; + for( int i=0,n=agui->folders.size(); ifolders[i]; + int selected = folder_item->foldernum == selected_folder ? 1 : 0; + folder_item->set_selected(selected); + } + } + agui->unlock_window(); + agui->async_update_assets(); + } + } + return 1; +} EditPopupTitle::EditPopupTitle(MWindow *mwindow, EditPopup *popup) @@ -248,32 +265,21 @@ EditPopupTitle::EditPopupTitle(MWindow *mwindow, EditPopup *popup) EditPopupTitle::~EditPopupTitle() { - delete popup; } int EditPopupTitle::handle_event() { int result; - - Track *trc = mwindow->session->track_highlighted; - - if (trc && trc->record) - { - Edit *edt = mwindow->session->edit_highlighted; - if(!edt) return 1; - + if( popup->edit ) { window = new EditPopupTitleWindow (mwindow, popup); window->create_objects(); result = window->run_window(); - - - if(!result && edt) - { - strcpy(edt->user_title, window->title_text->get_text()); + if( !result && popup->edit ) { + strcpy(popup->edit->user_title, window->title_text->get_text()); + mwindow->gui->draw_canvas(1, 0); + mwindow->gui->flash_canvas(1); } - - delete window; - window = 0; + delete window; window = 0; } return 1; @@ -284,20 +290,12 @@ EditPopupTitleWindow::EditPopupTitleWindow (MWindow *mwindow, EditPopup *popup) : BC_Window (_(PROGRAM_NAME ": Set edit title"), mwindow->gui->get_abs_cursor_x(0) - 400 / 2, mwindow->gui->get_abs_cursor_y(0) - 500 / 2, - 300, - 100, - 300, - 100, - 0, - 0, - 1) + 300, 130, 300, 130, 0, 0, 1) { this->mwindow = mwindow; this->popup = popup; - this->edt = this->mwindow->session->edit_highlighted; - if(this->edt) - { - strcpy(new_text, this->edt->user_title); + if( popup->edit ) { + strcpy(new_text, popup->edit->user_title); } } @@ -313,41 +311,39 @@ int EditPopupTitleWindow::close_event() void EditPopupTitleWindow::create_objects() { - int x = 5; + lock_window("EditPopupTitleWindow::create_objects"); + int x = 10; int y = 10; - - add_subwindow (new BC_Title (x, y, _("User title"))); - add_subwindow (title_text = new EditPopupTitleText (this, - mwindow, x, y + 20)); + add_subwindow (new BC_Title (x, y, _("User title:"))); + title_text = new EditPopupTitleText (this, mwindow, x+15, y+20, + popup->edit ? popup->edit->user_title : ""); + add_subwindow(title_text); add_tool(new BC_OKButton(this)); add_tool(new BC_CancelButton(this)); show_window(); flush(); + unlock_window(); } -EditPopupTitleText::EditPopupTitleText (EditPopupTitleWindow *window, - MWindow *mwindow, int x, int y) - : BC_TextBox(x, y, 250, 1, (char*)(window->edt ? window->edt->user_title : "")) +EditPopupTitleText::EditPopupTitleText (EditPopupTitleWindow *window, + MWindow *mwindow, int x, int y, const char *text) + : BC_TextBox(x, y, 250, 1, text) { this->window = window; this->mwindow = mwindow; } -EditPopupTitleText::~EditPopupTitleText() -{ +EditPopupTitleText::~EditPopupTitleText() +{ } - + int EditPopupTitleText::handle_event() { + if( get_keypress() == RETURN ) + window->set_done(0); return 1; } - - - - - -