X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=009647b3dbc7daeb084fd2fc56173be89e4f4ab5;hb=HEAD;hp=cfdfb6dd03006c877f96df70833979dd684d1eed;hpb=17b4e5a06157865391c2d07b552b81d84665bcae;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index cfdfb6dd..009647b3 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -300,9 +300,51 @@ void AssetVIcon::stop_audio() playing_audio = 0; } + +AWindowFolderItem::AWindowFolderItem() + : BC_ListBoxItem() +{ + parent = 0; +} + +AWindowFolderItem::AWindowFolderItem(const char *text, int color) + : BC_ListBoxItem(text, color) +{ + parent = 0; +} + +AWindowFolderItem::AWindowFolderItem(const char *text, BC_Pixmap *icon, int color) + : BC_ListBoxItem(text, icon, color) +{ + parent = 0; +} + +AssetPicon *AWindowFolderItem::get_picon() +{ + AWindowFolderItem *item = this; + while( item->parent ) { item = (AWindowFolderItem*)item->parent; } + return (AssetPicon*)item; +} + +int AWindowFolderSubItems::matches(const char *text) +{ + int i = names.size(); + while( --i >= 0 && strcmp(names[i], text) ); + if( i < 0 ) { + ArrayList *sublist = get_sublist(); + i = sublist ? sublist->size() : 0; + while( --i >= 0 ) { + AWindowFolderSubItems *item = (AWindowFolderSubItems *)sublist->get(i); + if( item->matches(text) ) break; + } + } + return i >= 0 ? 1 : 0; +} + + AssetPicon::AssetPicon(MWindow *mwindow, AWindowGUI *gui, Indexable *indexable) - : BC_ListBoxItem() + : AWindowFolderItem() { reset(); this->mwindow = mwindow; @@ -314,7 +356,7 @@ AssetPicon::AssetPicon(MWindow *mwindow, AssetPicon::AssetPicon(MWindow *mwindow, AWindowGUI *gui, EDL *edl) - : BC_ListBoxItem() + : AWindowFolderItem() { reset(); this->mwindow = mwindow; @@ -326,9 +368,9 @@ AssetPicon::AssetPicon(MWindow *mwindow, AssetPicon::AssetPicon(MWindow *mwindow, AWindowGUI *gui, int folder, int persist) - : BC_ListBoxItem(_(AWindowGUI::folder_names[folder]), + : AWindowFolderItem(_(AWindowGUI::folder_names[folder]), folder>=0 && folderfolder_icons[folder]: gui->folder_icon) + gui->folder_icons[folder] : gui->folder_icon) { reset(); foldernum = folder; @@ -339,7 +381,7 @@ AssetPicon::AssetPicon(MWindow *mwindow, AssetPicon::AssetPicon(MWindow *mwindow, AWindowGUI *gui, int folder, const char *title) - : BC_ListBoxItem(title, gui->folder_icon) + : AWindowFolderItem(title, gui->folder_icon) { reset(); foldernum = folder; @@ -350,7 +392,7 @@ AssetPicon::AssetPicon(MWindow *mwindow, AssetPicon::AssetPicon(MWindow *mwindow, AWindowGUI *gui, PluginServer *plugin) - : BC_ListBoxItem() + : AWindowFolderItem() { reset(); this->mwindow = mwindow; @@ -360,7 +402,7 @@ AssetPicon::AssetPicon(MWindow *mwindow, AssetPicon::AssetPicon(MWindow *mwindow, AWindowGUI *gui, Label *label) - : BC_ListBoxItem() + : AWindowFolderItem() { reset(); this->mwindow = mwindow; @@ -436,6 +478,8 @@ void AssetPicon::reset() label = 0; indexable = 0; edl = 0; + parent = 0; + sub_items = 0; foldernum = AW_NO_FOLDER; sort_key = -1; icon = 0; @@ -535,7 +579,7 @@ void AssetPicon::create_objects() icon_vframe = new VFrame(0, -1, pixmap_w, pixmap_h, BC_RGB888, -1); icon_vframe->transfer_from(gui->temp_picon); - if( asset->awindow_folder == AW_MEDIA_FOLDER ) { + if( asset->folder_no == AW_MEDIA_FOLDER ) { // vicon images double framerate = asset->get_frame_rate(); if( !framerate ) framerate = VICON_RATE; @@ -601,7 +645,7 @@ void AssetPicon::create_objects() base_colors[i], line_colors[i]); } mwindow->audio_cache->check_in(asset); - if( asset->awindow_folder == AW_MEDIA_FOLDER ) { + if( asset->folder_no == AW_MEDIA_FOLDER ) { double secs = duration; if( secs > 5 ) secs = 5; double refresh_rate = gui->vicon_thread->refresh_rate; @@ -1076,6 +1120,7 @@ void AWindowGUI::create_objects() add_subwindow(folder_list = new AWindowFolders(mwindow, this, fx, fy, fw, fh)); update_effects(); + folder_list->load_expanders(); //int x = mwindow->theme->abuttons_x; //int y = mwindow->theme->abuttons_y; @@ -1597,6 +1642,10 @@ void AWindowGUI::update_asset_list() for( int i=0; icreate_objects(); + if( picon->indexable ) + picon->foldernum = AW_MEDIA_FOLDER; + else if( picon->edl ) + picon->foldernum = AW_CLIP_FOLDER; assets.append(picon); } @@ -1674,6 +1723,8 @@ void AWindowGUI::sort_assets() void AWindowGUI::sort_folders() { folder_lock->lock("AWindowGUI::update_assets"); +// folder_list->collapse_recursive(&folders, 0); + folder_list->set_autoplacement(&folders, 0, 1); sort_picons(&folders); folder_list->update_format(folder_list->get_format(), 0); folder_lock->unlock(); @@ -1699,8 +1750,12 @@ EDL *AWindowGUI::collect_proxy(Indexable *indexable) proxy_edl->session->audio_tracks = unproxy_asset->channels; proxy_edl->create_default_tracks(); double length = proxy_asset->frame_rate > 0 ? - (double)proxy_asset->video_length / proxy_asset->frame_rate : - 1.0 / mwindow->edl->session->frame_rate; + ( proxy_asset->video_length >= 0 ? + ( proxy_asset->video_length / proxy_asset->frame_rate ) : + ( proxy_edl->session->si_useduration ? + proxy_edl->session->si_duration : + 1.0 / proxy_asset->frame_rate ) ) : + 1.0 / proxy_edl->session->frame_rate; Track *current = proxy_edl->tracks->first; for( int vtrack=0; current; current=NEXT ) { if( current->data_type != TRACK_VIDEO ) continue; @@ -1712,7 +1767,7 @@ EDL *AWindowGUI::collect_proxy(Indexable *indexable) if( current->data_type != TRACK_AUDIO ) continue; current->insert_asset(unproxy_asset, 0, length, 0, atrack++); } - proxy_edl->awindow_folder = AW_PROXY_FOLDER; + proxy_edl->folder_no = AW_PROXY_FOLDER; return proxy_edl; } @@ -1725,7 +1780,7 @@ void AWindowGUI::collect_assets(int proxy) while( (result = (AssetPicon*)asset_list->get_selection(0, i++)) != 0 ) { Indexable *indexable = result->indexable; if( proxy && indexable && indexable->is_asset && - indexable->awindow_folder == AW_PROXY_FOLDER ) { + indexable->folder_no == AW_PROXY_FOLDER ) { EDL *drag_edl = collect_proxy(indexable); if( drag_edl ) mwindow->session->drag_clips->append(drag_edl); continue; @@ -1741,19 +1796,22 @@ void AWindowGUI::collect_assets(int proxy) } } -void AWindowGUI::copy_picons(ArrayList *dst, - ArrayList *src, int folder) +void AWindowGUI::copy_picons(AssetPicon *picon, ArrayList *src) { // Remove current pointers + ArrayList *dst = displayed_assets; dst[0].remove_all(); dst[1].remove_all_objects(); + + AWindowFolderSubItems *sub_items = picon ? picon->sub_items : 0; + int folder = mwindow->edl->session->awindow_folder; BinFolder *bin_folder = folder < AWINDOW_USER_FOLDERS ? 0 : mwindow->edl->get_folder(folder); // Create new pointers for( int i = 0; i < src->total; i++ ) { - int visible = folder < 0 ? 1 : 0; - AssetPicon *picon = (AssetPicon*)src->values[i]; + int visible = folder >= AW_CLIP_FOLDER ? 0 : 1; + picon = (AssetPicon*)src->values[i]; picon->sort_key = -1; if( !visible && bin_folder ) { Indexable *idxbl = bin_folder->is_clips ? (Indexable *)picon->edl : @@ -1765,10 +1823,14 @@ void AWindowGUI::copy_picons(ArrayList *dst, visible = 1; } } - if( !visible && picon->indexable && picon->indexable->awindow_folder == folder ) + if( !visible && picon->indexable && picon->indexable->folder_no == folder ) visible = 1; - if( !visible && picon->edl && picon->edl->local_session->folder == folder ) + if( !visible && picon->edl && picon->edl->folder_no == folder ) visible = 1; + if( visible && sub_items ) { + if( !sub_items->matches(picon->get_text()) ) + visible = 0; + } if( visible ) { const char *text = search_text->get_text(); if( text && text[0] ) @@ -1838,38 +1900,29 @@ void AWindowGUI::filter_displayed_assets() //allow_iconlisting = 1; asset_titles[0] = C_("Title"); asset_titles[1] = _("Comments"); - - switch( mwindow->edl->session->awindow_folder ) { - case AW_AEFFECT_FOLDER: - copy_picons(displayed_assets, &aeffects, AW_NO_FOLDER); - break; - case AW_VEFFECT_FOLDER: - copy_picons(displayed_assets, &veffects, AW_NO_FOLDER); - break; - case AW_ATRANSITION_FOLDER: - copy_picons(displayed_assets, &atransitions, AW_NO_FOLDER); - break; - case AW_VTRANSITION_FOLDER: - copy_picons(displayed_assets, &vtransitions, AW_NO_FOLDER); - break; - case AW_LABEL_FOLDER: - copy_picons(displayed_assets, &labellist, AW_NO_FOLDER); - asset_titles[0] = _("Time Stamps"); - asset_titles[1] = C_("Title"); - //allow_iconlisting = 0; - break; - default: - copy_picons(displayed_assets, &assets, mwindow->edl->session->awindow_folder); - break; - } - - // Ensure the current folder icon is highlighted + AssetPicon *picon = 0; int selected_folder = mwindow->edl->session->awindow_folder; + // Ensure the current folder icon is highlighted for( int i = 0; i < folders.total; i++ ) { AssetPicon *folder_item = (AssetPicon *)folders.values[i]; int selected = folder_item->foldernum == selected_folder ? 1 : 0; folder_item->set_selected(selected); + if( selected ) picon = folder_item; } + + ArrayList *src = &assets; + switch( selected_folder ) { + case AW_AEFFECT_FOLDER: src = &aeffects; break; + case AW_VEFFECT_FOLDER: src = &veffects; break; + case AW_ATRANSITION_FOLDER: src = &atransitions; break; + case AW_VTRANSITION_FOLDER: src = &vtransitions; break; + case AW_LABEL_FOLDER: src = &labellist; + asset_titles[0] = _("Time Stamps"); + asset_titles[1] = C_("Title"); + //allow_iconlisting = 0; + break; + } + copy_picons(picon, src); } @@ -2031,6 +2084,8 @@ AWindowFolders::AWindowFolders(MWindow *mwindow, AWindowGUI *gui, int x, int y, this->mwindow = mwindow; this->gui = gui; set_drag_scroll(0); + last_item0 = 0; + last_item1 = 0; } AWindowFolders::~AWindowFolders() @@ -2039,8 +2094,21 @@ AWindowFolders::~AWindowFolders() int AWindowFolders::selection_changed() { - AssetPicon *picon = (AssetPicon*)get_selection(0, 0); - if( picon ) { + AWindowFolderItem *item0 = (AWindowFolderItem*)get_selection(0, 0); + AWindowFolderItem *item1 = (AWindowFolderItem*)get_selection(0, 1); +// prefer expanded entry + AWindowFolderItem *item = item1 ? item1 : item0; + if( item0 && item1 && last_item0 == item0 && last_item1 == item1 ) { + item1->set_selected(0); + item1 = 0; + item = item0; + } + last_item0 = item0; + last_item1 = item1; + if( item ) { + AssetPicon *picon = item->get_picon(); + picon->sub_items = (AWindowFolderSubItems*)(!item->parent ? 0 : item); + gui->stop_vicon_drawing(); if( get_button_down() && get_buttonpress() == 3 ) { @@ -2081,14 +2149,14 @@ int AWindowFolders::drag_stop() if( get_hidden() ) return 0; if( mwindow->session->current_operation == DRAG_ASSET && gui->folder_list->cursor_above() ) { // check user folder - int item_no = gui->folder_list->get_cursor_item(); + int item_no = gui->folder_list->get_cursor_data_item_no(); AssetPicon *picon = (AssetPicon *)(item_no < 0 ? 0 : gui->folders[item_no]); if( picon && picon->foldernum >= AWINDOW_USER_FOLDERS ) { BinFolder *folder = mwindow->edl->get_folder(picon->foldernum); ArrayList *drags = folder->is_clips ? ((ArrayList *)mwindow->session->drag_clips) : ((ArrayList *)mwindow->session->drag_assets); - if( folder && drags && !folder->add_patterns(drags) ) + if( folder && drags && !folder->add_patterns(drags, shift_down()) ) flicker(1,30); mwindow->session->current_operation = ::NO_OPERATION; result = 1; @@ -2097,6 +2165,72 @@ int AWindowFolders::drag_stop() return result; } +AWindowFolderSubItems::AWindowFolderSubItems(AWindowFolderItem *parent, const char *text) + : AWindowFolderItem(text) +{ + this->parent = parent; +} + +int AWindowFolders::load_expanders() +{ + char expanders_path[BCTEXTLEN]; + mwindow->create_defaults_path(expanders_path, EXPANDERS_FILE); + FILE *fp = fopen(expanders_path, "r"); + if( !fp ) { + snprintf(expanders_path, sizeof(expanders_path), "%s/%s", + File::get_cindat_path(), EXPANDERS_FILE); + fp = fopen(expanders_path, "r"); + } + + if( !fp ) return 1; + const char tab = '\t'; + char line[BCTEXTLEN]; line[0] = 0; + AWindowFolderItem *item = 0, *parent; + AWindowFolderSubItems *sub_items = 0; + int k = 0; + while( fgets(line,sizeof(line),fp) ) { + if( line[0] == '#' ) continue; + int i = strlen(line); + if( i > 0 && line[i-1] == '\n' ) line[--i] = 0; + if( i == 0 ) continue; + i = 0; + for( char *cp=line; *cp==tab; ++cp ) ++i; + if( i == 0 ) { + int i = gui->folders.size(); + while( --i >= 0 ) { + AssetPicon *folder = (AssetPicon *)gui->folders[i]; + if( !strcmp(folder->get_text(),_(line)) ) break; + } + item = (AWindowFolderItem*)(i >= 0 ? gui->folders[i] : 0); + sub_items = 0; + k = 0; + continue; + } + if( i > k+1 ) continue; + if( i == k+1 ) { + if( line[i] != '-' && sub_items ) { + sub_items->names.append(cstrdup(_(&line[i]))); + continue; + } + parent = item; + k = i; + } + else { + while( i < k ) { + item = item->parent; + --k; + } + parent = item->parent; + } + ArrayList *sublist = parent->get_sublist(); + if( !sublist ) sublist = parent->new_sublist(1); + sub_items = new AWindowFolderSubItems(parent, &line[i]); + sublist->append(item = sub_items); + } + fclose(fp); + return 0; +} + AWindowAssets::AWindowAssets(MWindow *mwindow, AWindowGUI *gui, int x, int y, int w, int h) : BC_ListBox(x, y, w, h, !gui->allow_iconlisting ? LISTBOX_TEXT : @@ -2243,7 +2377,6 @@ int AWindowAssets::selection_changed() VIcon *vicon = 0; if( !gui->vicon_thread->vicon ) { vicon = item->vicon; - deactivate_selection(); } gui->vicon_thread->set_view_popup(vicon); } @@ -2341,11 +2474,14 @@ int AWindowAssets::drag_motion_event() lock_window("AWindowAssets::drag_motion_event"); if( mwindow->session->current_operation == DRAG_ASSET && gui->folder_list->cursor_above() ) { // highlight user folder - int item_no = gui->folder_list->get_cursor_item(); + BC_ListBoxItem *item = 0; + int item_no = gui->folder_list->get_cursor_data_item_no(&item); if( item_no >= 0 ) { AssetPicon *folder = (AssetPicon *)gui->folders[item_no]; if( folder->foldernum < AWINDOW_USER_FOLDERS ) item_no = -1; } + if( item_no >= 0 ) + item_no = gui->folder_list->item_to_index(&gui->folders, item); int folder_xposition = gui->folder_list->get_xposition(); int folder_yposition = gui->folder_list->get_yposition(); gui->folder_list->update(&gui->folders, 0, 0, 1, @@ -2695,7 +2831,7 @@ AVIconDrawing::AVIconDrawing(AWindowGUI *agui, int x, int y, VFrame **images) : BC_Toggle(x, y, images, agui->vicon_drawing) { this->agui = agui; - set_tooltip(_("draw vicons")); + set_tooltip(_("Preview")); } void AVIconDrawing::calculate_geometry(AWindowGUI *agui, VFrame **images, int *ww, int *hh)