From: Carlos Lopez Date: Sun, 28 Jun 2009 15:39:35 +0000 (+0200) Subject: Change toggle duck icons from numbers to duck icon images. X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=df3517cbedbb486c3b092f765fe1019649005b73;p=synfig.git Change toggle duck icons from numbers to duck icon images. --- diff --git a/synfig-studio/trunk/images/Makefile.am b/synfig-studio/trunk/images/Makefile.am index 5db7c38..3053ca9 100644 --- a/synfig-studio/trunk/images/Makefile.am +++ b/synfig-studio/trunk/images/Makefile.am @@ -74,8 +74,13 @@ EXTRA_DIST = \ seek_begin.sif \ seek_end.sif \ seek_next_frame.sif \ - seek_prev_frame.sif - + seek_prev_frame.sif \ + duck_position_icon.sif \ + duck_vertex_icon.sif \ + duck_tangent_icon.sif \ + duck_radius_icon.sif \ + duck_width_icon.sif \ + duck_angle_icon.sif IMAGES = \ @@ -147,7 +152,13 @@ IMAGES = \ seek_begin.$(EXT) \ seek_end.$(EXT) \ seek_next_frame.$(EXT) \ - seek_prev_frame.$(EXT) + seek_prev_frame.$(EXT) \ + duck_position_icon.$(EXT) \ + duck_vertex_icon.$(EXT) \ + duck_tangent_icon.$(EXT) \ + duck_radius_icon.$(EXT) \ + duck_width_icon.$(EXT) \ + duck_angle_icon.$(EXT) MAINTAINERCLEANFILES = \ diff --git a/synfig-studio/trunk/images/duck_angle_icon.sif b/synfig-studio/trunk/images/duck_angle_icon.sif new file mode 100644 index 0000000..b4f89f8 --- /dev/null +++ b/synfig-studio/trunk/images/duck_angle_icon.sif @@ -0,0 +1,432 @@ + + + Duck Angle Icon. + Copyright 2009 Carlos López. Released under GNU Public License published by the Free Software Foundation version 2.0 of the License or any later version. + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 1.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.5211824179 + 0.0000000156 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.0000000700 + 1.5211824179 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.5211824179 + -0.0000001173 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000145 + -1.5211824179 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.5211824179 + 0.0000000156 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.0000000700 + 1.5211824179 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.5211824179 + -0.0000001173 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000145 + -1.5211824179 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/trunk/images/duck_position_icon.sif b/synfig-studio/trunk/images/duck_position_icon.sif new file mode 100644 index 0000000..c571eb1 --- /dev/null +++ b/synfig-studio/trunk/images/duck_position_icon.sif @@ -0,0 +1,432 @@ + + + Duck Position Icon. + Copyright 2009 Carlos López. Released under GNU Public License published by the Free Software Foundation version 2.0 of the License or any later version. + + + + + + + + + + + + + + + + + + + 0.000000 + 1.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.5211824179 + 0.0000000156 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.0000000700 + 1.5211824179 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.5211824179 + -0.0000001173 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000145 + -1.5211824179 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.5211824179 + 0.0000000156 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.0000000700 + 1.5211824179 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.5211824179 + -0.0000001173 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000145 + -1.5211824179 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/trunk/images/duck_radius_icon.sif b/synfig-studio/trunk/images/duck_radius_icon.sif new file mode 100644 index 0000000..9325d5e --- /dev/null +++ b/synfig-studio/trunk/images/duck_radius_icon.sif @@ -0,0 +1,432 @@ + + + Duck Vertex Icon. + Copyright 2009 Carlos López. Released under GNU Public License published by the Free Software Foundation version 2.0 of the License or any later version. + + + + + + + + + + + + + + + + + + + 0.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.5211824179 + 0.0000000156 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.0000000700 + 1.5211824179 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.5211824179 + -0.0000001173 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000145 + -1.5211824179 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.5211824179 + 0.0000000156 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.0000000700 + 1.5211824179 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.5211824179 + -0.0000001173 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000145 + -1.5211824179 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/trunk/images/duck_tangent_icon.sif b/synfig-studio/trunk/images/duck_tangent_icon.sif new file mode 100644 index 0000000..0843366 --- /dev/null +++ b/synfig-studio/trunk/images/duck_tangent_icon.sif @@ -0,0 +1,853 @@ + + + Duck Tangent Icon. + Copyright 2009 Carlos López. Released under GNU Public License published by the Free Software Foundation version 2.0 of the License or any later version. + + + + + + + + + + + + + + + + + + + 1.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 1.5211821795 + 1.5211821795 + + + + + + + + + + + + + + + + + + + + + + + + 1.5211838484 + 0.0000000156 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.0000000700 + 1.5211838484 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.5211838484 + -0.0000001173 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000145 + -1.5211838484 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 1.5211821795 + 1.5211821795 + + + + + + + + + + + + + + + + + + + + + + + + 1.5211838484 + 0.0000000156 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.0000000700 + 1.5211838484 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.5211838484 + -0.0000001173 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000145 + -1.5211838484 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 0.000000 + 1.000000 + + + + + -1.5211830139 + -1.5211830139 + + + + + + + + + + + + + + + + + + + + + + + + 1.5211821795 + 0.0000000156 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.0000000700 + 1.5211821795 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.5211821795 + -0.0000001173 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000145 + -1.5211821795 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + -1.5211830139 + -1.5211830139 + + + + + + + + + + + + + + + + + + + + + + + + 1.5211821795 + 0.0000000156 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.0000000700 + 1.5211821795 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.5211821795 + -0.0000001173 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000145 + -1.5211821795 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/trunk/images/duck_vertex_icon.sif b/synfig-studio/trunk/images/duck_vertex_icon.sif new file mode 100644 index 0000000..075bbcb --- /dev/null +++ b/synfig-studio/trunk/images/duck_vertex_icon.sif @@ -0,0 +1,432 @@ + + + Duck Vertex Icon. + Copyright 2009 Carlos López. Released under GNU Public License published by the Free Software Foundation version 2.0 of the License or any later version. + + + + + + + + + + + + + + + + + + + 1.000000 + 0.498039 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.5244762897 + 0.0000000156 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.0000000702 + 1.5244762897 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.5244762897 + -0.0000001177 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000146 + -1.5244762897 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.5244762897 + 0.0000000156 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.0000000702 + 1.5244762897 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.5244762897 + -0.0000001177 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000146 + -1.5244762897 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/trunk/images/duck_width_icon.sif b/synfig-studio/trunk/images/duck_width_icon.sif new file mode 100644 index 0000000..82c06a6 --- /dev/null +++ b/synfig-studio/trunk/images/duck_width_icon.sif @@ -0,0 +1,432 @@ + + + Duck Width Icon. + Copyright 2009 Carlos López. Released under GNU Public License published by the Free Software Foundation version 2.0 of the License or any later version. + + + + + + + + + + + + + + + + + + + 1.000000 + 0.000000 + 1.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.5211824179 + 0.0000000156 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.0000000700 + 1.5211824179 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.5211824179 + -0.0000001173 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000145 + -1.5211824179 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.5211824179 + 0.0000000156 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.0000000700 + 1.5211824179 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1.5211824179 + -0.0000001173 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0000000145 + -1.5211824179 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp index 32d3001..b63db43 100644 --- a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp +++ b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp @@ -193,6 +193,13 @@ IconController::IconController(const synfig::String& /*basepath*/) INIT_STOCK_ICON(seek_next_frame,"seek_next_frame."IMAGE_EXT,_("Next Frame")); INIT_STOCK_ICON(seek_end,"seek_end."IMAGE_EXT,_("Seek to End")); + INIT_STOCK_ICON(toggle_duck_position,"duck_position_icon."IMAGE_EXT,_("Toogle position ducks")); + INIT_STOCK_ICON(toggle_duck_vertex,"duck_vertex_icon."IMAGE_EXT,_("Toogle vertex ducks")); + INIT_STOCK_ICON(toggle_duck_tangent,"duck_tangent_icon."IMAGE_EXT,_("Toogle tangent ducks")); + INIT_STOCK_ICON(toggle_duck_radius,"duck_radius_icon."IMAGE_EXT,_("Toogle radius ducks")); + INIT_STOCK_ICON(toggle_duck_width,"duck_width_icon."IMAGE_EXT,_("Toogle width ducks")); + INIT_STOCK_ICON(toggle_duck_angle,"duck_angle_icon."IMAGE_EXT,_("Toogle angle ducks")); + INIT_STOCK_ICON_CLONE(cvs_add,"gtk-add",_("CVS Add")); INIT_STOCK_ICON_CLONE(cvs_update,"gtk-open",_("CVS Update")); INIT_STOCK_ICON_CLONE(cvs_commit,"gtk-save",_("CVS Commit")); diff --git a/synfig-studio/trunk/src/gtkmm/toggleducksdial.cpp b/synfig-studio/trunk/src/gtkmm/toggleducksdial.cpp index 8e07816..5474a8b 100644 --- a/synfig-studio/trunk/src/gtkmm/toggleducksdial.cpp +++ b/synfig-studio/trunk/src/gtkmm/toggleducksdial.cpp @@ -54,12 +54,12 @@ ToggleDucksDial::ToggleDucksDial(): Gtk::Table(1, 6, false) { Gtk::IconSize iconsize = Gtk::IconSize::from_name("synfig-small_icon"); - ducks_position = create_label_button(iconsize, "1", _("Toogle position ducks")); - ducks_vertex = create_label_button(iconsize, "2", _("Toogle vertex ducks")); - ducks_tangent = create_label_button(iconsize, "3", _("Toogle tangent ducks")); - ducks_radius = create_label_button(iconsize, "4", _("Toogle radius ducks")); - ducks_width = create_label_button(iconsize, "5", _("Toogle width ducks")); - ducks_angle = create_label_button(iconsize, "6", _("Toogle angle ducks")); + ducks_position = create_label_button(iconsize, "synfig-toggle_duck_position", _("Toogle position ducks")); + ducks_vertex = create_label_button(iconsize, "synfig-toggle_duck_vertex", _("Toogle vertex ducks")); + ducks_tangent = create_label_button(iconsize, "synfig-toggle_duck_tangent", _("Toogle tangent ducks")); + ducks_radius = create_label_button(iconsize, "synfig-toggle_duck_radius", _("Toogle radius ducks")); + ducks_width = create_label_button(iconsize, "synfig-toggle_duck_width", _("Toogle width ducks")); + ducks_angle = create_label_button(iconsize, "synfig-toggle_duck_angle", _("Toogle angle ducks")); attach(*ducks_position, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); attach(*ducks_vertex, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); @@ -70,13 +70,15 @@ ToggleDucksDial::ToggleDucksDial(): Gtk::Table(1, 6, false) } Gtk::ToggleButton * -ToggleDucksDial::create_label_button(Gtk::IconSize iconsize, const char *label, +ToggleDucksDial::create_label_button(Gtk::IconSize iconsize, const char *stockid, const char * tooltip) { Gtk::ToggleButton *tbutton = manage(new class Gtk::ToggleButton()); - tbutton->set_label(label); + Gtk::Image *icon = manage(new Gtk::Image(Gtk::StockID(stockid), iconsize)); tooltips.set_tip(*tbutton, tooltip); - //tbutton->set_relief(Gtk::RELIEF_NONE); + tbutton->add(*icon); + icon->set_padding(0, 0); + icon->show(); tbutton->show(); return tbutton; diff --git a/synfig-studio/trunk/src/gtkmm/toggleducksdial.h b/synfig-studio/trunk/src/gtkmm/toggleducksdial.h index 919b01a..d02cdea 100644 --- a/synfig-studio/trunk/src/gtkmm/toggleducksdial.h +++ b/synfig-studio/trunk/src/gtkmm/toggleducksdial.h @@ -58,7 +58,7 @@ class ToggleDucksDial : public Gtk::Table Gtk::ToggleButton *ducks_width; Gtk::ToggleButton *ducks_angle; - Gtk::ToggleButton *create_label_button(Gtk::IconSize iconsize, const char * label, const char * tooltip); + Gtk::ToggleButton *create_label_button(Gtk::IconSize iconsize, const char * stockid, const char * tooltip); public: