Commit 6ffef7ab authored by Bruno Coudoin's avatar Bruno Coudoin

Added admin icon on windows.

	Added Occitan support

svn path=/trunk/; revision=2594
parent 8f51a4b4
2007-04-14 Bruno coudoin <bruno.coudoin@free.fr>
Added admin icon on windows.
Added Occitan support
* Makefile.am:
* configure.in:
* docs/gcompris2spip.pl:
* gcompris-installer.nsi.in:
* src/gcompris/config.c:
* src/gcompris/gcomprisrc.rc:
* gc_admin.ico: created
2007-04-13 Bruno coudoin <bruno.coudoin@free.fr>
* src/boards/Makefile.mingw: added wordprocessor
......
......@@ -49,7 +49,7 @@ EXTRA_DIST = \
intltool-update.in \
gnome2-macros \
README.mingw README.translators README.windows \
config.h.mingw Makefile.mingw global_win32.mak gcompris.ico gcompris-uninstal.ico \
config.h.mingw Makefile.mingw global_win32.mak gcompris.ico gc_admin.ico gcompris-uninstal.ico \
gcompris-installer.nsi
......@@ -127,7 +127,7 @@ FCT_LDD_CP=function ldd_cp { \
$(INSTALL_D) $$2/$$f $$3/$$f ;\
ldd_cp $$3/$$f $$2 $$3;\
fi \
done ; }
done ; }
FCT_OTOOL_CP=function otool_cp { \
for f in $$(otool -L $$1 | grep $$2 | eval "sed -e 's,^.*$$2/\(.*.dylib\).*$$,\1,' " ); do \
......@@ -151,14 +151,14 @@ else
INSTALL_D=$(INSTALL) -D
endif
nsbundle:
nsbundle:
$(INSTALL) -d $(BUNDLE_RESOURCES_DIR)
$(INSTALL) -d $(BUNDLE_EXEC_DIR)
$(INSTALL) -d $(BUNDLE_EXEC_DIR)$(NSBUNDLE_GTK_DIR)
make install prefix=$(BUNDLE_RESOURCES_DIR) \
exec_prefix=$(BUNDLE_RESOURCES_DIR) \
bindir=$(BUNDLE_EXEC_DIR) \
PYTHON_PLUGIN_DIR=$(BUNDLE_RESOURCES_DIR)/share/gcompris/python
PYTHON_PLUGIN_DIR=$(BUNDLE_RESOURCES_DIR)/share/gcompris/python
mv $(BUNDLE_EXEC_DIR)/gcompris $(BUNDLE_EXEC_DIR)/$(BUNDLE_NAME)
if OS_MACOSX
$(FCT_OTOOL_CP); otool_cp $(BUNDLE_EXEC_DIR)/$(BUNDLE_NAME) $(prefix) $(BUNDLE_EXEC_DIR)$(NSBUNDLE_GTK_DIR) $(NSBUNDLE_GTK_DIR)
......@@ -190,7 +190,7 @@ if OS_MACOSX
$(INSTALL) $(top_srcdir)/macosx/GCompris.icns $(BUNDLE_RESOURCES_DIR)/
$(FCT_OTOOL_CP) ; for s in $$(find $(BUNDLE_EXEC_DIR)$(NSBUNDLE_GTK_DIR)/ -name '*.so') ; do \
otool_cp $$s $(prefix) $(BUNDLE_EXEC_DIR)$(NSBUNDLE_GTK_DIR) $(NSBUNDLE_GTK_DIR) ; \
done
done
$(FCT_OTOOL_CP) ; for s in $$(find $(BUNDLE_RESOURCES_DIR) -name '*.so') ; do \
otool_cp $$s $(prefix) $(BUNDLE_EXEC_DIR)$(NSBUNDLE_GTK_DIR) $(NSBUNDLE_GTK_DIR) ; \
done
......@@ -200,7 +200,7 @@ if OS_MACOSX
else
$(INSTALL) $(top_srcdir)/macosx/gcompris.png $(BUNDLE_RESOURCES_DIR)/
$(INSTALL) $(top_srcdir)/macosx/Info-gnustep.plist $(BUNDLE_RESOURCES_DIR)/
endif
endif
endif
......@@ -218,7 +218,7 @@ fi
LDFLAGS="${LDFLAGS} ${XF86VM_LIBS}"
dnl Add the languages which your application supports here.
ALL_LINGUAS="am ar az bg ca cs da de dz el en_CA en_GB es et eu fi fr ga gl gu he hi hr hu id it ja ka ko lt mk ml mr ms nb ne nl nn pa pl pt pt_BR ro ru rw sk sl so sq sr sr@Latn sv th tr vi wa zh_CN zh_TW"
ALL_LINGUAS="am ar az bg ca cs da de dz el en_CA en_GB es et eu fi fr ga gl gu he hi hr hu id it ja ka ko lt mk ml mr ms nb ne nl nn oc pa pl pt pt_BR ro ru rw sk sl so sq sr sr@Latn sv th tr vi wa zh_CN zh_TW"
dnl GCompris needs to know which locale are supported
AC_SUBST(ALL_LINGUAS)
......
......@@ -74,6 +74,7 @@ my %sections = (
"nb", 107,
"nn", 38,
"ne", 0,
"oc", 0,
"pa", 0,
"pl", 125,
"pt", 28,
......@@ -134,6 +135,7 @@ my %rubriques = (
"nb", 108,
"nn", 69,
"ne", 0,
"oc", 0,
"pa", 0,
"pl", 134,
"pt", 56,
......@@ -195,6 +197,7 @@ my %rubriques_all = (
"nb", 109,
"nn", 70,
"ne", 0,
"oc", 0,
"pa", 0,
"pl", 140,
"pt", 72,
......
......@@ -25,8 +25,8 @@ OutFile "gcompris-${GCOMPRIS_VERSION}.exe"
UninstallIcon ".\gcompris-uninstal.ico"
SetCompressor lzma
ShowInstDetails show
ShowUninstDetails show
ShowInstDetails hide
ShowUninstDetails hide
SetDateSave on
; $name and $INSTDIR are set in .onInit function..
......@@ -321,6 +321,8 @@ Section $(GCOMPRIS_SECTION_TITLE) SecGcompris
CreateDirectory "$SMPROGRAMS\Gcompris"
CreateShortCut "$SMPROGRAMS\Gcompris\Gcompris.lnk" "$INSTDIR\gcompris.exe"
CreateShortCut "$DESKTOP\Gcompris.lnk" "$INSTDIR\gcompris.exe"
CreateShortCut "$SMPROGRAMS\Gcompris\Gcompris Admin.lnk" "$INSTDIR\gcompris.exe" `-a` "$INSTDIR\gcompris.exe" 1
CreateShortCut "$DESKTOP\Gcompris Admin.lnk" "$INSTDIR\gcompris.exe" `-a` "$INSTDIR\gcompris.exe" 1
SetOutPath "$INSTDIR"
; If we don't have install rights.. we're done
......@@ -395,6 +397,7 @@ Section Uninstall
Delete "$INSTDIR\_gtk.pyd"
Delete "$INSTDIR\_socket.pyd"
Delete "$INSTDIR\_ssl.pyd"
Delete "$INSTDIR\_sqlite.pyd"
Delete "$INSTDIR\_tkinter.pyd"
Delete "$INSTDIR\atk.pyd"
Delete "$INSTDIR\bz2.pyd"
......@@ -427,17 +430,21 @@ Section Uninstall
Delete "$INSTDIR\libpng13.dll"
Delete "$INSTDIR\libreadline.dll"
Delete "$INSTDIR\libxml2.dll"
Delete "$INSTDIR\msvcr71.dll"
Delete "$INSTDIR\pango.pyd"
Delete "$INSTDIR\pangocairo.pyd"
Delete "$INSTDIR\pthreadGC.dll"
Delete "$INSTDIR\python24.dll"
Delete "$INSTDIR\python24.zip"
Delete "$INSTDIR\select.pyd"
Delete "$INSTDIR\setup.py"
Delete "$INSTDIR\sqlite3.dll"
Delete "$INSTDIR\unicodedata.pyd"
Delete "$INSTDIR\xmlparse.dll"
Delete "$INSTDIR\xmltok.dll"
Delete "$INSTDIR\zlib.pyd"
Delete "$INSTDIR\zlib1.dll"
Delete "$INSTDIR\README.mingw"
;Try to remove Gcompris install dir .. if empty
RMDir "$INSTDIR"
......@@ -445,6 +452,7 @@ Section Uninstall
; Shortcuts..
RMDir /r "$SMPROGRAMS\Gcompris"
Delete "$DESKTOP\Gcompris.lnk"
Delete "$DESKTOP\Gcompris Admin.lnk"
Goto done
......
......@@ -95,6 +95,7 @@ static gchar *linguas[] = {
"nl_NL.UTF-8", N_("Dutch"),
"nb_NO.UTF-8", N_("Norwegian Bokmal"),
"nn_NO.UTF-8", N_("Norwegian Nynorsk"),
"oc_FR.UTF-8", N_("Occitan (languedocien)"),
"pl_PL.UTF-8", N_("Polish"),
"pt_PT.UTF-8", N_("Portuguese"),
"pt_BR.UTF-8", N_("Portuguese (Brazil)"),
......
#define GCOMPRIS_ICON 104
#define GCOMPRIS_ICON_ADMIN 105
GCOMPRIS_ICON ICON "../../gcompris.ico"
GCOMPRIS_ICON_ADMIN ICON "../../gc_admin.ico"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment