projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
videoscope tweaks, add scope overlay grid (andrea), hw probe fix for sw fallback
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
editpanel.C
diff --git
a/cinelerra-5.1/cinelerra/editpanel.C
b/cinelerra-5.1/cinelerra/editpanel.C
index 6488be94564e9334529dd4e365307f4977e58278..03eb9e483e5b2d3f925037d7f1bf2b721da39f15 100644
(file)
--- a/
cinelerra-5.1/cinelerra/editpanel.C
+++ b/
cinelerra-5.1/cinelerra/editpanel.C
@@
-171,7
+171,7
@@
void EditPanel::update()
int EditPanel::calculate_w(MWindow *mwindow, int use_keyframe, int total_buttons)
{
int EditPanel::calculate_w(MWindow *mwindow, int use_keyframe, int total_buttons)
{
- int button_w = mwindow->theme->get_image_set("meters")[0]->get_w();
+ int button_w =
xS(24); //
mwindow->theme->get_image_set("meters")[0]->get_w();
int result = button_w * total_buttons;
if( use_keyframe )
result += 2*(button_w + mwindow->theme->toggle_margin);
int result = button_w * total_buttons;
if( use_keyframe )
result += 2*(button_w + mwindow->theme->toggle_margin);
@@
-259,16
+259,6
@@
void EditPanel::create_buttons()
x1 += paste->get_w();
}
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);
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);
}
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);
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();
}
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();
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();
}
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()
}
void EditPanel::create_objects()
@@
-1224,6
+1224,7
@@
void EditPanelScopeGUI::create_objects()
use_wave_gain = session->use_wave_gain;
use_vect_gain = session->use_vect_gain;
use_smooth = session->use_smooth;
use_wave_gain = session->use_wave_gain;
use_vect_gain = session->use_vect_gain;
use_smooth = session->use_smooth;
+ use_graticule = session->use_graticule;
ScopeGUI::create_objects();
}
ScopeGUI::create_objects();
}
@@
-1238,6
+1239,7
@@
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_wave_gain = use_wave_gain;
session->use_vect_gain = use_vect_gain;
session->use_smooth = use_smooth;
+ session->use_graticule = use_graticule;
}
int EditPanelScopeGUI::translation_event()
}
int EditPanelScopeGUI::translation_event()