X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcanvas.C;h=963c63d84240d6af1fcea3e2fb793f4c9beb759b;hp=17d5a42b5e952de5b515ccdc1650bde8e76b2484;hb=21af3206552d78919dad02f83c08439bedb05c89;hpb=2d6e0243914af46dbc07eb91aeb951630d71adf4 diff --git a/cinelerra-5.1/cinelerra/canvas.C b/cinelerra-5.1/cinelerra/canvas.C index 17d5a42b..963c63d8 100644 --- a/cinelerra-5.1/cinelerra/canvas.C +++ b/cinelerra-5.1/cinelerra/canvas.C @@ -114,22 +114,6 @@ void Canvas::use_auxwindow(BC_WindowBase *aux) canvas_auxwindow = aux; } -void Canvas::use_cwindow() -{ - canvas_menu->use_cwindow(); - fullscreen_menu->use_cwindow(); -} - -void Canvas::use_rwindow() -{ - canvas_menu->use_rwindow(); -} - -void Canvas::use_vwindow() -{ - canvas_menu->use_vwindow(); -} - int Canvas::get_fullscreen() { return is_fullscreen; @@ -914,11 +898,6 @@ void CanvasFullScreenPopup::create_objects() add_item(new CanvasSubWindowItem(canvas)); } -void CanvasFullScreenPopup::use_cwindow() -{ - add_item(new CanvasPopupAuto(canvas)); -} - CanvasSubWindowItem::CanvasSubWindowItem(Canvas *canvas) : BC_MenuItem(_("Windowed"), "f", 'f') { @@ -976,26 +955,6 @@ void CanvasPopup::create_objects() submenu->add_submenuitem(new CanvasPopupSize(canvas, _("Zoom 400%"), 4.0)); } -void CanvasPopup::use_cwindow() -{ - add_item(new CanvasPopupAuto(canvas)); - add_item(new CanvasPopupResetCamera(canvas)); - add_item(new CanvasPopupResetProjector(canvas)); - add_item(new CanvasPopupCameraKeyframe(canvas)); - add_item(new CanvasPopupProjectorKeyframe(canvas)); - add_item(toggle_controls = new CanvasToggleControls(canvas)); -} - -void CanvasPopup::use_rwindow() -{ - add_item(new CanvasPopupResetTranslation(canvas)); -} - -void CanvasPopup::use_vwindow() -{ - add_item(new CanvasPopupRemoveSource(canvas)); -} - CanvasPopupAuto::CanvasPopupAuto(Canvas *canvas) : BC_MenuItem(_("Zoom Auto")) @@ -1074,7 +1033,6 @@ int CanvasPopupProjectorKeyframe::handle_event() } - CanvasPopupResetTranslation::CanvasPopupResetTranslation(Canvas *canvas) : BC_MenuItem(_("Reset translation")) { @@ -1087,25 +1045,6 @@ int CanvasPopupResetTranslation::handle_event() } - -CanvasToggleControls::CanvasToggleControls(Canvas *canvas) - : BC_MenuItem(calculate_text(canvas->get_cwindow_controls())) -{ - this->canvas = canvas; -} -int CanvasToggleControls::handle_event() -{ - canvas->toggle_controls(); - set_text(calculate_text(canvas->get_cwindow_controls())); - return 1; -} - -char* CanvasToggleControls::calculate_text(int cwindow_controls) -{ - return !cwindow_controls ? _("Show controls") : _("Hide controls"); -} - - CanvasFullScreenItem::CanvasFullScreenItem(Canvas *canvas) : BC_MenuItem(_("Fullscreen"), "f", 'f') {