X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=9769b99847f940811adaeacc8c5a47c32fd8901e;hp=5bca38f3687eb34c281042fc881da2a708d65fce;hb=7b25542808937e46959c104a706b75f04b1215be;hpb=3ac72077bee819333ea9e8c3c3307b529ecf3647 diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index 5bca38f3..9769b998 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -25,10 +25,12 @@ #include "assets.h" #include "awindowgui.h" #include "awindow.h" +#include "bccmodels.h" #include "bcsignals.h" #include "bchash.h" #include "cache.h" -#include "bccmodels.h" +#include "cstrdup.h" +#include "clip.h" #include "clippopup.h" #include "cursors.h" #include "cwindowgui.h" @@ -52,6 +54,7 @@ #include "nestededls.h" #include "newfolder.h" #include "preferences.h" +#include "samples.h" #include "theme.h" #include "vframe.h" #include "vicon.h" @@ -104,14 +107,14 @@ VFrame *AssetVIcon::frame() delete temp; temp = 0; } if( !temp ) - temp = new VFrame(asset->width, asset->height, BC_RGB888); + temp = new VFrame(0, -1, asset->width, asset->height, BC_RGB888, -1); int ww = picon->gui->vicon_thread->view_w; int hh = picon->gui->vicon_thread->view_h; while( seq_no >= images.size() ) { file->set_layer(0); int64_t pos = images.size() / picon->gui->vicon_thread->refresh_rate * frame_rate; file->set_video_position(pos,0); - file->read_frame(temp); + if( file->read_frame(temp) ) temp->clear_frame(); add_image(temp, ww, hh, BC_RGB8); } mwindow->video_cache->check_in(asset); @@ -209,6 +212,32 @@ AssetPicon::~AssetPicon() } } +void AssetPicon::draw_wave(VFrame *frame, double *dp, int len, int base_color, int line_color) +{ + int w = frame->get_w(), h = frame->get_h(); + int h1 = h-1, h2 = h/2, y = h2; + int rgb_color = frame->pixel_rgb; + for( int x=0,x1=0,x2=0; x max ) max = value; + } + int ctr = (min + max) / 2; + int y0 = (int)(h2 - ctr*h2); CLAMP(y0, 0,h1); + int y1 = (int)(h2 - min*h2); CLAMP(y1, 0,h1); + int y2 = (int)(h2 - max*h2); CLAMP(y2, 0,h1); + frame->pixel_rgb = line_color; + frame->draw_line(x,y1, x,y2); + frame->pixel_rgb = base_color; + frame->draw_line(x,y, x,y0); + y = y0; + } + frame->pixel_rgb = rgb_color; +} + void AssetPicon::reset() { plugin = 0; @@ -220,6 +249,7 @@ void AssetPicon::reset() icon_vframe = 0; vicon = 0; in_use = 1; + mtime = 0; id = 0; persistent = 0; } @@ -296,35 +326,97 @@ void AssetPicon::create_objects() else { gui->lock_window("AssetPicon::create_objects 2"); icon = gui->video_icon; - icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_FILM]; + icon_vframe = gui->video_vframe; } } else { icon = gui->video_icon; - icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_FILM]; + icon_vframe = gui->video_vframe; } } else if( asset->audio_data ) { - icon = gui->audio_icon; - icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_SOUND]; - } + if( mwindow->preferences->use_thumbnails ) { + gui->unlock_window(); + File *file = mwindow->audio_cache->check_out(asset, + mwindow->edl, + 1); + if( file ) { + pixmap_w = pixmap_h * 16/9; + icon_vframe = new VFrame(0, + -1, pixmap_w, pixmap_h, BC_RGB888, -1); + { char string[BCTEXTLEN]; + sprintf(string, _("Reading %s"), name); + mwindow->gui->lock_window("AssetPicon::create_objects 3"); + mwindow->gui->show_message(string); + mwindow->gui->unlock_window(); } + int sample_rate = asset->get_sample_rate(); + int channels = asset->get_audio_channels(); + if( channels > 2 ) channels = 2; + int64_t length = asset->get_audio_samples(); + double duration = (double)length / sample_rate; + float t = duration > 1 ? (logf(duration) / logf(3600.f)) : 0; + if( t > 1 ) t = 1; + float h = 300 * t, s = 1., v = 1.; + float r, g, b; // duration, 0..1hr == hue red..magenta + HSV::hsv_to_rgb(r,g,b, h,s,v); + int ih = icon_vframe->get_h()/8, iw = icon_vframe->get_w(); + int ir = r * 256; CLAMP(ir, 0,255); + int ig = g * 256; CLAMP(ig, 0,255); + int ib = b * 256; CLAMP(ib, 0,255); + unsigned char **rows = icon_vframe->get_rows(); + for( int y=0; y=0; ) { + file->set_channel(i); + file->set_audio_position(0); + file->read_samples(&samples, length); + draw_wave(icon_vframe, samples.get_data(), length, + base_colors[i], line_colors[i]); + } + mwindow->audio_cache->check_in(asset); + gui->lock_window("AssetPicon::create_objects 4"); + icon = new BC_Pixmap(gui, pixmap_w, pixmap_h); + icon->draw_vframe(icon_vframe, + 0, 0, pixmap_w, pixmap_h, 0, 0); + } + else { + gui->lock_window("AssetPicon::create_objects 5"); + icon = gui->audio_icon; + icon_vframe = gui->audio_vframe; + } + } + else { + icon = gui->audio_icon; + icon_vframe = gui->audio_vframe; + } + } + struct stat st; + mtime = !stat(asset->path, &st) ? st.st_mtime : 0; } else if( indexable && !indexable->is_asset ) { icon = gui->video_icon; - icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_FILM]; + icon_vframe = gui->video_vframe; } else if( edl ) { set_text(strcpy(name, edl->local_session->clip_title)); icon = gui->clip_icon; - icon_vframe = mwindow->theme->get_image("clip_icon"); + icon_vframe = gui->clip_vframe; } else if( plugin ) { - strcpy(name, plugin->title); + strcpy(name, _(plugin->title)); set_text(name); icon_vframe = plugin->get_picon(); if( icon_vframe ) @@ -372,9 +464,7 @@ void AssetPicon::create_objects() mwindow->edl->session->frames_per_foot); set_text(name); icon = gui->label_icon; - icon_vframe = BC_WindowBase::get_resources()->type_to_icon[ICON_LABEL]; - set_icon(icon); - set_icon_vframe(icon_vframe); + icon_vframe = gui->label_vframe; } if( !icon ) { icon = gui->file_icon; @@ -392,19 +482,40 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow) { this->mwindow = mwindow; this->awindow = awindow; - file_icon = 0; - audio_icon = 0; - video_icon = 0; - folder_icon = 0; - clip_icon = 0; - label_icon = 0; - atransition_icon = 0; atransition_vframe = 0; - vtransition_icon = 0; vtransition_vframe = 0; - aeffect_icon = 0; aeffect_vframe = 0; - ladspa_icon = 0; ladspa_vframe = 0; - veffect_icon = 0; veffect_vframe = 0; - ff_aud_icon = 0; ff_aud_vframe = 0; - ff_vid_icon = 0; ff_vid_vframe = 0; + + file_vframe = 0; file_icon = 0; + folder_vframe = 0; folder_icon = 0; + audio_vframe = 0; audio_icon = 0; + video_vframe = 0; video_icon = 0; + label_vframe = 0; label_icon = 0; + + atransition_vframe = 0; atransition_icon = 0; + vtransition_vframe = 0; vtransition_icon = 0; + aeffect_vframe = 0; aeffect_icon = 0; + ladspa_vframe = 0; ladspa_icon = 0; + veffect_vframe = 0; veffect_icon = 0; + ff_aud_vframe = 0; ff_aud_icon = 0; + ff_vid_vframe = 0; ff_vid_icon = 0; + + aeffect_folder_vframe = 0; aeffect_folder_icon = 0; + atransition_folder_vframe = 0; atransition_folder_icon = 0; + clip_folder_vframe = 0; clip_folder_icon = 0; + label_folder_vframe = 0; label_folder_icon = 0; + media_folder_vframe = 0; media_folder_icon = 0; + proxy_folder_vframe = 0; proxy_folder_icon = 0; + veffect_folder_vframe = 0; veffect_folder_icon = 0; + vtransition_folder_vframe = 0; vtransition_folder_icon = 0; + + ladspa_vframe = 0; ladspa_icon = 0; + ff_aud_vframe = 0; ff_aud_icon = 0; + ff_vid_vframe = 0; ff_vid_icon = 0; + + clip_vframe = 0; clip_icon = 0; + atransition_vframe = 0; atransition_icon = 0; + vtransition_vframe = 0; vtransition_icon = 0; + aeffect_vframe = 0; aeffect_icon = 0; + veffect_vframe = 0; veffect_icon = 0; + plugin_visibility = ((uint64_t)1<<(8*sizeof(uint64_t)-1))-1; newfolder_thread = 0; asset_menu = 0; @@ -414,6 +525,7 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow) labellist_menu = 0; folderlist_menu = 0; temp_picon = 0; + search_text = 0; allow_iconlisting = 1; remove_plugin = 0; vicon_thread = 0; @@ -433,20 +545,8 @@ AWindowGUI::~AWindowGUI() displayed_assets[1].remove_all_objects(); delete vicon_thread; - delete file_icon; - delete audio_icon; - delete video_icon; - delete folder_icon; - delete clip_icon; - delete label_icon; - delete atransition_icon; - delete vtransition_icon; - delete aeffect_icon; - delete veffect_icon; - delete ladspa_icon; - delete ff_aud_icon; - delete ff_vid_icon; delete newfolder_thread; + delete asset_menu; delete clip_menu; delete label_menu; @@ -455,8 +555,31 @@ AWindowGUI::~AWindowGUI() delete cliplist_menu; delete labellist_menu; delete folderlist_menu; + delete search_text; delete temp_picon; delete remove_plugin; + + delete file_vframe; delete file_icon; + delete folder_vframe; delete folder_icon; + delete audio_vframe; delete audio_icon; + delete video_vframe; delete video_icon; + delete label_vframe; delete label_icon; + delete clip_vframe; delete clip_icon; + delete aeffect_folder_vframe; delete aeffect_folder_icon; + delete atransition_folder_vframe; delete atransition_folder_icon; + delete veffect_folder_vframe; delete veffect_folder_icon; + delete vtransition_folder_vframe; delete vtransition_folder_icon; + delete clip_folder_vframe; delete clip_folder_icon; + delete label_folder_vframe; delete label_folder_icon; + delete media_folder_vframe; delete media_folder_icon; + delete proxy_folder_vframe; delete proxy_folder_icon; + delete ladspa_vframe; delete ladspa_icon; + delete ff_aud_vframe; delete ff_aud_icon; + delete ff_vid_vframe; delete ff_vid_icon; + delete atransition_vframe; delete atransition_icon; + delete vtransition_vframe; delete vtransition_icon; + delete aeffect_vframe; delete aeffect_icon; + delete veffect_vframe; delete veffect_icon; } bool AWindowGUI::protected_pixmap(BC_Pixmap *icon) @@ -488,15 +611,21 @@ VFrame *AWindowGUI::get_picon(const char *name, const char *plugin_icons) { char png_path[BCTEXTLEN]; char *pp = png_path, *ep = pp + sizeof(png_path)-1; - snprintf(pp, ep-pp, "%s/picon_%s/%s.png", + snprintf(pp, ep-pp, "%s/picon/%s/%s.png", File::get_plugin_path(), plugin_icons, name); + if( access(png_path, R_OK) ) return 0; return VFramePng::vframe_png(png_path,0,0); } VFrame *AWindowGUI::get_picon(const char *name) { VFrame *vframe = get_picon(name, mwindow->preferences->plugin_icons); - if( !vframe ) vframe = get_picon(name, DEFAULT_PICON); + if( !vframe ) { + char png_name[BCSTRLEN], *pp = png_name, *ep = pp + sizeof(png_name)-1; + snprintf(pp, ep-pp, "%s.png", name); + unsigned char *data = mwindow->theme->get_image_data(png_name); + if( data ) vframe = new VFramePng(data, 0.); + } return vframe; } @@ -522,7 +651,7 @@ void AWindowGUI::plugin_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn, un void AWindowGUI::create_objects() { lock_window("AWindowGUI::create_objects"); - asset_titles[0] = _("Title"); + asset_titles[0] = C_("Title"); asset_titles[1] = _("Comments"); set_icon(mwindow->theme->get_image("awindow_icon")); @@ -576,22 +705,20 @@ void AWindowGUI::create_objects() mwindow->theme->get_awindow_sizes(this); load_defaults(mwindow->defaults); - add_subwindow(asset_list = new AWindowAssets(mwindow, - this, - mwindow->theme->alist_x, - mwindow->theme->alist_y, - mwindow->theme->alist_w, - mwindow->theme->alist_h)); + int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y; + int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h; + search_text = new AWindowSearchText(mwindow, this, x1, y1+5); + search_text->create_objects(); + int dy = search_text->get_h() + 10; + y1 += dy; h1 -= dy; + add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1)); vicon_thread = new VIconThread(asset_list); vicon_thread->start(); - add_subwindow(divider = new AWindowDivider(mwindow, - this, - mwindow->theme->adivider_x, - mwindow->theme->adivider_y, - mwindow->theme->adivider_w, - mwindow->theme->adivider_h)); + add_subwindow(divider = new AWindowDivider(mwindow, this, + mwindow->theme->adivider_x, mwindow->theme->adivider_y, + mwindow->theme->adivider_w, mwindow->theme->adivider_h)); divider->set_cursor(HSEPARATE_CURSOR, 0, 0); @@ -682,9 +809,12 @@ int AWindowGUI::translation_event() void AWindowGUI::reposition_objects() { - asset_list->reposition_window( - mwindow->theme->alist_x, mwindow->theme->alist_y, - mwindow->theme->alist_w, mwindow->theme->alist_h); + int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y; + int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h; + search_text->reposition_window(x1, y1+5, w1); + int dy = search_text->get_h() + 10; + y1 += dy; h1 -= dy; + asset_list->reposition_window(x1, y1, w1, h1); divider->reposition_window( mwindow->theme->adivider_x, mwindow->theme->adivider_y, mwindow->theme->adivider_w, mwindow->theme->adivider_h); @@ -771,8 +901,8 @@ void AWindowRemovePluginGUI::create_objects() add_subwindow(title); y += title->get_h() + 5; list = new BC_ListBox(x, y, - get_w() - 20, ok_button->get_y() - y - 5, LISTBOX_TEXT, &plugin_list, - 0, 0, 1, 0, 0, LISTBOX_SINGLE, ICON_LEFT, 0); + get_w() - 20, ok_button->get_y() - y - 5, LISTBOX_TEXT, &plugin_list, + 0, 0, 1, 0, 0, LISTBOX_SINGLE, ICON_LEFT, 0); add_subwindow(list); show_window(); } @@ -796,6 +926,7 @@ void AWindowRemovePlugin::handle_close_event(int result) { if( !result ) { printf(_("remove %s\n"), plugin->path); + awindow->gui->lock_window("AWindowRemovePlugin::handle_close_event"); ArrayList *folder = plugin->audio ? plugin->transition ? &awindow->gui->atransitions : @@ -805,26 +936,28 @@ void AWindowRemovePlugin::handle_close_event(int result) &awindow->gui->veffects : 0; if( folder ) remove_plugin(plugin, *folder); + MWindow *mwindow = awindow->mwindow; + awindow->gui->unlock_window(); char plugin_path[BCTEXTLEN]; strcpy(plugin_path, plugin->path); - MWindow *mwindow = awindow->mwindow; mwindow->plugindb->remove(plugin); remove(plugin_path); char index_path[BCTEXTLEN]; - snprintf(index_path, sizeof(index_path), "%s/%s", - mwindow->preferences->plugin_dir, PLUGIN_FILE); + mwindow->create_defaults_path(index_path, PLUGIN_FILE); remove(index_path); + char picon_path[BCTEXTLEN]; FileSystem fs; - fs.update(File::get_plugin_path()); + snprintf(picon_path, sizeof(picon_path), "%s/picon", + File::get_plugin_path()); + char png_name[BCSTRLEN], png_path[BCTEXTLEN]; + plugin->get_plugin_png_name(png_name); + fs.update(picon_path); for( int i=0; ipath; if( !fs.is_dir(fs_path) ) continue; - char *cp = strrchr(fs_path,'/'); - cp = !cp ? fs_path : cp+1; - if( strncmp("picon_", cp, 6) ) continue; - char png_path[BCTEXTLEN]; - if( !plugin->get_plugin_png_path(png_path, cp+6) ) - remove(png_path); + snprintf(png_path, sizeof(picon_path), "%s/%s", + fs_path, png_name); + remove(png_path); } delete plugin; plugin = 0; awindow->gui->async_update_assets(); @@ -902,7 +1035,6 @@ void AWindowGUI::async_update_assets() void AWindowGUI::update_folder_list() { - stop_vicon_drawing(); for( int i = 0; i < folders.total; i++ ) { AssetPicon *picon = (AssetPicon*)folders.values[i]; picon->in_use = 0; @@ -940,8 +1072,6 @@ void AWindowGUI::update_folder_list() folders.remove_number(i); } } - - start_vicon_drawing(); } void AWindowGUI::create_persistent_folder(ArrayList *output, @@ -1068,7 +1198,11 @@ void AWindowGUI::update_asset_list() if( !picon->in_use ) { delete picon; assets.remove_number(i); + continue; } + if( !picon->indexable || !picon->indexable->is_asset ) continue; + struct stat st; + picon->mtime = !stat(picon->indexable->path, &st) ? st.st_mtime : 0; } } @@ -1095,7 +1229,7 @@ void AWindowGUI::update_picon(Indexable *indexable) } } -void AWindowGUI::sort_assets() +void AWindowGUI::sort_assets(int use_mtime) { switch( mwindow->edl->session->awindow_folder ) { case AW_AEFFECT_FOLDER: @@ -1114,15 +1248,17 @@ void AWindowGUI::sort_assets() sort_picons(&labellist); break; default: - sort_picons(&assets); + sort_picons(&assets, use_mtime); } - +// reset xyposition + asset_list->update_format(asset_list->get_format(), 0); update_assets(); } void AWindowGUI::sort_folders() { sort_picons(&folders); + folder_list->update_format(folder_list->get_format(), 0); update_assets(); } @@ -1154,6 +1290,10 @@ void AWindowGUI::copy_picons(ArrayList *dst, if( folder < 0 || (picon->indexable && picon->indexable->awindow_folder == folder) || (picon->edl && picon->edl->local_session->awindow_folder == folder) ) { + const char *text = search_text->get_text(); + int hidden = text && text[0] && !bstrcasestr(picon->get_text(), text); + if( picon->vicon ) picon->vicon->hidden = hidden; + if( hidden ) continue; BC_ListBoxItem *item2, *item1; dst[0].append(item1 = picon); if( picon->edl ) @@ -1161,41 +1301,52 @@ void AWindowGUI::copy_picons(ArrayList *dst, else if( picon->label && picon->label->textstr ) dst[1].append(item2 = new BC_ListBoxItem(picon->label->textstr)); + else if( picon->mtime ) { + char date_time[BCSTRLEN]; + struct tm stm; localtime_r(&picon->mtime, &stm); + sprintf(date_time,"%04d.%02d.%02d %02d:%02d:%02d", + stm.tm_year+1900, stm.tm_mon+1, stm.tm_mday, + stm.tm_hour, stm.tm_min, stm.tm_sec); + dst[1].append(item2 = new BC_ListBoxItem(date_time)); + } else dst[1].append(item2 = new BC_ListBoxItem("")); - item1->set_autoplace_text(1); - item2->set_autoplace_text(1); + item1->set_autoplace_text(1); item1->set_autoplace_icon(1); + item2->set_autoplace_text(1); item2->set_autoplace_icon(1); } } } -void AWindowGUI::sort_picons(ArrayList *src) +void AWindowGUI::sort_picons(ArrayList *src, int use_mtime) { - int done = 0; - while(!done) - { + int done = 0, changed = 0; + while( !done ) { done = 1; - for( int i = 0; i < src->total - 1; i++ ) { - BC_ListBoxItem *item1 = src->values[i]; - BC_ListBoxItem *item2 = src->values[i + 1]; - item1->set_autoplace_icon(1); - item2->set_autoplace_icon(1); - item1->set_autoplace_text(1); - item2->set_autoplace_text(1); - if( strcmp(item1->get_text(), item2->get_text()) > 0 ) { + for( int i=0; itotal-1; ++i ) { + AssetPicon *item1 = (AssetPicon *)src->values[i]; + AssetPicon *item2 = (AssetPicon *)src->values[i + 1]; + if( use_mtime ? item1->mtime > item2->mtime : + strcmp(item1->get_text(), item2->get_text()) > 0 ) { src->values[i + 1] = item1; src->values[i] = item2; - done = 0; + done = 0; changed = 1; } } } + if( changed ) { + for( int i=0; itotal; ++i ) { + AssetPicon *item = (AssetPicon *)src->values[i]; + item->set_autoplace_icon(1); + item->set_autoplace_text(1); + } + } } void AWindowGUI::filter_displayed_assets() { //allow_iconlisting = 1; - asset_titles[0] = _("Title"); + asset_titles[0] = C_("Title"); asset_titles[1] = _("Comments"); switch( mwindow->edl->session->awindow_folder ) { @@ -1214,7 +1365,7 @@ void AWindowGUI::filter_displayed_assets() case AW_LABEL_FOLDER: copy_picons(displayed_assets, &labellist, AW_NO_FOLDER); asset_titles[0] = _("Time Stamps"); - asset_titles[1] = _("Title"); + asset_titles[1] = C_("Title"); //allow_iconlisting = 0; break; default: @@ -1234,10 +1385,14 @@ void AWindowGUI::filter_displayed_assets() void AWindowGUI::update_assets() { + stop_vicon_drawing(); update_folder_list(); update_asset_list(); labellist.remove_all_objects(); create_label_folder(); + + if( displayed_folder != mwindow->edl->session->awindow_folder ) + search_text->clear(); filter_displayed_assets(); if( mwindow->edl->session->folderlist_format != folder_list->get_format() ) { @@ -1262,6 +1417,7 @@ void AWindowGUI::update_assets() asset_list->center_selection(); flush(); + start_vicon_drawing(); return; } @@ -1453,7 +1609,7 @@ AWindowAssets::AWindowAssets(MWindow *mwindow, AWindowGUI *gui, int x, int y, in 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 + -1) // Allow drags, require shift for scrolling { this->mwindow = mwindow; this->gui = gui; @@ -1492,7 +1648,7 @@ int AWindowAssets::button_press_event() break; case AW_MEDIA_FOLDER: case AW_PROXY_FOLDER: - gui->assetlist_menu->update_titles(); + gui->assetlist_menu->update_titles(folder==AW_MEDIA_FOLDER); gui->assetlist_menu->activate_menu(); break; } @@ -1699,11 +1855,13 @@ int AWindowAssets::drag_stop_event() lock_window("AWindowAssets::drag_stop_event"); - if( result ) get_drag_popup()->set_animation(0); + if( result ) + get_drag_popup()->set_animation(0); BC_ListBox::drag_stop_event(); - mwindow->session->current_operation = ::NO_OPERATION; // since NO_OPERATION is also defined in listbox, we have to reach for global scope... - return 0; +// since NO_OPERATION is also defined in listbox, we have to reach for global scope... + mwindow->session->current_operation = ::NO_OPERATION; + return 1; } int AWindowAssets::column_resize_event() @@ -1725,16 +1883,68 @@ int AWindowAssets::focus_out_event() return BC_ListBox::focus_out_event(); } +AWindowSearchTextBox::AWindowSearchTextBox(AWindowSearchText *search_text, int x, int y, int w) + : BC_TextBox(x, y, w, 1, "") +{ + this->search_text = search_text; +} +int AWindowSearchTextBox::handle_event() +{ + return search_text->handle_event(); +} +AWindowSearchText::AWindowSearchText(MWindow *mwindow, AWindowGUI *gui, int x, int y) +{ + this->mwindow = mwindow; + this->gui = gui; + this->x = x; + this->y = y; +} +void AWindowSearchText::create_objects() +{ + int x1 = x, y1 = y, margin = 10; + gui->add_subwindow(text_title = new BC_Title(x1, y1, _("Search:"))); + x1 += text_title->get_w() + margin; + int w1 = gui->get_w() - x1 - 2*margin; + gui->add_subwindow(text_box = new AWindowSearchTextBox(this, x1, y1, w1)); +} +int AWindowSearchText::handle_event() +{ + gui->async_update_assets(); + return 1; +} +int AWindowSearchText::get_w() +{ + return text_box->get_w() + text_title->get_w() + 10; +} +int AWindowSearchText::get_h() +{ + return bmax(text_box->get_h(),text_title->get_h()); +} +void AWindowSearchText::reposition_window(int x, int y, int w) +{ + int x1 = x, y1 = y, margin = 10; + text_title->reposition_window(x1, y1); + x1 += text_title->get_w() + margin; + int w1 = gui->get_w() - x1 - 2*margin; + text_box->reposition_window(x1, y1, w1); +} +const char *AWindowSearchText::get_text() +{ + return text_box->get_text(); +} - +void AWindowSearchText::clear() +{ + text_box->update(""); +} AWindowNewFolder::AWindowNewFolder(MWindow *mwindow, AWindowGUI *gui, int x, int y) : BC_Button(x, y, mwindow->theme->newbin_data) @@ -1806,21 +2016,21 @@ int AWindowDeleteProject::handle_event() return 1; } -AWindowInfo::AWindowInfo(MWindow *mwindow, AWindowGUI *gui, int x, int y) - : BC_Button(x, y, mwindow->theme->infoasset_data) -{ - this->mwindow = mwindow; - this->gui = gui; - set_tooltip(_("Edit information on asset")); -} - -int AWindowInfo::handle_event() -{ - 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; -} +// AWindowInfo::AWindowInfo(MWindow *mwindow, AWindowGUI *gui, int x, int y) +// : BC_Button(x, y, mwindow->theme->infoasset_data) +// { +// this->mwindow = mwindow; +// this->gui = gui; +// set_tooltip(_("Edit information on asset")); +// } +// +// int AWindowInfo::handle_event() +// { +// int cur_x, cur_y; +// gui->get_abs_cursor(cur_x, cur_y, 0); +// gui->awindow->asset_edit->edit_asset(gui->selected_asset(), cur_x, cur_y); +// return 1; +// } AWindowRedrawIndex::AWindowRedrawIndex(MWindow *mwindow, AWindowGUI *gui, int x, int y) : BC_Button(x, y, mwindow->theme->redrawindex_data) @@ -1926,13 +2136,13 @@ AddPluginItem::AddPluginItem(AddTools *menu, char const *text, int idx) this->idx = idx; uint64_t msk = (uint64_t)1 << idx, vis = menu->gui->plugin_visibility; int chk = (msk & vis) ? 1 : 0; - set_checked(chk); + set_checked(chk); } int AddPluginItem::handle_event() { - int chk = get_checked() ^ 1; - set_checked(chk); + int chk = get_checked() ^ 1; + set_checked(chk); uint64_t msk = (uint64_t)1 << idx, vis = menu->gui->plugin_visibility; menu->gui->plugin_visibility = chk ? vis | msk : vis & ~msk; menu->gui->update_effects(); @@ -2004,8 +2214,8 @@ int AWindowListFormat::handle_event() void AWindowListFormat::update() { - set_text(mwindow->edl->session->assetlist_format == ASSETS_TEXT ? - (char*)_("Display icons") : (char*)_("Display text")); + set_text(mwindow->edl->session->assetlist_format == ASSETS_TEXT ? + (char*)_("Display icons") : (char*)_("Display text")); } AWindowListSort::AWindowListSort(MWindow *mwindow, AWindowGUI *gui) @@ -2017,8 +2227,7 @@ AWindowListSort::AWindowListSort(MWindow *mwindow, AWindowGUI *gui) int AWindowListSort::handle_event() { - gui->sort_assets(); + gui->sort_assets(0); return 1; } -