Changeset 2012:224cd6aacfc1 in lemon-0.x

Timestamp:

03/23/06 20:57:14 (18 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2646

Message:

• added gettext infrastructure to the gui
• the gui has a separate configure script now
• other minor changes

Files:

• Makefile.am (modified) (3 diffs)
• bootstrap (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• gui/ABOUT-NLS (added)
• gui/Makefile.am (modified) (3 diffs)
• gui/bootstrap (added)
• gui/configure.ac (added)
• gui/gettext.h (added)
• gui/graph-displayer.cc (modified) (3 diffs)
• gui/main_win.cc (modified) (8 diffs)
• gui/po/LINGUAS (added)
• gui/po/Makevars (added)
• gui/po/POTFILES.in (added)
• gui/po/glemon.pot (added)
• gui/po/hu.po (added)
• m4/lx_check_cplex.m4 (moved) (moved from config/lx_check_cplex.m4)
• m4/lx_check_glpk.m4 (moved) (moved from config/lx_check_glpk.m4)

Makefile.am

@@ -1 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = \
@@ -5 +5 @@
         lemon.spec \
         autopackage/default.apspec.in \
-        config/lx_check_cplex.m4 \
-        config/lx_check_glpk.m4
+        m4/lx_check_cplex.m4 \
+        m4/lx_check_glpk.m4
 
 if WANT_DOC
@@ -29 +29 @@
         configure \
         Makefile.in \
-        config/depcomp \
-        config/install-sh \
-        config/config.guess \
-        config/config.sub \
-        config/ltmain.sh \
-        config/missing \
-        config/mkinstalldirs \
+        build-aux/config.guess \
+        build-aux/config.sub \
+        build-aux/depcomp \
+        build-aux/install-sh \
+        build-aux/ltmain.sh \
+        build-aux/missing \
+        build-aux/mkinstalldirs \
         doc/Makefile.in \
         doc/doxygen.log \

bootstrap

@@ -68 +68 @@
 fi
 
+echo "Try using 'autoreconf -vi' instead of this."
+
 set -x
-$aclocal -I config \
+$aclocal -I m4 \
 && libtoolize --force --copy \
+&& $autoconf \
 && $autoheader \
-&& $automake --add-missing --copy --gnu \
-&& $autoconf
+&& $automake --add-missing --copy --gnu

configure.ac

@@ -1 +1 @@
 dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ([2.59])
 AC_INIT([LEMON], [svn-head], [etik-ol@cs.elte.hu], [lemon])
-AC_CONFIG_AUX_DIR([config])
-AM_INIT_AUTOMAKE([1.7])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
+dnl AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_INIT_AUTOMAKE([-Wall foreign])
 AC_CONFIG_SRCDIR([lemon/list_graph.h])
 AC_CONFIG_HEADERS([config.h lemon/config.h])
-AC_PREREQ([2.59])
 
 lx_cmdline_cxxflags_set=${CXXFLAGS+set}
@@ -65 +67 @@
 fi
 if test x"$enable_gui" != x"no"; then
-  PKG_CHECK_MODULES([GTK], [libgnomecanvasmm-2.6 >= 2.6.0])
+  AC_CONFIG_SUBDIRS([gui])
 fi
 AM_CONDITIONAL([WANT_GUI], [test x"$enable_gui" != x"no"])
@@ -123 +125 @@
 demo/Makefile
 test/Makefile
-gui/Makefile
 ])
 

gui/Makefile.am

@@ -1 @@
-AM_CPPFLAGS = -I$(top_srcdir)
-LDADD = $(top_builddir)/lemon/libemon.la
+AM_CPPFLAGS = -I$(top_srcdir) -DLOCALEDIR=\""$(datadir)/locale"\"
+LDADD = ../lemon/libemon.la
+
+ACLOCAL_AMFLAGS = -I m4
+
+EXTRA_DIST = \
+        build-aux/config.rpath
+
+SUBDIRS = po
 
 bin_PROGRAMS = glemon
@@ -40 +47 @@
         gui_writer.cc \
         xml.h \
-        guipixbufs.h
+        guipixbufs.h \
+        gettext.h
 
 glemon_CXXFLAGS = $(GTK_CFLAGS)
 glemon_LDFLAGS = $(GTK_LIBS)
+#glemon_LDADD = $(LIBINTL)
 
 IMAGES = \
@@ -68 +77 @@
         ( rm -f guipixbufs.h && false )
 
