1.1 --- a/main_win.cc	Wed Aug 17 12:35:43 2005 +0000
     1.2 +++ b/main_win.cc	Wed Aug 17 15:20:18 2005 +0000
     1.3 @@ -1,4 +1,5 @@
     1.4  #include "main_win.h"
     1.5 +#include "guipixbufs.h"
     1.6  
     1.7  MainWin::MainWin(const std::string& title) :
     1.8    mapwin("Map Setup", mapstorage, gd_canvas),
     1.9 @@ -13,63 +14,59 @@
    1.10  
    1.11    Glib::RefPtr<Gtk::IconFactory> p_icon_factory = Gtk::IconFactory::create();
    1.12   
    1.13 -  std::vector<std::string> icon_path;
    1.14 -  icon_path.push_back(DATADIR);
    1.15 -  icon_path.push_back("pixmaps");
    1.16 -  icon_path.push_back("gd");
    1.17 +  Glib::RefPtr<Gdk::Pixbuf> p_move_pixbuf = Gdk::Pixbuf::create_from_inline(
    1.18 +      2328, gui_icons_move);
    1.19 +  Glib::RefPtr<Gdk::Pixbuf> p_addnode_pixbuf = Gdk::Pixbuf::create_from_inline(
    1.20 +      2328, gui_icons_addnode);
    1.21 +  Glib::RefPtr<Gdk::Pixbuf> p_addlink_pixbuf = Gdk::Pixbuf::create_from_inline(
    1.22 +      2328, gui_icons_addlink);
    1.23 +  Glib::RefPtr<Gdk::Pixbuf> p_delete_pixbuf = Gdk::Pixbuf::create_from_inline(
    1.24 +      2328, gui_icons_delete);
    1.25 +  Glib::RefPtr<Gdk::Pixbuf> p_editlink_pixbuf = Gdk::Pixbuf::create_from_inline(
    1.26 +      2328, gui_icons_editlink);
    1.27 +  Glib::RefPtr<Gdk::Pixbuf> p_editnode_pixbuf = Gdk::Pixbuf::create_from_inline(
    1.28 +      2328, gui_icons_editnode);
    1.29 +  Glib::RefPtr<Gdk::Pixbuf> p_newmap_pixbuf = Gdk::Pixbuf::create_from_inline(
    1.30 +      2328, gui_icons_newmap);
    1.31  
    1.32 -  std::vector<std::string> move_icon_path(icon_path);
    1.33 -  move_icon_path.push_back("move.png");
    1.34    Gtk::IconSource move_icon_source;
    1.35 -  move_icon_source.set_filename(Glib::build_filename(move_icon_path));
    1.36 +  move_icon_source.set_pixbuf(p_move_pixbuf);
    1.37    Gtk::IconSet move_icon_set;
    1.38    move_icon_set.add_source(move_icon_source);
    1.39    p_icon_factory->add(Gtk::StockID("gd-move"), move_icon_set);
    1.40  
    1.41 -  std::vector<std::string> addnode_icon_path(icon_path);
    1.42 -  addnode_icon_path.push_back("addnode.png");
    1.43    Gtk::IconSource addnode_icon_source;
    1.44 -  addnode_icon_source.set_filename(Glib::build_filename(addnode_icon_path));
    1.45 +  addnode_icon_source.set_pixbuf(p_addnode_pixbuf);
    1.46    Gtk::IconSet addnode_icon_set;
    1.47    addnode_icon_set.add_source(addnode_icon_source);
    1.48    p_icon_factory->add(Gtk::StockID("gd-addnode"), addnode_icon_set);
    1.49  
    1.50 -  std::vector<std::string> addlink_icon_path(icon_path);
    1.51 -  addlink_icon_path.push_back("addlink.png");
    1.52    Gtk::IconSource addlink_icon_source;
    1.53 -  addlink_icon_source.set_filename(Glib::build_filename(addlink_icon_path));
    1.54 +  addlink_icon_source.set_pixbuf(p_addlink_pixbuf);
    1.55    Gtk::IconSet addlink_icon_set;
    1.56    addlink_icon_set.add_source(addlink_icon_source);
    1.57    p_icon_factory->add(Gtk::StockID("gd-addlink"), addlink_icon_set);
    1.58  
    1.59 -  std::vector<std::string> delete_icon_path(icon_path);
    1.60 -  delete_icon_path.push_back("delete.png");
    1.61    Gtk::IconSource delete_icon_source;
    1.62 -  delete_icon_source.set_filename(Glib::build_filename(delete_icon_path));
    1.63 +  delete_icon_source.set_pixbuf(p_delete_pixbuf);
    1.64    Gtk::IconSet delete_icon_set;
    1.65    delete_icon_set.add_source(delete_icon_source);
    1.66    p_icon_factory->add(Gtk::StockID("gd-delete"), delete_icon_set);
    1.67  
    1.68 -  std::vector<std::string> editlink_icon_path(icon_path);
    1.69 -  editlink_icon_path.push_back("editlink.png");
    1.70    Gtk::IconSource editlink_icon_source;
    1.71 -  editlink_icon_source.set_filename(Glib::build_filename(editlink_icon_path));
    1.72 +  editlink_icon_source.set_pixbuf(p_editlink_pixbuf);
    1.73    Gtk::IconSet editlink_icon_set;
    1.74    editlink_icon_set.add_source(editlink_icon_source);
    1.75    p_icon_factory->add(Gtk::StockID("gd-editlink"), editlink_icon_set);
    1.76  
    1.77 -  std::vector<std::string> editnode_icon_path(icon_path);
    1.78 -  editnode_icon_path.push_back("editnode.png");
    1.79    Gtk::IconSource editnode_icon_source;
    1.80 -  editnode_icon_source.set_filename(Glib::build_filename(editnode_icon_path));
    1.81 +  editnode_icon_source.set_pixbuf(p_editnode_pixbuf);
    1.82    Gtk::IconSet editnode_icon_set;
    1.83    editnode_icon_set.add_source(editnode_icon_source);
    1.84    p_icon_factory->add(Gtk::StockID("gd-editnode"), editnode_icon_set);
    1.85  
    1.86 -  std::vector<std::string> newmap_icon_path(icon_path);
    1.87 -  newmap_icon_path.push_back("newmap.png");
    1.88    Gtk::IconSource newmap_icon_source;
    1.89 -  newmap_icon_source.set_filename(Glib::build_filename(newmap_icon_path));
    1.90 +  newmap_icon_source.set_pixbuf(p_newmap_pixbuf);
    1.91    Gtk::IconSet newmap_icon_set;
    1.92    newmap_icon_set.add_source(newmap_icon_source);
    1.93    p_icon_factory->add(Gtk::StockID("gd-newmap"), newmap_icon_set);