From: Carlos Lopez <carlos@pcnuevo.(none)>
Date: Mon, 29 Jun 2009 15:51:11 +0000 (+0200)
Subject: Merge branch 'genete_setup_dialog'
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=f869a457651ca7b7e1bbd8cbe57b92b79ca253a4;hp=13674a3200c086cb4ac7539b2f7114be9faed9a7;p=synfig.git

Merge branch 'genete_setup_dialog'
---

diff --git a/.gitignore b/.gitignore
index b43aba7..36dc72b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,16 +24,30 @@ synfig-studio/src
 # ------------------------------------------------------------------------
 
 # generated in ETL, core and studio
+*-config
+ABOUT-NLS
+Makefile.in.in
+Makevars.template
+POTFILES
+Rules-quot
 aclocal.m4
+autom4te.cache
+boldquot.sed
 config.*
 configure
-*-config
 depcomp
+en@boldquot.header
+en@quot.header
+insert-header.sin
 install-sh
 libtool
 ltmain.sh
 missing
+quot.sed
+remove-potcdate.sed
+remove-potcdate.sin
 stamp-h1
+stamp-po
 
 # ------------------------------------------------------------------------
 
@@ -43,18 +57,95 @@ ETL/trunk/ETL/etl_profile_.h
 
 synfig-core/trunk/libltdl
 synfig-core/trunk/pkg-info/macosx/synfig-core.info