-EXTRA_DIST = $(IMAGES) guipixbufs.h
+EXTRA_DIST += $(IMAGES) guipixbufs.h
+
+MRPROPERFILES = \
+        aclocal.m4 \
+        config.h.in \
+        config.h.in~ \
+        configure \
+        Makefile.in \
+        build-aux/config.guess \
+        build-aux/config.rpath \
+        build-aux/config.sub \
+        build-aux/depcomp \
+        build-aux/install-sh \
+        build-aux/ltmain.sh \
+        build-aux/missing \
+        build-aux/mkinstalldirs \
+        Makefile.in \
+        m4/intmax.m4 \
+        m4/lib-link.m4 \
+        m4/lib-prefix.m4 \
+        m4/printf-posix.m4 \
+        m4/xsize.m4 \
+        m4/glibc2.m4 \
+        m4/lib-ld.m4 \
+        m4/lcmessage.m4 \
+        m4/wint_t.m4 \
+        m4/ulonglong.m4 \
+        m4/inttypes-pri.m4 \
+        m4/progtest.m4 \
+        m4/uintmax_t.m4 \
+        m4/signed.m4 \
+        m4/stdint_h.m4 \
+        m4/intdiv0.m4 \
+        m4/iconv.m4 \
+        m4/po.m4 \
+        m4/isc-posix.m4 \
+        m4/longlong.m4 \
+        m4/inttypes.m4 \
+        m4/size_max.m4 \
+        m4/glibc21.m4 \
+        m4/gettext.m4 \
+        m4/codeset.m4 \
+        m4/inttypes_h.m4 \
+        m4/wchar_t.m4 \
+        m4/longdouble.m4 \
+        m4/nls.m4 \
+        po/Rules-quot \
+        po/en@quot.header \
+        po/insert-header.sin \
+        po/quot.sed \
+        po/en@boldquot.header \
+        po/boldquot.sed \
+        po/Makevars.template \
+        po/remove-potcdate.sin \
+        po/Makefile.in.in
+
+mrproper:
+        $(MAKE) $(AM_MAKEFLAGS) maintainer-clean
+        -rm -f $(MRPROPERFILES)
+
+.PHONY: mrproper

gui/graph-displayer.cc

@@ +1 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "all_include.h"
 #include "mapstorage.h"
@@ -4 +8 @@
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
+
+#include <locale.h>
+#include "gettext.h"
 
 #define MAIN_PART
