add 'v' shortcut in resource wdw, sams proxy icons, update shortcuts doc

[goodguy/history.git] / cinelerra-5.1 / cinelerra / awindowgui.h

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index 4bc256423dd1c67e73bce4e4a5b2aa7639cc7503..61ad3d77715132bf9300723d6efe579d4580c134 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.h
+++ b/cinelerra-5.1/cinelerra/awindowgui.h
@@ -40,8 +40,10 @@
 #include "labels.h"
 #include "indexable.inc"
 #include "mwindow.inc"
+#include "mutex.inc"
 #include "newfolder.inc"
 #include "pluginserver.inc"
+#include "proxypopup.inc"
 #include "renderengine.inc"
 #include "samples.inc"
 #include "vicon.h"
@@ -200,6 +202,7 @@ public:
        void start_vicon_drawing();
        void stop_vicon_drawing();
        void update_picon(Indexable *indexable);
+       int cycle_assetlist_format();
 
        VFrame *get_picon(const char *name, const char *plugin_icons);
        VFrame *get_picon(const char *name);
@@ -214,6 +217,7 @@ public:
        AWindowFolders *folder_list;
        AWindowDivider *divider;
        AWindowSearchText *search_text;
+       Mutex *folder_lock;
 
 // Store data to speed up responses
 // Persistant data for listboxes
@@ -264,10 +268,12 @@ public:
        AssetPopup *asset_menu;
        ClipPopup *clip_menu;
        LabelPopup *label_menu;
+       ProxyPopup *proxy_menu;
        EffectListMenu *effectlist_menu;
        AssetListMenu *assetlist_menu;
        ClipListMenu *cliplist_menu;
        LabelListMenu *labellist_menu;
+       ProxyListMenu *proxylist_menu;
        FolderListMenu *folderlist_menu;
        AddTools *add_tools;
 // Temporary for reading picons from files