BC_MenuItem *menu_item;
BC_SubMenu *submenu;
add_item(info = new ClipPopupInfo(mwindow, this));
- add_item(format = new AWindowListFormat(mwindow));
+ add_item(format = new AWindowListFormat(mwindow, gui));
add_item(new ClipPopupSort(mwindow, this));
add_item(view = new ClipPopupView(mwindow, this));
add_item(view_window = new ClipPopupViewWindow(mwindow, this));
submenu->add_submenuitem(new ClipMatchSize(mwindow, this));
submenu->add_submenuitem(new ClipMatchRate(mwindow, this));
submenu->add_submenuitem(new ClipMatchAll(mwindow, this));
- add_item(menu_item = new BC_MenuItem(_("Remove...")));
- menu_item->add_submenu(submenu = new BC_SubMenu());
- submenu->add_submenuitem(new ClipPopupProjectRemove(mwindow, this));
- submenu->add_submenuitem(new ClipPopupDiskRemove(mwindow, this));
+ add_item(new ClipPopupDelete(mwindow, this));
}
void ClipPopup::paste_assets()
int ClipPopupInfo::handle_event()
{
- if(mwindow->session->drag_assets->total)
- {
- mwindow->awindow->asset_edit->edit_asset(
- mwindow->session->drag_assets->values[0]);
+ int cur_x, cur_y;
+ popup->gui->get_abs_cursor_xy(cur_x, cur_y, 0);
+
+ if( mwindow->session->drag_assets->total ) {
+ AssetEdit *asset_edit = mwindow->awindow->get_asset_editor();
+ asset_edit->edit_asset(
+ mwindow->session->drag_assets->values[0], cur_x, cur_y);
}
else
- if(mwindow->session->drag_clips->total)
- {
+ if( mwindow->session->drag_clips->total ) {
popup->gui->awindow->clip_edit->edit_clip(
- mwindow->session->drag_clips->values[0]);
+ mwindow->session->drag_clips->values[0], cur_x, cur_y);
}
return 1;
}
VWindow *vwindow = mwindow->get_viewer(1, DEFAULT_VWINDOW);
vwindow->gui->lock_window("ClipPopupView::handle_event");
- if(mwindow->session->drag_assets->total)
+ if( mwindow->session->drag_assets->total )
vwindow->change_source(
mwindow->session->drag_assets->values[0]);
else
- if(mwindow->session->drag_clips->total)
+ if( mwindow->session->drag_clips->total )
vwindow->change_source(
mwindow->session->drag_clips->values[0]);
// TODO: create new vwindow or change current vwindow
vwindow->gui->lock_window("ClipPopupView::handle_event");
- if(mwindow->session->drag_assets->total)
+ if( mwindow->session->drag_assets->total )
vwindow->change_source(
mwindow->session->drag_assets->values[0]);
else
- if(mwindow->session->drag_clips->total)
+ if( mwindow->session->drag_clips->total )
vwindow->change_source(
mwindow->session->drag_clips->values[0]);
edl->copy(start, end, 1, 0, 0, &file, "", 1);
const char *file_string = file.string();
long file_length = strlen(file_string);
- gui->get_clipboard()->to_clipboard(file_string, file_length,
- SECONDARY_SELECTION);
- gui->get_clipboard()->to_clipboard(file_string, file_length,
- BC_PRIMARY_SELECTION);
+ gui->to_clipboard(file_string, file_length, SECONDARY_SELECTION);
+ gui->to_clipboard(file_string, file_length, BC_PRIMARY_SELECTION);
}
gui->unlock_window();
return 1;
}
-ClipPopupProjectRemove::ClipPopupProjectRemove(MWindow *mwindow, ClipPopup *popup)
- : BC_MenuItem(_("Remove from project"))
+ClipPopupDelete::ClipPopupDelete(MWindow *mwindow, ClipPopup *popup)
+ : BC_MenuItem(_("Delete"))
{
this->mwindow = mwindow;
this->popup = popup;
}
-ClipPopupProjectRemove::~ClipPopupProjectRemove()
+ClipPopupDelete::~ClipPopupDelete()
{
}
-int ClipPopupProjectRemove::handle_event()
+int ClipPopupDelete::handle_event()
{
- mwindow->remove_assets_from_project(1,
- 1,
+ mwindow->remove_assets_from_project(1, 1,
mwindow->session->drag_assets,
mwindow->session->drag_clips);
return 1;
}
-ClipPopupDiskRemove::ClipPopupDiskRemove(MWindow *mwindow, ClipPopup *popup)
- : BC_MenuItem(_("Remove from disk"))
-{
- this->mwindow = mwindow;
- this->popup = popup;
-}
-
-ClipPopupDiskRemove::~ClipPopupDiskRemove()
-{
-}
-
-int ClipPopupDiskRemove::handle_event()
-{
- mwindow->awindow->asset_remove->start();
- return 1;
-}
-
-
ClipPasteToFolder::ClipPasteToFolder(MWindow *mwindow)
: BC_MenuItem(_("Paste Clip"))
{
{
MWindowGUI *gui = mwindow->gui;
gui->lock_window("ClipPasteToFolder::handle_event 1");
- int64_t len = gui->get_clipboard()->clipboard_len(SECONDARY_SELECTION);
+ int64_t len = gui->clipboard_len(BC_PRIMARY_SELECTION);
if( len ) {
- char *string = new char[len + 1];
- gui->get_clipboard()->from_clipboard(string, len, BC_PRIMARY_SELECTION);
+ char *string = new char[len];
+ gui->from_clipboard(string, len, BC_PRIMARY_SELECTION);
const char *clip_header = "<EDL VERSION=";
if( !strncmp(clip_header, string, strlen(clip_header)) ) {
FileXML file;
void ClipListMenu::create_objects()
{
- add_item(format = new AWindowListFormat(mwindow));
- add_item(new AWindowListSort(mwindow));
+ add_item(format = new AWindowListFormat(mwindow, gui));
+ add_item(new AWindowListSort(mwindow, gui));
add_item(new ClipPasteToFolder(mwindow));
update();
}