@@ -15 +22 @@
 int main(int argc, char *argv[])
 {
+  bindtextdomain(PACKAGE, LOCALEDIR);
+  bind_textdomain_codeset(PACKAGE, "UTF-8");
+  textdomain(PACKAGE);
 
   //initializing

gui/main_win.cc

@@ +1 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "main_win.h"
 #include "guipixbufs.h"
+
+#include "gettext.h"
+#define _(string) gettext (string)
 
 MainWin::MainWin()
@@ -72 +79 @@
   ag=Gtk::ActionGroup::create();
 
-  ag->add( Gtk::Action::create("FileMenu", "_File") );
+  ag->add( Gtk::Action::create("FileMenu", _("_File")) );
   ag->add( Gtk::Action::create("FileNew", Gtk::Stock::NEW),
       sigc::mem_fun(*this, &MainWin::newTab));
   ag->add( Gtk::Action::create("FileOpen", Gtk::Stock::OPEN),
       sigc::mem_fun(*this, &MainWin::openFile));
-  ag->add( Gtk::Action::create("FileClearTab", "Clear Tab"),
+  ag->add( Gtk::Action::create("FileClearTab", _("Clear Tab")),
       sigc::mem_fun(*this, &MainWin::newFile));
   ag->add( Gtk::Action::create("FileSave", Gtk::Stock::SAVE),
@@ -88 +95 @@
       sigc::mem_fun(*this, &MainWin::hide));
 
-  ag->add( Gtk::Action::create("ViewMenu", "_View") );
+  ag->add( Gtk::Action::create("ViewMenu", _("_View")) );
   ag->add( Gtk::Action::create("ViewZoomIn", Gtk::Stock::ZOOM_IN),
       sigc::mem_fun(*this, &MainWin::zoomIn));
@@ -98 +105 @@
       sigc::mem_fun(*this, &MainWin::zoom100));
   
-  ag->add( Gtk::Action::create("ShowMenu", "_Show") );
-  ag->add( Gtk::Action::create("ShowMaps", "_Maps"),
+  ag->add( Gtk::Action::create("ShowMenu", _("_Show")) );
+  ag->add( Gtk::Action::create("ShowMaps", _("_Maps")),
            sigc::mem_fun(*this, &MainWin::createMapWin));
 
-  ag->add( Gtk::Action::create("AlgoMenu", "_Algorithms") );
-  ag->add( Gtk::Action::create("AlgoGeneral", "_General"),
+  ag->add( Gtk::Action::create("AlgoMenu", _("_Algorithms")) );
+  ag->add( Gtk::Action::create("AlgoGeneral", _("_General")),
            sigc::bind( sigc::mem_fun ( *this, &MainWin::createAlgoWin ), 0) );
-  ag->add( Gtk::Action::create("AlgoKruskal", "_Kruskal"),
+  ag->add( Gtk::Action::create("AlgoKruskal", _("_Kruskal")),
            sigc::bind( sigc::mem_fun ( *this, &MainWin::createAlgoWin ), 1) );
 
   Gtk::RadioAction::Group tool_group;
-  ag->add( Gtk::RadioAction::create(tool_group, "MoveItem", Gtk::StockID("gd-move"), "Move"),
+  ag->add( Gtk::RadioAction::create(tool_group, "MoveItem", Gtk::StockID("gd-move"), _("Move")),
       sigc::bind( sigc::mem_fun ( *this, &MainWin::changeEditorialTool ), 0) );
-  ag->add( Gtk::RadioAction::create(tool_group, "CreateNode", Gtk::StockID("gd-addnode"), "Create node"),
+  ag->add( Gtk::RadioAction::create(tool_group, "CreateNode", Gtk::StockID("gd-addnode"), _("Create node")),
       sigc::bind( sigc::mem_fun ( *this, &MainWin::changeEditorialTool ), 1) );
-  ag->add( Gtk::RadioAction::create(tool_group, "CreateEdge", Gtk::StockID("gd-addlink"), "Create edge"),
+  ag->add( Gtk::RadioAction::create(tool_group, "CreateEdge", Gtk::StockID("gd-addlink"), _("Create edge")),
       sigc::bind( sigc::mem_fun ( *this, &MainWin::changeEditorialTool ), 2) );
-  ag->add( Gtk::RadioAction::create(tool_group, "EraseItem", Gtk::StockID("gd-delete"), "Delete"),
+  ag->add( Gtk::RadioAction::create(tool_group, "EraseItem", Gtk::StockID("gd-delete"), _("Delete")),
       sigc::bind( sigc::mem_fun ( *this, &MainWin::changeEditorialTool ), 3) );
 
-  ag->add( Gtk::RadioAction::create(tool_group, "EditEdgeMap", Gtk::StockID("gd-editlink"), "Edit edge map"),
+  ag->add( Gtk::RadioAction::create(tool_group, "EditEdgeMap", Gtk::StockID("gd-editlink"), _("Edit edge map")),
       sigc::bind( sigc::mem_fun ( *this, &MainWin::changeEditorialTool ), 4) );
-  ag->add( Gtk::RadioAction::create(tool_group, "EditNodeMap", Gtk::StockID("gd-editnode"), "Edit node map"),
+  ag->add( Gtk::RadioAction::create(tool_group, "EditNodeMap", Gtk::StockID("gd-editnode"), _("Edit node map")),
       sigc::bind( sigc::mem_fun ( *this, &MainWin::changeEditorialTool ), 5) );
 
@@ -251 +258 @@
   notebook.append_page((Gtk::Widget&)(*(tabs[active_tab])));
   notebook.set_current_page(size);
-  set_tabtitle("unsaved file");
+  set_tabtitle(_("unsaved file"));
   updateAlgoWinTabs();
 }
@@ -261 +268 @@
       if (tabs[active_tab]->mapstorage.modified)
         {
-          Gtk::MessageDialog mdialog("<b>Save changes before closing?</b>", true, 
+          Gtk::MessageDialog mdialog(_("<b>Save changes before closing?</b>"), true, 
                                      Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
-          mdialog.add_button("Close file _without Saving", Gtk::RESPONSE_REJECT);
+          mdialog.add_button(_("Close file _without Saving"), Gtk::RESPONSE_REJECT);
           mdialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
           mdialog.add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
@@ -450 +457 @@
   if(active_tab!=-1)
     {
-      NewMapWin * nmw=new NewMapWin("Create New Map - "+tabnames[active_tab], *(tabs[active_tab]));
+      NewMapWin * nmw=new NewMapWin(_("Create New Map - ")+tabnames[active_tab], *(tabs[active_tab]));
       nmw->show();
     }
@@ -479 +486 @@
         }
     }
-  NewMapWin * nmw=new NewMapWin("Create New Map - "+tabnames[i], *nbt, itisedge, false);
+  NewMapWin * nmw=new NewMapWin(_("Create New Map - ")+tabnames[i], *nbt, itisedge, false);
   nmw->run();
 }