From 37359e97c08b49214572ca06b16241f7b9a2721c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Teuli=C3=A8re?= Date: Sun, 7 Sep 2008 13:17:39 +0000 Subject: [PATCH] - Renamed the binaries: eliot is now the Qt interface, whereas wxeliot is the wxWidgets interface - Embed the program icon into the executable on Windows: the icon is not visible in Windows explorer - Fixed gettext configuration on Windows. The translations now appear, but the accents still don't display correctly. - Fixed a few translation issues --- Makefile.am | 2 +- configure.in | 5 ++++- dic/Makefile.am | 3 --- dic/compdic.cpp | 11 ++++++----- dic/listdic.cpp | 11 ++++++----- dic/regexpmain.cpp | 11 ++++++----- po/eliot.pot | 33 +++++++++++++++++++-------------- po/fr.po | 32 +++++++++++++++++--------------- qt/Makefile.am | 23 ++++++++++++++++++----- qt/images/eliot.ico | Bin 0 -> 3774 bytes qt/main.cpp | 17 +++++++++++------ qt/ui/dic_tools_widget.ui | 2 +- qt/ui/prefs_dialog.ui | 2 +- utils/ncurses.cpp | 11 ++++++----- wxwin/Makefile.am | 6 +++--- 15 files changed, 99 insertions(+), 70 deletions(-) create mode 100644 qt/images/eliot.ico diff --git a/Makefile.am b/Makefile.am index 4f67dd4..15c26b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,7 @@ package-win32-zip: mkdir -p $(WIN32_PACKAGE_DIR) # Copy the binaries and strip them - cp $(top_builddir)/wxwin/eliot$(EXEEXT) $(top_builddir)/dic/compdic$(EXEEXT) $(top_builddir)/dic/listdic$(EXEEXT) $(top_builddir)/qt/qeliot$(EXEEXT) $(WIN32_PACKAGE_DIR) + cp $(top_builddir)/wxwin/wxeliot$(EXEEXT) $(top_builddir)/dic/compdic$(EXEEXT) $(top_builddir)/dic/listdic$(EXEEXT) $(top_builddir)/qt/eliot$(EXEEXT) $(WIN32_PACKAGE_DIR) $(STRIP) $(WIN32_PACKAGE_DIR)/* # Copy the i18n files diff --git a/configure.in b/configure.in index e0acb14..4ea437c 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl -------------------------------------------------------------- dnl configure.in for Eliot dnl -------------------------------------------------------------- AC_INIT(eliot, 1.7-cvs) -AC_CONFIG_SRCDIR(wxwin/main.cc) +AC_CONFIG_SRCDIR(qt/main.cpp) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST @@ -69,6 +69,9 @@ dnl Regexp / Listdic / Compdic build enable AC_ARG_ENABLE([dictools],AC_HELP_STRING([--enable-dictools],[build independant dictionary tools (default enabled)])) AM_CONDITIONAL([BUILD_DICTOOLS], [test "${enable_dictools}" != "no"]) +dnl Define WIN32_BUILD if the compiler is i586-mingw32msvc-g++ +AM_CONDITIONAL([WIN32_BUILD], [test "${CXX}" = "i586-mingw32msvc-g++"]) + dnl -------------------------------------------------------------- dnl Checks for header files. dnl -------------------------------------------------------------- diff --git a/dic/Makefile.am b/dic/Makefile.am index d277764..2bce638 100644 --- a/dic/Makefile.am +++ b/dic/Makefile.am @@ -22,9 +22,6 @@ noinst_LIBRARIES = libdic.a localedir = $(datadir)/locale AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir) -I../intl -I$(top_srcdir)/intl $(INCICONV) -libdic_a_CFLAGS= -libdic_a_YFLAGS=-d -libdic_a_LFLAGS= libdic_a_SOURCES = \ dic_exception.cpp dic_exception.h \ header.cpp header.h \ diff --git a/dic/compdic.cpp b/dic/compdic.cpp index c488b3b..68cdbe4 100644 --- a/dic/compdic.cpp +++ b/dic/compdic.cpp @@ -443,15 +443,16 @@ int main(int argc, char* argv[]) // Set the message domain #ifdef WIN32 // Get the absolute path, as returned by GetFullPathName() - char localeDir[MAX_PATH]; - GetFullPathName(argv[0], MAX_PATH, localeDir, NULL); - char *pos = strrchr(localeDir, L'\\'); + char baseDir[MAX_PATH]; + GetFullPathName(argv[0], MAX_PATH, baseDir, NULL); + char *pos = strrchr(baseDir, L'\\'); if (pos) *pos = '\0'; + const string localeDir = baseDir + string("\\locale"); #else - static const char *localeDir = LOCALEDIR; + static const string localeDir = LOCALEDIR; #endif - bindtextdomain(PACKAGE, localeDir); + bindtextdomain(PACKAGE, localeDir.c_str()); textdomain(PACKAGE); #endif diff --git a/dic/listdic.cpp b/dic/listdic.cpp index 5d37e3b..3d9cc6c 100644 --- a/dic/listdic.cpp +++ b/dic/listdic.cpp @@ -130,15 +130,16 @@ int main(int argc, char *argv[]) // Set the message domain #ifdef WIN32 // Get the absolute path, as returned by GetFullPathName() - char localeDir[MAX_PATH]; - GetFullPathName(argv[0], MAX_PATH, localeDir, NULL); - char *pos = strrchr(localeDir, L'\\'); + char baseDir[MAX_PATH]; + GetFullPathName(argv[0], MAX_PATH, baseDir, NULL); + char *pos = strrchr(baseDir, L'\\'); if (pos) *pos = '\0'; + const string localeDir = baseDir + string("\\locale"); #else - static const char *localeDir = LOCALEDIR; + static const string localeDir = LOCALEDIR; #endif - bindtextdomain(PACKAGE, localeDir); + bindtextdomain(PACKAGE, localeDir.c_str()); textdomain(PACKAGE); #endif diff --git a/dic/regexpmain.cpp b/dic/regexpmain.cpp index 210136d..c4ed016 100644 --- a/dic/regexpmain.cpp +++ b/dic/regexpmain.cpp @@ -66,15 +66,16 @@ int main(int argc, char* argv[]) // Set the message domain #ifdef WIN32 // Get the absolute path, as returned by GetFullPathName() - char localeDir[MAX_PATH]; - GetFullPathName(argv[0], MAX_PATH, localeDir, NULL); - char *pos = strrchr(localeDir, L'\\'); + char baseDir[MAX_PATH]; + GetFullPathName(argv[0], MAX_PATH, baseDir, NULL); + char *pos = strrchr(baseDir, L'\\'); if (pos) *pos = '\0'; + const string localeDir = baseDir + string("\\locale"); #else - static const char *localeDir = LOCALEDIR; + static const string localeDir = LOCALEDIR; #endif - bindtextdomain(PACKAGE, localeDir); + bindtextdomain(PACKAGE, localeDir.c_str()); textdomain(PACKAGE); #endif diff --git a/po/eliot.pot b/po/eliot.pot index 9d5aeca..c4471f1 100644 --- a/po/eliot.pot +++ b/po/eliot.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-06 16:02+0200\n" +"POT-Creation-Date: 2008-09-07 10:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -192,29 +192,29 @@ msgstr "" msgid "? 0 2 1 1" msgstr "" -#: dic/compdic.cpp:511 +#: dic/compdic.cpp:512 msgid "A mandatory option is missing" msgstr "" -#: dic/compdic.cpp:519 +#: dic/compdic.cpp:520 msgid "Cannot stat uncompressed dictionary " msgstr "" -#: dic/compdic.cpp:527 +#: dic/compdic.cpp:528 msgid "Cannot open output file " msgstr "" -#: dic/compdic.cpp:575 -#, c-format -msgid " Load time: %.3f s\n" -msgstr "" - #: dic/compdic.cpp:576 #, c-format +msgid " Load time: %.3f s\n" +msgstr "" + +#: dic/compdic.cpp:577 +#, c-format msgid " Compression time: %.3f s\n" msgstr "" -#: dic/compdic.cpp:578 +#: dic/compdic.cpp:579 #, c-format msgid " Maximum recursion level reached: %d\n" msgstr "" @@ -258,15 +258,15 @@ msgstr "" msgid " dictionary: path to eliot dawg dictionary" msgstr "" -#: dic/regexpmain.cpp:94 dic/regexpmain.cpp:118 +#: dic/regexpmain.cpp:95 dic/regexpmain.cpp:119 msgid "Enter a regular expression:" msgstr "" -#: dic/regexpmain.cpp:105 +#: dic/regexpmain.cpp:106 msgid "result:" msgstr "" -#: dic/regexpmain.cpp:114 wxwin/searchpanel.cc:296 +#: dic/regexpmain.cpp:115 wxwin/searchpanel.cc:296 msgid "Invalid regular expression: " msgstr "" @@ -1455,7 +1455,8 @@ msgstr "" msgid "History" msgstr "" -#: qt/main_window.cpp:681 qt/ui/main_window.ui:136 +#: qt/main_window.cpp:681 qt/ui/dic_tools_widget.ui:13 +#: qt/ui/main_window.ui:136 msgid "Dictionary tools" msgstr "" @@ -1608,6 +1609,10 @@ msgstr "" msgid "Pass" msgstr "" +#: qt/ui/prefs_dialog.ui:13 +msgid "Preferences" +msgstr "" + #: qt/ui/prefs_dialog.ui:19 msgid "Interface" msgstr "" diff --git a/po/fr.po b/po/fr.po index 45246a8..5739b0a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: eliot 1.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-06 16:02+0200\n" +"POT-Creation-Date: 2008-09-07 10:38+0200\n" "PO-Revision-Date: 2008-08-31 10:43+0100\n" "Last-Translator: Olivier Teuliere \n" "Language-Team: French \n" @@ -210,29 +210,29 @@ msgstr "Z 10 1 0 1" msgid "? 0 2 1 1" msgstr "? 0 2 1 1" -#: dic/compdic.cpp:511 +#: dic/compdic.cpp:512 msgid "A mandatory option is missing" msgstr "Une option obligatoire est manquante" -#: dic/compdic.cpp:519 +#: dic/compdic.cpp:520 msgid "Cannot stat uncompressed dictionary " msgstr "Impossible de trouver le dictionnaire non compressé " -#: dic/compdic.cpp:527 +#: dic/compdic.cpp:528 msgid "Cannot open output file " msgstr "Impossible d'ouvrir le fichier d'output " -#: dic/compdic.cpp:575 +#: dic/compdic.cpp:576 #, c-format msgid " Load time: %.3f s\n" msgstr " Temps de chargement : %.3f s\n" -#: dic/compdic.cpp:576 +#: dic/compdic.cpp:577 #, c-format msgid " Compression time: %.3f s\n" msgstr " Temps de compression : %.3f s\n" -#: dic/compdic.cpp:578 +#: dic/compdic.cpp:579 #, c-format msgid " Maximum recursion level reached: %d\n" msgstr " Niveau maximum de rcursion atteint : %d\n" @@ -276,15 +276,15 @@ msgstr "Usage : %s dictionnaire" msgid " dictionary: path to eliot dawg dictionary" msgstr " dictionnaire : chemin vers un dictionnaire de type dawg pour Eliot" -#: dic/regexpmain.cpp:94 dic/regexpmain.cpp:118 +#: dic/regexpmain.cpp:95 dic/regexpmain.cpp:119 msgid "Enter a regular expression:" msgstr "Entrer une expression régulière :" -#: dic/regexpmain.cpp:105 +#: dic/regexpmain.cpp:106 msgid "result:" msgstr "résultat :" -#: dic/regexpmain.cpp:114 wxwin/searchpanel.cc:296 +#: dic/regexpmain.cpp:115 wxwin/searchpanel.cc:296 msgid "Invalid regular expression: " msgstr "Expression régulière invalide : " @@ -1379,7 +1379,7 @@ msgstr "&Préférences..." #: qt/main_window.cpp:326 msgid "Ctrl+F" -msgstr "Ctrl-F" +msgstr "Ctrl+F" #: qt/main_window.cpp:327 msgid "Edit the preferences" @@ -1487,7 +1487,8 @@ msgstr "" msgid "History" msgstr "Historique" -#: qt/main_window.cpp:681 qt/ui/main_window.ui:136 +#: qt/main_window.cpp:681 qt/ui/dic_tools_widget.ui:13 +#: qt/ui/main_window.ui:136 msgid "Dictionary tools" msgstr "Outils du dictionnaire" @@ -1648,6 +1649,10 @@ msgstr "Changer" msgid "Pass" msgstr "Passer" +#: qt/ui/prefs_dialog.ui:13 +msgid "Preferences" +msgstr "Préférences" + #: qt/ui/prefs_dialog.ui:19 msgid "Interface" msgstr "Interface" @@ -1729,9 +1734,6 @@ msgstr "Complément" #~ msgid "New..." #~ msgstr "&Nouvelle partie..." -#~ msgid "Preferences..." -#~ msgstr "&Préférences..." - #~ msgid "Save" #~ msgstr "Sauver" diff --git a/qt/Makefile.am b/qt/Makefile.am index 22407d0..c473f7e 100644 --- a/qt/Makefile.am +++ b/qt/Makefile.am @@ -24,7 +24,7 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" @QT_CFLAGS@ -DQT4LOCALEDIR=\"@QT4LOCA SUFFIXES=.ui.h .moc.cpp -bin_PROGRAMS = qeliot +bin_PROGRAMS = eliot RESOURCES = \ images/eliot.xpm @@ -37,7 +37,8 @@ EXTRA_DIST = \ ui/prefs_dialog.ui \ ui/training_widget.ui \ eliot.qrc \ - $(RESOURCES) + $(RESOURCES) \ + images/eliot.ico BUILT_SOURCES = \ ui/main_window.ui.h \ @@ -59,7 +60,7 @@ BUILT_SOURCES = \ main_window.moc.cpp \ resources.cpp -qeliot_SOURCES = \ +eliot_SOURCES = \ qtcommon.h \ bag_widget.cpp bag_widget.h \ dic_tools_widget.cpp dic_tools_widget.h \ @@ -73,9 +74,9 @@ qeliot_SOURCES = \ aux_window.cpp aux_window.h \ main_window.cpp main_window.h \ main.cpp -qeliot_SOURCES += $(BUILT_SOURCES) +eliot_SOURCES += $(BUILT_SOURCES) -qeliot_LDADD = @QT_LIBS@ ../game/libgame.a ../dic/libdic.a @LIBINTL@ +eliot_LDADD = @QT_LIBS@ ../game/libgame.a ../dic/libdic.a @LIBINTL@ # Generate a cpp file from the resources resources.cpp: eliot.qrc $(RESOURCES) @@ -97,6 +98,18 @@ resources.cpp: eliot.qrc $(RESOURCES) sed 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@ rm -f $@.tmp +# Embed the icon in the win32 binary, see http://doc.trolltech.com/4.4/appicon.html +if WIN32_BUILD +BUILT_SOURCES += win32icon.rc +eliot_SOURCES += win32icon.rc +eliot_LDADD += win32icon.o + +win32icon.rc: images/eliot.ico + echo "IDI_ICON1 ICON DISCARDABLE \"$(top_srcdir)/qt/images/eliot.ico\"" > $@ + +win32icon.o: win32icon.rc + i586-mingw32msvc-windres -o $@ -i $< +endif endif diff --git a/qt/images/eliot.ico b/qt/images/eliot.ico new file mode 100644 index 0000000000000000000000000000000000000000..f9cb7515bad4a98d17920a91eee39bf53ba3b119 GIT binary patch literal 3774 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 #include #include #include @@ -28,6 +29,9 @@ # include #endif +using std::string; + + int main(int argc, char **argv) { #ifdef HAVE_SETLOCALE @@ -42,22 +46,23 @@ int main(int argc, char **argv) // Set the message domain #ifdef WIN32 // Get the absolute path, as returned by GetFullPathName() - char localeDir[MAX_PATH]; - GetFullPathName(argv[0], MAX_PATH, localeDir, NULL); - char *pos = strrchr(localeDir, L'\\'); + char baseDir[MAX_PATH]; + GetFullPathName(argv[0], MAX_PATH, baseDir, NULL); + char *pos = strrchr(baseDir, L'\\'); if (pos) *pos = '\0'; + const string localeDir = baseDir + string("\\locale"); #else - static const char *localeDir = LOCALEDIR; + static const string localeDir = LOCALEDIR; #endif - bindtextdomain(PACKAGE, localeDir); + bindtextdomain(PACKAGE, localeDir.c_str()); textdomain(PACKAGE); // Translations for Qt's own strings QTranslator translator; // Set the path for the translation file #ifdef WIN32 - QString path = localeDir; + QString path = QString(localeDir.c_str()) + "\\qt4"; #else QString path = QString(QT4LOCALEDIR); #endif diff --git a/qt/ui/dic_tools_widget.ui b/qt/ui/dic_tools_widget.ui index 53758d2..f27191a 100644 --- a/qt/ui/dic_tools_widget.ui +++ b/qt/ui/dic_tools_widget.ui @@ -10,7 +10,7 @@ - Form + _("Dictionary tools") diff --git a/qt/ui/prefs_dialog.ui b/qt/ui/prefs_dialog.ui index 2382ba0..f477cb0 100644 --- a/qt/ui/prefs_dialog.ui +++ b/qt/ui/prefs_dialog.ui @@ -10,7 +10,7 @@ - Preferences + _("Preferences") diff --git a/utils/ncurses.cpp b/utils/ncurses.cpp index c130149..603a96b 100644 --- a/utils/ncurses.cpp +++ b/utils/ncurses.cpp @@ -1123,15 +1123,16 @@ int main(int argc, char ** argv) // Set the message domain #ifdef WIN32 // Get the absolute path, as returned by GetFullPathName() - char localeDir[MAX_PATH]; - GetFullPathName(argv[0], MAX_PATH, localeDir, NULL); - char *pos = strrchr(localeDir, L'\\'); + char baseDir[MAX_PATH]; + GetFullPathName(argv[0], MAX_PATH, baseDir, NULL); + char *pos = strrchr(baseDir, L'\\'); if (pos) *pos = '\0'; + const string localeDir = baseDir + string("\\locale"); #else - static const char *localeDir = LOCALEDIR; + static const string localeDir = LOCALEDIR; #endif - bindtextdomain(PACKAGE, localeDir); + bindtextdomain(PACKAGE, localeDir.c_str()); textdomain(PACKAGE); #endif diff --git a/wxwin/Makefile.am b/wxwin/Makefile.am index d43e896..a04860e 100644 --- a/wxwin/Makefile.am +++ b/wxwin/Makefile.am @@ -20,11 +20,11 @@ localedir = $(datadir)/locale if BUILD_WXWIDGETS -bin_PROGRAMS = eliot +bin_PROGRAMS = wxeliot AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" @WX_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/dic -I$(top_srcdir)/game -eliot_SOURCES = \ +wxeliot_SOURCES = \ configdb.cc configdb.h \ gfxboard.cc gfxboard.h \ gfxresult.cc gfxresult.h \ @@ -36,7 +36,7 @@ eliot_SOURCES = \ mainframe.cc mainframe.h \ main.cc ewx.h -eliot_LDADD = @WX_LIBS@ ../game/libgame.a ../dic/libdic.a @LIBINTL@ +wxeliot_LDADD = @WX_LIBS@ ../game/libgame.a ../dic/libdic.a @LIBINTL@ EXTRA_DIST = \ eliot.xpm \