images size changed, so that they fit in the window area now; welcome screen corrected.
[mdictionary] / Makefile
index 2b48b10..9172285 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,14 +31,14 @@ PACKAGES = packages
 
 #probably trash
 STARDICT = stardict
-APP_NAME = whitestork
+APP_NAME = mDictionary
 
 #versions
 MAJOR_VER = 1
-MINOR_VER = 1
+MINOR_VER = 0
 PATCH_VER = 0
 RELEASE_MAJOR_VER = 1
-RELEASE_MINOR_VER = 1
+RELEASE_MINOR_VER = 0
 RELEASE_PATCH_VER = 0
 PACK_VER = 0
 FRM_VER = 0.1
@@ -46,37 +46,40 @@ FRM_VER = 0.1
 # VERSION_FILE = ./${INCLUDE}/ws_version.h
 
 #package structure
-GUI_PACK_NAME = whitestorkgui
-MNG_PACK_NAME = whitestork
-PLUGINS_PACK_NAME = whitestorkplugins
-BOOKMARKS_PACK_NAME = whitestorkbookmarks
-META_PACK_NAME = whitestorkdictionary
-
-GUI_EXECUTABLE = ${BINARIES}/WhiteStork
-GUI_SERVICEFILE = org.maemo.WhiteStorkGui.service
+GUI_PACK_NAME = mdictionarygui
+MNG_PACK_NAME = mdictionary
+PLUGINS_PACK_NAME = mdictionaryplugins
+BOOKMARKS_PACK_NAME = mdictionarybookmarks
+META_PACK_NAME = mdictionarydictionary
+
+GUI_EXECUTABLE = ${BINARIES}/mdictionary
+GUI_SERVICEFILE = org.maemo.mdictionaryGui.service
 GUI_DIRS = ${DESTDIR}/usr/bin ${DESTDIR}/usr/share/applications/hildon ${DESTDIR}/usr/share/pixmaps ${DESTDIR}/usr/share/mis ${DESTDIR}/usr/share/dbus-1/services ${DESTDIR}/usr/share/locale  
-#${DESTDIR}/usr/share/doc/whitestorkgui
+#${DESTDIR}/usr/share/doc/mdictionarygui
 GUI_DBUS = ${DATA}/other/${GUI_SERVICEFILE}
-GUI_ICONS = ${DATA}/icons/whitestork_icon.png ${DATA}/icons/whitestork.png ${DATA}/icons/ws_top.png ${DATA}/icons/ws_warning_icon.png ${DATA}/icons/qgn_indi_search_whitestork.png ${DATA}/icons/ws_tra.png
+GUI_ICONS = ${DATA}/icons/mdictionary_icon.png ${DATA}/icons/mdictionary.png ${DATA}/icons/ws_top.png ${DATA}/icons/ws_warning_icon.png ${DATA}/icons/qgn_indi_search_mdictionary.png ${DATA}/icons/ws_tra.png ${DATA}/icons/mdictionary_about.png
 GUI_LOCALE = ${DATA}/locale/out/
 GUI_DOC = ${DATA}/docs/${GUI_PACK_NAME}/
-GUI_OTHER = ${DATA}/other/whitestork.desktop
-GUI_MIS = ${DATA}/mis/whitestork-search.xml
+GUI_OTHER = ${DATA}/other/mdictionary.desktop
+GUI_MIS = ${DATA}/mis/mdictionary-search.xml
 
-MNG_EXECUTABLE = ${BINARIES}/WhiteStorkManager 
-MNG_SERVICEFILE = org.maemo.WhiteStorkManager.service
-MNG_LIB = ${BINARIES}/ws_bookmark.so
-MNG_DIRS = ${DESTDIR}/usr/bin ${DESTDIR}/usr/lib/WhiteStork ${DESTDIR}/usr/share/dbus-1/services  ${DESTDIR}/usr/share/WhiteStork ${DESTDIR}/usr/share/doc/${MNG_PACK_NAME}
+MNG_EXECUTABLE = ${BINARIES}/mdictionaryManager 
+MNG_SERVICEFILE = org.maemo.mdictionaryManager.service
+MNG_LIB = ${BINARIES}/engine_bookmarks.so
+MNG_DIRS = ${DESTDIR}/usr/bin ${DESTDIR}/usr/lib/mdictionary ${DESTDIR}/usr/share/dbus-1/services  ${DESTDIR}/usr/share/mdictionary ${DESTDIR}/usr/share/doc/${MNG_PACK_NAME}
 MNG_DBUS = ${DATA}/other/${MNG_SERVICEFILE}
 MNG_OTHER = ${DATA}/dictionaries 
