X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainmenu.h;h=674be023bd28787ee4659ea44e71060149f706c7;hb=4a6b59824b2db18e6cc49b43a971923d5e5903ae;hp=2e965f41bcda8dd747026e5ae2ce547fbbe05b76;hpb=93cd60723f8816b0c787b1ce9fe7aa6067e0e749;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mainmenu.h b/cinelerra-5.1/cinelerra/mainmenu.h
index 2e965f41..674be023 100644
--- a/cinelerra-5.1/cinelerra/mainmenu.h
+++ b/cinelerra-5.1/cinelerra/mainmenu.h
@@ -128,7 +128,7 @@ public:
 	ShowLWindow *show_lwindow;
 	SplitX *split_x;
 	SplitY *split_y;
-	MixerViewer *mixer_viewer;
+	MixerItems *mixer_items;
 	LoadLayout *load_layout;
 	LoadLayout *save_layout;
 };
@@ -417,6 +417,22 @@ public:
 	MWindow *mwindow;
 };
 
+class MixerItems : public BC_MenuItem
+{
+public:
+	MixerItems(MWindow *mwindow);
+	void create_objects();
+	MWindow *mwindow;
+};
+
+class MixerViewer : public BC_MenuItem
+{
+public:
+	MixerViewer(MWindow *mwindow);
+	int handle_event();
+	MWindow *mwindow;
+};
+
 class TileMixers : public BC_MenuItem
 {
 public:
@@ -425,6 +441,14 @@ public:
 	MWindow *mwindow;
 };
 
+class AlignMixers : public BC_MenuItem
+{
+public:
+	AlignMixers(MWindow *mwindow);
+	int handle_event();
+	MWindow *mwindow;
+};
+
 // ======================================== audio
 
 class AddAudioTrack : public BC_MenuItem
@@ -706,14 +730,6 @@ public:
 	MWindow *mwindow;
 };
 
-class MixerViewer : public BC_MenuItem
-{
-public:
-	MixerViewer(MWindow *mwindow);
-	int handle_event();
-	MWindow *mwindow;
-};
-
 
 class LoadLayoutItem : public BC_MenuItem
 {
@@ -721,7 +737,9 @@ public:
 	LoadLayoutItem(LoadLayout *load_layout, const char *text, int no, int hotkey);
 	int handle_event();
 
-	int no;
+	int idx;
+	char layout_text[BCSTRLEN];
+	char layout_file[BCSTRLEN];
 	LoadLayout *load_layout;
 };
 
@@ -729,10 +747,53 @@ class LoadLayout : public BC_MenuItem
 {
 public:
 	LoadLayout(MWindow *mwindow, const char *text, int action);
+	~LoadLayout();
 	void create_objects();
+	void update();
+	int activate_submenu();
 
 	MWindow *mwindow; 
+	LoadLayoutDialog *layout_dialog;
 	int action;
 };
 
+class LoadLayoutDialog : public BC_DialogThread
+{
+public:
+	LoadLayoutDialog(LoadLayout *load_layout);
+	~LoadLayoutDialog();
+
+	void start_confirm_dialog(int wx, int wy, int idx);
+	void handle_done_event(int result);
+	void handle_close_event(int result);
+	BC_Window* new_gui();
+
+	LoadLayout *load_layout;
+	LoadLayoutConfirm *lgui;
+	int wx, wy, idx;
+};
+
+class LoadLayoutNameText : public BC_TextBox
+{
+public:
+	LoadLayoutNameText(LoadLayoutConfirm *confirm,
+		int x, int y, int w, const char *text);
+	~LoadLayoutNameText();
+
+	int handle_event();
+
+	LoadLayoutConfirm *confirm;
+};
+
+class LoadLayoutConfirm : public BC_Window
+{
+public:
+	LoadLayoutConfirm(LoadLayoutDialog *load_dialog, int x, int y);
+	~LoadLayoutConfirm();
+	void create_objects();
+
+	LoadLayoutDialog *layout_dialog;
+	LoadLayoutNameText *name_text;
+};
+
 #endif