X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=009647b3dbc7daeb084fd2fc56173be89e4f4ab5;hb=HEAD;hp=9be5b66ba743405552d4b4a4a384de0508395173;hpb=2f7295c1067fb2935ddc215831431c2959782ee3;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 9be5b66b..009647b3 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -153,6 +153,10 @@ VFrame *AssetVIcon::frame()
 		if( !temp )
 			temp = new VFrame(0, -1, asset->width, asset->height, BC_RGB888, -1);
 		while( seq_no >= images.size() ) {
+			mwindow->video_cache->check_in(asset);
+			Thread::yield();
+			file = mwindow->video_cache->check_out(asset, mwindow->edl, 0);
+			if( !file ) { usleep(1000);  continue; }
 			file->set_layer(0);
 			int64_t pos = images.size() / picon->gui->vicon_thread->refresh_rate * frame_rate;
 			file->set_video_position(pos,0);
@@ -173,12 +177,12 @@ int64_t AssetVIcon::set_seq_no(int64_t no)
 int AssetVIcon::get_vx()
 {
 	BC_ListBox *lbox = picon->gui->asset_list;
-	return lbox->get_item_x(picon);
+	return lbox->get_icon_x(picon);
 }
 int AssetVIcon::get_vy()
 {
 	BC_ListBox *lbox = picon->gui->asset_list;
-	return lbox->get_item_y(picon);
+	return lbox->get_icon_y(picon);
 }
 
 void AssetVIcon::load_audio()
@@ -296,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<BC_ListBoxItem *> *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;
@@ -310,7 +356,7 @@ AssetPicon::AssetPicon(MWindow *mwindow,
 
 AssetPicon::AssetPicon(MWindow *mwindow,
 	AWindowGUI *gui, EDL *edl)
- : BC_ListBoxItem()
+ : AWindowFolderItem()
 {
 	reset();
 	this->mwindow = mwindow;
@@ -322,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 && folder<AWINDOW_FOLDERS ?
-		gui->folder_icons[folder]: gui->folder_icon)
+		gui->folder_icons[folder] : gui->folder_icon)
 {
 	reset();
 	foldernum = folder;
@@ -335,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;
@@ -346,7 +392,7 @@ AssetPicon::AssetPicon(MWindow *mwindow,
 
 AssetPicon::AssetPicon(MWindow *mwindow,
 	AWindowGUI *gui, PluginServer *plugin)
- : BC_ListBoxItem()
+ : AWindowFolderItem()
 {
 	reset();
 	this->mwindow = mwindow;
@@ -356,7 +402,7 @@ AssetPicon::AssetPicon(MWindow *mwindow,
 
 AssetPicon::AssetPicon(MWindow *mwindow,
 	AWindowGUI *gui, Label *label)
- : BC_ListBoxItem()
+ : AWindowFolderItem()
 {
 	reset();
 	this->mwindow = mwindow;
@@ -371,6 +417,7 @@ AssetPicon::~AssetPicon()
 {
 	if( vicon )
 		gui->vicon_thread->del_vicon(vicon);
+	delete vicon_frame;
 	if( indexable ) indexable->remove_user();
 	if( edl ) edl->remove_user();
 	if( icon && !gui->protected_pixmap(icon) ) {
@@ -431,11 +478,14 @@ void AssetPicon::reset()
 	label = 0;
 	indexable = 0;
 	edl = 0;
+	parent = 0;
+	sub_items = 0;
 	foldernum = AW_NO_FOLDER;
 	sort_key = -1;
 	icon = 0;
 	icon_vframe = 0;
 	vicon = 0;
+	vicon_frame = 0;
 	in_use = 1;
 	comments_time = 0;
 	id = 0;
@@ -529,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;
@@ -595,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;
@@ -1049,8 +1099,7 @@ void AWindowGUI::create_objects()
 	add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1));
 
 	vicon_thread = new VIconThread(asset_list);
-	int x0 = 0, y0 = asset_list->get_title_h();
-	vicon_thread->set_drawing_area(x0,y0, get_w(),get_h());
+	asset_list->update_vicon_area();
 	vicon_thread->start();
 	vicon_audio = new AssetVIconAudio(this);
 
@@ -1071,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;
@@ -1136,6 +1186,7 @@ int AWindowGUI::resize_event(int w, int h)
 // 	view->reposition_window(x, y);
 
 	BC_WindowBase::resize_event(w, h);
+	asset_list->update_vicon_area();
 	return 1;
 }
 
@@ -1197,13 +1248,14 @@ int AWindowGUI::close_event()
 
 void AWindowGUI::start_vicon_drawing()
 {
-	if( !vicon_drawing ) return;
+	if( !vicon_drawing || !vicon_thread->interrupted ) return;
 	if( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER ||
 	    mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) {
 		switch( mwindow->edl->session->assetlist_format ) {
 		case ASSETS_ICONS:
 		case ASSETS_ICONS_PACKED:
 		case ASSETS_ICON_LIST:
+			asset_list->update_vicon_area();
 			vicon_thread->start_drawing();
 			break;
 		default:
@@ -1214,9 +1266,22 @@ void AWindowGUI::start_vicon_drawing()
 
 void AWindowGUI::stop_vicon_drawing()
 {
+	if( vicon_thread->interrupted ) return;
 	vicon_thread->stop_drawing();
 }
 
+VFrame *AssetPicon::get_vicon_frame()
+{
+	if( !vicon ) return 0;
+	if( gui->vicon_thread->interrupted ) return 0;
+	VFrame *frame = vicon->frame();
+	if( !frame ) return 0;
+	if( !vicon_frame )
+		vicon_frame = new VFrame(vicon->vw, vicon->vh, frame->get_color_model());
+	vicon_frame->transfer_from(frame);
+	return vicon_frame;
+}
+
 int AWindowGUI::cycle_assetlist_format()
 {
 	EDLSession *session = mwindow->edl->session;
@@ -1240,11 +1305,6 @@ int AWindowGUI::cycle_assetlist_format()
 	stop_vicon_drawing();
 	session->assetlist_format = format;
 	asset_list->update_format(session->assetlist_format, 0);
-	int x0 = 0;
-	int x1 = asset_list->get_w();
-	int y0 = asset_list->get_title_h();
-	int y1 = asset_list->get_h();
-	vicon_thread->set_drawing_area(x0,y0, x1,y1);
 	async_update_assets();
 	start_vicon_drawing();
 	return 1;
@@ -1582,6 +1642,10 @@ void AWindowGUI::update_asset_list()
 	for( int i=0; i<new_assets.size(); ++i ) {
 		AssetPicon *picon = new_assets[i];
 		picon->create_objects();
+		if( picon->indexable )
+			picon->foldernum = AW_MEDIA_FOLDER;
+		else if( picon->edl )
+			picon->foldernum = AW_CLIP_FOLDER;
 		assets.append(picon);
 	}
 
@@ -1659,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();
@@ -1672,20 +1738,24 @@ EDL *AWindowGUI::collect_proxy(Indexable *indexable)
 	int proxy_scale = mwindow->edl->session->proxy_scale;
 	ProxyRender::from_proxy_path(path, proxy_asset, proxy_scale);
 	Asset *unproxy_asset = mwindow->edl->assets->get_asset(path);
-	if( !unproxy_asset || !unproxy_asset->channels ) return 0;
+	if( !unproxy_asset || !unproxy_asset->layers ) return 0;
 // make a clip from proxy video tracks and unproxy audio tracks
 	EDL *proxy_edl = new EDL(mwindow->edl);
 	proxy_edl->create_objects();
+	proxy_edl->set_path(proxy_asset->path);
 	FileSystem fs;  fs.extract_name(path, proxy_asset->path);
-	proxy_edl->set_path(path);
 	strcpy(proxy_edl->local_session->clip_title, path);
 	strcpy(proxy_edl->local_session->clip_notes, _("Proxy clip"));
 	proxy_edl->session->video_tracks = proxy_asset->layers;
 	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;
@@ -1697,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;
 }
 
@@ -1706,13 +1776,13 @@ void AWindowGUI::collect_assets(int proxy)
 {
 	mwindow->session->drag_assets->remove_all();
 	mwindow->session->drag_clips->remove_all();
-	mwindow->session->clear_drag_proxy();
 	int i = 0;  AssetPicon *result;
 	while( (result = (AssetPicon*)asset_list->get_selection(0, i++)) != 0 ) {
-		Indexable *indexable = result->indexable;  EDL *drag_edl;
-		if( proxy && (drag_edl=collect_proxy(indexable)) ) {
-			mwindow->session->drag_clips->append(drag_edl);
-			mwindow->session->drag_proxy->append(drag_edl);
+		Indexable *indexable = result->indexable;
+		if( proxy && indexable && indexable->is_asset &&
+		    indexable->folder_no == AW_PROXY_FOLDER ) {
+			EDL *drag_edl = collect_proxy(indexable);
+			if( drag_edl ) mwindow->session->drag_clips->append(drag_edl);
 			continue;
 		}
 		if( indexable ) {
@@ -1726,26 +1796,41 @@ void AWindowGUI::collect_assets(int proxy)
 	}
 }
 
-void AWindowGUI::copy_picons(ArrayList<BC_ListBoxItem*> *dst,
-	ArrayList<BC_ListBoxItem*> *src, int folder)
+void AWindowGUI::copy_picons(AssetPicon *picon, ArrayList<BC_ListBoxItem*> *src)
 {
 // Remove current pointers
+	ArrayList<BC_ListBoxItem*> *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 && folder >= AWINDOW_USER_FOLDERS && picon->indexable ) {
-			picon->sort_key = mwindow->edl->folders.matches_indexable(folder, picon->indexable);
-			if( picon->sort_key >= 0 ) visible = 1;
+		if( !visible && bin_folder ) {
+			Indexable *idxbl = bin_folder->is_clips ? (Indexable *)picon->edl :
+			    picon->indexable ? picon->indexable :
+			    picon->edl ? picon->edl->get_proxy_asset() : 0;
+			if( idxbl ) {
+				picon->sort_key = mwindow->edl->folders.matches_indexable(folder, idxbl);
+				if( picon->sort_key < 0 ) continue;
+				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->awindow_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] )
@@ -1815,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<BC_ListBoxItem*> *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);
 }
 
 
@@ -1874,11 +1950,6 @@ void AWindowGUI::update_assets()
 
 	if( mwindow->edl->session->assetlist_format != asset_list->get_format() ) {
 		asset_list->update_format(mwindow->edl->session->assetlist_format, 0);
-		int x0 = 0;
-		int x1 = asset_list->get_w();
-		int y0 = asset_list->get_title_h();
-		int y1 = asset_list->get_h();
-		vicon_thread->set_drawing_area(x0,y0, x1,y1);
 	}
 	int asset_xposition = asset_list->get_xposition();
 	int asset_yposition = asset_list->get_yposition();
@@ -2013,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()
@@ -2021,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 ) {
@@ -2063,20 +2149,88 @@ 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<Indexable *> *drags = mwindow->session->drag_assets;
-			if( folder && drags ) folder->add_patterns(drags);
+			ArrayList<Indexable *> *drags = folder->is_clips ?
+				((ArrayList<Indexable *> *)mwindow->session->drag_clips) :
+				((ArrayList<Indexable *> *)mwindow->session->drag_assets);
+			if( folder && drags && !folder->add_patterns(drags, shift_down()) )
+				flicker(1,30);
 			mwindow->session->current_operation = ::NO_OPERATION;
-			flicker(1,30);
 			result = 1;
 		}
 	}
 	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<BC_ListBoxItem*> *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 :
@@ -2214,20 +2368,19 @@ int AWindowAssets::selection_changed()
 			break;
 		}
 
-		BC_ListBox::deactivate_selection();
-		return 1;
+		deactivate_selection();
 	}
-	else if( gui->vicon_drawing &&
-		 get_button_down() && get_buttonpress() == 1 &&
-		 (item = (AssetPicon*)get_selection(0, 0)) ) {
+	else if( gui->vicon_drawing && get_button_down() && get_buttonpress() == 1 &&
+		 ( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER ||
+		   mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) &&
+		   (item = (AssetPicon*)get_selection(0, 0)) != 0 ) {
 		VIcon *vicon = 0;
-		if( !gui->vicon_thread->viewing ) {
+		if( !gui->vicon_thread->vicon  ) {
 			vicon = item->vicon;
 		}
 		gui->vicon_thread->set_view_popup(vicon);
-
 	}
-	return 0;
+	return 1;
 }
 
 void AWindowAssets::draw_background()
@@ -2268,8 +2421,7 @@ int AWindowAssets::drag_start_event()
 			// do nothing!
 			break;
 		case AW_PROXY_FOLDER:
-			proxy = 1;
-			// fall thru
+			proxy = 1; // fall thru
 		case AW_MEDIA_FOLDER:
 		default:
 			mwindow->session->current_operation = DRAG_ASSET;
@@ -2322,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,
@@ -2382,7 +2537,6 @@ int AWindowAssets::drag_stop_event()
 	BC_ListBox::drag_stop_event();
 // since NO_OPERATION is also defined in listbox, we have to reach for global scope...
 	mwindow->session->current_operation = ::NO_OPERATION;
-	mwindow->session->clear_drag_proxy();
 
 	return 1;
 }
@@ -2396,8 +2550,9 @@ int AWindowAssets::column_resize_event()
 
 int AWindowAssets::focus_in_event()
 {
+	int ret = BC_ListBox::focus_in_event();
 	gui->start_vicon_drawing();
-	return 0;
+	return ret;
 }
 
 int AWindowAssets::focus_out_event()
@@ -2406,6 +2561,43 @@ int AWindowAssets::focus_out_event()
 	return BC_ListBox::focus_out_event();
 }
 
+int AWindowAssets::cursor_enter_event()
+{
+	int ret = BC_ListBox::cursor_enter_event();
+	gui->start_vicon_drawing();
+	return ret;
+}
+
+int AWindowAssets::cursor_leave_event()
+{
+	gui->stop_vicon_drawing();
+	return BC_ListBox::cursor_leave_event();
+}
+
+void AWindowAssets::update_vicon_area()
+{
+	int x0 = 0, x1 = get_w();
+	int y0 = get_title_h();
+	int y1 = get_h();
+	if( is_highlighted() ) {
+		x0 += LISTBOX_BORDER;  x1 -= LISTBOX_BORDER;
+		y0 += LISTBOX_BORDER;  y1 -= LISTBOX_BORDER;
+	}
+	gui->vicon_thread->set_drawing_area(x0,y0, x1,y1);
+}
+
+int AWindowAssets::mouse_over_event(int no)
+{
+	if( gui->vicon_thread->viewing &&
+	    no >= 0 && no < gui->displayed_assets[0].size() ) {
+		AssetPicon *picon = (AssetPicon *)gui->displayed_assets[0][no];
+		VIcon *vicon = picon->vicon;
+		picon->gui->vicon_thread->set_view_popup(vicon);
+	}
+	return 0;
+}
+
+
 AWindowSearchTextBox::AWindowSearchTextBox(AWindowSearchText *search_text, int x, int y, int w)
  : BC_TextBox(x, y, w, 1, "")
 {
@@ -2639,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)