X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Ficoncontroller.cpp;h=35738103dfed1c58ee848e9ca25c107590c7bc0d;hb=334e15ce6c4d9b1f30a168a55e7ef4d31320d568;hp=38e6b2aab18e127b1b6225286e2280afb4e6914c;hpb=449972484abe4b99beef5ac1ed918814e76041c6;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
index 38e6b2a..3573810 100644
--- a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
+++ b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
@@ -36,6 +36,8 @@
 #include <gtkmm/window.h>
 #include <synfigapp/action.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -47,12 +49,6 @@ using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
-// Quick hack to keep stuff working until gettext support is added
-#ifndef _
-#define _(x)	(x)
-#define N_(x)	(x)
-#endif
-
 #ifdef WIN32
 #	ifdef IMAGE_DIR
 #		undef IMAGE_DIR
@@ -137,23 +133,27 @@ IconController::IconController(const synfig::String& /*basepath*/)
 	stock_##name=Gtk::StockItem(Gtk::StockID("synfig-" #name),desc);   			\
 	Gtk::Stock::add(stock_##name);
 
-	INIT_STOCK_ICON(swap_colors,"swap_colors_icon."IMAGE_EXT,_("Swap Colors"));
-	INIT_STOCK_ICON(canvas,"canvas_icon."IMAGE_EXT,_("Canvas"));
-	INIT_STOCK_ICON(value_node,"valuenode_icon."IMAGE_EXT,_("ValueNode"));
-	INIT_STOCK_ICON(real,"real_icon."IMAGE_EXT,_("Real"));
+	INIT_STOCK_ICON(bool,"bool_icon."IMAGE_EXT,_("Bool"));
 	INIT_STOCK_ICON(integer,"integer_icon."IMAGE_EXT,_("Integer"));
+	INIT_STOCK_ICON(angle,"angle_icon."IMAGE_EXT,_("Angle"));
+	INIT_STOCK_ICON(time,"time_icon."IMAGE_EXT,_("Time"));
+	INIT_STOCK_ICON(real,"real_icon."IMAGE_EXT,_("Real"));
 	INIT_STOCK_ICON(vector,"vector_icon."IMAGE_EXT,_("Vector"));
 	INIT_STOCK_ICON(color,"color_icon."IMAGE_EXT,_("Color"));
-	INIT_STOCK_ICON(angle,"angle_icon."IMAGE_EXT,_("Angle"));
 	INIT_STOCK_ICON(segment,"segment_icon."IMAGE_EXT,_("Segment"));
+	INIT_STOCK_ICON(blinepoint,"blinepoint_icon."IMAGE_EXT,_("BLine Point"));
+	INIT_STOCK_ICON(list,"list_icon."IMAGE_EXT,_("Rename"));
+	INIT_STOCK_ICON(canvas,"canvas_icon."IMAGE_EXT,_("Canvas"));
+	INIT_STOCK_ICON(string,"string_icon."IMAGE_EXT,_("Rename"));
+	INIT_STOCK_ICON(gradient,"gradient_icon."IMAGE_EXT,_("Gradient"));
+
+	INIT_STOCK_ICON(swap_colors,"swap_colors_icon."IMAGE_EXT,_("Swap Colors"));
+	INIT_STOCK_ICON(value_node,"valuenode_icon."IMAGE_EXT,_("ValueNode"));
 	INIT_STOCK_ICON(about,"about_icon."IMAGE_EXT,_("About"));
 	INIT_STOCK_ICON(rename,"rename_icon."IMAGE_EXT,_("Rename"));
-	INIT_STOCK_ICON(list,"list_icon."IMAGE_EXT,_("Rename"));
 	INIT_STOCK_ICON(canvas_pointer,"canvas_pointer_icon."IMAGE_EXT,_("Rename"));
-	INIT_STOCK_ICON(string,"string_icon."IMAGE_EXT,_("Rename"));
 	INIT_STOCK_ICON(canvas_new,"canvas_icon."IMAGE_EXT,_("New Canvas"));
 	INIT_STOCK_ICON(saveall,"saveall_icon."IMAGE_EXT,_("Save All"));
-	INIT_STOCK_ICON(bool,"bool_icon."IMAGE_EXT,_("Bool"));
 	INIT_STOCK_ICON(layer,"layer_icon."IMAGE_EXT,_("Layer"));
 	INIT_STOCK_ICON(layer_pastecanvas,"pastecanvas_icon."IMAGE_EXT,_("Paste Canvas"));
 	INIT_STOCK_ICON(group,"group_icon."IMAGE_EXT,_("Group"));
@@ -162,8 +162,6 @@ IconController::IconController(const synfig::String& /*basepath*/)
 	INIT_STOCK_ICON(grid_snap_enable,"grid_snap_enable_icon."IMAGE_EXT,_("Enable Grid Snap"));
 	INIT_STOCK_ICON(grid_snap_disable,"grid_snap_disable_icon."IMAGE_EXT,_("Disable Grid Snap"));
 	INIT_STOCK_ICON(duplicate,"duplicate_icon."IMAGE_EXT,_("Duplicate"));
-	INIT_STOCK_ICON(gradient,"gradient_icon."IMAGE_EXT,_("Gradient"));
-	INIT_STOCK_ICON(blinepoint,"blinepoint_icon."IMAGE_EXT,_("BLine Point"));
 
 	INIT_STOCK_ICON(clear_undo,"clear_undo_icon."IMAGE_EXT,_("Clear Undo Stack"));
 	INIT_STOCK_ICON(clear_redo,"clear_redo_icon."IMAGE_EXT,_("Clear Redo Stack"));
@@ -229,16 +227,11 @@ Gdk::Cursor
 IconController::get_tool_cursor(const Glib::ustring& name,const Glib::RefPtr<Gdk::Window>& window)
 {
 	Glib::RefPtr<Gdk::Pixmap> pixmap;
-	DEBUGPOINT();
 	pixmap=Gdk::Pixmap::create(window, 64, 64, 8);
-	DEBUGPOINT();
 	pixmap->set_colormap(window->get_colormap());
 	//pixmap->set_colormap(Gdk::Colormap::create(pixmap->get_visual(),false));
-	DEBUGPOINT();
 	Glib::RefPtr<Gdk::Pixbuf> pixbuf;
-	DEBUGPOINT();
 	pixbuf=Gtk::Button().render_icon(Gtk::StockID("synfig-"+name),Gtk::ICON_SIZE_SMALL_TOOLBAR);
-	DEBUGPOINT();
 
 	pixbuf->render_to_drawable_alpha(
 		pixmap,
@@ -261,12 +254,10 @@ IconController::get_tool_cursor(const Glib::ustring& name,const Glib::RefPtr<Gdk
 		0,0 // Dither X,Y
 	);
 */
-	DEBUGPOINT();
 
 	Gdk::Color FG("#000000");
 	Gdk::Color BG("#FF00FF");
 
-	DEBUGPOINT();
   	return Gdk::Cursor(pixmap, pixmap, FG, BG, 0, 0);
 }
 
@@ -275,42 +266,45 @@ studio::value_icon(synfig::ValueBase::Type type)
 {
 		switch(type)
 		{
-		case ValueBase::TYPE_REAL:
-			return Gtk::StockID("synfig-real");
+		case ValueBase::TYPE_BOOL:
+			return Gtk::StockID("synfig-bool");
 			break;
 		case ValueBase::TYPE_INTEGER:
 			return Gtk::StockID("synfig-integer");
 			break;
-		case ValueBase::TYPE_BOOL:
-			return Gtk::StockID("synfig-bool");
-			break;
 		case ValueBase::TYPE_ANGLE:
 			return Gtk::StockID("synfig-angle");
 			break;
+		case ValueBase::TYPE_TIME:
+			return Gtk::StockID("synfig-time");
+			break;
+		case ValueBase::TYPE_REAL:
+			return Gtk::StockID("synfig-real");
+			break;
 		case ValueBase::TYPE_VECTOR:
 			return Gtk::StockID("synfig-vector");
 			break;
 		case ValueBase::TYPE_COLOR:
 			return Gtk::StockID("synfig-color");
 			break;
-		case ValueBase::TYPE_STRING:
-			return Gtk::StockID("synfig-string");
+		case ValueBase::TYPE_SEGMENT:
+			return Gtk::StockID("synfig-segment");
 			break;
-		case ValueBase::TYPE_CANVAS:
-			return Gtk::StockID("synfig-canvas_pointer");
+		case ValueBase::TYPE_BLINEPOINT:
+			return Gtk::StockID("synfig-blinepoint");
 			break;
 		case ValueBase::TYPE_LIST:
 			return Gtk::StockID("synfig-list");
 			break;
-		case ValueBase::TYPE_SEGMENT:
-			return Gtk::StockID("synfig-segment");
+		case ValueBase::TYPE_CANVAS:
+			return Gtk::StockID("synfig-canvas_pointer");
+			break;
+		case ValueBase::TYPE_STRING:
+			return Gtk::StockID("synfig-string");
 			break;
 		case ValueBase::TYPE_GRADIENT:
 			return Gtk::StockID("synfig-gradient");
 			break;
-		case ValueBase::TYPE_BLINEPOINT:
-			return Gtk::StockID("synfig-blinepoint");
-			break;
 		case ValueBase::TYPE_NIL:
 		default:
 			return Gtk::StockID("synfig-unknown");