add auto zoombar/status color, fix 3 batchrender boobies, rotate plugin tweaks, add...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / zoombar.C

diff --git a/cinelerra-5.1/cinelerra/zoombar.C b/cinelerra-5.1/cinelerra/zoombar.C
index 274961c0473df18b7d21dd1742a4d40ae9baa296..79ecfd9cdf7da2bd319f77e06c9c3b93e22c954d 100644 (file)
--- a/cinelerra-5.1/cinelerra/zoombar.C
+++ b/cinelerra-5.1/cinelerra/zoombar.C
@@ -148,9 +148,22 @@ int ZoomBar::draw()
 }
 
 void ZoomBar::update_autozoom()
+{
+       update_autozoom(mwindow->edl->local_session->zoombar_showautocolor);
+}
+
+void ZoomBar::update_autozoom(int grouptype, int color)
+{
+       mwindow->edl->local_session->zoombar_showautotype = grouptype;
+       update_autozoom(color);
+}
+
+void ZoomBar::update_autozoom(int color)
 {
        char string[BCTEXTLEN];
        int autogroup_type = mwindow->edl->local_session->zoombar_showautotype;
+       mwindow->edl->local_session->zoombar_showautocolor = color;
+       if( color < 0 ) color = get_resources()->default_text_color;
        switch( autogroup_type ) {
        case AUTOGROUPTYPE_AUDIO_FADE:
        case AUTOGROUPTYPE_VIDEO_FADE:
@@ -173,9 +186,10 @@ void ZoomBar::update_autozoom()
        }
        auto_zoom_text->update(string);
        const char *group_name = AutoTypeMenu::to_text(autogroup_type);
-       auto_type->set_text(group_name);
+       auto_type->set_text(group_name, color);
 }
 
+
 int ZoomBar::update()
 {
        sample_zoom->update(mwindow->edl->local_session->zoom_sample);
@@ -201,7 +215,7 @@ TitleAlphaBar::TitleAlphaBar(MWindow *mwindow, ZoomBar *zoombar, int x, int y)
        this->mwindow = mwindow;
        this->zoombar = zoombar;
        set_precision(0.01);
-       set_tooltip(_("Title Alpha"));
+       enable_show_value(0);
 }
 
 int TitleAlphaBar::handle_event()
@@ -224,7 +238,7 @@ TitleAlphaText::TitleAlphaText(MWindow *mwindow, ZoomBar *zoombar, int x, int y)
 
 int TitleAlphaText::handle_event()
 {
-       float v = atof(get_text())*100;
+       float v = atof(get_text());
        mwindow->session->title_bar_alpha = v;
        zoombar->title_alpha_bar->update(v);
        mwindow->gui->draw_trackmovement();