-MNG_DICT1 = ${DATA}/dictionaries/StarDictSampleDict/sample.dict.dz ${DATA}/dictionaries/StarDictSampleDict/sample.idx ${DATA}/dictionaries/StarDictSampleDict/sample.ifo ${DESTDIR}/usr/share/WhiteStork/dictionaries/StarDictSampleDict/
-MNG_DICT2 = ${DATA}/dictionaries/XDXFSampleDict/dict.xdxf ${DESTDIR}/usr/share/WhiteStork/dictionaries/XDXFSampleDict/
-MNG_DICT_DIRS = ${DESTDIR}/usr/share/WhiteStork/dictionaries/StarDictSampleDict/ ${DESTDIR}/usr/share/WhiteStork/dictionaries/XDXFSampleDict/
+
+MNG_DICT1 = ${DATA}/dictionaries/FinnishEnglish/comn_sdict02_finnish-english.dict.dz ${DATA}/dictionaries/FinnishEnglish/comn_sdict02_finnish-english.idx ${DATA}/dictionaries/FinnishEnglish/comn_sdict02_finnish-english.ifo ${DESTDIR}/usr/share/mdictionary/dictionaries/FinnishEnglish/
+MNG_DICT2 = ${DATA}/dictionaries/EnglishFinnish/dict.xdxf ${DATA}/dictionaries/EnglishFinnish/dict.cache ${DESTDIR}/usr/share/mdictionary/dictionaries/EnglishFinnish/
+
+MNG_DICT_DIRS = ${DESTDIR}/usr/share/mdictionary/dictionaries/FinnishEnglish/ ${DESTDIR}/usr/share/mdictionary/dictionaries/EnglishFinnish/
+
 MNG_BOOKMARKS = ${DATA}/bookmarks/${BOOKMARKS}/*
 MNG_DOC = ${DATA}/docs/${MNG_PACK_NAME}/
 
 PLUGINS_LIB = ${BINARIES}/engine_*.so
-PLUGINS_DIRS = ${DESTDIR}/usr/lib/WhiteStork ${DESTDIR}/usr/share/pixmaps
+PLUGINS_DIRS = ${DESTDIR}/usr/lib/mdictionary ${DESTDIR}/usr/share/pixmaps
 #${DESTDIR}/usr/share/doc/${PLUGINS_PACK_NAME} 
 PLUGINS_ICONS = ${DATA}/icons/engine_xdxf_icon.png
 PLUGINS_DOC = ${DATA}/docs/${PLUGINS_PACK_NAME}/
@@ -86,7 +89,7 @@ META_DOC = ${DATA}/docs/${META_PACK_NAME}/
 
 MAIL_ADDRESS = mdictionary-devel@garage.maemo.org
 LOCALEDIR=/usr/share/locale
-GETTEXT_PACKAGE=whitestork
+GETTEXT_PACKAGE=mdictionary
 ALL_LINGUAS="en_GB"
 #APP_VER = ${MAJOR_VER}.${MINOR_VER}.`svn info | grep "Revision:" | awk '{print $$2}'`
 
@@ -116,14 +119,14 @@ tag-version: clean
 send-last:     debs
                @tar -czf ${APP_NAME}-${APP_VER}.tar.gz *_${APP_VER}-${PACK_VER}_${ARCH}.deb
                @echo -e -n "#!/bin/bash\n\
-                       mutt -x -a ~/debs.log -a ~/build.log -a ~/${APP_NAME}-${APP_VER}.tar.gz -s \"[WhiteStork]: daily build - version ${APP_NAME}-${APP_VER}\" ${MAIL_ADDRESS} <~/mail.content\n\
+                       mutt -x -a ~/debs.log -a ~/build.log -a ~/${APP_NAME}-${APP_VER}.tar.gz -s \"[mdictionary]: daily build - version ${APP_NAME}-${APP_VER}\" ${MAIL_ADDRESS} <~/mail.content\n\
                        rm -f ~/${APP_NAME}-${APP_VER}.tar.gz\n" > mail.script
 
                @chmod +x mail.script
 
                @echo -e -n "\
                        This message was generated automatically , please do not reply.\n\
-                       Attachment: ${APP_NAME}-${APP_VER}.tar.gz - tarball with the newest Whitestork's packages.\n\
+                       Attachment: ${APP_NAME}-${APP_VER}.tar.gz - tarball with the newest mdictionary's packages.\n\
                        Attachment: build.log - logs from building binaries.\n\
                        Attachment: debs.log - logs from making *.deb packages.\n\n\
                        Automatic Building Framework ver: ${FRM_VER}\nCopyright 2006 ComArch S.A.\n" > mail.content
@@ -144,17 +147,17 @@ localization:
                @echo -e -n "Locale generation successfully completed...\n"
                @echo -e -n "Locale generation successfully completed...\n" > ${LOG_BUILD}
 
-build: pre-build  ${BINARIES}/ws_dbus.o ${BINARIES}/WhiteStork ${BINARIES}/WhiteStorkManager ${BINARIES}/ws_bookmark.so plugins
-               @echo -e -n "\nBuilding WhiteStork is finished.\n"
+build: pre-build  ${BINARIES}/ws_dbus.o ${GUI_EXECUTABLE} ${MNG_EXECUTABLE} ${BINARIES}/engine_bookmarks.so plugins
+               @echo -e -n "\nBuilding mdictionary is finished.\n"
 
 pre-build:
-               @echo -e -n "Building WhiteStork... \n"
+               @echo -e -n "Building mdictionary... \n"
                @echo -e -n "" > ${LOG_BUILD}
 
 plugins: ${BINARIES}/engine_xdxf.so ${BINARIES}/engine_stardict.so
                
 
-${BINARIES}/WhiteStorkManager: 
+${MNG_EXECUTABLE}: 
 # update-version
                @echo -e -n "**--> Compiling Manager...\n"
                @echo -e -n "**--> Compiling Manager...\n" >> ${LOG_BUILD}
@@ -166,7 +169,7 @@ ${BINARIES}/ws_dbus.o:
 #              @cd ${DBUS} && make >> ../../${LOG_BUILD}
                @make -C ${DBUS} >> ${LOG_BUILD}
 
-${BINARIES}/WhiteStork: 
+${GUI_EXECUTABLE}: 
 #update-version
                @echo -e -n "**--> Compiling User Interface...\n"
                @echo -e -n "**--> Compiling User Interface...\n" >> ${LOG_BUILD}
@@ -187,7 +190,7 @@ ${BINARIES}/engine_stardict.so:
 #              @cd ${STARDICT_PLUGIN} && make >> ../../../${LOG_BUILD}
                @make -C ${STARDICT_PLUGIN} >> ${LOG_BUILD}
 
-${BINARIES}/ws_bookmark.so: 
+${BINARIES}/engine_bookmarks.so: 
 # update-version
                @echo -e -n "**--> Compiling Bookmarks...\n"
                @echo -e -n "**--> Compiling Bookmarks...\n" >> ${LOG_BUILD}
@@ -223,28 +226,28 @@ run: clean install entries run-dict clean-temp
 
 
 run-dict:
-               @run-standalone.sh WhiteStorkManager
+               @run-standalone.sh mdictionaryManager
 
 clean-temp:
-               @-fakeroot rm -rf /usr/share/WhiteStork
-               @-fakeroot rm -rf /usr/lib/WhiteStork
-               @-fakeroot rm -rf /usr/include/WhiteStork
-               @-fakeroot rm -f /etc/others-menu/extra_applications/0112_whitestorkgui.desktop
-               @-fakeroot rm -f /usr/share/applications/hildon/whitestorkgui.desktop 
-               @-fakeroot rm -f /usr/share/pixmaps/whitestork.png 
-               @-fakeroot rm -f /usr/share/pixmaps/whitestork_icon.png
-               @-fakeroot rm -f /usr/bin/WhiteStork
-               @-fakeroot rm -f /usr/bin/WhiteStorkManager
-               @-fakeroot rm -f /usr/share/applications/hildon/whitestorkgui.desktop 
-               @-fakeroot rm -f /usr/lib/WhiteStork/engine_xdxf.so
-               @-fakeroot rm -f /usr/lib/WhiteStork/engine_stardict.so
-
-#              gconftool-2 --recursive-unset /apps/maemo/WhiteStork
-
-install-manager: localization ${BINARIES}/ws_dbus.o  ${BINARIES}/ws_bookmark.so ${BINARIES}/WhiteStorkManager
+               @-fakeroot rm -rf /usr/share/mdictionary
+               @-fakeroot rm -rf /usr/lib/mdictionary
+               @-fakeroot rm -rf /usr/include/mdictionary
+               @-fakeroot rm -f /etc/others-menu/extra_applications/0112_mdictionarygui.desktop
+               @-fakeroot rm -f /usr/share/applications/hildon/mdictionarygui.desktop 
+               @-fakeroot rm -f /usr/share/pixmaps/mdictionary.png 
+               @-fakeroot rm -f /usr/share/pixmaps/mdictionary_icon.png
+               @-fakeroot rm -f /usr/bin/mdictionary
+               @-fakeroot rm -f /usr/bin/mdictionaryManager
+               @-fakeroot rm -f /usr/share/applications/hildon/mdictionarygui.desktop 
+               @-fakeroot rm -f /usr/lib/mdictionary/engine_xdxf.so
+               @-fakeroot rm -f /usr/lib/mdictionary/engine_stardict.so
+
+#              gconftool-2 --recursive-unset /apps/maemo/mdictionary
+
+install-manager: localization ${BINARIES}/ws_dbus.o  ${BINARIES}/engine_bookmarks.so ${MNG_EXECUTABLE}
                @install -d ${MNG_DIRS}
                @cp ${MNG_EXECUTABLE} ${DESTDIR}/usr/bin
-               @cp ${MNG_LIB} ${DESTDIR}/usr/lib/WhiteStork
+               @cp ${MNG_LIB} ${DESTDIR}/usr/lib/mdictionary
                @cp ${MNG_DBUS} ${DESTDIR}/usr/share/dbus-1/services
                @find  ${MNG_DOC} -type f -not -path *.svn* -exec cp {} ${DESTDIR}/usr/share/doc/${MNG_PACK_NAME} \;
                
@@ -252,10 +255,10 @@ install-manager: localization ${BINARIES}/ws_dbus.o  ${BINARIES}/ws_bookmark.so
 #              @cp ${MNG_DICT1}
 #              @cp ${MNG_DICT2}
                
-               @install -d ${DESTDIR}/usr/share/WhiteStork/dictionaries/bookmarks
-               @cp -rf ${MNG_BOOKMARKS} ${DESTDIR}/usr/share/WhiteStork/dictionaries/bookmarks
+               @install -d ${DESTDIR}/usr/share/mdictionary/dictionaries/bookmarks
+               @cp -rf ${MNG_BOOKMARKS} ${DESTDIR}/usr/share/mdictionary/dictionaries/bookmarks
                
-install-gui:   ${BINARIES}/ws_dbus.o ${BINARIES}/WhiteStork 
+install-gui:   ${BINARIES}/ws_dbus.o ${GUI_EXECUTABLE} 
                @install -d ${GUI_DIRS}
                @cp ${GUI_EXECUTABLE} ${DESTDIR}/usr/bin
                @cp ${GUI_ICONS} ${DESTDIR}/usr/share/pixmaps
@@ -267,37 +270,39 @@ install-gui:      ${BINARIES}/ws_dbus.o ${BINARIES}/WhiteStork
 
 install-plugins: plugins
                @install -d ${PLUGINS_DIRS}
-               @cp ${PLUGINS_LIB} ${DESTDIR}/usr/lib/WhiteStork
+               @cp ${PLUGINS_LIB} ${DESTDIR}/usr/lib/mdictionary
                @cp ${PLUGINS_ICONS} ${DESTDIR}/usr/share/pixmaps
                @install -d ${MNG_DICT_DIRS}
                @cp ${MNG_DICT1}
                @cp ${MNG_DICT2}
 #              @find  ${PLUGINS_DOC} -type f -not -path *.svn* -exec cp {} ${DESTDIR}/usr/share/doc/${PLUGINS_PACK_NAME} \;
 
+install-mdictionary:   install-manager install-gui install-plugins
+
 install:       install-manager install-gui install-plugins
-               @echo -e "\n\nIf you are installing whitestork, please run 'make entries', before running the application ( not as root )\n\n"
+               @echo -e "\n\nIf you are installing mdictionary, please run 'make entries', before running the application ( not as root )\n\n"
 
 entries:       
-               gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/StarDictSampleDict/name "Polish - English Sample Dictionary"
-               gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/StarDictSampleDict/path "/usr/share/WhiteStork/dictionaries/StarDictSampleDict"
-               gconftool-2 --type bool --set /apps/maemo/WhiteStork/Dictionaries/StarDictSampleDict/active true
-               gconftool-2 --type bool --set /apps/maemo/WhiteStork/Dictionaries/StarDictSampleDict/optimized false
-               gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/XDXFSampleDict/name "English - Polish Sample Dictionary"
-               gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/XDXFSampleDict/path "/usr/share/WhiteStork/dictionaries/XDXFSampleDict"
-               gconftool-2 --type bool --set /apps/maemo/WhiteStork/Dictionaries/XDXFSampleDict/active true
-               gconftool-2 --type bool --set /apps/maemo/WhiteStork/Dictionaries/XDXFSampleDict/optimized false
+               gconftool-2 --type string --set /apps/maemo/mdictionary/dictionaries/StarDictSampleDict/name "Polish - English Sample Dictionary"
+               gconftool-2 --type string --set /apps/maemo/mdictionary/dictionaries/StarDictSampleDict/path "/usr/share/mdictionary/dictionaries/StarDictSampleDict"
+               gconftool-2 --type bool --set /apps/maemo/mdictionary/dictionaries/StarDictSampleDict/active true
+               gconftool-2 --type bool --set /apps/maemo/mdictionary/dictionaries/StarDictSampleDict/optimized false
+               gconftool-2 --type string --set /apps/maemo/mdictionary/dictionaries/XDXFSampleDict/name "English - Polish Sample Dictionary"
+               gconftool-2 --type string --set /apps/maemo/mdictionary/dictionaries/XDXFSampleDict/path "/usr/share/mdictionary/dictionaries/XDXFSampleDict"
+               gconftool-2 --type bool --set /apps/maemo/mdictionary/dictionaries/XDXFSampleDict/active true
+               gconftool-2 --type bool --set /apps/maemo/mdictionary/dictionaries/XDXFSampleDict/optimized false
                
-               gconftool-2 --type string --set /apps/maemo/WhiteStork/Engines/bookmarks/path "/usr/lib/WhiteStork/ws_bookmark.so"
-               gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/bookmarks/name "Bookmarks"
-               gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/bookmarks/path "/usr/share/WhiteStork/dictionaries/bookmarks"
-               gconftool-2 --type bool --set /apps/maemo/WhiteStork/Dictionaries/bookmarks/active false
-               gconftool-2 --type bool --set /apps/maemo/WhiteStork/Dictionaries/bookmarks/optimized true
-               chmod -R 0777 /usr/share/WhiteStork/dictionaries
+               gconftool-2 --type string --set /apps/maemo/mdictionary/engines/bookmarks/path "/usr/lib/mdictionary/engine_bookmarks.so"
+               gconftool-2 --type string --set /apps/maemo/mdictionary/dictionaries/bookmarks/name "Bookmarks"
+               gconftool-2 --type string --set /apps/maemo/mdictionary/dictionaries/bookmarks/path "/usr/share/mdictionary/dictionaries/bookmarks"
+               gconftool-2 --type bool --set /apps/maemo/mdictionary/dictionaries/bookmarks/active false
+               gconftool-2 --type bool --set /apps/maemo/mdictionary/dictionaries/bookmarks/optimized true
+               chmod -R 0777 /usr/share/mdictionary/dictionaries
                
-               gconftool-2 --type string --set /apps/maemo/WhiteStork/Engines/xdxf/path "/usr/lib/WhiteStork/engine_xdxf.so"
-               gconftool-2 --type string --set /apps/maemo/WhiteStork/Engines/stardict/path "/usr/lib/WhiteStork/engine_stardict.so"
+               gconftool-2 --type string --set /apps/maemo/mdictionary/engines/xdxf/path "/usr/lib/mdictionary/engine_xdxf.so"
+               gconftool-2 --type string --set /apps/maemo/mdictionary/engines/stardict/path "/usr/lib/mdictionary/engine_stardict.so"
                
-#              maemo-select-menu-location whitestork.desktop
+#              maemo-select-menu-location mdictionary.desktop
 
 
 install_deb: clean-inst-log uninstall eng-deb-i mng-deb-i gui-deb-i
@@ -307,8 +312,8 @@ clean-inst-log:
                @echo -n "" > ${LOG_INST}
 
 uninstall:
-               @-fakeroot dpkg --purge whitestork
-#              @-fakeroot dpkg --purge whitestorkdictionary
+               @-fakeroot dpkg --purge mdictionary
+#              @-fakeroot dpkg --purge mdictionarydictionary
 
 display: access
                @fakeroot su ${USER} -c 'af-sb-init.sh start'   
@@ -334,3 +339,9 @@ repo:       release-package meta-package
        
 package: clean
        dpkg-buildpackage -rfakeroot
+
+.PHONY: docs
+docs:
+       doxygen Doxyfile
+       # doxygen always put wrong meta charset tag - we have repair it manualy
+       sed -i -e "s/charset=iso-8859-1/charset=utf-8/g" doc/html/*html