X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fsplashgui.C;h=e91d640d8d980e39c301ae3b69dc458e24e35960;hb=a2d9ab21fbb8e29310d9cd0be439522d05d0d0ba;hp=7441e3dec4b1ca71791229dbe57619e3684d3ec9;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/splashgui.C b/cinelerra-5.1/cinelerra/splashgui.C index 7441e3de..e91d640d 100644 --- a/cinelerra-5.1/cinelerra/splashgui.C +++ b/cinelerra-5.1/cinelerra/splashgui.C @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #include "bcdisplayinfo.h" @@ -30,19 +30,8 @@ SplashGUI::SplashGUI(VFrame *bg, int x, int y) - : BC_Window(_(PROGRAM_NAME ": Loading"), - x, - y, - bg->get_w(), - bg->get_h(), - -1, - -1, - 0, - 0, - 1, - -1, - "", - 0) + : BC_Window(_(PROGRAM_NAME ": Loading"), x, y, bg->get_w(), bg->get_h(), + -1, -1, 0, 0, 1, -1, "", 0) { this->bg = bg; } @@ -54,13 +43,21 @@ SplashGUI::~SplashGUI() void SplashGUI::create_objects() { + lock_window("SplashGUI::create_objects"); draw_vframe(bg, 0, 0); flash(); show_window(); - add_subwindow(operation = - new BC_Title(5, + operation = new BC_Title(5, get_h() - get_text_height(MEDIUMFONT) - 5, - _("Loading..."))); + _("Loading...")); + add_subwindow(operation); + unlock_window(); } +void SplashGUI::update_status(const char *text) +{ + lock_window("SplashGUI::update_status"); + operation->update(text); + unlock_window(); +}