add select all/none, layout shortcuts from all guis, docs tweaks + cv->gg

[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 c3843292ade0de05cc4cbc1d42ac8f4bccf0bd58..6023c5e56f2998489bac98b12a109118b2ac65b0 100644 (file)
--- a/cinelerra-5.1/cinelerra/mainmenu.C
+++ b/cinelerra-5.1/cinelerra/mainmenu.C
@@ -1583,7 +1583,7 @@ LoadLayoutItem::LoadLayoutItem(LoadLayout *load_layout, const char *text, int no
        this->load_layout = load_layout;
        if( hotkey ) {
                char hot_txt[BCSTRLEN];
        this->load_layout = load_layout;
        if( hotkey ) {
                char hot_txt[BCSTRLEN];

-               sprintf(hot_txt, _("Ctl+Shift+F%d"), hotkey-KEY_F1+1);
+               sprintf(hot_txt, _("CtlSft+F%d"), hotkey-KEY_F1+1);

                set_ctrl();  set_shift();
                set_hotkey_text(hot_txt);
        }
                set_ctrl();  set_shift();
                set_hotkey_text(hot_txt);
        }


@@ -1591,21 +1591,15 @@ LoadLayoutItem::LoadLayoutItem(LoadLayout *load_layout, const char *text, int no
 
 int LoadLayoutItem::handle_event()
 {
 
 int LoadLayoutItem::handle_event()
 {

-       char layout_path[BCTEXTLEN];
-       snprintf(layout_path, sizeof(layout_path), "%s/" LAYOUT_FILE,
-               File::get_config_path(), no);

        MWindow *mwindow = load_layout->mwindow;
        switch( load_layout->action ) {
        case LAYOUT_LOAD:
        MWindow *mwindow = load_layout->mwindow;
        switch( load_layout->action ) {
        case LAYOUT_LOAD:

-               mwindow->session->load_file(layout_path);
+               mwindow->load_layout(no);

                break;
        case LAYOUT_SAVE:
                break;
        case LAYOUT_SAVE:

-               mwindow->session->save_file(layout_path);
+               mwindow->save_layout(no);

                break;
        }
                break;
        }

-       mwindow->restore_windows();
-       mwindow->gui->default_positions();
-       mwindow->save_defaults();

        return 1;
 }
 
        return 1;
 }