Remove the "Focus Point" setting from the document properties dialog. It's only...

[synfig.git] / synfig-studio / trunk / src / gtkmm / renddesc.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/renddesc.cpp b/synfig-studio/trunk/src/gtkmm/renddesc.cpp
index 4d87a82..f1a3464 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/renddesc.cpp
+++ b/synfig-studio/trunk/src/gtkmm/renddesc.cpp
@@ -39,6 +39,8 @@
 #include <synfig/general.h>
 //#include <gtkmm/separator.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -58,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)
@@ -136,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));
@@ -318,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;
@@ -388,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));
@@ -403,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
@@ -423,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));
@@ -532,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("<b>Time Settings</b>");
+       ((Gtk::Label *) time_frame->get_label_widget())->set_markup(_("<b>Time Settings</b>"));
        panelBox->pack_start(*time_frame, false, false, 0);
 
        Gtk::Alignment *timeFramePadding = manage(new Gtk::Alignment(0, 0, 1, 1));
@@ -597,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(_("<b>Focus Point</b>"));
-       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;
 }