From: Carlos López Date: Fri, 14 Aug 2009 14:50:15 +0000 (+0200) Subject: Add new icons (thanks David Rylander) and adjust its size to a better size 16x16. X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=714ab44cd605f122ef1cf311eb301f74f246f71a;p=synfig.git Add new icons (thanks David Rylander) and adjust its size to a better size 16x16. Change the original size to be multiple of 16. --- diff --git a/synfig-studio/trunk/images/Makefile.am b/synfig-studio/trunk/images/Makefile.am index 84e53fa..ebcdc0b 100644 --- a/synfig-studio/trunk/images/Makefile.am +++ b/synfig-studio/trunk/images/Makefile.am @@ -83,8 +83,9 @@ EXTRA_DIST = \ duck_angle_icon.sif \ show_grid_icon.sif \ snap_grid_icon.sif \ - onion_skin_icon.sif - + onion_skin_icon.sif \ + incr_resolution_icon.sif \ + decr_resolution_icon.sif IMAGES = \ installer_logo.$(EXT) \ @@ -164,7 +165,9 @@ IMAGES = \ duck_angle_icon.$(EXT) \ show_grid_icon.$(EXT) \ snap_grid_icon.$(EXT) \ - onion_skin_icon.$(EXT) + onion_skin_icon.$(EXT) \ + incr_resolution_icon.$(EXT) \ + decr_resolution_icon.$(EXT) MAINTAINERCLEANFILES = \ diff --git a/synfig-studio/trunk/images/decr_resolution_icon.sif b/synfig-studio/trunk/images/decr_resolution_icon.sif new file mode 100644 index 0000000..11309c6 --- /dev/null +++ b/synfig-studio/trunk/images/decr_resolution_icon.sif @@ -0,0 +1,2066 @@ + + + Synfig Studio Increase Resolution icon + Placed in the Public Domain in 2009 by David Rylander (rylleman) + + + + + + + + + + + + + + + + + + + + 0.012910 + 0.012910 + 0.012910 + 0.791045 + + + 0.013228 + 0.012910 + 0.012910 + 0.000000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + 0.1808688790 + -0.3216028810 + + + + + + + + + + + + + + + + -1.8803261518 + 2.0255250931 + + + + + 1.9384056330 + -1.9093658924 + + + + + -2.7515196800 + -1.2269309759 + + + + + 2.7515196800 + -1.2269309759 + + + + + 2.7515196800 + -2.7224798203 + + + + + -2.7515196800 + -2.7079598904 + + + + + + + + + + + + + + + + + + + + + + 0.373780 + 0.373780 + 0.373780 + 1.000000 + + + + + 0.2596156895 + -0.2596156895 + + + + + + + + + + + + + + + + + + + + + + + + 0.6082969904 + -0.7146050334 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.8105180264 + -1.0468254089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.4171810150 + -1.8412650824 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.1971764565 + -2.5201497078 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.6016182899 + -2.4190392494 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.7605063915 + -2.0145971775 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.0960659981 + -1.3357125521 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.0849608183 + -0.7290493846 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.7671849132 + -0.5412727594 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.7671849132 + -0.5268284082 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.006310 + 0.006310 + 0.006310 + 1.000000 + + + + + 0.2596156895 + -0.2596156895 + + + + + + + + + + + + + + + + + + + + + + + + 0.6082969904 + -0.7146050334 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.8105180264 + -1.0468254089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.4171810150 + -1.8412650824 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.1971764565 + -2.5201497078 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.6016182899 + -2.4190392494 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.7605063915 + -2.0145971775 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.0960659981 + -1.3357125521 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.0849608183 + -0.7290493846 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.7671849132 + -0.5412727594 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.7671849132 + -0.5268284082 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.006310 + 0.006310 + 0.006310 + 1.000000 + + + + + 0.8154594898 + -0.7322493792 + + + + + + + + + + + + + + + + + + + + + + + + 1.9302197695 + -1.0941885710 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.6557769775 + -1.4697419405 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.2080018520 + -1.7875177860 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.006310 + 0.006310 + 0.006310 + 1.000000 + + + + + 0.3994087279 + -0.3661246896 + + + + + + + + + + + + + + + + + + + + + + + + 1.9562728405 + -1.1136487722 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.7107187510 + -1.5180907249 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.2918323278 + -1.8503109217 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.006310 + 0.006310 + 0.006310 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.9945726395 + -1.2053306103 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.7634629011 + -1.5664395094 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.3445764780 + -1.8986598253 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.006310 + 0.006310 + 0.006310 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.4745756388 + -1.3728852272 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.7023460865 + -2.4273231030 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.006310 + 0.006310 + 0.006310 + 1.000000 + + + + + + + + + + + -0.5412190557 + 0.5796812773 + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + + + + + + + -0.5412190557 + 0.5796812773 + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 0.172611 + 0.349351 + 0.629024 + 1.000000 + + + + + + + + + + + -0.5412190557 + 0.5796812773 + + + + + + + + + + + + + + + + + + + + + + 0.028991 + 0.133209 + 0.374624 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -2.5754709244 + 0.5521963239 + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + -0.5528581738 + -1.4704164267 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.4697546959 + 0.5521963239 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.5936067700 + 0.0558041893 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.007843 + 0.074510 + 1.000000 + + + + + -0.5412190557 + 0.5796812773 + + + + + 2.5961568356 + 2.5961568356 + + + + + + + + + + + + + + + + + 0.4606958926 + 3.9370617867 + + + + diff --git a/synfig-studio/trunk/images/duck_angle_icon.sif b/synfig-studio/trunk/images/duck_angle_icon.sif index 882da55..d85d6b5 100644 --- a/synfig-studio/trunk/images/duck_angle_icon.sif +++ b/synfig-studio/trunk/images/duck_angle_icon.sif @@ -1,5 +1,5 @@ - + Duck Angle Icon. Copyright 2009 Carlos López and Gerald Young. Released under GNU Public License published by the Free Software Foundation version 2.0 of the License or any later version. diff --git a/synfig-studio/trunk/images/duck_position_icon.sif b/synfig-studio/trunk/images/duck_position_icon.sif index ef219c0..38e5777 100644 --- a/synfig-studio/trunk/images/duck_position_icon.sif +++ b/synfig-studio/trunk/images/duck_position_icon.sif @@ -1,5 +1,5 @@ - + Duck Position Icon. Copyright 2009 Carlos López and Gerald Young. Released under GNU Public License published by the Free Software Foundation version 2.0 of the License or any later version. @@ -25,7 +25,7 @@ - + diff --git a/synfig-studio/trunk/images/duck_radius_icon.sif b/synfig-studio/trunk/images/duck_radius_icon.sif index b50a62d..8a42c59 100644 --- a/synfig-studio/trunk/images/duck_radius_icon.sif +++ b/synfig-studio/trunk/images/duck_radius_icon.sif @@ -1,5 +1,5 @@ - + Duck Vertex Icon. Copyright 2009 Carlos López and Gerald Young. Released under GNU Public License published by the Free Software Foundation version 2.0 of the License or any later version. diff --git a/synfig-studio/trunk/images/duck_tangent_icon.sif b/synfig-studio/trunk/images/duck_tangent_icon.sif index 0fead6c..181759e 100644 --- a/synfig-studio/trunk/images/duck_tangent_icon.sif +++ b/synfig-studio/trunk/images/duck_tangent_icon.sif @@ -1,5 +1,5 @@ - + Duck Tangent Icon. Copyright 2009 Carlos López and Gerald Young. Released under GNU Public License published by the Free Software Foundation version 2.0 of the License or any later version. diff --git a/synfig-studio/trunk/images/duck_vertex_icon.sif b/synfig-studio/trunk/images/duck_vertex_icon.sif index ff7bba5..7f88fc7 100644 --- a/synfig-studio/trunk/images/duck_vertex_icon.sif +++ b/synfig-studio/trunk/images/duck_vertex_icon.sif @@ -1,5 +1,5 @@ - + Duck Vertex Icon. Copyright 2009 Carlos López and Gerald Young. Released under GNU Public License published by the Free Software Foundation version 2.0 of the License or any later version. diff --git a/synfig-studio/trunk/images/duck_width_icon.sif b/synfig-studio/trunk/images/duck_width_icon.sif index 19f7199..cd0baa8 100644 --- a/synfig-studio/trunk/images/duck_width_icon.sif +++ b/synfig-studio/trunk/images/duck_width_icon.sif @@ -1,5 +1,5 @@ - + Duck Width Icon. Copyright 2009 Carlos López and Gerald Young. Released under GNU Public License published by the Free Software Foundation version 2.0 of the License or any later version. @@ -25,7 +25,7 @@ - + diff --git a/synfig-studio/trunk/images/incr_resolution_icon.sif b/synfig-studio/trunk/images/incr_resolution_icon.sif new file mode 100644 index 0000000..fb04be0 --- /dev/null +++ b/synfig-studio/trunk/images/incr_resolution_icon.sif @@ -0,0 +1,2066 @@ + + + Synfig Studio Decrease Resolution icon + Placed in the Public Domain in 2009 by David Rylander (rylleman) + + + + + + + + + + + + + + + + + + + + 0.012910 + 0.012910 + 0.012910 + 0.791045 + + + 0.013228 + 0.012910 + 0.012910 + 0.000000 + + + 1.000000 + 1.000000 + 1.000000 + 0.000000 + + + + + + 0.1808688790 + -0.3216028810 + + + + + + + + + + + + + + + + -1.8803261518 + 2.0255250931 + + + + + 1.9384056330 + -1.9093658924 + + + + + -2.7515196800 + -1.2269309759 + + + + + 2.7515196800 + -1.2269309759 + + + + + 2.7515196800 + -2.7224798203 + + + + + -2.7515196800 + -2.7079598904 + + + + + + + + + + + + + + + + + + + + + + 0.373780 + 0.373780 + 0.373780 + 1.000000 + + + + + 0.2596156895 + -0.2596156895 + + + + + + + + + + + + + + + + + + + + + + + + 0.6082969904 + -0.7352388501 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.8105180264 + -1.0674591064 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.4171810150 + -1.8618987799 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.1971764565 + -2.5407836437 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.6016182899 + -2.4396731853 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.7605063915 + -2.0352311134 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.0960659981 + -1.3563462496 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.0849608183 + -0.7496832013 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.7671849132 + -0.5619065762 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.7671849132 + -0.5474622250 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.006310 + 0.006310 + 0.006310 + 1.000000 + + + + + 0.2596156895 + -0.2596156895 + + + + + + + + + + + + + + + + + + + + + + + + 0.6082969904 + -0.7352388501 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.8105180264 + -1.0674591064 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.4171810150 + -1.8618987799 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.1971764565 + -2.5407836437 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.6016182899 + -2.4396731853 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.7605063915 + -2.0352311134 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.0960659981 + -1.3563462496 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.0849608183 + -0.7496832013 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.7671849132 + -0.5619065762 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.7671849132 + -0.5474622250 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.006310 + 0.006310 + 0.006310 + 1.000000 + + + + + 0.8154594898 + -0.7322493792 + + + + + + + + + + + + + + + + + + + + + + + + 1.9302197695 + -1.1148222685 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.6557769775 + -1.4903756380 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.2080018520 + -1.8081514835 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.006310 + 0.006310 + 0.006310 + 1.000000 + + + + + 0.3994087279 + -0.3661246896 + + + + + + + + + + + + + + + + + + + + + + + + 1.9562728405 + -1.1342824697 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.7107187510 + -1.5387244225 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.2918323278 + -1.8709446192 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.006310 + 0.006310 + 0.006310 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.9945726395 + -1.2259643078 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.7634629011 + -1.5870732069 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.3445764780 + -1.9192935228 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.006310 + 0.006310 + 0.006310 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + 1.4745756388 + -1.3935189247 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.7023460865 + -2.4479570389 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.006310 + 0.006310 + 0.006310 + 1.000000 + + + + + + + + + + + -0.5412190557 + 0.5796812773 + + + + + + + + + + + + + + + + + + + + + + 1.000000 + 1.000000 + 1.000000 + 1.000000 + + + + + + + + + + + -0.5412190557 + 0.5796812773 + + + + + + + + + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + 0.172611 + 0.349351 + 0.629024 + 1.000000 + + + + + + + + + + + -0.5412190557 + 0.5796812773 + + + + + + + + + + + + + + + + + + + + + + 0.028991 + 0.133209 + 0.374624 + 1.000000 + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + + + + + + -2.5754709244 + 0.5521963239 + + + + + + + + + + + + + + 0.0000000000 + 0.0000000000 + + + + + + + + + + + + + + + + + + + -0.5528581738 + -1.4704164267 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.4697546959 + 0.5521963239 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -0.5936067700 + 0.0558041893 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.007843 + 0.074510 + 1.000000 + + + + + -0.5412190557 + 0.5796812773 + + + + + 0.9735587835 + 0.9735587835 + + + + + + + + + + + + + + + + + 0.4606958926 + 2.8725743294 + + + + diff --git a/synfig-studio/trunk/images/show_grid_icon.sif b/synfig-studio/trunk/images/show_grid_icon.sif index 8799241..84254d3 100644 --- a/synfig-studio/trunk/images/show_grid_icon.sif +++ b/synfig-studio/trunk/images/show_grid_icon.sif @@ -36,7 +36,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -322,7 +322,7 @@ - + @@ -465,7 +465,7 @@ - + @@ -608,7 +608,7 @@ - + @@ -751,7 +751,7 @@ - + @@ -894,7 +894,7 @@ - + @@ -1037,7 +1037,7 @@ - + diff --git a/synfig-studio/trunk/images/snap_grid_icon.sif b/synfig-studio/trunk/images/snap_grid_icon.sif index 96c5613..ed1c7da 100644 --- a/synfig-studio/trunk/images/snap_grid_icon.sif +++ b/synfig-studio/trunk/images/snap_grid_icon.sif @@ -36,7 +36,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -322,7 +322,7 @@ - + @@ -465,7 +465,7 @@ - + @@ -608,7 +608,7 @@ - + @@ -751,7 +751,7 @@ - + @@ -894,7 +894,7 @@ - + @@ -1037,7 +1037,7 @@ - + diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp index 7ffc505..1a941c8 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp @@ -1123,10 +1123,10 @@ CanvasView::create_status_bar() Gtk::Widget* CanvasView::create_display_bar() { - displaybar = manage(new class Gtk::Table(1, 7, false)); - + displaybar = manage(new class Gtk::Table(10, 1, false)); + Gtk::IconSize iconsize=Gtk::IconSize::from_name("synfig-small_icon_16x16"); // Setup the ToggleDuckDial widget - toggleducksdial = Gtk::manage(new class ToggleDucksDial()); + toggleducksdial = Gtk::manage(new class ToggleDucksDial(iconsize)); Duck::Type m = work_area->get_type_mask(); toggleducksdial->update_toggles(m); @@ -1152,7 +1152,7 @@ CanvasView::create_display_bar() toggleducksdial->show(); // Set up the ResolutionDial widget - resolutiondial=Gtk::manage(new class ResolutionDial()); + resolutiondial=Gtk::manage(new class ResolutionDial(iconsize)); resolutiondial->update_lowres(work_area->get_low_resolution_flag()); resolutiondial->signal_increase_resolution().connect( @@ -1179,7 +1179,7 @@ CanvasView::create_display_bar() // Set up the show grid toggle button show_grid = Gtk::manage(new class Gtk::ToggleButton()); show_grid->set_active(work_area->grid_status()); - Gtk::Image *icon = manage(new Gtk::Image(Gtk::StockID("synfig-toggle_show_grid"), Gtk::IconSize::from_name("synfig-small_icon"))); + Gtk::Image *icon = manage(new Gtk::Image(Gtk::StockID("synfig-toggle_show_grid"), iconsize)); icon->set_padding(0, 0); icon->show(); show_grid->add(*icon); @@ -1192,7 +1192,7 @@ CanvasView::create_display_bar() // Set up the snap to grid toggle button snap_grid = Gtk::manage(new class Gtk::ToggleButton()); snap_grid->set_active(work_area->grid_status()); - Gtk::Image *icon2 = manage(new Gtk::Image(Gtk::StockID("synfig-toggle_snap_grid"), Gtk::IconSize::from_name("synfig-small_icon"))); + Gtk::Image *icon2 = manage(new Gtk::Image(Gtk::StockID("synfig-toggle_snap_grid"), iconsize)); icon2->set_padding(0, 0); icon2->show(); snap_grid->add(*icon2); @@ -1205,7 +1205,7 @@ CanvasView::create_display_bar() // Set up the onion skin toggle button onion_skin = Gtk::manage(new class Gtk::ToggleButton()); onion_skin->set_active(work_area->get_onion_skin()); - Gtk::Image *icon3 = manage(new Gtk::Image(Gtk::StockID("synfig-toggle_onion_skin"), Gtk::IconSize::from_name("synfig-small_icon"))); + Gtk::Image *icon3 = manage(new Gtk::Image(Gtk::StockID("synfig-toggle_onion_skin"), iconsize)); icon3->set_padding(0, 0); icon3->show(); onion_skin->add(*icon3); diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp index 05301a7..8898a7f 100644 --- a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp +++ b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp @@ -207,6 +207,9 @@ IconController::IconController(const synfig::String& /*basepath*/) INIT_STOCK_ICON(toggle_onion_skin,"onion_skin_icon."IMAGE_EXT,_("Toggle onion skin")); + INIT_STOCK_ICON(increase_resolution,"incr_resolution_icon."IMAGE_EXT,_("Increase resolution")); + INIT_STOCK_ICON(decrease_resolution,"decr_resolution_icon."IMAGE_EXT,_("Decrease resolution")); + 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")); @@ -236,6 +239,8 @@ IconController::IconController(const synfig::String& /*basepath*/) icon_factory->add_default(); Gtk::IconSize::register_new("synfig-small_icon",12,12); + Gtk::IconSize::register_new("synfig-small_icon_16x16",16,16); + 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); diff --git a/synfig-studio/trunk/src/gtkmm/resolutiondial.cpp b/synfig-studio/trunk/src/gtkmm/resolutiondial.cpp index 5680f62..b7ef2c9 100644 --- a/synfig-studio/trunk/src/gtkmm/resolutiondial.cpp +++ b/synfig-studio/trunk/src/gtkmm/resolutiondial.cpp @@ -50,12 +50,11 @@ using namespace studio; /* === M E T H O D S ======================================================= */ -ResolutionDial::ResolutionDial(): Gtk::Table(1, 3, false) +ResolutionDial::ResolutionDial(Gtk::IconSize & size): Gtk::Table(3, 1, false) { - Gtk::IconSize iconsize = Gtk::IconSize::from_name("synfig-small_icon"); - increase_resolution = create_icon(iconsize, Gtk::Stock::ADD, _("Increase Display Resolution")); - decrease_resolution = create_icon(iconsize, Gtk::Stock::REMOVE, _("Decrease Display Resolution")); + increase_resolution = create_icon(size, Gtk::StockID("synfig-increase_resolution"), _("Increase Display Resolution")); + decrease_resolution = create_icon(size, Gtk::StockID("synfig-decrease_resolution"), _("Decrease Display Resolution")); use_low_resolution = create_check(_("Low Res"), _("Use Low Resolution when enabled")); attach(*decrease_resolution, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); @@ -64,7 +63,7 @@ ResolutionDial::ResolutionDial(): Gtk::Table(1, 3, false) } Gtk::Button * -ResolutionDial::create_icon(Gtk::IconSize size, const Gtk::BuiltinStockID & stockid, +ResolutionDial::create_icon(Gtk::IconSize size, const Gtk::StockID & stockid, const char * tooltip) { Gtk::Button *button = manage(new class Gtk::Button()); diff --git a/synfig-studio/trunk/src/gtkmm/resolutiondial.h b/synfig-studio/trunk/src/gtkmm/resolutiondial.h index 5ee9df9..611eb11 100644 --- a/synfig-studio/trunk/src/gtkmm/resolutiondial.h +++ b/synfig-studio/trunk/src/gtkmm/resolutiondial.h @@ -55,12 +55,12 @@ class ResolutionDial : public Gtk::Table Gtk::Button *decrease_resolution; Gtk::CheckButton *use_low_resolution; - Gtk::Button *create_icon(Gtk::IconSize size, const Gtk::BuiltinStockID & stockid, const char * tooltip); + Gtk::Button *create_icon(Gtk::IconSize size, const Gtk::StockID & stockid, const char * tooltip); Gtk::CheckButton *create_check(const char *text, const char *tooltip); public: - ResolutionDial(); + ResolutionDial(Gtk::IconSize & size); void update_lowres(bool flag); Glib::SignalProxy0 signal_increase_resolution() { return increase_resolution->signal_clicked(); } diff --git a/synfig-studio/trunk/src/gtkmm/toggleducksdial.cpp b/synfig-studio/trunk/src/gtkmm/toggleducksdial.cpp index 358923a..00ea236 100644 --- a/synfig-studio/trunk/src/gtkmm/toggleducksdial.cpp +++ b/synfig-studio/trunk/src/gtkmm/toggleducksdial.cpp @@ -50,16 +50,14 @@ using namespace studio; /* === M E T H O D S ======================================================= */ -ToggleDucksDial::ToggleDucksDial(): Gtk::Table(1, 6, false) +ToggleDucksDial::ToggleDucksDial(Gtk::IconSize & size): Gtk::Table(1, 6, false) { - Gtk::IconSize iconsize = Gtk::IconSize::from_name("synfig-small_icon"); - - ducks_position = create_label_button(iconsize, "synfig-toggle_duck_position", _("Toggle position ducks")); - ducks_vertex = create_label_button(iconsize, "synfig-toggle_duck_vertex", _("Toggle vertex ducks")); - ducks_tangent = create_label_button(iconsize, "synfig-toggle_duck_tangent", _("Toggle tangent ducks")); - ducks_radius = create_label_button(iconsize, "synfig-toggle_duck_radius", _("Toggle radius ducks")); - ducks_width = create_label_button(iconsize, "synfig-toggle_duck_width", _("Toggle width ducks")); - ducks_angle = create_label_button(iconsize, "synfig-toggle_duck_angle", _("Toggle angle ducks")); + ducks_position = create_label_button(size, "synfig-toggle_duck_position", _("Toggle position ducks")); + ducks_vertex = create_label_button(size, "synfig-toggle_duck_vertex", _("Toggle vertex ducks")); + ducks_tangent = create_label_button(size, "synfig-toggle_duck_tangent", _("Toggle tangent ducks")); + ducks_radius = create_label_button(size, "synfig-toggle_duck_radius", _("Toggle radius ducks")); + ducks_width = create_label_button(size, "synfig-toggle_duck_width", _("Toggle width ducks")); + ducks_angle = create_label_button(size, "synfig-toggle_duck_angle", _("Toggle 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); diff --git a/synfig-studio/trunk/src/gtkmm/toggleducksdial.h b/synfig-studio/trunk/src/gtkmm/toggleducksdial.h index d02cdea..832e212 100644 --- a/synfig-studio/trunk/src/gtkmm/toggleducksdial.h +++ b/synfig-studio/trunk/src/gtkmm/toggleducksdial.h @@ -62,7 +62,7 @@ class ToggleDucksDial : public Gtk::Table public: - ToggleDucksDial(); + ToggleDucksDial(Gtk::IconSize & size); void update_toggles(Duck::Type mask); Glib::SignalProxy0 signal_ducks_position() { return ducks_position->signal_toggled(); } Glib::SignalProxy0 signal_ducks_vertex() { return ducks_vertex-> signal_toggled(); }