X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=272bfea8ef56bbf71ca1b6526db45a68414fc5f8;hb=faf9f1da60357505e88f5be80c0256a64bf2d650;hp=9a39a6fbe3094acb365242507ea6155a9f65de3a;hpb=8b0d4fea3dbf5321d0688eb75f25be77f751d003;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index 9a39a6fb..272bfea8 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -35,6 +35,7 @@ #include "cwindow.h" #include "edl.h" #include "edlsession.h" +#include "effectlist.h" #include "file.h" #include "filesystem.h" #include "folderlistmenu.h" @@ -342,7 +343,7 @@ void AssetPicon::create_objects() } else if( plugin ) { - strcpy(name, _(plugin->title)); + strcpy(name, plugin->title); set_text(name); icon_vframe = plugin->get_picon(); if( icon_vframe ) @@ -438,6 +439,7 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow) plugin_visibility = ((uint64_t)1<<(8*sizeof(uint64_t)-1))-1; newfolder_thread = 0; asset_menu = 0; + effectlist_menu = 0; assetlist_menu = 0; cliplist_menu = 0; labellist_menu = 0; @@ -447,6 +449,7 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow) remove_plugin = 0; vicon_thread = 0; vicon_drawing = 1; + displayed_folder = AW_NO_FOLDER; } AWindowGUI::~AWindowGUI() @@ -481,6 +484,7 @@ AWindowGUI::~AWindowGUI() delete asset_menu; delete clip_menu; delete label_menu; + delete effectlist_menu; delete assetlist_menu; delete cliplist_menu; delete labellist_menu; @@ -634,6 +638,8 @@ SET_TRACE add_subwindow(label_menu = new LabelPopup(mwindow, this)); label_menu->create_objects(); + add_subwindow(effectlist_menu = new EffectListMenu(mwindow, this)); + effectlist_menu->create_objects(); add_subwindow(assetlist_menu = new AssetListMenu(mwindow, this)); assetlist_menu->create_objects(); add_subwindow(cliplist_menu = new ClipListMenu(mwindow, this)); @@ -826,12 +832,13 @@ void AWindowRemovePlugin::handle_close_event(int result) mwindow->plugindb->remove(plugin); remove(plugin_path); char index_path[BCTEXTLEN]; - sprintf(index_path, "%s/%s", mwindow->preferences->plugin_dir, PLUGIN_FILE); + snprintf(index_path, sizeof(index_path), "%s/%s", + mwindow->preferences->plugin_dir, PLUGIN_FILE); remove(index_path); char png_path[BCTEXTLEN]; - if( plugin->get_theme_png_path(png_path, mwindow->preferences->theme) ) + if( plugin->get_plugin_png_path(png_path, mwindow->preferences->plugin_icons) ) remove(png_path); - if( plugin->get_theme_png_path(png_path, "picon") ) + if( plugin->get_plugin_png_path(png_path, DEFAULT_PICON) ) remove(png_path); delete plugin; plugin = 0; awindow->gui->async_update_assets(); @@ -1295,27 +1302,27 @@ void AWindowGUI::update_assets() //printf("AWindowGUI::update_assets 3\n"); filter_displayed_assets(); -//for( int i = 0; i < folders.total; i++ ) //printf("AWindowGUI::update_assets 4\n"); -// printf("AWindowGUI::update_assets %s\n", folders.values[i]->get_text()); - if( mwindow->edl->session->folderlist_format != folder_list->get_format() ) + if( mwindow->edl->session->folderlist_format != folder_list->get_format() ) { folder_list->update_format(mwindow->edl->session->folderlist_format, 0); - folder_list->update(&folders, 0, 0, 1, - folder_list->get_xposition(), - folder_list->get_yposition(), - -1); -//printf("AWindowGUI::update_assets 5\n"); + } + int folder_xposition = folder_list->get_xposition(); + int folder_yposition = folder_list->get_yposition(); + folder_list->update(&folders, 0, 0, 1, folder_xposition, folder_yposition, -1); - if( mwindow->edl->session->assetlist_format != asset_list->get_format() ) +//printf("AWindowGUI::update_assets 5\n"); + if( mwindow->edl->session->assetlist_format != asset_list->get_format() ) { asset_list->update_format(mwindow->edl->session->assetlist_format, 0); - - -//printf("AWindowGUI::update_assets 6 %d\n", displayed_assets[0].total); + } + int asset_xposition = asset_list->get_xposition(); + int asset_yposition = asset_list->get_yposition(); + if( displayed_folder != mwindow->edl->session->awindow_folder ) { + displayed_folder = mwindow->edl->session->awindow_folder; + asset_xposition = asset_yposition = 0; + } asset_list->update(displayed_assets, asset_titles, mwindow->edl->session->asset_columns, ASSET_COLUMNS, - asset_list->get_xposition(), - asset_list->get_yposition(), - -1, 0); + asset_xposition, asset_yposition, -1, 0); asset_list->center_selection(); //printf("AWindowGUI::update_assets 7\n"); @@ -1434,21 +1441,18 @@ int AWindowDivider::button_release_event() AWindowFolders::AWindowFolders(MWindow *mwindow, AWindowGUI *gui, int x, int y, int w, int h) - : BC_ListBox(x, - y, - w, - h, + : BC_ListBox(x, y, w, h, mwindow->edl->session->folderlist_format == ASSETS_ICONS ? LISTBOX_ICONS : LISTBOX_TEXT, - &gui->folders, // Each column has an ArrayList of BC_ListBoxItems. - 0, // Titles for columns. Set to 0 for no titles + &gui->folders, // Each column has an ArrayList of BC_ListBoxItems. + 0, // Titles for columns. Set to 0 for no titles 0, // width of each column - 1, // Total columns. - 0, // Pixel of top of window. - 0, // If this listbox is a popup window - LISTBOX_SINGLE, // Select one item or multiple items - ICON_TOP, // Position of icon relative to text of each item - 1) // Allow drags + 1, // Total columns. + 0, // Pixel of top of window. + 0, // If this listbox is a popup window + LISTBOX_SINGLE, // Select one item or multiple items + ICON_TOP, // Position of icon relative to text of each item + 1) // Allow drags { this->mwindow = mwindow; this->gui = gui; @@ -1509,18 +1513,19 @@ AWindowAssets::AWindowAssets(MWindow *mwindow, AWindowGUI *gui, int x, int y, in (mwindow->edl->session->assetlist_format == ASSETS_ICONS && gui->allow_iconlisting ) ? LISTBOX_ICONS : LISTBOX_TEXT, &gui->assets, // Each column has an ArrayList of BC_ListBoxItems. - gui->asset_titles, // Titles for columns. Set to 0 for no titles - mwindow->edl->session->asset_columns, // width of each column - 1, // Total columns. - 0, // Pixel of top of window. - 0, // If this listbox is a popup window - LISTBOX_MULTIPLE, // Select one item or multiple items - ICON_TOP, // Position of icon relative to text of each item - 1) // Allow drag + gui->asset_titles,// Titles for columns. Set to 0 for no titles + mwindow->edl->session->asset_columns, // width of each column + 1, // Total columns. + 0, // Pixel of top of window. + 0, // If this listbox is a popup window + LISTBOX_MULTIPLE, // Select one item or multiple items + ICON_TOP, // Position of icon relative to text of each item + 1) // Allow drag { this->mwindow = mwindow; this->gui = gui; set_drag_scroll(0); + set_scroll_stretch(1, 1); } AWindowAssets::~AWindowAssets() @@ -1537,6 +1542,13 @@ int AWindowAssets::button_press_event() BC_ListBox::deactivate_selection(); int folder = mwindow->edl->session->awindow_folder; switch( folder ) { + case AW_AEFFECT_FOLDER: + case AW_VEFFECT_FOLDER: + case AW_ATRANSITION_FOLDER: + case AW_VTRANSITION_FOLDER: + gui->effectlist_menu->update(); + gui->effectlist_menu->activate_menu(); + break; case AW_LABEL_FOLDER: gui->labellist_menu->update(); gui->labellist_menu->activate_menu(); @@ -1545,7 +1557,7 @@ int AWindowAssets::button_press_event() gui->cliplist_menu->update(); gui->cliplist_menu->activate_menu(); break; - default: + case AW_MEDIA_FOLDER: gui->assetlist_menu->update_titles(); gui->assetlist_menu->activate_menu(); break; @@ -1553,7 +1565,6 @@ int AWindowAssets::button_press_event() result = 1; } - return result; } @@ -1595,8 +1606,8 @@ int AWindowAssets::selection_changed() case AW_VEFFECT_FOLDER: case AW_ATRANSITION_FOLDER: case AW_VTRANSITION_FOLDER: - gui->assetlist_menu->update_titles(); - gui->assetlist_menu->activate_menu(); + gui->effectlist_menu->update(); + gui->effectlist_menu->activate_menu(); break; case AW_LABEL_FOLDER: if( !item->label ) break; @@ -1873,7 +1884,9 @@ AWindowInfo::AWindowInfo(MWindow *mwindow, AWindowGUI *gui, int x, int y) int AWindowInfo::handle_event() { - gui->awindow->asset_edit->edit_asset(gui->selected_asset()); + int cur_x, cur_y; + gui->get_abs_cursor_xy(cur_x, cur_y, 0); + gui->awindow->asset_edit->edit_asset(gui->selected_asset(), cur_x, cur_y); return 1; } @@ -2027,15 +2040,15 @@ int AVIconDrawing::handle_event() } -AWindowListFormat::AWindowListFormat(MWindow *mwindow) +AWindowListFormat::AWindowListFormat(MWindow *mwindow, AWindowGUI *gui) : BC_MenuItem("") { this->mwindow = mwindow; + this->gui = gui; } int AWindowListFormat::handle_event() { - AWindowGUI *gui = mwindow->awindow->gui; gui->stop_vicon_drawing(); EDLSession *session = mwindow->edl->session; @@ -2063,15 +2076,15 @@ void AWindowListFormat::update() (char*)_("Display icons") : (char*)_("Display text")); } -AWindowListSort::AWindowListSort(MWindow *mwindow) +AWindowListSort::AWindowListSort(MWindow *mwindow, AWindowGUI *gui) : BC_MenuItem(_("Sort items")) { this->mwindow = mwindow; + this->gui = gui; } int AWindowListSort::handle_event() { - AWindowGUI *gui = mwindow->awindow->gui; gui->sort_assets(); return 1; }