mixer

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

diff --git a/cinelerra-5.1/cinelerra/gwindowgui.C b/cinelerra-5.1/cinelerra/gwindowgui.C
index b1b8300c2ee9c72d42b67193ad8f7e6f737fec7d..b18920349d34ccb8516030ba3e63209a995c9a4c 100644 (file)
--- a/cinelerra-5.1/cinelerra/gwindowgui.C
+++ b/cinelerra-5.1/cinelerra/gwindowgui.C
@@ -68,26 +68,26 @@ void GWindowGUI::start_color_thread(GWindowColorButton *color_button)
 
 const char *GWindowGUI::other_text[NON_AUTOMATION_TOTAL] =
 {
-       "Assets",
-       "Titles",
-       "Transitions",
-       "Plugin Autos"
+       N_("Assets"),
+       N_("Titles"),
+       N_("Transitions"),
+       N_("Plugin Autos")
 };
 
 const char *GWindowGUI::auto_text[AUTOMATION_TOTAL] =
 {
-       "Mute",
-       "Camera X",
-       "Camera Y",
-       "Camera Z",
-       "Projector X",
-       "Projector Y",
-       "Projector Z",
-       "Fade",
-       "Pan",
-       "Mode",
-       "Mask",
-       "Speed"
+       N_("Mute"),
+       N_("Camera X"),
+       N_("Camera Y"),
+       N_("Camera Z"),
+       N_("Projector X"),
+       N_("Projector Y"),
+       N_("Projector Z"),
+       N_("Fade"),
+       N_("Pan"),
+       N_("Mode"),
+       N_("Mask"),
+       N_("Speed")
 };
 
 int GWindowGUI::auto_colors[AUTOMATION_TOTAL] =
@@ -190,8 +190,10 @@ GWindowColorButton::GWindowColorButton(GWindowToggle *auto_toggle, int x, int y,
 {
        this->auto_toggle = auto_toggle;
        this->color = 0;
-       for( int i=0; i<3; ++i )
+       for( int i=0; i<3; ++i ) {
                vframes[i] = new VFrame(w, w, BC_RGBA8888, -1);
+               vframes[i]->clear_frame();
+       }
 }
 
 GWindowColorButton::~GWindowColorButton()
@@ -248,7 +250,7 @@ void GWindowColorButton::update_gui(int color)
 }
 
 GWindowColorThread::GWindowColorThread(GWindowColorButton *color_button)
- : ColorThread(0, color_button->auto_toggle->caption)
+ : ColorPicker(0, color_button->auto_toggle->caption)
 {
        this->color = 0;
        this->color_button = color_button;
@@ -369,7 +371,7 @@ void GWindowGUI::create_objects()
                case AUTOMATION_PAN:  vframe = mwindow->theme->pankeyframe_data;   break;
                case AUTOMATION_MASK: vframe = mwindow->theme->maskkeyframe_data;  break;
                }
-               const char *label = tp->isauto ? auto_text[tp->ref] : other_text[tp->ref] ;
+               const char *label = _(tp->isauto ? auto_text[tp->ref] : other_text[tp->ref]);
                int color = !tp->isauto ? -1 : auto_colors[tp->ref];
                GWindowToggle *toggle = new GWindowToggle(mwindow, this, x, y, label, color, tp);
                add_tool(toggles[i] = toggle);
@@ -415,6 +417,7 @@ int GWindowGUI::translation_event()
 
 int GWindowGUI::close_event()
 {
+       delete color_thread;  color_thread = 0;
        hide_window();
        mwindow->session->show_gwindow = 0;
        unlock_window();