X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdialog_preview.cpp;h=07828693b872b1f11279aff43bf715a300011c0e;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=d1b9e15692c71817e75b4b50943dce9b7176e654;hpb=e10033355e7df3cd6b2dc9799cf9423d16e3c4ce;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dialog_preview.cpp b/synfig-studio/trunk/src/gtkmm/dialog_preview.cpp
index d1b9e15..0782869 100644
--- a/synfig-studio/trunk/src/gtkmm/dialog_preview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dialog_preview.cpp
@@ -2,7 +2,7 @@
 /*!	\file dialog_preview.cpp
 **	\brief Preview dialog File
 **
-**	$Id: dialog_preview.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
@@ -35,6 +35,8 @@
 #include <gtkmm/alignment.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/box.h>
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -67,7 +69,7 @@ Dialog_Preview::~Dialog_Preview()
 {
 }
 
-void Dialog_Preview::set_preview(handle<Preview>	prev)
+void Dialog_Preview::set_preview(etl::handle<Preview> prev)
 {
 	get_window().clear();
 	preview.set_preview(prev);
@@ -92,8 +94,8 @@ settings(this,"prevoptions")
 {
 	//framerate = 15.0f;
 	//zoom = 0.2f;
-	
-	//set the fps of the time widgets	
+
+	//set the fps of the time widgets
 	Gtk::Alignment *dialogPadding = manage(new Gtk::Alignment(0, 0, 1, 1));
 	dialogPadding->set_padding(12, 12, 12, 12);
 	get_vbox()->add(*dialogPadding);
@@ -109,7 +111,7 @@ settings(this,"prevoptions")
 	Gtk::Alignment *generalPadding = manage(new Gtk::Alignment(0, 0, 1, 1));
 	generalPadding->set_padding(6, 0, 24, 0);
 	generalFrame->add(*generalPadding);
-	
+
 	Gtk::Table *generalTable = manage(new Gtk::Table(2, 2, false));
 	generalTable->set_row_spacings(6);
 	generalTable->set_col_spacings(12);
@@ -132,7 +134,7 @@ settings(this,"prevoptions")
 	fpsSpinner->set_alignment(1);
 	generalTable->attach(*fpsLabel, 0, 1, 1, 2, Gtk::SHRINK | Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
 	generalTable->attach(*fpsSpinner, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
-	
+
 	Gtk::Frame *timeFrame = manage(new Gtk::Frame(_("Time Settings")));
 	timeFrame->set_shadow_type(Gtk::SHADOW_NONE);
 	((Gtk::Label *) timeFrame->get_label_widget())->set_markup(_("<b>Time Settings</b>"));
@@ -146,7 +148,7 @@ settings(this,"prevoptions")
 	timeTable->set_row_spacings(6);
 	timeTable->set_col_spacings(12);
 	timePadding->add(*timeTable);
-	
+
 	check_overbegin.set_alignment(0, 0.5);
 	check_overbegin.set_use_underline(TRUE);
 	check_overend.set_alignment(0, 0.5);
@@ -157,10 +159,10 @@ settings(this,"prevoptions")
 	timeTable->attach(time_begin, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
 	timeTable->attach(check_overend, 0, 1, 1, 2, Gtk::SHRINK | Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
 	timeTable->attach(time_end, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
-	
+
 	check_overbegin.signal_toggled().connect(sigc::mem_fun(*this,&Dialog_PreviewOptions::on_overbegin_toggle));
 	check_overend.signal_toggled().connect(sigc::mem_fun(*this,&Dialog_PreviewOptions::on_overend_toggle));
-		
+
 	Gtk::Button *cancelButton = manage(new Gtk::Button(Gtk::StockID("gtk-cancel")));
 	cancelButton->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_PreviewOptions::on_cancel_pressed));
 	add_action_widget(*cancelButton, 1);
@@ -169,7 +171,7 @@ settings(this,"prevoptions")
 	okbutton->set_label(_("Preview"));
 	okbutton->signal_clicked().connect(sigc::mem_fun(*this,&Dialog_PreviewOptions::on_ok_pressed));
 	add_action_widget(*okbutton, 0);
-	
+
 	time_begin.set_sensitive(false);
 	time_end.set_sensitive(false);
 	show_all();
@@ -188,7 +190,7 @@ void Dialog_PreviewOptions::on_ok_pressed()
 	i.overend = get_end_override();
 	if(i.overbegin) i.begintime = (float)get_begintime();
 	if(i.overend)	i.endtime = (float)get_endtime();
-	
+
 	hide();
 	signal_finish_(i);
 	signal_finish_.clear();
@@ -210,9 +212,9 @@ void Dialog_PreviewOptions::on_overend_toggle()
 	time_end.set_sensitive(get_end_override());
 }
 
-void studio::Dialog_PreviewOptions::set_global_fps(float f) 
-{ 
-	globalfps = f; 
-	time_begin.set_fps(f); 
+void studio::Dialog_PreviewOptions::set_global_fps(float f)
+{
+	globalfps = f;
+	time_begin.set_fps(f);
 	time_end.set_fps(f);
 }