+synfig-core/trunk/po/*.gmo
+synfig-core/trunk/po/synfig.pot
 synfig-core/trunk/src/modules/synfig_modules.cfg
 synfig-core/trunk/src/synfig/proto/nodebase.h
 synfig-core/trunk/src/tool/synfig
 synfig-core/trunk/synfig.pc.in
 
+synfig-core/trunk/m4/codeset.m4
+synfig-core/trunk/m4/gettext.m4
+synfig-core/trunk/m4/glibc2.m4
+synfig-core/trunk/m4/glibc21.m4
+synfig-core/trunk/m4/iconv.m4
+synfig-core/trunk/m4/intdiv0.m4
+synfig-core/trunk/m4/inttypes.m4
+synfig-core/trunk/m4/inttypes-h.m4
+synfig-core/trunk/m4/inttypes_h.m4
+synfig-core/trunk/m4/inttypes-pri.m4
+synfig-core/trunk/m4/intmax.m4
+synfig-core/trunk/m4/isc-posix.m4
+synfig-core/trunk/m4/lcmessage.m4
+synfig-core/trunk/m4/lib-ld.m4
+synfig-core/trunk/m4/lib-link.m4
+synfig-core/trunk/m4/lib-prefix.m4
+synfig-core/trunk/m4/lock.m4
+synfig-core/trunk/m4/longdouble.m4
+synfig-core/trunk/m4/longlong.m4
+synfig-core/trunk/m4/po.m4
+synfig-core/trunk/m4/progtest.m4
+synfig-core/trunk/m4/nls.m4
+synfig-core/trunk/m4/printf-posix.m4
+synfig-core/trunk/m4/uintmax_t.m4
+synfig-core/trunk/m4/ulonglong.m4
+synfig-core/trunk/m4/signed.m4
+synfig-core/trunk/m4/size_max.m4
+synfig-core/trunk/m4/stdint_h.m4
+synfig-core/trunk/m4/visibility.m4
+synfig-core/trunk/m4/wchar_t.m4
+synfig-core/trunk/m4/wint_t.m4
+synfig-core/trunk/m4/xsize.m4
+
+synfig-studio/trunk/autorevision.h
+synfig-studio/trunk/images/128x128
+synfig-studio/trunk/images/16x16
+synfig-studio/trunk/images/22x22
+synfig-studio/trunk/images/24x24
+synfig-studio/trunk/images/32x32
+synfig-studio/trunk/images/48x48
+synfig-studio/trunk/images/64x64
+synfig-studio/trunk/images/*.png
+synfig-studio/trunk/images/images.nsh
+synfig-studio/trunk/images/unimages.nsh
+synfig-studio/trunk/m4/codeset.m4
+synfig-studio/trunk/m4/gettext.m4
+synfig-studio/trunk/m4/glibc21.m4
+synfig-studio/trunk/m4/glibc2.m4
+synfig-studio/trunk/m4/iconv.m4
+synfig-studio/trunk/m4/intdiv0.m4
+synfig-studio/trunk/m4/intmax.m4
+synfig-studio/trunk/m4/inttypes-h.m4
+synfig-studio/trunk/m4/inttypes_h.m4
+synfig-studio/trunk/m4/inttypes.m4
+synfig-studio/trunk/m4/inttypes-pri.m4
+synfig-studio/trunk/m4/isc-posix.m4
+synfig-studio/trunk/m4/lcmessage.m4
+synfig-studio/trunk/m4/lib-ld.m4
+synfig-studio/trunk/m4/lib-link.m4
+synfig-studio/trunk/m4/lib-prefix.m4
+synfig-studio/trunk/m4/lock.m4
+synfig-studio/trunk/m4/longdouble.m4
+synfig-studio/trunk/m4/longlong.m4
+synfig-studio/trunk/m4/nls.m4
+synfig-studio/trunk/m4/po.m4
+synfig-studio/trunk/m4/printf-posix.m4
+synfig-studio/trunk/m4/progtest.m4
+synfig-studio/trunk/m4/signed.m4
+synfig-studio/trunk/m4/size_max.m4
+synfig-studio/trunk/m4/stdint_h.m4
+synfig-studio/trunk/m4/uintmax_t.m4
+synfig-studio/trunk/m4/ulonglong.m4
+synfig-studio/trunk/m4/visibility.m4
+synfig-studio/trunk/m4/wchar_t.m4
+synfig-studio/trunk/m4/wint_t.m4
+synfig-studio/trunk/m4/xsize.m4
 synfig-studio/trunk/pkg-info/macosx/synfig-studio.info
+synfig-studio/trunk/po/*.gmo
+synfig-studio/trunk/po/synfigstudio.pot
 synfig-studio/trunk/src/gtkmm/synfigstudio
 synfig-studio/trunk/synfigstudio-thumbnailer.schemas
 synfig-studio/trunk/synfigstudio.desktop
-synfig-studio/trunk/images/*.png
-synfig-studio/trunk/images/images.nsh
-synfig-studio/trunk/images/unimages.nsh
 
 # ------------------------------------------------------------------------
 
diff --git a/synfig-studio/trunk/src/gtkmm/framedial.cpp b/synfig-studio/trunk/src/gtkmm/framedial.cpp
index a88af27..a361bd3 100644
--- a/synfig-studio/trunk/src/gtkmm/framedial.cpp
+++ b/synfig-studio/trunk/src/gtkmm/framedial.cpp
@@ -32,6 +32,7 @@
 
 #include "framedial.h"
 #include <gtkmm/image.h>
+#include <gtkmm/stock.h>
 
 #endif
 
@@ -52,10 +53,14 @@ FrameDial::FrameDial(): Gtk::Table(3, 1, false)
 {
 	Gtk::IconSize iconsize = Gtk::IconSize::from_name("synfig-small_icon");
 
-	seek_begin = create_icon(iconsize, "synfig-seek_begin", _("Seek to Begin"));
-	seek_prev_frame = create_icon(iconsize, "synfig-seek_prev_frame", _("Previous Frame"));
-	seek_next_frame = create_icon(iconsize, "synfig-seek_next_frame", _("Next Frame"));
-	seek_end = create_icon(iconsize, "synfig-seek_end", _("Seek to End"));
+	seek_begin = create_icon(iconsize, Gtk::Stock::MEDIA_PREVIOUS,
+					_("Seek to Begin"));
+	seek_prev_frame = create_icon(iconsize, Gtk::Stock::MEDIA_REWIND,
+					_("Previous Frame"));
+	seek_next_frame = create_icon(iconsize, Gtk::Stock::MEDIA_FORWARD,
+					_("Next Frame"));
+	seek_end = create_icon(iconsize, Gtk::Stock::MEDIA_NEXT,
+					_("Seek to End"));
 
 	attach(*seek_begin, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
 	attach(*seek_prev_frame, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
@@ -64,11 +69,11 @@ FrameDial::FrameDial(): Gtk::Table(3, 1, false)
 }
 
 Gtk::Button *
-FrameDial::create_icon(Gtk::IconSize iconsize, const char * stockid,
+FrameDial::create_icon(Gtk::IconSize size, const Gtk::BuiltinStockID & stockid,
 		const char * tooltip)
 {
 	Gtk::Button *button = manage(new class Gtk::Button());
-	Gtk::Image *icon = manage(new Gtk::Image(Gtk::StockID(stockid), iconsize));
+	Gtk::Image *icon = manage(new Gtk::Image(stockid, size));
 	button->add(*icon);
 	tooltips.set_tip(*button, tooltip);
 	icon->set_padding(0, 0);
@@ -78,3 +83,4 @@ FrameDial::create_icon(Gtk::IconSize iconsize, const char * stockid,
 
 	return button;
 }
+
diff --git a/synfig-studio/trunk/src/gtkmm/framedial.h b/synfig-studio/trunk/src/gtkmm/framedial.h
index 58136b7..01f2be0 100644
--- a/synfig-studio/trunk/src/gtkmm/framedial.h
+++ b/synfig-studio/trunk/src/gtkmm/framedial.h
@@ -53,7 +53,8 @@ class FrameDial : public Gtk::Table
 	Gtk::Button *seek_next_frame;
 	Gtk::Button *seek_end;
 
-	Gtk::Button *create_icon(Gtk::IconSize iconsize, const char * stockid, const char * tooltip);
+	Gtk::Button *create_icon(Gtk::IconSize size, const Gtk::BuiltinStockID & stockid,
+			const char * tooltip);
 
 public:
 	FrameDial();
diff --git a/synfig-studio/trunk/src/gtkmm/zoomdial.cpp b/synfig-studio/trunk/src/gtkmm/zoomdial.cpp
index 78c76c1..ae2f4a4 100644
--- a/synfig-studio/trunk/src/gtkmm/zoomdial.cpp
+++ b/synfig-studio/trunk/src/gtkmm/zoomdial.cpp
@@ -31,6 +31,7 @@
 
 #include "zoomdial.h"
 #include <gtkmm/image.h>
+#include <gtkmm/stock.h>
 
 #include "general.h"
 
@@ -51,10 +52,10 @@ using namespace studio;
 
 ZoomDial::ZoomDial(Gtk::IconSize & size): Table(3, 1, false)
 {
-	zoom_in = create_icon(size, "gtk-add", _("Zoom In"));
-	zoom_out = create_icon(size, "gtk-remove", _("Zoom Out"));
-	zoom_fit = create_icon(size, "gtk-zoom-fit", _("Zoom to Fit"));
-	zoom_norm = create_icon(size, "gtk-zoom-100", _("Zoom to 100%"));
+	zoom_in = create_icon(size, Gtk::Stock::ZOOM_IN, _("Zoom In"));
+	zoom_out = create_icon(size, Gtk::Stock::ZOOM_OUT, _("Zoom Out"));
+	zoom_fit = create_icon(size, Gtk::Stock::ZOOM_FIT, _("Zoom to Fit"));
+	zoom_norm = create_icon(size, Gtk::Stock::ZOOM_100, _("Zoom to 100%"));
 
 	attach(*zoom_out, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
 	attach(*zoom_norm, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
@@ -63,11 +64,11 @@ ZoomDial::ZoomDial(Gtk::IconSize & size): Table(3, 1, false)
 }
 
 Gtk::Button *
-ZoomDial::create_icon(Gtk::IconSize size, const char * stockid,
+ZoomDial::create_icon(Gtk::IconSize size, const Gtk::BuiltinStockID & stockid,
 		const char * tooltip)
 {
 	Gtk::Button *button = manage(new class Gtk::Button());
-	Gtk::Image *icon = manage(new Gtk::Image(Gtk::StockID(stockid), size));
+	Gtk::Image *icon = manage(new Gtk::Image(stockid, size));
 	button->add(*icon);
 	tooltips.set_tip(*button, tooltip);
 	icon->set_padding(0, 0);
@@ -78,4 +79,3 @@ ZoomDial::create_icon(Gtk::IconSize size, const char * stockid,
 	return button;
 }
 
-
diff --git a/synfig-studio/trunk/src/gtkmm/zoomdial.h b/synfig-studio/trunk/src/gtkmm/zoomdial.h
index eda3fae..1d9d63a 100644
--- a/synfig-studio/trunk/src/gtkmm/zoomdial.h
+++ b/synfig-studio/trunk/src/gtkmm/zoomdial.h
@@ -50,7 +50,7 @@ class ZoomDial : public Gtk::Table
 	Gtk::Button *zoom_fit;
 	Gtk::Button *zoom_norm;
 
-	Gtk::Button *create_icon(Gtk::IconSize size, const char * stockid,
+	Gtk::Button *create_icon(Gtk::IconSize size, const Gtk::BuiltinStockID & stockid,
 			const char * tooltip);
 
 public: