X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fperformanceprefs.C;h=44545e319f20cf647264945c7097db55c22c0629;hb=b104b77f5296719bd5e6de8472eb71542ddaedec;hp=12a8fc950cfb5a0d1389d6d01516cabce78537f6;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/performanceprefs.C b/cinelerra-5.1/cinelerra/performanceprefs.C index 12a8fc95..44545e31 100644 --- a/cinelerra-5.1/cinelerra/performanceprefs.C +++ b/cinelerra-5.1/cinelerra/performanceprefs.C @@ -41,6 +41,8 @@ PerformancePrefs::PerformancePrefs(MWindow *mwindow, PreferencesWindow *pwindow) : PreferencesDialog(mwindow, pwindow) { hot_node = -1; +// *** CONTEXT_HELP *** + context_help_set_keyword("Performance"); } PerformancePrefs::~PerformancePrefs() @@ -63,7 +65,7 @@ void PerformancePrefs::create_objects() char string[BCTEXTLEN]; BC_Resources *resources = BC_WindowBase::get_resources(); BC_WindowBase *win; - int maxw, curw; + BC_Title *title; node_list = 0; generate_node_list(); @@ -73,56 +75,58 @@ void PerformancePrefs::create_objects() int y0 = y; win = add_subwindow(new BC_Title(x, y + ys5, _("Cache size (MB):"), MEDIUMFONT, resources->text_default)); - maxw = win->get_w(); - int x1 = x + xmargin4; - win = add_subwindow(new BC_Title(x1, y + ys5, _("Use HW Device:"))); - x1 += win->get_w() + xs5; - PrefsUseHWDev *use_hw_dev = new PrefsUseHWDev(pwindow, this, x1, y); - use_hw_dev->create_objects(); - + win->context_help_set_keyword("Performance section"); + int maxw = win->get_w(); int y1 = y += ys30; - win = add_subwindow(new BC_Title(x, y + ys5, _("Seconds to preroll renders:"))); - if((curw = win->get_w()) > maxw) - maxw = curw; - maxw += x + xs5; - - cache_size = new CICacheSize(maxw, y0, pwindow, this); + win = add_subwindow(new BC_Title(x, y1 + ys5, _("Seconds to preroll renders:"))); + win->context_help_set_keyword("Performance section"); + maxw = bmax(win->get_w(), maxw); + int x2 = x + maxw + xs5; + int y2 = y += ys30; + cache_size = new CICacheSize(x2, y0, pwindow, this); cache_size->create_objects(); - - add_subwindow(new BC_Title(x, y + ys5, _("Seconds to preroll renders:"))); - PrefsRenderPreroll *preroll = new PrefsRenderPreroll(pwindow, this, maxw, y1); + PrefsRenderPreroll *preroll = new PrefsRenderPreroll(pwindow, this, x2, y1); preroll->create_objects(); + add_subwindow(new PrefsForceUniprocessor(pwindow, x, y2)); y += ys30; - x1 = x + xmargin4; - BC_Title *smp_title = new BC_Title(x1, y + ys5, _("Project SMP cpus:")); - add_subwindow(smp_title); - x1 += smp_title->get_w() + xs5; - PrefsProjectSMP *proj_smp = new PrefsProjectSMP(pwindow, this, x1, y); + int x1 = x + xmargin4; + add_subwindow(cache_transitions = new CacheTransitions(x1, y0, pwindow, this)); + cache_transitions->context_help_set_keyword("Performance section"); + win = add_subwindow(new BC_Title(x1, y1, _("Use HW Device:"))); + win->context_help_set_keyword("Performance section"); + maxw = win->get_w(); + win = add_subwindow(new BC_Title(x1, y2, _("Project SMP cpus:"))); + win->context_help_set_keyword("Performance section"); + maxw = bmax(win->get_w(), maxw); + x2 = x1 + maxw + xs5; + PrefsUseHWDev *use_hw_dev = new PrefsUseHWDev(pwindow, this, x2, y1); + use_hw_dev->create_objects(); + PrefsProjectSMP *proj_smp = new PrefsProjectSMP(pwindow, this, x2, y2); proj_smp->create_objects(); - PrefsForceUniprocessor *force_1cpu = new PrefsForceUniprocessor(pwindow, x, y); - add_subwindow(force_1cpu); - y += ys30; - // Background rendering add_subwindow(new BC_Bar(xs5, y, get_w() - xs10)); y += ys5; - add_subwindow(new BC_Title(x, y, _("Background Rendering (Video only)"), LARGEFONT, resources->text_default)); + add_subwindow(title = new BC_Title(x, y, _("Background Rendering (Video only)"), LARGEFONT, resources->text_default)); + title->context_help_set_keyword("Background Rendering"); y1 = y += ys30; win = add_subwindow(new PrefsUseBRender(pwindow, x, y)); + win->context_help_set_keyword("Background Rendering"); y += win->get_h() + ys10; win = add_subwindow(new BC_Title(x, y, _("Frames per background rendering job:"))); + win->context_help_set_keyword("Background Rendering"); y += win->get_h() + ys5; PrefsBRenderFragment *brender_fragment = new PrefsBRenderFragment(pwindow, this, x + xmargin3, y); brender_fragment->create_objects(); y += brender_fragment->get_h() + ys5; win = add_subwindow(new BC_Title(x, y, _("Frames to preroll background:"))); + win->context_help_set_keyword("Background Rendering"); y += win->get_h() + ys5; PrefsBRenderPreroll *bpreroll = new PrefsBRenderPreroll(pwindow, this, x + xmargin3, y + ys5); @@ -130,7 +134,8 @@ void PerformancePrefs::create_objects() y += bpreroll->get_h() + ys20; x += xmargin4; - add_subwindow(new BC_Title(x, y1, _("Output for background rendering:"))); + add_subwindow(title = new BC_Title(x, y1, _("Output for background rendering:"))); + title->context_help_set_keyword("Background Rendering"); y1 += ys20; brender_tools = new FormatTools(mwindow, this, pwindow->thread->preferences->brender_asset); @@ -151,21 +156,28 @@ void PerformancePrefs::create_objects() // Renderfarm add_subwindow(new BC_Bar(xs5, y, get_w() - xs10)); y += ys5; - add_subwindow(new BC_Title(x, y, _("Render Farm"), LARGEFONT, resources->text_default)); + add_subwindow(title = new BC_Title(x, y, _("Render Farm"), LARGEFONT, resources->text_default)); + title->context_help_set_keyword("Render Farm Menu"); x1 = get_w() - BC_GenericButton::calculate_w(this, _("Reset rates")) - x; add_subwindow(new PrefsRenderFarmReset(pwindow, this, x1, y)); x1 = x + xmargin4; BC_Title *node_title = new BC_Title(x1, y, _("Nodes:")); add_subwindow(node_title); + node_title->context_help_set_keyword("Render Farm Menu"); x1 += node_title->get_w() + xS(15); sprintf(string, _(MASTER_NODE_FRAMERATE_TEXT), pwindow->thread->preferences->local_rate); add_subwindow(master_rate = new BC_Title(x1, y, string)); + master_rate->context_help_set_keyword("Render Farm Menu"); add_subwindow(node_list = new PrefsRenderFarmNodes(pwindow, this, x + xmargin4, y+=yS(25))); + node_list->context_help_set_keyword("Render Farm Menu"); add_subwindow(new PrefsRenderFarm(pwindow, x, y+=ys5)); - add_subwindow(new BC_Title(x, y+=ys30, _("Hostname:"))); - add_subwindow(new BC_Title(x + xmargin3, y, _("Port:"))); + add_subwindow(title = new BC_Title(x, y+=ys30, _("Hostname:"))); + title->context_help_set_keyword("Render Farm Menu"); + add_subwindow(title = new BC_Title(x + xmargin3, y, _("Port:"))); + title->context_help_set_keyword("Render Farm Menu"); add_subwindow(edit_node = new PrefsRenderFarmEditNode(pwindow, this, x, y+=yS(25))); + edit_node->context_help_set_keyword("Render Farm Menu"); edit_port = new PrefsRenderFarmPort(pwindow, this, x+xmargin3, y); edit_port->create_objects(); @@ -173,16 +185,19 @@ void PerformancePrefs::create_objects() add_subwindow(new PrefsRenderFarmNewNode(pwindow, this, x+xmargin2, y)); add_subwindow(new PrefsRenderFarmSortNodes(pwindow, this, x, y+=ys30)); add_subwindow(new PrefsRenderFarmDelNode(pwindow, this, x+xmargin2, y)); - add_subwindow(new BC_Title(x, y+=ys35, _("Client Watchdog Timeout:"))); + add_subwindow(title = new BC_Title(x, y+=ys35, _("Client Watchdog Timeout:"))); + title->context_help_set_keyword("Render Farm Menu"); renderfarm_watchdog = new PrefsRenderFarmWatchdog(pwindow, this, x+xmargin3, y-ys5); renderfarm_watchdog->create_objects(); - add_subwindow(new BC_Title(x, y+=ys35, _("Total jobs to create:"))); + add_subwindow(title = new BC_Title(x, y+=ys35, _("Total jobs to create:"))); + title->context_help_set_keyword("Render Farm Menu"); PrefsRenderFarmJobs *jobs = new PrefsRenderFarmJobs(pwindow, this, x + xmargin3, y-ys5); jobs->create_objects(); y += jobs->get_h() + ys5; win = add_subwindow(new BC_Title(x, y, _("(overridden if new file at each label is checked)"))); + win->context_help_set_keyword("Render Farm Menu"); // y += win->get_h() + ys5; // add_subwindow(new PrefsRenderFarmVFS(pwindow, this, x, y)); // add_subwindow(new BC_Title(x, y, @@ -322,6 +337,20 @@ int CICacheSize::handle_event() return 0; } +CacheTransitions::CacheTransitions(int x, int y, + PreferencesWindow *pwindow, PerformancePrefs *subwindow) + : BC_CheckBox(x, y, pwindow->thread->preferences->cache_transitions, + _("Cache Transitions")) +{ + this->pwindow = pwindow; +} + +int CacheTransitions::handle_event() +{ + pwindow->thread->preferences->cache_transitions = get_value(); + return 0; +} + PrefsUseHWDev::PrefsUseHWDev(PreferencesWindow *pwindow, PerformancePrefs *subwindow, int x, int y) @@ -400,6 +429,8 @@ PrefsRenderFarm::PrefsRenderFarm(PreferencesWindow *pwindow, int x, int y) _("Use render farm")) { this->pwindow = pwindow; +// *** CONTEXT_HELP *** + context_help_set_keyword("Render Farm section"); } PrefsRenderFarm::~PrefsRenderFarm() { @@ -418,6 +449,8 @@ PrefsForceUniprocessor::PrefsForceUniprocessor(PreferencesWindow *pwindow, int x _("Force single processor use")) { this->pwindow = pwindow; +// *** CONTEXT_HELP *** + context_help_set_keyword("Performance section"); } PrefsForceUniprocessor::~PrefsForceUniprocessor() { @@ -550,6 +583,8 @@ PrefsRenderFarmNewNode::PrefsRenderFarmNewNode(PreferencesWindow *pwindow, Perfo { this->pwindow = pwindow; this->subwindow = subwindow; +// *** CONTEXT_HELP *** + context_help_set_keyword("Render Farm Menu"); } PrefsRenderFarmNewNode::~PrefsRenderFarmNewNode() { @@ -580,6 +615,8 @@ PrefsRenderFarmReplaceNode::PrefsRenderFarmReplaceNode(PreferencesWindow *pwindo { this->pwindow = pwindow; this->subwindow = subwindow; +// *** CONTEXT_HELP *** + context_help_set_keyword("Render Farm Menu"); } PrefsRenderFarmReplaceNode::~PrefsRenderFarmReplaceNode() { @@ -604,6 +641,8 @@ PrefsRenderFarmDelNode::PrefsRenderFarmDelNode(PreferencesWindow *pwindow, Perfo { this->pwindow = pwindow; this->subwindow = subwindow; +// *** CONTEXT_HELP *** + context_help_set_keyword("Render Farm Menu"); } PrefsRenderFarmDelNode::~PrefsRenderFarmDelNode() { @@ -630,6 +669,8 @@ PrefsRenderFarmSortNodes::PrefsRenderFarmSortNodes(PreferencesWindow *pwindow, { this->pwindow = pwindow; this->subwindow = subwindow; +// *** CONTEXT_HELP *** + context_help_set_keyword("Render Farm Menu"); } PrefsRenderFarmSortNodes::~PrefsRenderFarmSortNodes() @@ -652,6 +693,8 @@ PrefsRenderFarmReset::PrefsRenderFarmReset(PreferencesWindow *pwindow, { this->pwindow = pwindow; this->subwindow = subwindow; +// *** CONTEXT_HELP *** + context_help_set_keyword("Render Farm Menu"); } int PrefsRenderFarmReset::handle_event()