awindowgui / mwindowedit / label rework

[goodguy/history.git] / cinelerra-5.1 / cinelerra / cwindowtool.C

diff --git a/cinelerra-5.1/cinelerra/cwindowtool.C b/cinelerra-5.1/cinelerra/cwindowtool.C
index 59a0b5eb821e6afad643b9f3bd797d94616438b2..caf0bf82d2953b65b9f4eeb2d9917d9a958cdd9b 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindowtool.C
+++ b/cinelerra-5.1/cinelerra/cwindowtool.C
@@ -480,7 +480,9 @@ void CWindowEyedropGUI::create_objects()
        int y = margin;
        int x2 = 70;
        lock_window("CWindowEyedropGUI::create_objects");
-       BC_Title *title1, *title2, *title3, *title4, *title5, *title6, *title7;
+       BC_Title *title0, *title1, *title2, *title3, *title4, *title5, *title6, *title7;
+       add_subwindow(title0 = new BC_Title(x, y,_("X,Y:")));
+       y += title0->get_h() + margin;
        add_subwindow(title7 = new BC_Title(x, y, _("Radius:")));
        y += BC_TextBox::calculate_h(this, MEDIUMFONT, 1, 1) + margin;
 
@@ -497,6 +499,7 @@ void CWindowEyedropGUI::create_objects()
        y += title5->get_h() + margin;
        add_subwindow(title6 = new BC_Title(x, y, "V:"));
 
+       add_subwindow(current = new BC_Title(x2, title0->get_y(), ""));
 
        radius = new CWindowCoord(this, x2, title7->get_y(),
                mwindow->edl->session->eyedrop_radius);
@@ -520,6 +523,12 @@ void CWindowEyedropGUI::create_objects()
 
 void CWindowEyedropGUI::update()
 {
+       char string[BCTEXTLEN];
+       sprintf(string, "%d, %d",
+               thread->gui->eyedrop_x,
+               thread->gui->eyedrop_y);
+       current->update(string);
+
        radius->update((int64_t)mwindow->edl->session->eyedrop_radius);
 
        red->update(mwindow->edl->local_session->red);
@@ -589,28 +598,27 @@ const _CVD Camera_Crv_Smooth =
        {       FloatAuto::SMOOTH,
                true,
                "tan_smooth",
-               _("\"smooth\" Curve on current Camera Keyframes")
+               N_("\"smooth\" Curve on current Camera Keyframes")
        };
 const _CVD Camera_Crv_Linear =
        {       FloatAuto::LINEAR,
                true,
                "tan_linear",
-               _("\"linear\" Curve on current Camera Keyframes")
+               N_("\"linear\" Curve on current Camera Keyframes")
        };
 const _CVD Projector_Crv_Smooth =
        {       FloatAuto::SMOOTH,
                false,
                "tan_smooth",
-               _("\"smooth\" Curve on current Projector Keyframes")
+               N_("\"smooth\" Curve on current Projector Keyframes")
        };
 const _CVD Projector_Crv_Linear =
        {       FloatAuto::LINEAR,
                false,
                "tan_linear",
-               _("\"linear\" Curve on current Projector Keyframes")
+               N_("\"linear\" Curve on current Projector Keyframes")
        };
 
-
 // Implementation Class für Keyframe Curve Mode buttons
 //
 // This button reflects the state of the "current" keyframe
@@ -638,7 +646,7 @@ CWindowCurveToggle::CWindowCurveToggle(_CVD mode, MWindow *mwindow, CWindowToolG
 {
        this->gui = gui;
        this->mwindow = mwindow;
-       set_tooltip(cfg.tooltip);
+       set_tooltip(_(cfg.tooltip));
 }
 
 void CWindowCurveToggle::check_toggle_state(FloatAuto *x, FloatAuto *y, FloatAuto *z)
@@ -813,9 +821,9 @@ void CWindowCameraGUI::handle_event()
                        if(z_auto)
                        {
                                float zoom = atof(z->get_text());
-                               if(zoom > 10) zoom = 10;
+                               if(zoom > 100.) zoom = 100.;
                                else
-                               if(zoom < 0) zoom = 0;
+                               if(zoom < 0.01) zoom = 0.01;
        // Doesn't allow user to enter from scratch
        //              if(zoom != atof(z->get_text()))
        //                      z->update(zoom);
@@ -856,8 +864,11 @@ void CWindowCameraGUI::update()
                x->update(x_auto->get_value());
        if(y_auto)
                y->update(y_auto->get_value());
-       if(z_auto)
-               z->update(z_auto->get_value());
+       if(z_auto) {
+               float value = z_auto->get_value();
+               z->update(value);
+               thread->gui->composite_panel->cpanel_zoom->update(value);
+       }
 
        if( x_auto && y_auto && z_auto )
        {
@@ -1258,9 +1269,8 @@ void CWindowProjectorGUI::handle_event()
                        if(z_auto)
                        {
                                float zoom = atof(z->get_text());
-                               if(zoom > 10000) zoom = 10000;
-                               else
-                               if(zoom < 0) zoom = 0;
+                               if(zoom > 100.) zoom = 100.;
+                               else if(zoom < 0.01) zoom = 0.01;
 //                     if (zoom != atof(z->get_text()))
 //                             z->update(zoom);
                                z_auto->set_value(zoom);
@@ -1300,8 +1310,11 @@ void CWindowProjectorGUI::update()
                x->update(x_auto->get_value());
        if(y_auto)
                y->update(y_auto->get_value());
-       if(z_auto)
-               z->update(z_auto->get_value());
+       if(z_auto) {
+               float value = z_auto->get_value();
+               z->update(value);
+               thread->gui->composite_panel->cpanel_zoom->update(value);
+       }
 
        if( x_auto && y_auto && z_auto )
        {
@@ -1879,7 +1892,7 @@ int CWindowMaskFeather::handle_event()
                        mask, point, create_it);
 
        if(track)
-       {       
+       {
 #ifdef USE_KEYFRAME_SPANNING
 // Create temp keyframe
                MaskAuto temp_keyframe(mwindow->edl, autos);
@@ -1930,7 +1943,7 @@ int CWindowMaskValue::handle_event()
 #else
        int create_it = 1;
 #endif
-       
+
        mwindow->undo->update_undo_before(_("mask value"), this);
        ((CWindowMaskGUI*)gui)->get_keyframe(track, autos, keyframe,
                mask, point, create_it);