upgrade to ffmpeg-2.8

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

diff --git a/cinelerra-5.0/cinelerra/mwindowgui.C b/cinelerra-5.0/cinelerra/mwindowgui.C
index 4e8ee78ddd1ddb9cb43cbac840add1954dd67e91..86a41fcc8459ca611ac30b9d7a8facc496dd1306 100644 (file)
--- a/cinelerra-5.0/cinelerra/mwindowgui.C
+++ b/cinelerra-5.0/cinelerra/mwindowgui.C
@@ -58,8 +58,9 @@
 #include "renderengine.h"
 #include "resourcethread.h"
 #include "samplescroll.h"
-#include "swindow.h"
+#include "shbtnprefs.h"
 #include "statusbar.h"
+#include "swindow.h"
 #include "theme.h"
 #include "trackcanvas.h"
 #include "trackscroll.h"
@@ -74,7 +75,7 @@
 
 // the main window uses its own private colormap for video
 MWindowGUI::MWindowGUI(MWindow *mwindow)
- : BC_Window(PROGRAM_NAME ": Program", 
+ : BC_Window(_(PROGRAM_NAME ": Program"), 
                mwindow->session->mwindow_x, 
                mwindow->session->mwindow_y, 
                mwindow->session->mwindow_w, 
@@ -258,7 +259,10 @@ void MWindowGUI::create_objects()
        
        if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
 
-       add_subwindow(mainmenu = new MainMenu(mwindow, this));
+       int x = get_w() - MainShBtns::calculate_w(0);
+       add_subwindow(mainmenu = new MainMenu(mwindow, this, x));
+       add_subwindow(mainshbtns = new MainShBtns(mwindow, x, 0));
+       mainshbtns->load(mwindow->preferences);
        mwindow->theme->get_mwindow_sizes(this, get_w(), get_h());
        mwindow->theme->draw_mwindow_bg(this);
        mainmenu->create_objects();
@@ -539,7 +543,7 @@ void MWindowGUI::update_title(char *path)
        FileSystem fs;
        char filename[BCTEXTLEN], string[BCTEXTLEN];
        fs.extract_name(filename, path);
-       sprintf(string, PROGRAM_NAME ": %s", filename);
+       sprintf(string, _(PROGRAM_NAME ": %s"), filename);
        set_title(string);
 //printf("MWindowGUI::update_title %s\n", string);
        flush();