X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Feditpopup.C;h=25931b5d42a8821443de286a97931fc9880b3278;hp=e8d27b9609800942374ad2a56ae1f6138a72eebc;hb=2e48b660e37eb5c661264d601211e16cb6cd6e89;hpb=b9f98da8f1cd8b7b31ead02fa41f299b56cac3da diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C index e8d27b96..25931b5d 100644 --- a/cinelerra-5.1/cinelerra/editpopup.C +++ b/cinelerra-5.1/cinelerra/editpopup.C @@ -24,10 +24,12 @@ #include "awindow.h" #include "awindowgui.h" #include "edit.h" +#include "edits.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" @@ -60,7 +62,9 @@ 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)); + add_item(new EditPopupShow(mwindow, this)); resize_option = 0; matchsize_option = 0; } @@ -85,13 +89,6 @@ int EditPopup::update(Track *track, Edit *edit) } - - - - - - - EditAttachEffect::EditAttachEffect(MWindow *mwindow, EditPopup *popup) : BC_MenuItem(_("Attach effect...")) { @@ -219,89 +216,134 @@ 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->folder_no; + 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) : BC_MenuItem(_("User title...")) { this->mwindow = mwindow; this->popup = popup; - window = 0; + dialog_thread = new EditTitleDialogThread(this); } EditPopupTitle::~EditPopupTitle() { - delete popup; + delete dialog_thread; } 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; - - window = new EditPopupTitleWindow (mwindow, popup); - window->create_objects(); - result = window->run_window(); + if( popup->edit ) { + dialog_thread->close_window(); + int wx = mwindow->gui->get_abs_cursor_x(0) - 400 / 2; + int wy = mwindow->gui->get_abs_cursor_y(0) - 500 / 2; + dialog_thread->start(wx, wy); + } + return 1; +} +void EditTitleDialogThread::start(int wx, int wy) +{ + this->wx = wx; this->wy = wy; + BC_DialogThread::start(); +} - if(!result && edt) - { - strcpy(edt->user_title, window->title_text->get_text()); - } +EditTitleDialogThread::EditTitleDialogThread(EditPopupTitle *edit_title) +{ + this->edit_title = edit_title; + window = 0; +} +EditTitleDialogThread::~EditTitleDialogThread() +{ + close_window(); +} - delete window; - window = 0; - } +BC_Window* EditTitleDialogThread::new_gui() +{ + MWindow *mwindow = edit_title->mwindow; + EditPopup *popup = edit_title->popup; + window = new EditPopupTitleWindow(mwindow, popup, wx, wy); + window->create_objects(); + return window; +} - return 1; +void EditTitleDialogThread::handle_close_event(int result) +{ + window = 0; } +void EditTitleDialogThread::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"); + mwindow->gui->draw_canvas(1, 0); + mwindow->gui->flash_canvas(1); + mwindow->gui->unlock_window(); +} -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) +EditPopupTitleWindow::EditPopupTitleWindow(MWindow *mwindow, + EditPopup *popup, int wx, int wy) + : BC_Window(_(PROGRAM_NAME ": Set edit title"), wx, wy, + 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); - } + strcpy(new_text, !popup->edit ? "" : popup->edit->user_title); } EditPopupTitleWindow::~EditPopupTitleWindow() { } -int EditPopupTitleWindow::close_event() -{ - set_done(1); - return 1; -} - void EditPopupTitleWindow::create_objects() { lock_window("EditPopupTitleWindow::create_objects"); - int x = 5; - int y = 10; - - add_subwindow (new BC_Title (x, y, _("User title"))); - add_subwindow (title_text = new EditPopupTitleText (this, - mwindow, x, y + 20)); + 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); + add_subwindow(title_text); add_tool(new BC_OKButton(this)); add_tool(new BC_CancelButton(this)); @@ -312,9 +354,9 @@ void EditPopupTitleWindow::create_objects() } -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; @@ -326,6 +368,141 @@ EditPopupTitleText::~EditPopupTitleText() int EditPopupTitleText::handle_event() { + if( get_keypress() == RETURN ) + window->set_done(0); return 1; } + +EditPopupShow::EditPopupShow(MWindow *mwindow, EditPopup *popup) + : BC_MenuItem(_("Show edit")) +{ + this->mwindow = mwindow; + this->popup = popup; + dialog_thread = new EditShowDialogThread(this); +} + +EditPopupShow::~EditPopupShow() +{ + delete dialog_thread; +} + +int EditPopupShow::handle_event() +{ + if( popup->edit ) { + dialog_thread->close_window(); + int wx = mwindow->gui->get_abs_cursor_x(0) - 400 / 2; + int wy = mwindow->gui->get_abs_cursor_y(0) - 500 / 2; + dialog_thread->start(wx, wy); + } + return 1; +} + +void EditShowDialogThread::start(int wx, int wy) +{ + this->wx = wx; this->wy = wy; + BC_DialogThread::start(); +} + +EditShowDialogThread::EditShowDialogThread(EditPopupShow *edit_show) +{ + this->edit_show = edit_show; + window = 0; +} +EditShowDialogThread::~EditShowDialogThread() +{ + close_window(); +} + +BC_Window* EditShowDialogThread::new_gui() +{ + MWindow *mwindow = edit_show->mwindow; + EditPopup *popup = edit_show->popup; + window = new EditPopupShowWindow(mwindow, popup, wx, wy); + window->create_objects(); + return window; +} + +void EditShowDialogThread::handle_close_event(int result) +{ + window = 0; +} + +EditPopupShowWindow::EditPopupShowWindow(MWindow *mwindow, + EditPopup *popup, int wx, int wy) + : BC_Window(_(PROGRAM_NAME ": Show edit"), wx, wy, + 300, 220, 300, 220, 0, 0, 1) +{ + this->mwindow = mwindow; + this->popup = popup; +} + +EditPopupShowWindow::~EditPopupShowWindow() +{ +} + +void EditPopupShowWindow::create_objects() +{ + lock_window("EditPopupShowWindow::create_objects"); + int x = 10, y = 10; + BC_Title *title; + char text[BCTEXTLEN]; + Track *track = popup->track; + Edit *edit = popup->edit; + 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; + int tw = get_w() - x1 - 20; + truncate_text(text, track->title, tw); + add_subwindow(new BC_Title(x1, y, text)); + y += title->get_h() + 5; + sprintf(text, _("Edit %d:"), track->edits->number_of(edit)+1); + add_subwindow(title = new BC_Title(x, y, text)); + char edit_title[BCTEXTLEN]; + edit->get_title(edit_title); + truncate_text(text, edit_title, tw); + add_subwindow(new BC_Title(x1, y, text)); + y += title->get_h() + 5; + + EDLSession *session = mwindow->edl->session; + int time_format = session->time_format; + int sample_rate = session->sample_rate; + double frame_rate = session->frame_rate; + double frames_per_foot = session->frames_per_foot; + + double startsource = track->from_units(edit->startsource); + double startproject = track->from_units(edit->startproject); + double length = track->from_units(edit->length); + + char text_startsource[BCSTRLEN]; + char text_startproject[BCSTRLEN]; + char text_length[BCSTRLEN]; + sprintf(text, _("StartSource: %s\nStartProject: %s\nLength: %s\n"), + Units::totext(text_startsource, startsource, + time_format, sample_rate, frame_rate, frames_per_foot), + Units::totext(text_startproject, startproject, + time_format, sample_rate, frame_rate, frames_per_foot), + Units::totext(text_length, length, + time_format, sample_rate, frame_rate, frames_per_foot)); + show_text = new EditPopupShowText(this, mwindow, x+15, y+10, text); + add_subwindow(show_text); + add_tool(new BC_OKButton(this)); + + show_window(); + flush(); + unlock_window(); +} + + +EditPopupShowText::EditPopupShowText(EditPopupShowWindow *window, + MWindow *mwindow, int x, int y, const char *text) + : BC_TextBox(x, y, 250, 4, text) +{ + this->window = window; + this->mwindow = mwindow; +} + +EditPopupShowText::~EditPopupShowText() +{ +} +