X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmainmenu.C;h=7b9b3707d28649e0aed9a0423b0c6636c1dab160;hp=bc12bed7d7e7ca95f9c4f3bf9a265892eb91c70a;hb=0df48ad2d876409c5beeae2e21933a728ea76c33;hpb=eb7b1a0bb84ed4f40b651b74ff72e63b97cce1c2 diff --git a/cinelerra-5.1/cinelerra/mainmenu.C b/cinelerra-5.1/cinelerra/mainmenu.C index bc12bed7..7b9b3707 100644 --- a/cinelerra-5.1/cinelerra/mainmenu.C +++ b/cinelerra-5.1/cinelerra/mainmenu.C @@ -97,7 +97,6 @@ void MainMenu::create_objects() { BC_Menu *viewmenu, *windowmenu, *settingsmenu, *trackmenu; PreferencesMenuitem *preferences; - total_loads = 0; add_menu(filemenu = new BC_Menu(_("File"))); filemenu->add_item(new_project = new NewProject(mwindow)); @@ -106,6 +105,8 @@ void MainMenu::create_objects() // file loaders filemenu->add_item(load_file = new Load(mwindow, this)); load_file->create_objects(); + filemenu->add_item(load_recent = new LoadRecent(mwindow, this)); + load_recent->create_objects(); // new and load can be undone so no need to prompt save Save *save; // affected by saveas @@ -148,9 +149,9 @@ void MainMenu::create_objects() editmenu->add_item(new Cut(mwindow)); editmenu->add_item(new Copy(mwindow)); editmenu->add_item(new Paste(mwindow)); - editmenu->add_item(new Clear(mwindow)); editmenu->add_item(new PasteSilence(mwindow)); - editmenu->add_item(new MuteSelection(mwindow)); + editmenu->add_item(clear_menu = new EditClearMenu(mwindow)); + clear_menu->create_objects(); editmenu->add_item(new TrimSelection(mwindow)); editmenu->add_item(new SelectAll(mwindow)); editmenu->add_item(new BC_MenuItem("-")); @@ -161,7 +162,6 @@ void MainMenu::create_objects() editmenu->add_item(new MenuTransitionLength(mwindow)); editmenu->add_item(new DetachTransitions(mwindow)); editmenu->add_item(new BC_MenuItem("-")); - editmenu->add_item(new ClearLabels(mwindow)); editmenu->add_item(new CutCommercials(mwindow)); editmenu->add_item(new PasteSubttl(mwindow)); @@ -384,22 +384,21 @@ int MainMenu::init_veffects(BC_Hash *defaults) void MainMenu::init_loads(BC_Hash *defaults) { - total_loads = defaults->get((char*)"TOTAL_LOADS", 0); - if( !total_loads ) return; - filemenu->add_item(new BC_MenuItem("-")); +// total_loads for legacy xml + int total_loads = defaults->get((char*)"TOTAL_LOADS", 0); + int loads_total = defaults->get((char*)"LOADS_TOTAL", 0); + if( loads_total < total_loads ) loads_total = total_loads; - char string[BCTEXTLEN], path[BCTEXTLEN], filename[BCTEXTLEN]; + char string[BCTEXTLEN], path[BCTEXTLEN]; FileSystem dir; //printf("MainMenu::init_loads 2\n"); - for(int i = 0; i < total_loads; i++) { + for( int i=0; iget(string, path); - filemenu->add_item(load[i] = new LoadPrevious(mwindow, load_file)); - dir.extract_name(filename, path, 0); - load[i]->set_text(filename); - load[i]->set_path(path); + if( load.size() < TOTAL_LOADS ) + load.append(new LoadRecentItem(path)); } } @@ -431,10 +430,13 @@ int MainMenu::save_veffects(BC_Hash *defaults) int MainMenu::save_loads(BC_Hash *defaults) { +// legacy to prevent segv, older code cant tolerate total_loads>10 + int loads_total = load.size(); + int total_loads = MIN(10, loads_total); + defaults->update((char*)"LOADS_TOTAL", loads_total); defaults->update((char*)"TOTAL_LOADS", total_loads); char string[BCTEXTLEN]; - for(int i = 0; i < total_loads; i++) - { + for( int i=0; iupdate(string, load[i]->path); } @@ -529,62 +531,11 @@ int MainMenu::add_veffect(char *title) int MainMenu::add_load(char *path) { - if(total_loads == 0) -{ - filemenu->add_item(new BC_MenuItem("-")); - } - -// test for existing copy - FileSystem fs; - char text[BCTEXTLEN], new_path[BCTEXTLEN]; // get text and path - fs.extract_name(text, path); - strcpy(new_path, path); - - for(int i = 0; i < total_loads; i++) - { - if(!strcmp(load[i]->get_text(), text)) // already exists - { // swap for top load - for(int j = i; j > 0; j--) // move preceeding loads down - { - load[j]->set_text(load[j - 1]->get_text()); - load[j]->set_path(load[j - 1]->path); - } - load[0]->set_text(text); - load[0]->set_path(new_path); - - return 1; - } - } - -// add another load - if(total_loads < TOTAL_LOADS) - { - filemenu->add_item(load[total_loads] = new LoadPrevious(mwindow, load_file)); - total_loads++; - } - -// cycle loads down - for(int i = total_loads - 1; i > 0; i--) - { - // set menu item text - load[i]->set_text(load[i - 1]->get_text()); - // set filename - load[i]->set_path(load[i - 1]->path); - } - -// set up the new load - load[0]->set_text(text); - load[0]->set_path(new_path); - return 0; + return load.add_load(path); } - - - - - // ================================== menu items MainDumpsSubMenu::MainDumpsSubMenu(BC_MenuItem *menu_item) @@ -956,6 +907,35 @@ int Paste::handle_event() return 1; } +EditClearSubMenu::EditClearSubMenu(BC_MenuItem *menu_item) + : BC_SubMenu() +{ + this->menu_item = menu_item; +} +EditClearSubMenu::~EditClearSubMenu() +{ +} + +EditClearMenu::EditClearMenu(MWindow *mwindow) + : BC_MenuItem(_("Clear...")) +{ + this->mwindow = mwindow; + this->clear_sub_menu = 0; +} +EditClearMenu::~EditClearMenu() +{ +} + +void EditClearMenu::create_objects() +{ + add_submenu(clear_sub_menu = new EditClearSubMenu(this)); + clear_sub_menu->add_item(new Clear(mwindow)); + clear_sub_menu->add_item(new MuteSelection(mwindow)); + clear_sub_menu->add_item(new ClearSelect(mwindow)); + clear_sub_menu->add_item(new ClearLabels(mwindow)); + clear_sub_menu->add_item(new ClearHardEdges(mwindow)); +}; + Clear::Clear(MWindow *mwindow) : BC_MenuItem(_("Clear"), _("Del"), DELETE) { @@ -999,6 +979,17 @@ int SelectAll::handle_event() return 1; } +ClearHardEdges::ClearHardEdges(MWindow *mwindow) : BC_MenuItem(_("Clear Hard Edges")) +{ + this->mwindow = mwindow; +} + +int ClearHardEdges::handle_event() +{ + mwindow->clear_hard_edges(); + return 1; +} + ClearLabels::ClearLabels(MWindow *mwindow) : BC_MenuItem(_("Clear labels")) { this->mwindow = mwindow; @@ -1010,6 +1001,19 @@ int ClearLabels::handle_event() return 1; } +ClearSelect::ClearSelect(MWindow *mwindow) : BC_MenuItem(_("Clear Select"),"Ctrl-Shift-A",'A') +{ + set_ctrl(1); + set_shift(1); + this->mwindow = mwindow; +} + +int ClearSelect::handle_event() +{ + mwindow->clear_select(); + return 1; +} + CutCommercials::CutCommercials(MWindow *mwindow) : BC_MenuItem(_("Cut ads")) { this->mwindow = mwindow; @@ -1853,7 +1857,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; } @@ -1864,20 +1868,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)); @@ -1886,3 +1892,118 @@ void LoadLayoutConfirm::create_objects() unlock_window(); } + +LoadRecentItem::LoadRecentItem(const char *path) +{ + this->path = cstrdup(path); +} + +LoadRecentItem::~LoadRecentItem() +{ + delete [] path; +} + +int LoadRecentItems::add_load(char *path) +{ +// test for existing copy + FileSystem fs; + char name[BCTEXTLEN], text[BCTEXTLEN]; + fs.extract_name(name, path); + int loads_total = size(); + int ret = 0, k = loads_total; + LoadRecentItem *load_item = 0; + + for( int i=0; !ret && ipath); + if( strcmp(name, text) ) continue; + k = i; ret = 1; // already exists, move to top + } + if( !ret ) { // adding a new one + while( loads_total >= TOTAL_LOADS ) + remove_object_number(--loads_total); + insert(new LoadRecentItem(path), 0); + } + else if( k > 0 ) { // cycle loads + while( --k >= 0 ) set(k+1, get(k)); + set(0, load_item); + } + return ret; +} + +LoadRecentItems::LoadRecentItems() +{ +} + +LoadRecentItems::~LoadRecentItems() +{ + remove_all_objects(); +} + +LoadRecent::LoadRecent(MWindow *mwindow, MainMenu *main_menu) + : BC_MenuItem(_("Load Recent...")) +{ + this->mwindow = mwindow; + this->main_menu = main_menu; + total_items = 0; +} +LoadRecent::~LoadRecent() +{ +} + +void LoadRecent::create_objects() +{ + add_submenu(submenu = new LoadRecentSubMenu(this)); +} + +LoadPrevious *LoadRecent::get_next_item() +{ + int k = total_items++; + if( k < submenu->total_items() ) + return (LoadPrevious *)submenu->get_item(k); + LoadPrevious *load_prev = new LoadPrevious(mwindow, main_menu->load_file); + submenu->add_item(load_prev); + return load_prev; +} + +int LoadRecent::activate_submenu() +{ + total_items = 0; + scan_items(1); + if( total_items > 0 ) { + LoadPrevious *load_prev = get_next_item(); + load_prev->set_text("-"); + load_prev->set_path(""); + } + scan_items(0); + while( total_items < submenu->total_items() ) + submenu->del_item(0); + return BC_MenuItem::activate_submenu(); +} + +void LoadRecent::scan_items(int use_xml) +{ + FileSystem fs; + int loads_total = main_menu->load.size(); + for( int i=0; iload[i]; + char name[BCTEXTLEN]; + fs.extract_name(name, recent->path); + const char *cp = strrchr(name, '.'); + if( !cp || strcasecmp(cp+1,"xml") ? use_xml : !use_xml ) continue; + LoadPrevious *load_prev = get_next_item(); + load_prev->set_text(name); + load_prev->set_path(recent->path); + } +} + +LoadRecentSubMenu::LoadRecentSubMenu(LoadRecent *load_recent) + : BC_SubMenu() +{ + this->load_recent = load_recent; +} + +LoadRecentSubMenu::~LoadRecentSubMenu() +{ +} +