X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_defaults.cpp;h=3e51bf5df43eb313c789529fcabfebcd27c88cde;hb=079d558cd0918585fe2d33f70f9be7e72230f722;hp=9f8cb7e278d95c8b6a5d3b8878a033b273f20957;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/widget_defaults.cpp b/synfig-studio/trunk/src/gtkmm/widget_defaults.cpp
index 9f8cb7e..3e51bf5 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_defaults.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_defaults.cpp
@@ -43,6 +43,8 @@
 #include "widget_distance.h"
 #include "widget_enum.h"
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -78,7 +80,7 @@ public:
 	}
 
 	bool
-	redraw(GdkEventExpose*bleh)
+	redraw(GdkEventExpose */*bleh*/)
 	{
 		Glib::RefPtr<Gdk::GC> gc(Gdk::GC::create(get_window()));
 
@@ -168,13 +170,15 @@ public:
 				{
 					Distance dist(synfigapp::Main::get_bline_width());
 
-					if(event->scroll.direction==GDK_SCROLL_UP)
-					{
-						dist+=DEFAULT_INCREMENT;
-					}
-					else if(event->scroll.direction==GDK_SCROLL_DOWN)
-					{
-						dist-=DEFAULT_INCREMENT;
+					switch(event->scroll.direction){
+						case GDK_SCROLL_UP:
+						case GDK_SCROLL_RIGHT:
+							dist+=DEFAULT_INCREMENT;
+						break;
+						case GDK_SCROLL_DOWN:
+						case GDK_SCROLL_LEFT:
+							dist-=DEFAULT_INCREMENT;
+						break;
 					}
 					synfigapp::Main::set_bline_width(dist);
 					return true;
@@ -234,10 +238,13 @@ Widget_Defaults::Widget_Defaults()
 		tooltips_.set_tip(*button_swap,_("Swap Background and\nForeground Colors"));
 
 		// Reset button
-		Gtk::Button* button_reset(manage(new Gtk::Button("R")));
+		Gtk::Button* button_reset(manage(new Gtk::Button()));
 		button_reset->show();
 		button_reset->set_relief(Gtk::RELIEF_NONE);
 		button_reset->set_border_width(0);
+		icon=manage(new Gtk::Image(Gtk::StockID("synfig-reset_colors"),Gtk::IconSize(1)));
+		icon->show();
+		button_reset->add(*icon);
 		dynamic_cast<Gtk::Misc*>(button_reset->get_child())->set_padding(0,0);
 		//button_reset->set_size_request(16/3,16/3);
 		button_reset->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Defaults::on_reset_color_clicked));
@@ -280,10 +287,10 @@ Widget_Defaults::Widget_Defaults()
 	widget_interpolation->set_param_desc(
 		ParamDesc("interpolation")
 			.set_hint("enum")
-			.add_enum_value(INTERPOLATION_TCB,"auto",_("TCB"))
-			.add_enum_value(INTERPOLATION_CONSTANT,"constant",_("Constant"))
-			.add_enum_value(INTERPOLATION_HALT,"ease",_("Ease in/out"))
-			.add_enum_value(INTERPOLATION_LINEAR,"linear",_("Linear"))
+			.add_enum_value(INTERPOLATION_TCB,"auto",_("_TCB"))
+			.add_enum_value(INTERPOLATION_CONSTANT,"constant",_("_Constant"))
+			.add_enum_value(INTERPOLATION_HALT,"ease",_("_Ease In/Out"))
+			.add_enum_value(INTERPOLATION_LINEAR,"linear",_("_Linear"))
 	);
 	attach(*widget_interpolation,0, 2, 5, 6, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 1, 1);
 	tooltips_.set_tip(*widget_interpolation,_("Default Interpolation"));