projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove filefork
[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..b0c0f53f2144a0cd86864715c3f8b58398f5c679 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 "renderengine.h"
#include "resourcethread.h"
#include "samplescroll.h"
-#include "s
window
.h"
+#include "s
hbtnprefs
.h"
#include "statusbar.h"
#include "statusbar.h"
+#include "swindow.h"
#include "theme.h"
#include "trackcanvas.h"
#include "trackscroll.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)
// 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,
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__);
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();
mwindow->theme->get_mwindow_sizes(this, get_w(), get_h());
mwindow->theme->draw_mwindow_bg(this);
mainmenu->create_objects();
@@
-385,7
+389,6
@@
int MWindowGUI::resize_event(int w, int h)
mwindow->session->mwindow_h = h;
mwindow->theme->get_mwindow_sizes(this, w, h);
mwindow->theme->draw_mwindow_bg(this);
mwindow->session->mwindow_h = h;
mwindow->theme->get_mwindow_sizes(this, w, h);
mwindow->theme->draw_mwindow_bg(this);
-// mainmenu->reposition_window(0, 0, w, mainmenu->get_h());
mbuttons->resize_event();
statusbar->resize_event();
mbuttons->resize_event();
statusbar->resize_event();
@@
-465,6
+468,9
@@
int MWindowGUI::resize_event(int w, int h)
zoombar->resize_event();
pane_button->reposition_window(w - mwindow->theme->get_image_set("pane")[0]->get_w(),
mwindow->theme->mzoom_y + 1 - mwindow->theme->get_image_set("pane")[0]->get_h());
zoombar->resize_event();
pane_button->reposition_window(w - mwindow->theme->get_image_set("pane")[0]->get_w(),
mwindow->theme->mzoom_y + 1 - mwindow->theme->get_image_set("pane")[0]->get_h());
+ int x = get_w() - MainShBtns::calculate_w(0);
+ mainmenu->resize_event(x, mainmenu->get_h());
+ mainshbtns->reposition_window(x, 0);
// get_scrollbars(0);
// canvas->resize_event();
//printf("MWindowGUI::resize_event %d\n", __LINE__);
// get_scrollbars(0);
// canvas->resize_event();
//printf("MWindowGUI::resize_event %d\n", __LINE__);
@@
-539,7
+545,7
@@
void MWindowGUI::update_title(char *path)
FileSystem fs;
char filename[BCTEXTLEN], string[BCTEXTLEN];
fs.extract_name(filename, 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();
set_title(string);
//printf("MWindowGUI::update_title %s\n", string);
flush();