X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=44c8340729cbd7a0392d23492792b59cfa8ad9ed;hb=2d3216db7740f8155429914c17af1edb04a032bb;hp=b492958b71cc7b2bd3ac2669d8041b6710c51912;hpb=6989d1403b14b5b27dbf81b2c1cf6889511adf97;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index b492958..44c8340 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -99,6 +99,7 @@
 #include "preview.h"
 #include "audiocontainer.h"
 #include "widget_timeslider.h"
+#include "framedial.h"
 
 #include <synfigapp/main.h>
 #include <synfigapp/inputdevice.h>
@@ -247,6 +248,37 @@ public:
 		//view->progressbar->set_fraction(0);
 	}
 
+	virtual Response confirmation(const std::string &title,
+			const std::string &primaryText,
+			const std::string &secondaryText,
+			const std::string &confirmPhrase,
+			const std::string &cancelPhrase,
+			Response defaultResponse=RESPONSE_OK)
+	{
+		view->present();
+		//while(studio::App::events_pending())studio::App::iteration(false);
+		Gtk::MessageDialog dialog(
+			*view,			// Parent
+			primaryText,		// Message
+			false,			// Markup
+			Gtk::MESSAGE_WARNING,	// Type
+			Gtk::BUTTONS_NONE,	// Buttons
+			true			// Modal
+		);
+
+		if (! title.empty())
+			dialog.set_title(title);
+		if (! secondaryText.empty())
+			dialog.set_secondary_text(secondaryText);
+
+		dialog.add_button(cancelPhrase, RESPONSE_CANCEL);
+		dialog.add_button(confirmPhrase, RESPONSE_OK);
+		dialog.set_default_response(defaultResponse);
+
+		dialog.show_all();
+		return (Response) dialog.run();
+	}
+
 	virtual Response yes_no(const std::string &title, const std::string &message,Response dflt=RESPONSE_YES)
 	{
 		view->present();
@@ -941,8 +973,6 @@ CanvasView::create_time_bar()
 	keyframebutton->signal_clicked().connect(sigc::mem_fun(*this, &studio::CanvasView::on_keyframe_button_pressed));
 	keyframebutton->show();
 
-	Gtk::Table *table= manage(new class Gtk::Table(2, 3, false));
-
 	//setup the audio display
 	disp_audio->set_size_request(-1,32); //disp_audio->show();
 	disp_audio->set_time_adjustment(&time_adjustment());
@@ -956,14 +986,32 @@ CanvasView::create_time_bar()
 		sigc::mem_fun(*audio,&AudioContainer::stop_scrubbing)
 	);
 
-	table->attach(*manage(disp_audio), 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
-	table->attach(*timeslider, 0, 1, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK, 0, 0);
-	table->attach(*time_window_scroll, 0, 1, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK, 0, 0);
+	FrameDial *framedial = manage(new class FrameDial());
+	framedial->signal_seek_begin().connect(
+			sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek_time), Time::begin())
+	);
+	framedial->signal_seek_prev_frame().connect(
+			sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek_frame), -1)
+	);
+	framedial->signal_seek_next_frame().connect(
+			sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek_frame), 1)
+	);
+	framedial->signal_seek_end().connect(
+			sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek_time), Time::end())
+	);
+	framedial->show();
+
+	Gtk::Table *table = manage(new class Gtk::Table(4, 3, false));
+	timebar = table;
 
-	table->attach(*animatebutton, 1, 2, 0, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
-	table->attach(*keyframebutton, 2, 3, 0, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
-	timebar=table;
+	table->attach(*manage(disp_audio), 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
+	table->attach(*framedial, 0, 1, 1, 2,Gtk::SHRINK, Gtk::SHRINK);
+	table->attach(*timeslider, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
+	table->attach(*time_window_scroll, 1, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
+	table->attach(*animatebutton, 2, 3, 0, 3, Gtk::SHRINK, Gtk::SHRINK);
+	table->attach(*keyframebutton, 3, 4, 0, 3, Gtk::SHRINK, Gtk::SHRINK);
 	table->show();
+
 	return table;
 }
 
@@ -2845,9 +2893,9 @@ CanvasView::rebuild_ducks_layer_(synfig::TransformStack& transform_stack, synfig
 			Vector focus(layer->get_param("focus").get(Vector()));
 
 			if(!scale.is_equal_to(Vector(1,1)))
-				transform_stack.push(new Transform_Scale(scale,origin+focus));
+				transform_stack.push(new Transform_Scale(layer->get_guid(), scale,origin+focus));
 			if(!origin.is_equal_to(Vector(0,0)))
-				transform_stack.push(new Transform_Translate(origin));
+				transform_stack.push(new Transform_Translate(layer->get_guid(), origin));
 
 			rebuild_ducks_layer_(transform_stack,child_canvas,selected_list);