X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Feditpanel.C;h=11e1fc5c84609142bdc9af982999c03c3cedf395;hb=099132c524d32342be6cfc4948ecb1b3a439b988;hp=8523028966ba8ffc41319ac55ddccc24bb9d9f39;hpb=7ffa6954689f14a41a3bae7a0fdb3f2abeaa9679;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/editpanel.C b/cinelerra-5.1/cinelerra/editpanel.C
index 85230289..11e1fc5c 100644
--- a/cinelerra-5.1/cinelerra/editpanel.C
+++ b/cinelerra-5.1/cinelerra/editpanel.C
@@ -259,16 +259,6 @@ void EditPanel::create_buttons()
 		x1 += paste->get_w();
 	}
 
-	if( use_meters ) {
-		if( meter_panel ) {
-			meters = new MeterShow(mwindow, meter_panel, x1, y1);
-			subwindow->add_subwindow(meters);
-			x1 += meters->get_w();
-		}
-		else
-			printf("EditPanel::create_objects: meter_panel == 0\n");
-	}
-
 	if( use_labels ) {
 		labelbutton = new EditLabelbutton(mwindow, this, x1, y1);
 		subwindow->add_subwindow(labelbutton);
@@ -328,6 +318,16 @@ void EditPanel::create_buttons()
 		scope_dialog = new EditPanelScopeDialog(mwindow, this);
 	}
 
+	if( use_meters ) {
+		if( meter_panel ) {
+			meters = new MeterShow(mwindow, meter_panel, x1, y1);
+			subwindow->add_subwindow(meters);
+			x1 += meters->get_w();
+		}
+		else
+			printf("EditPanel::create_objects: meter_panel == 0\n");
+	}
+
 	if( use_commercial ) {
 		commercial = new EditCommercial(mwindow, this, x1, y1);
 		subwindow->add_subwindow(commercial);
@@ -393,11 +393,6 @@ void EditPanel::reposition_buttons(int x, int y)
 		x1 += paste->get_w();
 	}
 
-	if( use_meters ) {
-		meters->reposition_window(x1, y1);
-		x1 += meters->get_w();
-	}
-
 	if( use_labels ) {
 		labelbutton->reposition_window(x1, y1);
 		x1 += labelbutton->get_w();
@@ -443,6 +438,11 @@ void EditPanel::reposition_buttons(int x, int y)
 		scope->reposition_window(x1, y1-yS(1));
 		x1 += scope->get_w();
 	}
+
+	if( use_meters ) {
+		meters->reposition_window(x1, y1);
+		x1 += meters->get_w();
+	}
 }
 
 void EditPanel::create_objects()
@@ -1224,6 +1224,9 @@ void EditPanelScopeGUI::create_objects()
 	use_wave_gain = session->use_wave_gain;
 	use_vect_gain = session->use_vect_gain;
 	use_smooth = session->use_smooth;
+	use_refresh = session->use_refresh;
+	use_release = session->use_release;
+	use_graticule = session->use_graticule;
 	ScopeGUI::create_objects();
 }
 
@@ -1238,6 +1241,9 @@ void EditPanelScopeGUI::toggle_event()
 	session->use_wave_gain = use_wave_gain;
 	session->use_vect_gain = use_vect_gain;
 	session->use_smooth = use_smooth;
+	session->use_refresh = use_refresh;
+	session->use_release = use_release;
+	session->use_graticule = use_graticule;
 }
 
 int EditPanelScopeGUI::translation_event()