X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fmbuttons.C;h=ab9e27fe7893e29740ae9a4e08070ec7eb5bd65e;hb=ac6cc6b87e596ffb6cc0e3c5b965f99893e70acd;hp=7533fe234eb749c9740285291d2dbae34772ec90;hpb=8bbd1679c5811ba26608d5fc9ed60cedeb2bc103;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.0/cinelerra/mbuttons.C b/cinelerra-5.0/cinelerra/mbuttons.C index 7533fe23..ab9e27fe 100644 --- a/cinelerra-5.0/cinelerra/mbuttons.C +++ b/cinelerra-5.0/cinelerra/mbuttons.C @@ -71,7 +71,7 @@ void MButtons::create_objects() edit_panel->create_objects(); x += edit_panel->get_w(); - ffmpeg_toggle = new MainFFMpegToggle(mwindow, this, get_w()-30, 0); + ffmpeg_toggle = new MainFFMpegToggle(mwindow, this, get_w(), 0); add_subwindow(ffmpeg_toggle); flash(0); } @@ -83,6 +83,7 @@ int MButtons::resize_event() mwindow->theme->mbuttons_w, mwindow->theme->mbuttons_h); draw_top_background(get_parent(), 0, 0, get_w(), get_h()); + ffmpeg_toggle->reposition_window(get_w()-30, 0); flash(0); return 0; } @@ -169,27 +170,13 @@ MainEditing::MainEditing(MWindow *mwindow, MButtons *mbuttons, int x, int y) } -#include "data/ff_checked_png.h" -#include "data/ff_down_png.h" -#include "data/ff_checkedhi_png.h" -#include "data/ff_up_png.h" -#include "data/ff_hi_png.h" - -static VFrame *ff_images[] = { - new VFrame(ff_up_png), - new VFrame(ff_hi_png), - new VFrame(ff_checked_png), - new VFrame(ff_down_png), - new VFrame(ff_checkedhi_png) -}; - MainFFMpegToggle::MainFFMpegToggle(MWindow *mwindow, MButtons *mbuttons, int x, int y) - : BC_Toggle(x - ff_images[0]->get_w(), y, &ff_images[0], - mwindow->preferences->ffmpeg_early_probe) + : BC_Toggle(x - mwindow->theme->ffmpeg_toggle[0]->get_w(), y, + mwindow->theme->ffmpeg_toggle, mwindow->preferences->ffmpeg_early_probe) { this->mwindow = mwindow; this->mbuttons = mbuttons; - set_tooltip("FFMpeg early probe"); + set_tooltip(_("FFMpeg early probe")); } MainFFMpegToggle::~MainFFMpegToggle() @@ -200,7 +187,7 @@ int MainFFMpegToggle::handle_event() { mwindow->preferences->ffmpeg_early_probe = get_value(); mwindow->show_warning(&mwindow->preferences->warn_indecies, - "Changing the base codecs may require rebuilding indecies."); + _("Changing the base codecs may require rebuilding indecies.")); return 1; }