add adams 4.6->4.6.1 (mostly)

[goodguy/history.git] / cinelerra-5.0 / cinelerra / new.C

diff --git a/cinelerra-5.0/cinelerra/new.C b/cinelerra-5.0/cinelerra/new.C
index 79a14fd682fb55a79306aaec868880840d590faa..c0f234ae723a238d8352057d25bc7a3c8315f748 100644 (file)
--- a/cinelerra-5.0/cinelerra/new.C
+++ b/cinelerra-5.0/cinelerra/new.C
@@ -53,7 +53,7 @@
 
 
 New::New(MWindow *mwindow)
- : BC_MenuItem(_("New..."), "n", 'n')
+ : BC_MenuItem(_("New"), "n", 'n')
 {
        this->mwindow = mwindow;
        script = 0;
@@ -74,7 +74,10 @@ void New::create_objects()
 int New::handle_event() 
 {
        mwindow->gui->unlock_window();
-       thread->start();
+       mwindow->edl->save_defaults(mwindow->defaults);
+       create_new_edl();
+       create_new_project();
+//     thread->start();
        mwindow->gui->lock_window("New::handle_event");
 
        return 1;
@@ -143,10 +146,12 @@ NewThread::NewThread(MWindow *mwindow, New *new_project)
 {
        this->mwindow = mwindow;
        this->new_project = new_project;
+       nwindow = 0;
 }
 
 NewThread::~NewThread()
 {
+       close_window();
 }
 
 
@@ -226,7 +231,7 @@ N_("Cinelerra: New Project");
 #endif
 
 NewWindow::NewWindow(MWindow *mwindow, NewThread *new_thread, int x, int y)
- : BC_Window(_(PROGRAM_NAME ": New Project"), 
+ : BC_Window(_(_(PROGRAM_NAME ": New Project")), 
                x,
                y,
                WIDTH, 
@@ -841,7 +846,7 @@ const char* ColormodelPulldown::colormodel_to_text()
        for(int i = 0; i < mwindow->colormodels.total; i++)
                if(mwindow->colormodels.values[i]->value == *output_value) 
                        return mwindow->colormodels.values[i]->get_text();
-       return "Unknown";
+       return _("Unknown");
 }
 
 
@@ -880,7 +885,7 @@ NewSwapExtents::NewSwapExtents(MWindow *mwindow, NewWindow *gui, int x, int y)
 {
        this->mwindow = mwindow;
        this->gui = gui;
-       set_tooltip("Swap dimensions");
+       set_tooltip(_("Swap dimensions"));
 }
 
 int NewSwapExtents::handle_event()