X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.h;h=165e201f60a26af2ed5af0657b87a98b4afcb3b4;hb=faf9f1da60357505e88f5be80c0256a64bf2d650;hp=a1d2b5e5ea6355699852327b84139ca715810493;hpb=8b3b351f3703224915cf26d1b01d1d8ee632a178;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index a1d2b5e5..165e201f 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.h
+++ b/cinelerra-5.1/cinelerra/awindowgui.h
@@ -28,9 +28,14 @@
 #include "asset.inc"
 #include "assets.inc"
 #include "awindow.inc"
-#include "awindowmenu.inc"
+#include "awindowgui.inc"
+#include "clippopup.inc"
 #include "edl.inc"
+#include "effectlist.inc"
+#include "folderlistmenu.inc"
 #include "guicast.h"
+#include "labeledit.inc"
+#include "labelpopup.inc"
 #include "labels.h"
 #include "indexable.inc"
 #include "mwindow.inc"
@@ -38,30 +43,6 @@
 #include "pluginserver.inc"
 #include "vicon.h"
 
-class AWindowAssets;
-class AWindowFolders;
-class AWindowNewFolder;
-class AWindowDeleteFolder;
-class AWindowRenameFolder;
-class AWindowDeleteDisk;
-class AWindowDeleteProject;
-class AWindowDivider;
-class AWindowInfo;
-class AWindowRedrawIndex;
-class AWindowPaste;
-class AWindowAppend;
-class AWindowView;
-class AddTools;
-class AddPluginsMenu;
-class AddPluginItem;
-class AVIconDrawing;
-
-class AssetPicon;
-class AssetVIcon;
-class LabelPopup;
-class LabelPopupEdit;
-class AWindowGUI;
-
 class AssetPicon : public BC_ListBoxItem
 {
 public:
@@ -69,7 +50,8 @@ 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, const char *folder);
+	AssetPicon(MWindow *mwindow, AWindowGUI *gui, int folder);
+	AssetPicon(MWindow *mwindow, AWindowGUI *gui, const char *folder_name, int folder_num);
 	virtual ~AssetPicon();
 
 	void create_objects();
@@ -79,6 +61,7 @@ public:
 	AWindowGUI *gui;
 	BC_Pixmap *icon;
 	VFrame *icon_vframe;
+	int foldernum;
 // ID of thing pointed to
 	int id;
 
@@ -158,7 +141,7 @@ public:
 	void update_effects();
 	void sort_assets();
 	void reposition_objects();
-	int current_folder_number();
+	static int folder_number(const char *name);
 // Call back for MWindow entry point
 	int drag_motion();
 	int drag_stop();
@@ -171,10 +154,8 @@ public:
 		int is_transition);
 	void create_label_folder();
 	void copy_picons(ArrayList<BC_ListBoxItem*> *dst,
-		ArrayList<BC_ListBoxItem*> *src,
-		char *folder);
-	void sort_picons(ArrayList<BC_ListBoxItem*> *src,
-		char *folder);
+		ArrayList<BC_ListBoxItem*> *src, int folder);
+	void sort_picons(ArrayList<BC_ListBoxItem*> *src);
 // Return the selected asset in asset_list
 	Indexable* selected_asset();
 	PluginServer* selected_plugin();
@@ -184,6 +165,7 @@ public:
 	int load_defaults(BC_Hash *defaults);
 	void start_vicon_drawing();
 	void stop_vicon_drawing();
+	void update_picon(Indexable *indexable);
 
 	MWindow *mwindow;
 	AWindow *awindow;
@@ -206,8 +188,8 @@ 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
@@ -215,6 +197,7 @@ public:
 	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;
@@ -227,8 +210,12 @@ public:
 
 // Popup menus
 	AssetPopup *asset_menu;
+	ClipPopup *clip_menu;
 	LabelPopup *label_menu;
+	EffectListMenu *effectlist_menu;
 	AssetListMenu *assetlist_menu;
+	ClipListMenu *cliplist_menu;
+	LabelListMenu *labellist_menu;
 	FolderListMenu *folderlist_menu;
 	AddTools *add_tools;
 // Temporary for reading picons from files
@@ -246,6 +233,7 @@ public:
 	int create_custom_xatoms();
 // Function to overload to recieve customly defined atoms
 	virtual int recieve_custom_xatoms(xatom_event *event);
+	static const char *folder_names[];
 
 private:
 	void update_folder_list();
@@ -404,34 +392,6 @@ public:
 	int x, y;
 };
 
-class LabelPopup : public BC_PopupMenu
-{
-public:
-	LabelPopup(MWindow *mwindow, AWindowGUI *gui);
-	~LabelPopup();
-
-	void create_objects();
-// Set mainsession with the current selections
-	int update();
-
-	MWindow *mwindow;
-	AWindowGUI *gui;
-
-	LabelPopupEdit *editlabel;
-};
-
-class LabelPopupEdit : public BC_MenuItem
-{
-public:
-	LabelPopupEdit(MWindow *mwindow, LabelPopup *popup);
-	~LabelPopupEdit();
-
-	int handle_event();
-
-	MWindow *mwindow;
-	LabelPopup *popup;
-};
-
 class AddTools : public BC_PopupMenu
 {
 public:
@@ -440,7 +400,6 @@ public:
 
 	MWindow *mwindow;
 	AWindowGUI *gui;
-	AddPluginsMenu *add_plugins;
 };
 
 class AddPluginItem : public BC_MenuItem
@@ -465,4 +424,28 @@ public:
 	~AVIconDrawing();
 };
 
+
+class AWindowListFormat : public BC_MenuItem
+{
+public:
+	AWindowListFormat(MWindow *mwindow, AWindowGUI *gui);
+
+	void update();
+	int handle_event();
+	MWindow *mwindow;
+	AWindowGUI *gui;
+};
+
+
+class AWindowListSort : public BC_MenuItem
+{
+public:
+	AWindowListSort(MWindow *mwindow, AWindowGUI *gui);
+
+	void update();
+	int handle_event();
+	MWindow *mwindow;
+	AWindowGUI *gui;
+};
+
 #endif