version update, chg shortcut for del last trk, ogg fixes/tweaks

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

diff --git a/cinelerra-5.1/cinelerra/mainmenu.C b/cinelerra-5.1/cinelerra/mainmenu.C
index f33a5c74fd37f9afe6b3d71dd5f339bac95ab45d..39e7ef0c680c9e28c0d42a2f1c8e935786f90199 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainmenu.C
+++ b/cinelerra-5.1/cinelerra/mainmenu.C
@@ -28,6 +28,7 @@
 #include "bdcreate.h"
 #include "cache.h"
 #include "channelinfo.h"
+#include "convert.h"
 #include "cplayback.h"
 #include "cropvideo.h"
 #include "cwindow.h"
@@ -218,6 +219,9 @@ void MainMenu::create_objects()
        ProxyMenuItem *proxy;
        settingsmenu->add_item(proxy = new ProxyMenuItem(mwindow));
        proxy->create_objects();
+       ConvertMenuItem *convert;
+       settingsmenu->add_item(convert = new ConvertMenuItem(mwindow));
+       convert->create_objects();
        mwindow->preferences_thread = preferences->thread;
        settingsmenu->add_item(cursor_on_frames = new CursorOnFrames(mwindow));
        settingsmenu->add_item(labels_follow_edits = new LabelsFollowEdits(mwindow));
@@ -1243,8 +1247,10 @@ int DeleteFirstTrack::handle_event()
 }
 
 DeleteLastTrack::DeleteLastTrack(MWindow *mwindow)
- : BC_MenuItem(_("Delete last track"), "d", 'd')
+ : BC_MenuItem(_("Delete last track"), "Ctrl-Shift-D", 'D')
 {
+       set_ctrl(1);
+       set_shift(1);
        this->mwindow = mwindow;
 }
 
@@ -1857,7 +1863,7 @@ int LoadLayoutNameText::handle_event()
 }
 
 LoadLayoutConfirm::LoadLayoutConfirm(LoadLayoutDialog *layout_dialog, int x, int y)
- : BC_Window(_(PROGRAM_NAME ": Layout"), x, y, 300,140, 300,140, 0)
+ : BC_Window(_(PROGRAM_NAME ": Layout"), x, y, xS(300),yS(140), xS(300),yS(140), 0)
 {
        this->layout_dialog = layout_dialog;
 }
@@ -1868,20 +1874,22 @@ LoadLayoutConfirm::~LoadLayoutConfirm()
 
 void LoadLayoutConfirm::create_objects()
 {
+       int xs10 = xS(10), xs20 = xS(20);
+       int ys10 = yS(10);
        lock_window("LoadLayoutConfirm::create_objects");
-       int x = 10, y = 10, pad = 10;
+       int x = xs10, y = ys10;
        BC_SubMenu *layout_submenu = layout_dialog->load_layout->get_submenu();
        LoadLayoutItem *item = (LoadLayoutItem *)
                layout_submenu->get_item(layout_dialog->idx);
        BC_Title *title;
        add_subwindow(title = new BC_Title(x, y, _("Layout Name:")));
-       int x1 = x + title->get_w() + 10;
+       int x1 = x + title->get_w() + xs10;
        add_subwindow(title = new BC_Title(x1, y, item->get_text()));
-       y += title->get_h() + pad;
+       y += title->get_h() + ys10;
        add_subwindow(name_text = new LoadLayoutNameText(this,
-               x, y, get_w()-x-20, item->layout_text));
+               x, y, get_w()-x-xs20, item->layout_text));
        y += name_text->get_h();
-       x1 = x + 80;
+       x1 = x + xS(80);
        char legend[BCTEXTLEN];
        sprintf(legend, _("a-z,A-Z,0-9_ only, %dch max"), LAYOUT_NAME_LEN);
        add_subwindow(title = new BC_Title(x1, y, legend));