X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Ficoncontroller.cpp;h=912487ecf1e333926d8be772f6ab8a44a0f26636;hb=c797a5de358807f73c2e2ed21d4f01b6a66d597e;hp=4d90c55e050dd511030e4cce20c97aa7160cd2a3;hpb=f7c2dc75685bf7dfce2b8152656938f66d6df11e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp index 4d90c55..912487e 100644 --- a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp +++ b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp @@ -6,7 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley -** Copyright (c) 2007 Chris Moore +** Copyright (c) 2007, 2008 Chris Moore ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -162,6 +162,8 @@ 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(encapsulate,"encapsulate_icon."IMAGE_EXT,_("Encapsulate")); + INIT_STOCK_ICON(select_all_child_layers,"select_all_child_layers_icon."IMAGE_EXT,_("Select All Child Layers")); 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")); @@ -227,16 +229,11 @@ Gdk::Cursor IconController::get_tool_cursor(const Glib::ustring& name,const Glib::RefPtr& window) { Glib::RefPtr 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 pixbuf; - DEBUGPOINT(); pixbuf=Gtk::Button().render_icon(Gtk::StockID("synfig-"+name),Gtk::ICON_SIZE_SMALL_TOOLBAR); - DEBUGPOINT(); pixbuf->render_to_drawable_alpha( pixmap, @@ -259,12 +256,10 @@ IconController::get_tool_cursor(const Glib::ustring& name,const Glib::RefPtr