X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.h;h=62e865970aee8a631f6f5b61f4fa8586d909a9b0;hb=a985e771ecfb00f01c6405c7aa4fb958a780e558;hp=2b4a69a9de3e347399a4afc363c55af7285ea374;hpb=95683646dce10ad3f6a8c8c9c9225c69f4841ec5;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index 2b4a69a9..62e86597 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.h
+++ b/cinelerra-5.1/cinelerra/awindowgui.h
@@ -31,6 +31,7 @@
 #include "awindowgui.inc"
 #include "clippopup.inc"
 #include "edl.inc"
+#include "effectlist.inc"
 #include "folderlistmenu.inc"
 #include "guicast.h"
 #include "labeledit.inc"
@@ -49,7 +50,7 @@ public:
 	AssetPicon(MWindow *mwindow, AWindowGUI *gui, EDL *edl);
 	AssetPicon(MWindow *mwindow, AWindowGUI *gui, PluginServer *plugin);
 	AssetPicon(MWindow *mwindow, AWindowGUI *gui, Label *plugin);
-	AssetPicon(MWindow *mwindow, AWindowGUI *gui, int folder);
+	AssetPicon(MWindow *mwindow, AWindowGUI *gui, int folder, int persist);
 	AssetPicon(MWindow *mwindow, AWindowGUI *gui, const char *folder_name, int folder_num);
 	virtual ~AssetPicon();
 
@@ -166,6 +167,12 @@ public:
 	void stop_vicon_drawing();
 	void update_picon(Indexable *indexable);
 
+	VFrame *get_picon(const char *name, const char *plugin_icons);
+	VFrame *get_picon(const char *name);
+	VFrame *resource_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn, int idx);
+	VFrame *theme_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn);
+	VFrame *plugin_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn, unsigned char *png);
+
 	MWindow *mwindow;
 	AWindow *awindow;
 
@@ -187,30 +194,31 @@ public:
 // Currently displayed data for listboxes
 // Currently displayed assets + comments
 	ArrayList<BC_ListBoxItem*> displayed_assets[2];
-
 	const char *asset_titles[ASSET_COLUMNS];
+	int displayed_folder;
 
 	BC_Hash *defaults;
 // Persistent icons
-	BC_Pixmap *folder_icon;
-	BC_Pixmap *file_icon;
-	BC_Pixmap *audio_icon;
-	BC_Pixmap *video_icon;
-	BC_Pixmap *label_icon;
-	BC_Pixmap *clip_icon;         VFrame *clip_vframe;
-	BC_Pixmap *atransition_icon;  VFrame *atransition_vframe;
-	BC_Pixmap *vtransition_icon;  VFrame *vtransition_vframe;
-	BC_Pixmap *aeffect_icon;      VFrame *aeffect_vframe;
-	BC_Pixmap *ladspa_icon;       VFrame *ladspa_vframe;
-	BC_Pixmap *ff_aud_icon;       VFrame *ff_aud_vframe;
-	BC_Pixmap *ff_vid_icon;       VFrame *ff_vid_vframe;
-	BC_Pixmap *veffect_icon;      VFrame *veffect_vframe;
+	BC_Pixmap *folder_icon;       VFrame *folder_res,  *folder_vframe;
+	BC_Pixmap *file_icon;         VFrame *file_res,    *file_vframe;
+	BC_Pixmap *audio_icon;        VFrame *audio_res,   *audio_vframe;
+	BC_Pixmap *video_icon;        VFrame *video_res,   *video_vframe;
+	BC_Pixmap *label_icon;        VFrame *label_res,   *label_vframe;
+	BC_Pixmap *clip_icon;         VFrame *clip_res,    *clip_vframe;
+	BC_Pixmap *atransition_icon;  VFrame *atrans_res,  *atransition_vframe;
+	BC_Pixmap *vtransition_icon;  VFrame *vtrans_res,  *vtransition_vframe;
+	BC_Pixmap *aeffect_icon;      VFrame *aeffect_res, *aeffect_vframe;
+	BC_Pixmap *veffect_icon;      VFrame *veffect_res, *veffect_vframe;
+	BC_Pixmap *ladspa_icon;       VFrame *ladspa_res,  *ladspa_vframe;
+	BC_Pixmap *ff_aud_icon;       VFrame *ff_aud_res,  *ff_aud_vframe;
+	BC_Pixmap *ff_vid_icon;       VFrame *ff_vid_res,  *ff_vid_vframe;
 	NewFolderThread *newfolder_thread;
 
 // Popup menus
 	AssetPopup *asset_menu;
 	ClipPopup *clip_menu;
 	LabelPopup *label_menu;
+	EffectListMenu *effectlist_menu;
 	AssetListMenu *assetlist_menu;
 	ClipListMenu *cliplist_menu;
 	LabelListMenu *labellist_menu;