X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Frenddesc.cpp;h=f1a3464e8d3b9daff0b5ce32ef45e713bce8efe8;hb=b3153cc6f4b90adc7fd2041daf2a553edc4ba1eb;hp=c9c1daeb386092e2e01d3ea9812e9adf0ef8d583;hpb=c6af6e1c3816eb3b15c573089b32e6ae65cd2f49;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/renddesc.cpp b/synfig-studio/trunk/src/gtkmm/renddesc.cpp index c9c1dae..f1a3464 100644 --- a/synfig-studio/trunk/src/gtkmm/renddesc.cpp +++ b/synfig-studio/trunk/src/gtkmm/renddesc.cpp @@ -2,10 +2,11 @@ /*! \file gtkmm/renddesc.cpp ** \brief Template File ** -** $Id: renddesc.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $ +** $Id$ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007 Chris Moore ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -36,7 +37,9 @@ #include #include #include -//#include +//#include + +#include "general.h" #endif @@ -57,10 +60,6 @@ using namespace studio; #define SYNFIG_MAX_PIXEL_HEIGHT (~(1<<31)) #endif -#if ! defined(_) -#define _(x) (x) -#endif - #ifndef DPM2DPI #define DPM2DPI(x) ((x)/39.3700787402) #define DPI2DPM(x) ((x)*39.3700787402) @@ -81,12 +80,12 @@ Widget_RendDesc::Widget_RendDesc(): Gtk::Notebook(), adjustment_width(1,1,SYNFIG_MAX_PIXEL_WIDTH), adjustment_height(1,1,SYNFIG_MAX_PIXEL_HEIGHT), - adjustment_xres(0,0,10000000), - adjustment_yres(0,0,10000000), - adjustment_phy_width(0,0,10000000), - adjustment_phy_height(0,0,10000000), - adjustment_fps(0,0,10000000), - adjustment_span(0,0,10000000) + adjustment_xres(0,0.0000000001,10000000), + adjustment_yres(0,0.0000000001,10000000), + adjustment_phy_width(0,0.0000000001,10000000), + adjustment_phy_height(0,0.0000000001,10000000), + adjustment_fps(0,0.0000000001,10000000), + adjustment_span(0,0.0000000001,10000000) { update_lock=0; @@ -135,7 +134,6 @@ Widget_RendDesc::refresh() adjustment_span.set_value(rend_desc_.get_span()); entry_tl->set_value(rend_desc_.get_tl()); entry_br->set_value(rend_desc_.get_br()); - entry_focus->set_value(rend_desc_.get_focus()); toggle_px_aspect->set_active((bool)(rend_desc_.get_flags()&RendDesc::PX_ASPECT)); toggle_px_width->set_active((bool)(rend_desc_.get_flags()&RendDesc::PX_W)); @@ -317,16 +315,6 @@ Widget_RendDesc::on_br_changed() } void -Widget_RendDesc::on_focus_changed() -{ - if(update_lock)return; - UpdateLock lock(update_lock); - rend_desc_.set_focus(entry_focus->get_value()); - refresh(); - signal_changed()(); -} - -void Widget_RendDesc::on_span_changed() { if(update_lock)return; @@ -387,7 +375,6 @@ Widget_RendDesc::create_widgets() entry_end_time=manage(new Widget_Time()); //entry_start_frame=manage(new Gtk::SpinButton(adjustment_start_frame,1,0)); //entry_end_frame=manage(new Gtk::SpinButton(adjustment_end_frame,1,0)); - entry_focus=manage(new Widget_Vector()); toggle_px_aspect=manage(new Gtk::CheckButton(_("_Pixel Aspect"), true)); toggle_px_aspect->set_alignment(0, 0.5); toggle_px_width=manage(new Gtk::CheckButton(_("Pi_xel Width"), true)); @@ -402,7 +389,6 @@ Widget_RendDesc::create_widgets() toggle_im_height->set_alignment(0, 0.5); toggle_im_span=manage(new Gtk::CheckButton(_("Image _Span"), true)); toggle_im_span->set_alignment(0, 0.5); - time_frame=manage(new Gtk::Frame(_("Time"))); } void @@ -422,7 +408,6 @@ Widget_RendDesc::connect_signals() entry_end_time->signal_value_changed().connect(sigc::mem_fun(*this,&studio::Widget_RendDesc::on_end_time_changed)); //entry_start_frame->signal_value_changed().connect(sigc::mem_fun(*this,&studio::Widget_RendDesc::on_start_frame_changed)); //entry_end_frame->signal_value_changed().connect(sigc::mem_fun(*this,&studio::Widget_RendDesc::on_end_frame_changed)); - entry_focus->signal_value_changed().connect(sigc::mem_fun(*this,&studio::Widget_RendDesc::on_focus_changed)); toggle_px_aspect->signal_toggled().connect(sigc::mem_fun(*this, &studio::Widget_RendDesc::on_lock_changed)); toggle_px_width->signal_toggled().connect(sigc::mem_fun(*this, &studio::Widget_RendDesc::on_lock_changed)); toggle_px_height->signal_toggled().connect(sigc::mem_fun(*this, &studio::Widget_RendDesc::on_lock_changed)); @@ -531,9 +516,9 @@ Widget_RendDesc::create_time_tab() Gtk::VBox *panelBox = manage(new Gtk::VBox(false, 12)); // for future widgets paddedPanel->add(*panelBox); - Gtk::Frame *time_frame = manage(new Gtk::Frame("Time Settings")); + time_frame = manage(new Gtk::Frame(_("Time Settings"))); time_frame->set_shadow_type(Gtk::SHADOW_NONE); - ((Gtk::Label *) time_frame->get_label_widget())->set_markup("Time Settings"); + ((Gtk::Label *) time_frame->get_label_widget())->set_markup(_("Time Settings")); panelBox->pack_start(*time_frame, false, false, 0); Gtk::Alignment *timeFramePadding = manage(new Gtk::Alignment(0, 0, 1, 1)); @@ -596,23 +581,6 @@ Widget_RendDesc::create_other_tab() lockTable->attach(*toggle_px_height, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0); lockTable->attach(*toggle_px_aspect, 2, 3, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0); - Gtk::Frame *focusFrame = manage(new Gtk::Frame(_("Focus Point"))); - focusFrame->set_shadow_type(Gtk::SHADOW_NONE); - ((Gtk::Label *) focusFrame->get_label_widget())->set_markup(_("Focus Point")); - panelBox->pack_start(*focusFrame, false, false, 0); - - Gtk::Alignment *focusPadding = manage(new Gtk::Alignment(0, 0, 1, 1)); - focusPadding->set_padding(6, 0, 24, 0); - focusFrame->add(*focusPadding); - - Gtk::HBox *focusBox = manage(new Gtk::HBox(false, 12)); - focusPadding->add(*focusBox); - - Gtk::Label *focusLabel = manage(new Gtk::Label(_("_Focus Point"), 0, 0.5, true)); - focusLabel->set_mnemonic_widget(*entry_focus); - focusBox->pack_start(*focusLabel, false, false, 0); - focusBox->pack_start(*entry_focus, true, true, 0); - paddedPanel->show_all(); return paddedPanel; }