1.1 --- a/gui/main_win.cc Tue Aug 16 20:17:43 2005 +0000
1.2 +++ b/gui/main_win.cc Wed Aug 17 12:35:43 2005 +0000
1.3 @@ -8,6 +8,75 @@
1.4 set_default_size(WIN_WIDTH,WIN_HEIGHT);
1.5 add(vbox);
1.6
1.7 +
1.8 + // custom icons for the toolbar
1.9 +
1.10 + Glib::RefPtr<Gtk::IconFactory> p_icon_factory = Gtk::IconFactory::create();
1.11 +
1.12 + std::vector<std::string> icon_path;
1.13 + icon_path.push_back(DATADIR);
1.14 + icon_path.push_back("pixmaps");
1.15 + icon_path.push_back("gd");
1.16 +
1.17 + std::vector<std::string> move_icon_path(icon_path);
1.18 + move_icon_path.push_back("move.png");
1.19 + Gtk::IconSource move_icon_source;
1.20 + move_icon_source.set_filename(Glib::build_filename(move_icon_path));
1.21 + Gtk::IconSet move_icon_set;
1.22 + move_icon_set.add_source(move_icon_source);
1.23 + p_icon_factory->add(Gtk::StockID("gd-move"), move_icon_set);
1.24 +
1.25 + std::vector<std::string> addnode_icon_path(icon_path);
1.26 + addnode_icon_path.push_back("addnode.png");
1.27 + Gtk::IconSource addnode_icon_source;
1.28 + addnode_icon_source.set_filename(Glib::build_filename(addnode_icon_path));
1.29 + Gtk::IconSet addnode_icon_set;
1.30 + addnode_icon_set.add_source(addnode_icon_source);
1.31 + p_icon_factory->add(Gtk::StockID("gd-addnode"), addnode_icon_set);
1.32 +
1.33 + std::vector<std::string> addlink_icon_path(icon_path);
1.34 + addlink_icon_path.push_back("addlink.png");
1.35 + Gtk::IconSource addlink_icon_source;
1.36 + addlink_icon_source.set_filename(Glib::build_filename(addlink_icon_path));
1.37 + Gtk::IconSet addlink_icon_set;
1.38 + addlink_icon_set.add_source(addlink_icon_source);
1.39 + p_icon_factory->add(Gtk::StockID("gd-addlink"), addlink_icon_set);
1.40 +
1.41 + std::vector<std::string> delete_icon_path(icon_path);
1.42 + delete_icon_path.push_back("delete.png");
1.43 + Gtk::IconSource delete_icon_source;
1.44 + delete_icon_source.set_filename(Glib::build_filename(delete_icon_path));
1.45 + Gtk::IconSet delete_icon_set;
1.46 + delete_icon_set.add_source(delete_icon_source);
1.47 + p_icon_factory->add(Gtk::StockID("gd-delete"), delete_icon_set);
1.48 +
1.49 + std::vector<std::string> editlink_icon_path(icon_path);
1.50 + editlink_icon_path.push_back("editlink.png");
1.51 + Gtk::IconSource editlink_icon_source;
1.52 + editlink_icon_source.set_filename(Glib::build_filename(editlink_icon_path));
1.53 + Gtk::IconSet editlink_icon_set;
1.54 + editlink_icon_set.add_source(editlink_icon_source);
1.55 + p_icon_factory->add(Gtk::StockID("gd-editlink"), editlink_icon_set);
1.56 +
1.57 + std::vector<std::string> editnode_icon_path(icon_path);
1.58 + editnode_icon_path.push_back("editnode.png");
1.59 + Gtk::IconSource editnode_icon_source;
1.60 + editnode_icon_source.set_filename(Glib::build_filename(editnode_icon_path));
1.61 + Gtk::IconSet editnode_icon_set;
1.62 + editnode_icon_set.add_source(editnode_icon_source);
1.63 + p_icon_factory->add(Gtk::StockID("gd-editnode"), editnode_icon_set);
1.64 +
1.65 + std::vector<std::string> newmap_icon_path(icon_path);
1.66 + newmap_icon_path.push_back("newmap.png");
1.67 + Gtk::IconSource newmap_icon_source;
1.68 + newmap_icon_source.set_filename(Glib::build_filename(newmap_icon_path));
1.69 + Gtk::IconSet newmap_icon_set;
1.70 + newmap_icon_set.add_source(newmap_icon_source);
1.71 + p_icon_factory->add(Gtk::StockID("gd-newmap"), newmap_icon_set);
1.72 +
1.73 + p_icon_factory->add_default();
1.74 +
1.75 +
1.76 ag=Gtk::ActionGroup::create();
1.77
1.78 ag->add( Gtk::Action::create("FileMenu", "_File") );
1.79 @@ -39,19 +108,21 @@
1.80 sigc::mem_fun(this->mapwin, &MapWin::show));
1.81
1.82 Gtk::RadioAction::Group tool_group;
1.83 - ag->add( Gtk::RadioAction::create(tool_group, "MoveItem", Gtk::Stock::CONVERT, "Move"),
1.84 + ag->add( Gtk::RadioAction::create(tool_group, "MoveItem", Gtk::StockID("gd-move"), "Move"),
1.85 sigc::bind( sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::changeEditorialTool ), 0) );
1.86 - ag->add( Gtk::RadioAction::create(tool_group, "CreateNode", Gtk::Stock::NO, "Create node"),
1.87 + ag->add( Gtk::RadioAction::create(tool_group, "CreateNode", Gtk::StockID("gd-addnode"), "Create node"),
1.88 sigc::bind( sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::changeEditorialTool ), 1) );
1.89 - ag->add( Gtk::RadioAction::create(tool_group, "CreateEdge", Gtk::Stock::REMOVE, "Create edge"),
1.90 + ag->add( Gtk::RadioAction::create(tool_group, "CreateEdge", Gtk::StockID("gd-addlink"), "Create edge"),
1.91 sigc::bind( sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::changeEditorialTool ), 2) );
1.92 - ag->add( Gtk::RadioAction::create(tool_group, "EraseItem", Gtk::Stock::DELETE, "Delete"),
1.93 + ag->add( Gtk::RadioAction::create(tool_group, "EraseItem", Gtk::StockID("gd-delete"), "Delete"),
1.94 sigc::bind( sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::changeEditorialTool ), 3) );
1.95 - ag->add( Gtk::Action::create("EditEdgeMap", Gtk::Stock::PROPERTIES),
1.96 +
1.97 + ag->add( Gtk::RadioAction::create(tool_group, "EditEdgeMap", Gtk::StockID("gd-editlink"), "Edit edge map"),
1.98 sigc::bind( sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::changeEditorialTool ), 4) );
1.99 - ag->add( Gtk::Action::create("EditNodeMap", Gtk::Stock::PREFERENCES),
1.100 + ag->add( Gtk::RadioAction::create(tool_group, "EditNodeMap", Gtk::StockID("gd-editnode"), "Edit node map"),
1.101 sigc::bind( sigc::mem_fun ( this->gd_canvas, &GraphDisplayerCanvas::changeEditorialTool ), 5) );
1.102 - ag->add( Gtk::Action::create("AddMap", Gtk::Stock::NEW),
1.103 +
1.104 + ag->add( Gtk::Action::create("AddMap", Gtk::StockID("gd-newmap")),
1.105 sigc::mem_fun ( this->newmapwin, &NewMapWin::show ) );
1.106
1.107 uim=Gtk::UIManager::create();
1.108 @@ -99,6 +170,7 @@
1.109 " <toolitem action='EraseItem' />"
1.110 " <toolitem action='EditEdgeMap' />"
1.111 " <toolitem action='EditNodeMap' />"
1.112 + " <separator />"
1.113 " <toolitem action='AddMap' />"
1.114 " </toolbar>"
1.115 "</ui>";