fix awdw solo vicon crash, fix nested clip for binfolders, open edit edl

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

diff --git a/cinelerra-5.1/cinelerra/mainerror.C b/cinelerra-5.1/cinelerra/mainerror.C
index 61ffa7c46b433c09611844598cd704b87cd70115..e206a22d6a7c8579acb2cd13ac875f83fed5f62d 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainerror.C
+++ b/cinelerra-5.1/cinelerra/mainerror.C
@@ -40,19 +40,9 @@ MainError* MainError::main_error = 0;
 
 
 MainErrorGUI::MainErrorGUI(MWindow *mwindow, MainError *thread, int x, int y)
- : BC_Window(_(PROGRAM_NAME ": Errors"),
-        x,
-        y,
-        mwindow->session->ewindow_w,
-        mwindow->session->ewindow_h,
-        50,
-        50,
-        1,
-        0,
-        1,
-        -1,
-        "",
-        1)
+ : BC_Window(_(PROGRAM_NAME ": Messages"),
+       x, y, mwindow->session->ewindow_w, mwindow->session->ewindow_h,
+       xS(50), yS(50), 1, 0, 1, -1, "", 1)
 {
        this->mwindow = mwindow;
        this->thread = thread;
@@ -67,11 +57,11 @@ void MainErrorGUI::create_objects()
        lock_window("MainErrorGUI::create_objects");
        BC_Button *button;
        add_subwindow(button = new BC_OKButton(this));
-       int x = 10, y = 10;
-       add_subwindow(title = new BC_Title(x, y, _("The following errors occurred:")));
-       y += title->get_h() + 5;
+       int x = xS(10), y = yS(10);
+       add_subwindow(title = new BC_Title(x, y, _("Message log:")));
+       y += title->get_h() + yS(5);
        add_subwindow(list = new BC_ListBox(x, y,
-                get_w() - 20, button->get_y() - y - 5,
+                get_w() - xS(20), button->get_y() - y - yS(5),
                 LISTBOX_TEXT,          // Display text list or icons
                 &thread->errors,       // Each column has an ArrayList of BC_ListBoxItems.
                 0,                     // Titles for columns.  Set to 0 for no titles
@@ -105,10 +95,6 @@ int MainErrorGUI::resize_event(int w, int h)
 }
 
 
-
-
-
-
 MainError::MainError(MWindow *mwindow)
  : BC_DialogThread()
 {
@@ -168,7 +154,7 @@ void MainError::append_error(const char *string)
 void MainError::show_error_local(const char *string)
 {
 // assume user won't get to closing the GUI here
-       lock_window("MainError::show_error_local");
+       lock_dialog("MainError::show_error_local");
        if( get_gui() ) {
                MainErrorGUI *gui = (MainErrorGUI*)get_gui();
                gui->lock_window("MainError::show_error_local");
@@ -186,7 +172,7 @@ void MainError::show_error_local(const char *string)
                append_error(string);
                start();
        }
-       unlock_window();
+       unlock_dialog();
 }
 
 
@@ -197,9 +183,3 @@ void MainError::show_error(const char *string)
        printf("%s%s", string, len>0 && string[len-1] == '\n' ? "" : "\n");
 }
 
-
-
-
-
-
-