Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-studio / tags / stable / src / gtkmm / zoomdial.h

diff --git a/synfig-studio/tags/stable/src/gtkmm/zoomdial.h b/synfig-studio/tags/stable/src/gtkmm/zoomdial.h
index 42c902e..72bce13 100644 (file)
--- a/synfig-studio/tags/stable/src/gtkmm/zoomdial.h
+++ b/synfig-studio/tags/stable/src/gtkmm/zoomdial.h
@@ -1,34 +1,38 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file zoomdial.h
 **     \brief Template Header
 **
-**     $Id: zoomdial.h,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**     $Id$
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**  Copyright (c) 2008 Chris Moore
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_STUDIO_ZOOMDIAL_H
-#define __SINFG_STUDIO_ZOOMDIAL_H
+#ifndef __SYNFIG_STUDIO_ZOOMDIAL_H
+#define __SYNFIG_STUDIO_ZOOMDIAL_H
 
 /* === H E A D E R S ======================================================= */
 
 #include <gtkmm/tooltips.h>
 #include <gtkmm/button.h>
 
+#include "general.h"
+
 /* === M A C R O S ========================================================= */
 
 #define SMALL_BUTTON(button,stockid,tooltip)   \
@@ -54,7 +58,7 @@ class ZoomDial : public Gtk::Table
        Gtk::Tooltips tooltips;
        Gtk::IconSize iconsize;
 
-       
+
 public:
        Gtk::Button *zoom_in;
        Gtk::Button *zoom_out;
@@ -65,14 +69,15 @@ public:
        {
                Gtk::Image *icon;
 
-               SMALL_BUTTON(zoom_in,"gtk-add","Zoom In");
-               SMALL_BUTTON(zoom_out,"gtk-remove","Zoom Out");
-               SMALL_BUTTON(zoom_fit,"gtk-zoom-fit","Zoom Fit");
-               SMALL_BUTTON(zoom_norm,"gtk-zoom-100","Zoom to 100%");
+               SMALL_BUTTON(zoom_in,"gtk-add",_("Zoom In"));
+               SMALL_BUTTON(zoom_out,"gtk-remove",_("Zoom Out"));
+               SMALL_BUTTON(zoom_fit,"gtk-zoom-fit",_("Zoom to Fit"));
+               SMALL_BUTTON(zoom_norm,"gtk-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);
-               attach(*zoom_in, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+               attach(*zoom_fit, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+               attach(*zoom_in, 3, 4, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
        }
 
        Glib::SignalProxy0<void> signal_zoom_in()