/* === S Y N F I G ========================================================= */
-/*! \file template.cpp
+/*! \file iconcontroler.cpp
** \brief Template File
**
-** $Id: iconcontroler.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+** $Id$
**
** \legal
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 Chris Moore
**
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+** This package is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License as
+** published by the Free Software Foundation; either version 2 of
+** the License, or (at your option) any later version.
**
-** You may not copy, print, publish, or in any
-** other way distribute this software without
-** a prior written agreement with
-** the copyright holder.
+** This package is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** General Public License for more details.
** \endlegal
*/
/* ========================================================================= */
static Glib::RefPtr<Gdk::Pixbuf> _tree_pixbuf_table_value_type[(int)synfig::ValueBase::TYPE_END];
+#ifdef WIN32
IconControler::IconControler(const synfig::String& basepath)
+#else
+IconControler::IconControler(const synfig::String& /*basepath*/)
+#endif
{
Gtk::IconSource icon_source;
icon_source.set_direction_wildcarded();
#else
path_to_icons=IMAGE_DIR;
#endif
- path_to_icons+=ETL_DIRECTORY_SEPERATOR;
+
+ char* synfig_root=getenv("SYNFIG_ROOT");
+ if(synfig_root) {
+ path_to_icons=synfig_root;
+ path_to_icons+=ETL_DIRECTORY_SEPARATOR;
+
+ path_to_icons+="share/pixmaps/synfigstudio";
+ }
+ path_to_icons+=ETL_DIRECTORY_SEPARATOR;
try{
Gtk::Window::set_default_icon_from_file(path_to_icons+"synfig_icon."+IMAGE_EXT);
{
synfig::warning("Unable to open "+path_to_icons+"synfig_icon."+IMAGE_EXT);
}
-
+
/*
#define INIT_STOCK_ICON(name,iconfile,desc) \
stock_##name=Gtk::StockItem(Gtk::StockID("synfig-" #name),desc); \
#define INIT_STOCK_ITEM(name,desc) \
stock_##name=Gtk::StockItem(Gtk::StockID("synfig-" #name),desc); \
- Gtk::Stock::add(stock_##name);
+ 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(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,_("PasteCanvas"));
+ INIT_STOCK_ICON(layer_pastecanvas,"pastecanvas_icon."IMAGE_EXT,_("Paste Canvas"));
INIT_STOCK_ICON(group,"group_icon."IMAGE_EXT,_("Group"));
INIT_STOCK_ICON(grid_enable,"grid_enable_icon."IMAGE_EXT,_("Show Grid"));
INIT_STOCK_ICON(grid_disable,"grid_disable_icon."IMAGE_EXT,_("Hide Grid"));
INIT_STOCK_ICON(clear_redo,"clear_redo_icon."IMAGE_EXT,_("Clear Redo Stack"));
INIT_STOCK_ICON(children,"children_icon."IMAGE_EXT,_("Children"));
+ INIT_STOCK_ICON(curves,"curves_icon."IMAGE_EXT,_("Curves"));
INIT_STOCK_ICON(keyframes,"keyframe_icon."IMAGE_EXT,_("Keyframes"));
INIT_STOCK_ICON(meta_data,"meta_data_icon."IMAGE_EXT,_("MetaData"));
INIT_STOCK_ICON(navigator,"navigator_icon."IMAGE_EXT,_("Navigator"));
INIT_STOCK_ICON(mirror,"mirror_icon."IMAGE_EXT,_("Mirror Tool"));
icon_factory->add_default();
-
+
Gtk::IconSize::register_new("synfig-small_icon",12,12);
for(int i(0);i<(int)ValueBase::TYPE_END;i++)
_tree_pixbuf_table_value_type[i]=Gtk::Button().render_icon(value_icon(ValueBase::Type(i)),Gtk::ICON_SIZE_SMALL_TOOLBAR);
);
*/
DEBUGPOINT();
-
+
Gdk::Color FG("#000000");
Gdk::Color BG("#FF00FF");
-
+
DEBUGPOINT();
return Gdk::Cursor(pixmap, pixmap, FG, BG, 0, 0);
}
}
else
{
- return Gtk::StockID("synfig-value_node");
+ return Gtk::StockID("synfig-value_node");
}
}
studio::get_action_stock_id(const synfigapp::Action::BookEntry& action)
{
Gtk::StockID stock_id;
- if(action.task=="raise") stock_id=Gtk::Stock::GO_UP;
- else if(action.task=="lower") stock_id=Gtk::Stock::GO_DOWN;
- else if(action.task=="add") stock_id=Gtk::Stock::ADD;
+ if(action.task=="add") stock_id=Gtk::Stock::ADD;
+ else if(action.task=="connect") stock_id=Gtk::Stock::CONNECT;
+ else if(action.task=="disconnect") stock_id=Gtk::Stock::DISCONNECT;
else if(action.task=="insert") stock_id=Gtk::Stock::ADD;
- else if(action.task=="move_top") stock_id=Gtk::Stock::GOTO_TOP;
+ else if(action.task=="lower") stock_id=Gtk::Stock::GO_DOWN;
else if(action.task=="move_bottom") stock_id=Gtk::Stock::GOTO_BOTTOM;
+ else if(action.task=="move_top") stock_id=Gtk::Stock::GOTO_TOP;
+ else if(action.task=="raise") stock_id=Gtk::Stock::GO_UP;
else if(action.task=="remove") stock_id=Gtk::Stock::DELETE;
- else if(action.task=="set_on") stock_id=Gtk::Stock::YES;
else if(action.task=="set_off") stock_id=Gtk::Stock::NO;
- else if(action.task=="remove") stock_id=Gtk::Stock::DELETE;
- else stock_id=Gtk::StockID("synfig-"+action.task);
-
+ else if(action.task=="set_on") stock_id=Gtk::Stock::YES;
+ else stock_id=Gtk::StockID("synfig-"+
+ action.task);
return stock_id;
}
Gtk::StockID
studio::layer_icon(const synfig::String &layer)
{
- if(layer=="PasteCanvas" || layer=="pastecanvas")
+ if(layer=="PasteCanvas" || layer=="pastecanvas" || layer=="paste_canvas")
return Gtk::StockID("synfig-layer_pastecanvas");
else if(layer=="rotate")
return Gtk::StockID("synfig-rotate");