X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.C;h=070353020f8195996b02b77b0a371d316ca94b38;hb=3fc547b01e919d3044bacf2a78baddeaed04e3a0;hp=c1cd79f6119ff4e027a804bc7d828b2ae72d9d80;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index c1cd79f6..07035302 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -1388,7 +1388,7 @@ void MWindow::create_mixers()
 	save_backup();
 	undo->update_undo_after(_("create mixers"), LOAD_ALL);
 	restart_brender();
-	gui->update(1, 2, 1, 1, 1, 1, 0);
+	gui->update(1, FORCE_REDRAW, 1, 1, 1, 1, 0);
 	sync_parameters(CHANGE_ALL);
 }
 
@@ -2007,6 +2007,7 @@ if(debug) printf("MWindow::load_filenames %d\n", __LINE__);
 				break;
 			}
 			if( strcmp(cin_version, CINELERRA_VERSION) &&
+			    strcmp(cin_version, "Unify") &&
 			    strcmp(cin_version, "5.1") ) {
 				char string[BCTEXTLEN];
 				snprintf(string, sizeof(string),
@@ -2856,6 +2857,74 @@ void MWindow::show_lwindow()
 	gui->mainmenu->show_lwindow->set_checked(1);
 }
 
+void MWindow::restore_windows()
+{
+	if( !session->show_vwindow ) {
+		for( int i=0, n=vwindows.size(); i<n; ++i ) {
+			VWindow *vwindow = vwindows[i];
+			if( !vwindow || !vwindow->is_running() ) continue;
+			vwindow->gui->lock_window("MWindow::restore_windows");
+			vwindow->gui->close(1);
+			vwindow->gui->unlock_window();
+		}
+	}
+	else
+		show_vwindow();
+
+	if( !session->show_awindow && !awindow->gui->is_hidden() ) {
+		awindow->gui->lock_window("MWindow::restore_windows");
+		awindow->gui->close_event();
+		awindow->gui->unlock_window();
+	}
+	else if( session->show_awindow && awindow->gui->is_hidden() )
+		show_awindow();
+
+	if( !session->show_cwindow && !cwindow->gui->is_hidden() ) {
+		cwindow->gui->lock_window("MWindow::restore_windows");
+		cwindow->hide_window();
+		cwindow->gui->unlock_window();
+	}
+	else if( session->show_cwindow && cwindow->gui->is_hidden() )
+		cwindow->show_window();
+
+	if( !session->show_gwindow && !gwindow->gui->is_hidden() ) {
+		gwindow->gui->lock_window("MWindow::restore_windows");
+		gwindow->gui->close_event();
+		gwindow->gui->unlock_window();
+	}
+	else if( session->show_gwindow && gwindow->gui->is_hidden() )
+		show_gwindow();
+
+	if( !session->show_lwindow && !lwindow->gui->is_hidden() ) {
+		lwindow->gui->lock_window("MWindow::restore_windows");
+		lwindow->gui->close_event();
+		lwindow->gui->unlock_window();
+	}
+	else if( session->show_lwindow && lwindow->gui->is_hidden() )
+		show_lwindow();
+
+	gui->focus();
+}
+
+void MWindow::save_layout(int no)
+{
+	char layout_path[BCTEXTLEN];
+	snprintf(layout_path, sizeof(layout_path), "%s/" LAYOUT_FILE,
+		File::get_config_path(), no);
+	session->save_file(layout_path);
+}
+
+void MWindow::load_layout(int no)
+{
+	char layout_path[BCTEXTLEN];
+	snprintf(layout_path, sizeof(layout_path), "%s/" LAYOUT_FILE,
+		File::get_config_path(), no);
+	session->load_file(layout_path);
+	restore_windows();
+	gui->default_positions();
+	save_defaults();
+}
+
 int MWindow::tile_windows(int window_config)
 {
 	int need_reload = 0;
@@ -2909,7 +2978,7 @@ void MWindow::set_auto_visibility(Autos *autos, int value)
 	else
 		return;
 
-	gui->update(0, 1, 0, 0, 0, 0, 0);
+	gui->update(0, NORMAL_DRAW, 0, 0, 0, 0, 0);
 	gui->mainmenu->update_toggles(1);
 	gui->unlock_window();
 	gwindow->gui->update_toggles(1);
@@ -3150,7 +3219,7 @@ void MWindow::hide_plugin(Plugin *plugin, int lock)
 	plugin->show = 0;
 // Update the toggle
 	gui->lock_window("MWindow::hide_plugin");
-	gui->update(0, 1, 0, 0, 0, 0, 0);
+	gui->update(0, NORMAL_DRAW, 0, 0, 0, 0, 0);
 	gui->unlock_window();
 
 	if(lock) plugin_gui_lock->lock("MWindow::hide_plugin");
@@ -3481,7 +3550,7 @@ void MWindow::update_project(int load_mode)
 		gui->load_panes();
 	}
 
-	gui->update(1, 1, 1, 1, 1, 1, 1);
+	gui->update(1, NORMAL_DRAW, 1, 1, 1, 1, 1);
 	if(debug) PRINT_TRACE
 	gui->unlock_window();
 	init_brender();
@@ -3986,7 +4055,7 @@ void MWindow::remove_assets_from_project(int push_undo, int redraw,
 		restart_brender();
 
 		gui->lock_window("MWindow::remove_assets_from_project 3");
-		gui->update(1, 1, 1, 1, 0, 1, 0);
+		gui->update(1, NORMAL_DRAW, 1, 1, 0, 1, 0);
 		gui->unlock_window();
 
 	// Removes from playback here
@@ -4312,7 +4381,7 @@ void MWindow::resync_guis()
 // Update GUIs
 	restart_brender();
 	gui->lock_window("MWindow::resync_guis");
-	gui->update(1, 1, 1, 1, 1, 1, 0);
+	gui->update(1, NORMAL_DRAW, 1, 1, 1, 1, 0);
 	gui->unlock_window();
 
 	cwindow->gui->lock_window("MWindow::resync_guis");