diff --git a/Sankore 3.1.iss b/OpenBoard.iss similarity index 99% rename from Sankore 3.1.iss rename to OpenBoard.iss index 759c3b51..4a7eca08 100644 --- a/Sankore 3.1.iss +++ b/OpenBoard.iss @@ -19,7 +19,7 @@ DefaultGroupName=Open-Sankor OutputDir=.\install\win32\ OutputBaseFilename=Open-Sankore -SetupIconFile=.\resources\win\uniboard.ico +SetupIconFile=.\resources\win\OpenBoard.ico Compression=lzma SolidCompression=yes diff --git a/Open-Sankore.packproj b/OpenBoard.packproj similarity index 100% rename from Open-Sankore.packproj rename to OpenBoard.packproj diff --git a/Sankore_3.1.pro b/OpenBoard.pro similarity index 70% rename from Sankore_3.1.pro rename to OpenBoard.pro index 642c794a..19a41053 100644 --- a/Sankore_3.1.pro +++ b/OpenBoard.pro @@ -1,4 +1,4 @@ -TARGET = "Open-Sankore" +TARGET = "OpenBoard" TEMPLATE = app THIRD_PARTY_PATH=../Sankore-ThirdParty @@ -8,10 +8,10 @@ CONFIG += debug_and_release \ no_include_pwd -VERSION_MAJ = 2 -VERSION_MIN = 00 +VERSION_MAJ = 0 +VERSION_MIN = 08 VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error -VERSION_PATCH = 08 +VERSION_PATCH = 00 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = $$replace(VERSION, "\\.r", "") @@ -107,7 +107,7 @@ RCC_DIR = $$BUILD_DIR/rcc UI_DIR = $$BUILD_DIR/ui win32 { - RC_FILE = resources/win/sankore.rc + RC_FILE = resources/win/OpenBoard.rc CONFIG += qaxcontainer exists(console):CONFIG += console QMAKE_CXXFLAGS += /MP @@ -127,9 +127,6 @@ win32 { macx { LIBS += -framework Foundation LIBS += -lcrypto - #commented because Sankore crashes on Java Script. It seems to backends dependencies. - #LIBS += -framework AppKit - #LIBS += -framework WebKit CONFIG(release, debug|release):CONFIG += x86 @@ -170,180 +167,180 @@ macx { UB_THIRDPARTY_INTERACTIVE.path = "$$RESOURCES_DIR/library/interactive" UB_MACX_ICNS.files = $$files(resources/macx/*.icns) UB_MACX_ICNS.path = "$$RESOURCES_DIR" - UB_MACX_EXTRAS.files = "resources/macx/Save PDF to Open-Sankore.workflow" + UB_MACX_EXTRAS.files = "resources/macx/Save PDF to OpenBoard.workflow" UB_MACX_EXTRAS.path = "$$RESOURCES_DIR" UB_I18N.path = $$DESTDIR/i18n # not used - exists(resources/i18n/sankore_en.qm) { - TRANSLATION_en.files = resources/i18n/sankore_en.qm \ + exists(resources/i18n/OpenBoard_en.qm) { + TRANSLATION_en.files = resources/i18n/OpenBoard_en.qm \ resources/i18n/Localizable.strings TRANSLATION_en.path = "$$RESOURCES_DIR/en.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_en } - exists(resources/i18n/sankore_en_UK.qm) { - TRANSLATION_en_UK.files = resources/i18n/sankore_en_UK.qm \ + exists(resources/i18n/OpenBoard_en_UK.qm) { + TRANSLATION_en_UK.files = resources/i18n/OpenBoard_en_UK.qm \ resources/i18n/Localizable.strings TRANSLATION_en_UK.path = "$$RESOURCES_DIR/en_UK.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_en_UK } - exists(resources/i18n/sankore_fr.qm) { - TRANSLATION_fr.files = resources/i18n/sankore_fr.qm \ + exists(resources/i18n/OpenBoard_fr.qm) { + TRANSLATION_fr.files = resources/i18n/OpenBoard_fr.qm \ resources/i18n/Localizable.strings TRANSLATION_fr.path = "$$RESOURCES_DIR/fr.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_fr } - exists(resources/i18n/sankore_fr_CH.qm) { - TRANSLATION_fr_CH.files = resources/i18n/sankore_fr_CH.qm \ + exists(resources/i18n/OpenBoard_fr_CH.qm) { + TRANSLATION_fr_CH.files = resources/i18n/OpenBoard_fr_CH.qm \ resources/i18n/Localizable.strings TRANSLATION_fr_CH.path = "$$RESOURCES_DIR/fr_CH.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_fr_CH } - exists(resources/i18n/sankore_de.qm) { - TRANSLATION_de.files = resources/i18n/sankore_de.qm \ + exists(resources/i18n/OpenBoard_de.qm) { + TRANSLATION_de.files = resources/i18n/OpenBoard_de.qm \ resources/i18n/Localizable.strings TRANSLATION_de.path = "$$RESOURCES_DIR/de.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_de } - exists(resources/i18n/sankore_nl.qm) { - TRANSLATION_nl.files = resources/i18n/sankore_nl.qm \ + exists(resources/i18n/OpenBoard_nl.qm) { + TRANSLATION_nl.files = resources/i18n/OpenBoard_nl.qm \ resources/i18n/Localizable.strings TRANSLATION_nl.path = "$$RESOURCES_DIR/nl.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_nl } - exists(resources/i18n/sankore_es.qm) { - TRANSLATION_es.files = resources/i18n/sankore_es.qm \ + exists(resources/i18n/OpenBoard_es.qm) { + TRANSLATION_es.files = resources/i18n/OpenBoard_es.qm \ resources/i18n/Localizable.strings TRANSLATION_es.path = "$$RESOURCES_DIR/es.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_es } - exists(resources/i18n/sankore_it.qm) { - TRANSLATION_it.files = resources/i18n/sankore_it.qm \ + exists(resources/i18n/OpenBoard_it.qm) { + TRANSLATION_it.files = resources/i18n/OpenBoard_it.qm \ resources/i18n/Localizable.strings TRANSLATION_it.path = "$$RESOURCES_DIR/it.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_it } - exists(resources/i18n/sankore_pl.qm) { - TRANSLATION_pl.files = resources/i18n/sankore_pl.qm \ + exists(resources/i18n/OpenBoard_pl.qm) { + TRANSLATION_pl.files = resources/i18n/OpenBoard_pl.qm \ resources/i18n/Localizable.strings TRANSLATION_pl.path = "$$RESOURCES_DIR/pl.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_pl } - exists(resources/i18n/sankore_ru.qm) { - TRANSLATION_ru.files = resources/i18n/sankore_ru.qm \ + exists(resources/i18n/OpenBoard_ru.qm) { + TRANSLATION_ru.files = resources/i18n/OpenBoard_ru.qm \ resources/i18n/Localizable.strings TRANSLATION_ru.path = "$$RESOURCES_DIR/ru.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_ru } - exists(resources/i18n/sankore_da.qm) { - TRANSLATION_da.files = resources/i18n/sankore_da.qm \ + exists(resources/i18n/OpenBoard_da.qm) { + TRANSLATION_da.files = resources/i18n/OpenBoard_da.qm \ resources/i18n/Localizable.strings TRANSLATION_da.path = "$$RESOURCES_DIR/da.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_da } - exists(resources/i18n/sankore_nb.qm) { - TRANSLATION_nb.files = resources/i18n/sankore_nb.qm \ + exists(resources/i18n/OpenBoard_nb.qm) { + TRANSLATION_nb.files = resources/i18n/OpenBoard_nb.qm \ resources/i18n/Localizable.strings TRANSLATION_nb.path = "$$RESOURCES_DIR/nb.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_nb } - exists(resources/i18n/sankore_sv.qm) { - TRANSLATION_sv.files = resources/i18n/sankore_sv.qm \ + exists(resources/i18n/OpenBoard_sv.qm) { + TRANSLATION_sv.files = resources/i18n/OpenBoard_sv.qm \ resources/i18n/Localizable.strings TRANSLATION_sv.path = "$$RESOURCES_DIR/sv.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_sv } - exists(resources/i18n/sankore_ja.qm) { - TRANSLATION_ja.files = resources/i18n/sankore_ja.qm \ + exists(resources/i18n/OpenBoard_ja.qm) { + TRANSLATION_ja.files = resources/i18n/OpenBoard_ja.qm \ resources/i18n/Localizable.strings TRANSLATION_ja.path = "$$RESOURCES_DIR/ja.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_ja } - exists(resources/i18n/sankore_ko.qm) { - TRANSLATION_ko.files = resources/i18n/sankore_ko.qm \ + exists(resources/i18n/OpenBoard_ko.qm) { + TRANSLATION_ko.files = resources/i18n/OpenBoard_ko.qm \ resources/i18n/Localizable.strings TRANSLATION_ko.path = "$$RESOURCES_DIR/ko.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_ko } - exists(resources/i18n/sankore_zh.qm) { - TRANSLATION_zh.files = resources/i18n/sankore_zh.qm \ + exists(resources/i18n/OpenBoard_zh.qm) { + TRANSLATION_zh.files = resources/i18n/OpenBoard_zh.qm \ resources/i18n/Localizable.strings TRANSLATION_zh.path = "$$RESOURCES_DIR/zh.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_zh } - exists(resources/i18n/sankore_zh_CN.qm) { - TRANSLATION_zh_CN.files = resources/i18n/sankore_zh_CN.qm \ + exists(resources/i18n/OpenBoard_zh_CN.qm) { + TRANSLATION_zh_CN.files = resources/i18n/OpenBoard_zh_CN.qm \ resources/i18n/Localizable.strings TRANSLATION_zh_CN.path = "$$RESOURCES_DIR/zh_CN.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_zh_CN } - exists(resources/i18n/sankore_zh_TW.qm) { - TRANSLATION_zh_TW.files = resources/i18n/sankore_zh_TW.qm \ + exists(resources/i18n/OpenBoard_zh_TW.qm) { + TRANSLATION_zh_TW.files = resources/i18n/OpenBoard_zh_TW.qm \ resources/i18n/Localizable.strings TRANSLATION_zh_TW.path = "$$RESOURCES_DIR/zh_TW.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_zh_TW } - exists(resources/i18n/sankore_ro.qm) { - TRANSLATION_ro.files = resources/i18n/sankore_ro.qm \ + exists(resources/i18n/OpenBoard_ro.qm) { + TRANSLATION_ro.files = resources/i18n/OpenBoard_ro.qm \ resources/i18n/Localizable.strings TRANSLATION_ro.path = "$$RESOURCES_DIR/ro.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_ro } - exists(resources/i18n/sankore_ar.qm) { - TRANSLATION_ar.files = resources/i18n/sankore_ar.qm \ + exists(resources/i18n/OpenBoard_ar.qm) { + TRANSLATION_ar.files = resources/i18n/OpenBoard_ar.qm \ resources/i18n/Localizable.strings TRANSLATION_ar.path = "$$RESOURCES_DIR/ar.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_ar } - exists(resources/i18n/sankore_iw.qm) { - TRANSLATION_iw.files = resources/i18n/sankore_iw.qm \ + exists(resources/i18n/OpenBoard_iw.qm) { + TRANSLATION_iw.files = resources/i18n/OpenBoard_iw.qm \ resources/i18n/Localizable.strings TRANSLATION_iw.path = "$$RESOURCES_DIR/iw.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_iw } - exists(resources/i18n/sankore_pt.qm) { - TRANSLATION_pt.files = resources/i18n/sankore_pt.qm \ + exists(resources/i18n/OpenBoard_pt.qm) { + TRANSLATION_pt.files = resources/i18n/OpenBoard_pt.qm \ resources/i18n/Localizable.strings TRANSLATION_pt.path = "$$RESOURCES_DIR/pt.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_pt } - exists(resources/i18n/sankore_sk.qm) { - TRANSLATION_sk.files = resources/i18n/sankore_sk.qm \ + exists(resources/i18n/OpenBoard_sk.qm) { + TRANSLATION_sk.files = resources/i18n/OpenBoard_sk.qm \ resources/i18n/Localizable.strings TRANSLATION_sk.path = "$$RESOURCES_DIR/sk.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_sk } - exists(resources/i18n/sankore_bg.qm) { - TRANSLATION_bg.files = resources/i18n/sankore_bg.qm \ + exists(resources/i18n/OpenBoard_bg.qm) { + TRANSLATION_bg.files = resources/i18n/OpenBoard_bg.qm \ resources/i18n/Localizable.strings TRANSLATION_bg.path = "$$RESOURCES_DIR/bg.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_bg } - exists(resources/i18n/sankore_ca.qm) { - TRANSLATION_ca.files = resources/i18n/sankore_ca.qm \ + exists(resources/i18n/OpenBoard_ca.qm) { + TRANSLATION_ca.files = resources/i18n/OpenBoard_ca.qm \ resources/i18n/Localizable.strings TRANSLATION_ca.path = "$$RESOURCES_DIR/ca.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_ca } - exists(resources/i18n/sankore_el.qm) { - TRANSLATION_el.files = resources/i18n/sankore_el.qm \ + exists(resources/i18n/OpenBoard_el.qm) { + TRANSLATION_el.files = resources/i18n/OpenBoard_el.qm \ resources/i18n/Localizable.strings TRANSLATION_el.path = "$$RESOURCES_DIR/el.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_el } - exists(resources/i18n/sankore_tr.qm) { - TRANSLATION_tr.files = resources/i18n/sankore_tr.qm \ + exists(resources/i18n/OpenBoard_tr.qm) { + TRANSLATION_tr.files = resources/i18n/OpenBoard_tr.qm \ resources/i18n/Localizable.strings TRANSLATION_tr.path = "$$RESOURCES_DIR/tr.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_tr } - exists(resources/i18n/sankore_cs.qm) { - TRANSLATION_cs.files = resources/i18n/sankore_cs.qm \ + exists(resources/i18n/OpenBoard_cs.qm) { + TRANSLATION_cs.files = resources/i18n/OpenBoard_cs.qm \ resources/i18n/localizable.strings TRANSLATION_cs.path = "$$RESOURCES_DIR/cs.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_cs } - exists(resources/i18n/sankore_mg.qm) { - TRANSLATION_mg.files = resources/i18n/sankore_mg.qm \ + exists(resources/i18n/OpenBoard_mg.qm) { + TRANSLATION_mg.files = resources/i18n/OpenBoard_mg.qm \ resources/i18n/localizable.strings TRANSLATION_mg.path = "$$RESOURCES_DIR/mg.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_mg @@ -358,10 +355,10 @@ macx { SPARKLE_KEY \ FRAMEWORKS - QMAKE_PKGINFO_TYPEINFO = "UniB" + QMAKE_PKGINFO_TYPEINFO = "OpenB" QMAKE_INFO_PLIST = "resources/macx/Info.plist" - # For packger (release.macx.sh script) to know Uniboard version + # For packger (release.macx.sh script) to know OpenBoard version system(mkdir -p $$BUILD_DIR) system(printf \""$$OSX_VERSION"\" > $$BUILD_DIR/osx_version) system(printf \""$$VERSION"\" > $$BUILD_DIR/version) @@ -386,39 +383,39 @@ linux-g++* { system(echo "$$SVN_VERSION" > $$BUILD_DIR/svnversion) } -RESOURCES += resources/sankore.qrc +RESOURCES += resources/OpenBoard.qrc RESOURCES += plugins/cffadaptor/resources/resources.qrc # When adding a translation here, also add it in the macx part -TRANSLATIONS = resources/i18n/sankore_en.ts \ - resources/i18n/sankore_en_UK.ts \ - resources/i18n/sankore_fr.ts \ - resources/i18n/sankore_fr_CH.ts \ - resources/i18n/sankore_de.ts \ - resources/i18n/sankore_nl.ts \ - resources/i18n/sankore_es.ts \ - resources/i18n/sankore_it.ts \ - resources/i18n/sankore_pl.ts \ - resources/i18n/sankore_ru.ts \ - resources/i18n/sankore_da.ts \ - resources/i18n/sankore_nb.ts \ - resources/i18n/sankore_sv.ts \ - resources/i18n/sankore_ja.ts \ - resources/i18n/sankore_ko.ts \ - resources/i18n/sankore_zh.ts \ - resources/i18n/sankore_zh_CN.ts \ - resources/i18n/sankore_zh_TW.ts \ - resources/i18n/sankore_ro.ts \ - resources/i18n/sankore_ar.ts \ - resources/i18n/sankore_iw.ts \ - resources/i18n/sankore_pt.ts \ - resources/i18n/sankore_sk.ts \ - resources/i18n/sankore_bg.ts \ - resources/i18n/sankore_ca.ts \ - resources/i18n/sankore_el.ts \ - resources/i18n/sankore_tr.ts \ - resources/i18n/sankore_cs.ts \ - resources/i18n/sankore_mg.ts +TRANSLATIONS = resources/i18n/OpenBoard_en.ts \ + resources/i18n/OpenBoard_en_UK.ts \ + resources/i18n/OpenBoard_fr.ts \ + resources/i18n/OpenBoard_fr_CH.ts \ + resources/i18n/OpenBoard_de.ts \ + resources/i18n/OpenBoard_nl.ts \ + resources/i18n/OpenBoard_es.ts \ + resources/i18n/OpenBoard_it.ts \ + resources/i18n/OpenBoard_pl.ts \ + resources/i18n/OpenBoard_ru.ts \ + resources/i18n/OpenBoard_da.ts \ + resources/i18n/OpenBoard_nb.ts \ + resources/i18n/OpenBoard_sv.ts \ + resources/i18n/OpenBoard_ja.ts \ + resources/i18n/OpenBoard_ko.ts \ + resources/i18n/OpenBoard_zh.ts \ + resources/i18n/OpenBoard_zh_CN.ts \ + resources/i18n/OpenBoard_zh_TW.ts \ + resources/i18n/OpenBoard_ro.ts \ + resources/i18n/OpenBoard_ar.ts \ + resources/i18n/OpenBoard_iw.ts \ + resources/i18n/OpenBoard_pt.ts \ + resources/i18n/OpenBoard_sk.ts \ + resources/i18n/OpenBoard_bg.ts \ + resources/i18n/OpenBoard_ca.ts \ + resources/i18n/OpenBoard_el.ts \ + resources/i18n/OpenBoard_tr.ts \ + resources/i18n/OpenBoard_cs.ts \ + resources/i18n/OpenBoard_mg.ts INSTALLS = UB_ETC \ UB_I18N \ diff --git a/buildDebianPackage.sh b/buildDebianPackage.sh index 877f4f8c..784241cf 100755 --- a/buildDebianPackage.sh +++ b/buildDebianPackage.sh @@ -30,6 +30,7 @@ checkUser() initializeVariables() { + APPLICATION_NAME="OpenBoard" MAKE_TAG=true CREATE_DIENA_DISTRIBUTION_ZIP=false STANDARD_QT_USED=false @@ -78,15 +79,15 @@ alertIfPreviousVersionInstalled(){ if [ ! -e "$APT_CACHE" ]; then notifyError "apt-cache command not found" else - SEARCH_RESULT=`$APT_CACHE search open-sankore` - if [ `echo $SEARCH_RESULT | grep -c open-sankore` -ge 1 ]; then - notifyError "Found a previous version of Open-Sankore. Remove it to avoid to put it as dependency" + SEARCH_RESULT=`$APT_CACHE search $APPLICATION_NAME` + if [ `echo $SEARCH_RESULT | grep -c $APPLICATION_NAME` -ge 1 ]; then + notifyError "Found a previous version of $APPLICATION_NAME. Remove it to avoid to put it as dependency" fi fi } checkDir(){ - if [ ! -d "$1" ]; then + if [ ! -d "$1" ]; then notifyError "Directory not found : $1" fi } @@ -160,23 +161,23 @@ rm -rf "build/linux/release" rm -rf install notifyProgress "QT" "Internalization" -$LRELEASES Sankore_3.1.pro +$LRELEASES $APPLICATION_NAME.pro cd $GUI_TRANSLATIONS_DIRECTORY_PATH $LRELEASES translations.pro cd - -notifyProgress "Open-Sankore" "Building Open-Sankore" +notifyProgress "$APPLICATION_NAME" "Building $APPLICATION_NAME" if [ "$ARCHITECTURE" == "amd64" ]; then - $QMAKE_PATH Sankore_3.1.pro -spec linux-g++-64 + $QMAKE_PATH $APPLICATION_NAME.pro -spec linux-g++-64 else - $QMAKE_PATH Sankore_3.1.pro -spec linux-g++ + $QMAKE_PATH $APPLICATION_NAME.pro -spec linux-g++ fi make -j 4 release-install -if [ ! -e "$PRODUCT_PATH/Open-Sankore" ]; then - notifyError "Open-Sankore build failed" +if [ ! -e "$PRODUCT_PATH/$APPLICATION_NAME" ]; then + notifyError "$APPLICATION_NAME build failed" fi notifyProgress "Git Hub" "Make a tag of the delivered version" @@ -236,7 +237,7 @@ cd $PRODUCT_PATH find . -name .svn -exec rm -rf {} \; 2> /dev/null cd - -notifyProgress "Building Sankore" "Finished to build Sankore building the package" +notifyProgress "Building $APPLICATION_NAME" "Finished to build $APPLICATION_NAME building the package" BASE_WORKING_DIR="packageBuildDir" @@ -264,7 +265,7 @@ cat > "$BASE_WORKING_DIR/DEBIAN/prerm" << EOF # along with this program. If not, see . # --------------------------------------------------------------------- -xdg-desktop-menu uninstall /usr/share/applications/Open-Sankore.desktop +xdg-desktop-menu uninstall /usr/share/applications/$APPLICATION_NAME.desktop exit 0 #DEBHELPER# EOF @@ -286,19 +287,19 @@ cat > "$BASE_WORKING_DIR/DEBIAN/postint" << EOF # along with this program. If not, see . # --------------------------------------------------------------------- -xdg-desktop-menu install --novendor /usr/share/applications/Open-Sankore.desktop +xdg-desktop-menu install --novendor /usr/share/applications/$APPLICATION_NAME.desktop exit 0 #DEBHELPER# EOF -SANKORE_DIRECTORY_NAME="Open-Sankore-$VERSION" -SANKORE_PACKAGE_DIRECTORY="$BASE_WORKING_DIR/usr/local/$SANKORE_DIRECTORY_NAME" -#move sankore build directory to packages directory -cp -R $PRODUCT_PATH $SANKORE_PACKAGE_DIRECTORY +APPLICATION_DIRECTORY_NAME="$APPLICATION_NAME-$VERSION" +PACKAGE_DIRECTORY="$BASE_WORKING_DIR/usr/local/$APPLICATION_DIRECTORY_NAME" +#move build directory to packages directory +cp -R $PRODUCT_PATH $PACKAGE_DIRECTORY -cat > $BASE_WORKING_DIR/usr/local/$SANKORE_DIRECTORY_NAME/run.sh << EOF +cat > $BASE_WORKING_DIR/usr/local/$APPLICATION_DIRECTORY_NAME/run.sh << EOF #!/bin/bash # -------------------------------------------------------------------- # This program is free software: you can redistribute it and/or modify @@ -315,34 +316,34 @@ cat > $BASE_WORKING_DIR/usr/local/$SANKORE_DIRECTORY_NAME/run.sh << EOF # along with this program. If not, see . # --------------------------------------------------------------------- -env LD_LIBRARY_PATH=/usr/local/$SANKORE_DIRECTORY_NAME/qtlib:$LD_LIBRARY_PATH /usr/local/$SANKORE_DIRECTORY_NAME/Open-Sankore +env LD_LIBRARY_PATH=/usr/local/$APPLICATION_DIRECTORY_NAME/qtlib:$LD_LIBRARY_PATH /usr/local/$APPLICATION_DIRECTORY_NAME/$APPLICATION_NAME EOF -CHANGE_LOG_FILE="$BASE_WORKING_DIR/DEBIAN/changelog-sankore-$VERSION.txt" +CHANGE_LOG_FILE="$BASE_WORKING_DIR/DEBIAN/changelog-$APPLICATION_NAME-$VERSION.txt" CONTROL_FILE="$BASE_WORKING_DIR/DEBIAN/control" CHANGE_LOG_TEXT="changelog.txt" -echo "Open-Sankore ($VERSION) $ARCHITECTURE; urgency=low" > "$CHANGE_LOG_FILE" +echo "$APPLICATION_NAME ($VERSION) $ARCHITECTURE; urgency=low" > "$CHANGE_LOG_FILE" echo >> "$CHANGE_LOG_FILE" cat $CHANGE_LOG_TEXT >> "$CHANGE_LOG_FILE" echo >> "$CHANGE_LOG_FILE" -echo "-- Claudio Valerio `date`" >> "$CHANGE_LOG_FILE" +echo "-- Claudio Valerio `date`" >> "$CHANGE_LOG_FILE" -echo "Package: open-sankore" > "$CONTROL_FILE" +echo "Package: $APPLICATION_NAME" > "$CONTROL_FILE" echo "Version: $VERSION" >> "$CONTROL_FILE" echo "Section: education" >> "$CONTROL_FILE" echo "Priority: optional" >> "$CONTROL_FILE" echo "Architecture: $ARCHITECTURE" >> "$CONTROL_FILE" echo "Essential: no" >> "$CONTROL_FILE" -echo "Installed-Size: `du -s $SANKORE_PACKAGE_DIRECTORY | awk '{ print $1 }'`" >> "$CONTROL_FILE" -echo "Maintainer: Open-Sankoré Developers team " >> "$CONTROL_FILE" -echo "Homepage: http://dev.open-sankore.org" >> "$CONTROL_FILE" +echo "Installed-Size: `du -s $PACKAGE_DIRECTORY | awk '{ print $1 }'`" >> "$CONTROL_FILE" +echo "Maintainer: $APPLICATION_NAME Developers team " >> "$CONTROL_FILE" +echo "Homepage: http://oe-f.org" >> "$CONTROL_FILE" echo -n "Depends: " >> "$CONTROL_FILE" unset tab declare -a tab let count=0 -for l in `objdump -p $SANKORE_PACKAGE_DIRECTORY/Open-Sankore | grep NEEDED | awk '{ print $2 }'`; do +for l in `objdump -p $PACKAGE_DIRECTORY/$APPLICATION_NAME | grep NEEDED | awk '{ print $2 }'`; do for lib in `dpkg -S $l | awk -F":" '{ print $1 }'`; do #echo $lib presence=`echo ${tab[*]} | grep -c "$lib"`; @@ -363,27 +364,26 @@ echo "" >> "$CONTROL_FILE" echo "Description: This a interactive white board that uses a free standard format." >> "$CONTROL_FILE" find $BASE_WORKING_DIR/usr/ -exec md5sum {} > $BASE_WORKING_DIR/DEBIAN/md5sums 2>/dev/null \; -SANKORE_SHORTCUT="$BASE_WORKING_DIR/usr/share/applications/Open-Sankore.desktop" -echo "[Desktop Entry]" > $SANKORE_SHORTCUT -echo "Version=$VERSION" >> $SANKORE_SHORTCUT -echo "Encoding=UTF-8" >> $SANKORE_SHORTCUT -echo "Name=Open-Sankore ($VERSION)" >> $SANKORE_SHORTCUT -echo "GenericName=Open-Sankore" >> $SANKORE_SHORTCUT -echo "Comment=Logiciel de création de présentations pour tableau numérique interactif (TNI)" >> $SANKORE_SHORTCUT -echo "Exec=/usr/local/$SANKORE_DIRECTORY_NAME/run.sh" >> $SANKORE_SHORTCUT -echo "Icon=/usr/local/$SANKORE_DIRECTORY_NAME/sankore.png" >> $SANKORE_SHORTCUT -echo "StartupNotify=true" >> $SANKORE_SHORTCUT -echo "Terminal=false" >> $SANKORE_SHORTCUT -echo "Type=Application" >> $SANKORE_SHORTCUT -echo "Categories=Education" >> $SANKORE_SHORTCUT -echo "Name[fr_FR]=Open-Sankore ($VERSION)" >> $SANKORE_SHORTCUT -cp "resources/images/uniboard.png" "$SANKORE_PACKAGE_DIRECTORY/sankore.png" +APPLICATION_SHORTCUT="$BASE_WORKING_DIR/usr/share/applications/$APPLICATION_NAME.desktop" +echo "[Desktop Entry]" > $APPLICATION_SHORTCUT +echo "Version=$VERSION" >> $APPLICATION_SHORTCUT +echo "Encoding=UTF-8" >> $APPLICATION_SHORTCUT +echo "Name=$APPLICATION_NAME ($VERSION)" >> $APPLICATION_SHORTCUT +echo "GenericName=$APPLICATION_NAME" >> $APPLICATION_SHORTCUT +echo "Comment=Logiciel de création de présentations pour tableau numérique interactif (TNI)" >> $APPLICATION_SHORTCUT +echo "Exec=/usr/local/$APPLICATION_DIRECTORY_NAME/run.sh" >> $APPLICATION_SHORTCUT +echo "Icon=/usr/local/$APPLICATION_DIRECTORY_NAME/$APPLICATION_NAME.png" >> $APPLICATION_SHORTCUT +echo "StartupNotify=true" >> $APPLICATION_SHORTCUT +echo "Terminal=false" >> $APPLICATION_SHORTCUT +echo "Type=Application" >> $APPLICATION_SHORTCUT +echo "Categories=Education" >> $APPLICATION_SHORTCUT +cp "resources/images/OpenBoard.png" "$PACKAGE_DIRECTORY/$APPLICATION_NAME.png" chmod 755 "$BASE_WORKING_DIR/DEBIAN" chmod 755 "$BASE_WORKING_DIR/DEBIAN/prerm" chmod 755 "$BASE_WORKING_DIR/DEBIAN/postint" mkdir -p "install/linux" -DEBIAN_PACKAGE_NAME="Open-Sankore_${VERSION}_$ARCHITECTURE.deb" +DEBIAN_PACKAGE_NAME="$APPLICATION_NAME_${VERSION}_$ARCHITECTURE.deb" chown -R root:root $BASE_WORKING_DIR dpkg -b "$BASE_WORKING_DIR" "install/linux/$DEBIAN_PACKAGE_NAME" @@ -391,16 +391,16 @@ dpkg -b "$BASE_WORKING_DIR" "install/linux/$DEBIAN_PACKAGE_NAME" #clean up mess rm -rf $BASE_WORKING_DIR -notifyProgress "Open-Sankore" "Package built" +notifyProgress "$APPLICATION_NAME" "Package built" if [ $CREATE_DIENA_DISTRIBUTION_ZIP == true ]; then - ZIP_NAME="Open-Sankoré_`lsb_release -is`_`lsb_release -rs`_${VERSION}_${ARCHITECTURE}.zip" + ZIP_NAME="$APPLICATION_NAME_`lsb_release -is`_`lsb_release -rs`_${VERSION}_${ARCHITECTURE}.zip" cd install/linux $ZIP_PATH -1 --junk-paths ${ZIP_NAME} ${DEBIAN_PACKAGE_NAME} ../../ReleaseNotes.pdf ../../JournalDesModifications.pdf cd - - notifyProgress "Open-Sankore" "Build Diena zip file for distribution" + notifyProgress "$APPLICATION_NAME" "Build Diena zip file for distribution" fi exit 0 diff --git a/release.macx.sh b/release.macx.sh index f3595d74..27dec389 100755 --- a/release.macx.sh +++ b/release.macx.sh @@ -15,6 +15,7 @@ # --------------------------------------------------------------------- +APPLICATION_NAME="OpenBoard" BASE_TROLLTECH_DIRECTORY=/usr/local/Trolltech/Qt-4.8.0 # Executables QMAKE=$BASE_TROLLTECH_DIRECTORY/bin/qmake @@ -59,14 +60,14 @@ for eachTranslation in `ls $BASE_QT_TRANSLATIONS_DIRECTORY/qt_??.qm` do # looking fo the language code for each qt translation file languageCode=`echo $eachTranslation | sed 's/.*qt_\(.*\).qm/\1/'` - basicDir=$PRODUCT_DIR/Open-Sankore.app/Contents/Resources/ + basicDir=$PRODUCT_DIR/$APPLICATION_NAME.app/Contents/Resources/ for eachDirectory in `ls $basicDir` do - # looping through the Sankore availables languages + # looping through the OpenBoard availables languages directoryLanguageCode=`echo $eachDirectory | sed 's/\(.*\)\.lproj/\1/'` if [ ! -z $directoryLanguageCode ]; then if [[ $eachDirectory == *".lproj"* && $eachDirectory != "empty.lproj" && $directoryLanguageCode == *$languageCode* ]]; then - # sankore translation found for qt translation file + # OpenBoard translation found for qt translation file cp $eachTranslation $basicDir/$eachDirectory if [ $directoryLanguageCode != $languageCode ]; then # handling fr and fr_CH code. @@ -106,12 +107,12 @@ rm -rf "$BUILD_DIR" # application translations notify "Generating applications translatons" -$LRELEASE "Sankore_3.1.pro" +$LRELEASE "$APPLICATION_NAME.pro" # generate Makefiles notify "Generating Makefile ..." -QMAKE_CMD="$QMAKE Sankore_3.1.pro -spec macx-g++" +QMAKE_CMD="$QMAKE $APPLICATION_NAME.pro -spec macx-g++" $QMAKE_CMD @@ -123,7 +124,7 @@ notify "Qt Translations ..." $LRELEASE $BASE_QT_TRANSLATIONS_DIRECTORY/translations.pro addQtTranslations -cp -R resources/customizations $PRODUCT_DIR/Open-Sankore.app/Contents/Resources +cp -R resources/customizations $PRODUCT_DIR/$APPLICATION_NAME.app/Contents/Resources VERSION=`cat "$BUILD_DIR/version"` if [ ! -f "$BUILD_DIR/version" ]; then @@ -144,14 +145,12 @@ if [ $? != 0 ]; then fi -NAME="Open-Sankore" - -DMG="$NAME.dmg" -VOLUME="/Volumes/$NAME" -APP="$PRODUCT_DIR/Open-Sankore.app" -DSYM_NAME="$NAME (r$SVN_REVISION).dSYM" +DMG="$APPLICATION_NAME.dmg" +VOLUME="/Volumes/$APPLICATION_NAME" +APP="$PRODUCT_DIR/$APPLICATION_NAME.app" +DSYM_NAME="$APPLICATION_NAME (r$SVN_REVISION).dSYM" DSYM="$PRODUCT_DIR/$DSYM_NAME" -GSYM_i386="$PRODUCT_DIR/$NAME i386.sym" +GSYM_i386="$PRODUCT_DIR/$APPLICATION_NAME i386.sym" INFO_PLIST="$APP/Contents/Info.plist" rm -f "$APP/Contents/Resources/empty.lproj" @@ -159,22 +158,22 @@ rm -f "$APP/Contents/Resources/empty.lproj" # set various version infomration in Info.plist $PLISTBUDDY -c "Set :CFBundleVersion $VERSION" "$INFO_PLIST" $PLISTBUDDY -c "Set :CFBundleShortVersionString $VERSION" "$INFO_PLIST" -$PLISTBUDDY -c "Set :CFBundleGetInfoString $NAME" "$INFO_PLIST" +$PLISTBUDDY -c "Set :CFBundleGetInfoString $APPLICATION_NAME" "$INFO_PLIST" # bundle Qt Frameworks into the app bundle notify "Bulding frameworks ..." cd "`pwd`/build/macx/release/product/" -$MACDEPLOYQT "`pwd`/Open-Sankore.app" +$MACDEPLOYQT "`pwd`/$APPLICATION_NAME.app" cd - notify "Extracting debug information ..." -$DSYMUTIL "$APP/Contents/MacOS/Open-Sankore" -o "$DSYM" -$STRIP -S "$APP/Contents/MacOS/Open-Sankore" +$DSYMUTIL "$APP/Contents/MacOS/$APPLICATION_NAME" -o "$DSYM" +$STRIP -S "$APP/Contents/MacOS/$APPLICATION_NAME" if [ "$1" == "pkg" ]; then - BASE_ICEBERG_CONFIG_FILE="Open-Sankore.packproj" + BASE_ICEBERG_CONFIG_FILE="$APPLICATION_NAME.packproj" #copy the standard file for working with - ICEBERG_CONFIG_FILE="Open-Sankore-working.packproj" + ICEBERG_CONFIG_FILE="$APPLICATION_NAME-working.packproj" cp -r $BASE_ICEBERG_CONFIG_FILE $ICEBERG_CONFIG_FILE # set version information $PLISTBUDDY -c "Set :Hierarchy:Attributes:Settings:Description:International:IFPkgDescriptionVersion $VERSION" "$ICEBERG_CONFIG_FILE" @@ -198,7 +197,7 @@ fi notify "Creating dmg ..." umount "$VOLUME" 2> /dev/null -$DMGUTIL --open --volume="$NAME" "$DMG" +$DMGUTIL --open --volume="$APPLICATION_NAME" "$DMG" cp *.pdf "$VOLUME" cp -R "$APP" "$VOLUME" @@ -211,9 +210,9 @@ $DMGUTIL --set --x=400 --y=120 "$VOLUME/Applications" $DMGUTIL --set --x=180 --y=280 "$VOLUME/ReleaseNotes.pdf" $DMGUTIL --set --x=400 --y=280 "$VOLUME/JournalDesModifications.pdf" -$DMGUTIL --close --volume="$NAME" "$DMG" +$DMGUTIL --close --volume="$APPLICATION_NAME" "$DMG" -notify "$NAME is built" +notify "$APPLICATION_NAME is built" PRODUCT_DIR="install/mac/" diff --git a/release.win7.vc9.64.bat b/release.win7.vc9.64.bat deleted file mode 100644 index b344d2f8..00000000 --- a/release.win7.vc9.64.bat +++ /dev/null @@ -1,74 +0,0 @@ -REM -------------------------------------------------------------------- -REM This program is free software: you can redistribute it and/or modify -REM it under the terms of the GNU General Public License as published by -REM the Free Software Foundation, either version 3 of the License, or -REM (at your option) any later version. -REM -REM This program is distributed in the hope that it will be useful, -REM but WITHOUT ANY WARRANTY; without even the implied warranty of -REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -REM GNU General Public License for more details. -REM -REM You should have received a copy of the GNU General Public License -REM along with this program. If not, see . -REM --------------------------------------------------------------------- - -set QT_DIR=..\Qt-sankore3.1 -set QT_BIN=%QT_DIR%\bin - -set PROGRAMS_FILE_PATH=C:\Program Files (x86) - -set GIT_BIN=%PROGRAMS_FILE_PATH%\Git\bin -set VS_BIN=%PROGRAMS_FILE_PATH%\Microsoft Visual Studio 9.0\VC\bin -set WIN_SDK_BIN=%PROGRAMS_FILE_PATH%\Microsoft SDKs\Windows\v6.0A\Bin -set INNO_EXE=%PROGRAMS_FILE_PATH%\Inno Setup 5\iscc.exe -set BUILD_DIR=build\win32\release -set LRELEASE=%QT_DIR%\bin\lrelease -set BASE_QT_TRANSLATIONS_DIRECTORY=%QT_DIR%\translations - -set PATH=%QT_BIN%;%PATH%;%WIN_SDK_BIN%;%GIT_BIN% - -call "%VS_BIN%\vcvars32.bat" - -echo %PATH% - -REM this checks if the custom qt directory path -REM is correct. This is important because installer -REM pick up dll from this directory -IF NOT EXIST "..\Qt-sankore3.1\lib\QtCore4.dll" GOTO EXIT_WITH_ERROR - -REM rmdir /S /Q %BUILD_DIR% - -set EDITION=MNEMIS_EDITION - -"%QT_BIN%\qmake.exe" "DEFINES+=%EDITION%" - -%LRELEASE% Sankore_3.1.pro - -set /p VERSION= < build\win32\release\version -git rev-list --tags --max-count=1 > tmp -set /p LAST_TAG= < tmp -erase tmp -git describe %LAST_TAG% > tmp -set /p LAST_TAG_VERSION=< tmp -erase tmp - -echo %VERSION% -echo %LAST_TAG_VERSION% - -REM if not v%VERSION%==%LAST_TAG_VERSION% GOTO EXIT_WITH_ERROR - -nmake release-install -copy %BASE_QT_TRANSLATIONS_DIRECTORY%\qt_*.qm build\win32\release\product\i18n\ -del build\win32\release\product\i18n\qt_help* - -del "build\win32\release\product\Sankore.pdb" - -set INSTALLER_NAME=Open-Sankore - -set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe - -call "%INNO_EXE%" "Sankore 3.1.iss" /F"%INSTALLER_NAME%" - -:EXIT_WITH_ERROR - echo ERROR diff --git a/release.win7.vc9.bat b/release.win7.vc9.bat index fd453081..1a9911f2 100644 --- a/release.win7.vc9.bat +++ b/release.win7.vc9.bat @@ -14,6 +14,8 @@ REM You should have received a copy of the GNU General Public License REM along with this program. If not, see . REM --------------------------------------------------------------------- + +set APPLICATION_NAME=OpenBoard set QT_DIR=..\Qt-4.8 set QT_BIN=%QT_DIR%\bin @@ -42,9 +44,9 @@ IF NOT EXIST "%QT_DIR%\lib\QtCore4.dll" GOTO EXIT_WITH_ERROR rmdir /S /Q %BUILD_DIR% rmdir /S /Q install -"%QT_BIN%\qmake.exe" Sankore_3.1.pro +"%QT_BIN%\qmake.exe" %APPLICATION_NAME%.pro -%LRELEASE% Sankore_3.1.pro +%LRELEASE% %APPLICATION_NAME%.pro %LRELEASE% %BASE_QT_TRANSLATIONS_DIRECTORY%\translations.pro set /p VERSION= < build\win32\release\version @@ -61,9 +63,9 @@ REM echo %VERSION% REM echo %LAST_TAG_VERSION% nmake release-install -IF NOT EXIST build\win32\release\product\Open-Sankore.exe GOTO EXIT_WITH_ERROR +IF NOT EXIST build\win32\release\product\%APPLICATION_NAME%.exe GOTO EXIT_WITH_ERROR -xcopy C:\OpenSankore\lib\*.dll build\win32\release\product\ +xcopy C:\%APPLICATION_NAME%\lib\*.dll build\win32\release\product\ xcopy %QT_DIR%\lib\QtOpenGL4.dll build\win32\release\product\ set CUSTOMIZATIONS=build\win32\release\product\customizations @@ -75,18 +77,16 @@ xcopy /s %BASE_QT_TRANSLATIONS_DIRECTORY%\qt_*.qm %I18n%\ del build\win32\release\product\i18n\qt_help* -del "build\win32\release\product\Sankore.pdb" - -set INSTALLER_NAME=Open-Sankore +del "build\win32\release\product\%APPLICATION_NAME%.pdb" -set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe +set INSTALLER_PATH=.\install\win32\%APPLICATION_NAME%.exe -call "%INNO_EXE%" "Sankore 3.1.iss" /F"%INSTALLER_NAME%" +call "%INNO_EXE%" "%APPLICATION_NAME%.iss" /F"%APPLICATION_NAME%" set INSTALL_DIRECTORY=install\win32\ xcopy *.pdf %INSTALL_DIRECTORY% cd %INSTALL_DIRECTORY% -call %SEVEN_ZIP_EXE% a Open-Sankor_Windows_%VERSION%.zip *.exe *.pdf +call %SEVEN_ZIP_EXE% a %APPLICATION_NAME%_Windows_%VERSION%.zip *.exe *.pdf cd ..\..\ GOTO END @@ -95,6 +95,6 @@ echo "Error found" GOTO :EOF :END -echo "Open-Sankore's build finished" +echo "%APPLICATION_NAME% build finished" :EOF diff --git a/resources/sankore.qrc b/resources/OpenBoard.qrc similarity index 99% rename from resources/sankore.qrc rename to resources/OpenBoard.qrc index c2e99561..38c1ba18 100644 --- a/resources/sankore.qrc +++ b/resources/OpenBoard.qrc @@ -1,6 +1,6 @@ - images/uniboard.png + images/OpenBoard.png images/bigUniboard.png images/close.svg images/increase.svg @@ -209,8 +209,8 @@ webbrowser/object-wrapper.html macx/PowerPointImport.applescript macx/upgrade.sh - podcast/uniboard.prx - www/uniboard-web-player.html + podcast/OpenBoard.prx + www/OpenBoard-web-player.html images/toolbar/tutorial.png images/edit-mode.svg images/save.svg diff --git a/resources/forms/blackoutWidget.ui b/resources/forms/blackoutWidget.ui index 844c4cd1..932e708d 100644 --- a/resources/forms/blackoutWidget.ui +++ b/resources/forms/blackoutWidget.ui @@ -189,7 +189,7 @@ - + diff --git a/resources/forms/documents.ui b/resources/forms/documents.ui index fc723452..66ff3935 100644 --- a/resources/forms/documents.ui +++ b/resources/forms/documents.ui @@ -244,7 +244,7 @@ - + diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui index 980ef5c8..71426908 100644 --- a/resources/forms/mainWindow.ui +++ b/resources/forms/mainWindow.ui @@ -14,8 +14,8 @@ Open-Sankoré - - :/images/uniboard.png:/images/uniboard.png + + :/images/OpenBoard.png:/images/OpenBoard.png @@ -178,7 +178,7 @@ true - + :/images/toolbar/stylus.png:/images/toolbar/stylus.png @@ -196,7 +196,7 @@ true - + :/images/toolbar/background.png:/images/toolbar/background.png @@ -208,7 +208,7 @@ - + :/images/toolbar/undoOn.png:/images/toolbar/undoOn.png @@ -220,7 +220,7 @@ - + :/images/toolbar/redoOn.png:/images/toolbar/redoOn.png @@ -232,7 +232,7 @@ - + :/images/toolbar/previousPageOn.png:/images/toolbar/previousPageOn.png @@ -247,7 +247,7 @@ - + :/images/toolbar/nextPageOn.png:/images/toolbar/nextPageOn.png @@ -265,7 +265,7 @@ false - + :/images/toolbar/documents.png:/images/toolbar/documents.png @@ -280,7 +280,7 @@ - + :/images/toolbar/web.png:/images/toolbar/web.png @@ -301,7 +301,7 @@ true - + :/images/toolbar/smallPen.png:/images/toolbar/smallPen.png @@ -316,7 +316,7 @@ true - + :/images/toolbar/mediumPen.png:/images/toolbar/mediumPen.png @@ -331,7 +331,7 @@ true - + :/images/toolbar/largePen.png:/images/toolbar/largePen.png @@ -343,7 +343,7 @@ - + :/images/toolbar/quitOn.png:/images/toolbar/quitOn.png @@ -364,7 +364,7 @@ true - + :/images/toolbar/smallEraser.png:/images/toolbar/smallEraser.png @@ -382,7 +382,7 @@ true - + :/images/toolbar/mediumEraser.png:/images/toolbar/mediumEraser.png @@ -397,7 +397,7 @@ true - + :/images/toolbar/largeEraser.png:/images/toolbar/largeEraser.png @@ -409,7 +409,7 @@ - + :/images/toolbar/color.png:/images/toolbar/color.png @@ -421,7 +421,7 @@ - + :/images/toolbar/color.png:/images/toolbar/color.png @@ -430,7 +430,7 @@ - + :/images/toolbar/color.png:/images/toolbar/color.png @@ -439,7 +439,7 @@ - + :/images/toolbar/color.png:/images/toolbar/color.png @@ -448,7 +448,7 @@ - + :/images/toolbar/previousPageOn.png:/images/toolbar/previousPageOn.png @@ -463,7 +463,7 @@ - + :/images/toolbar/nextPageOn.png:/images/toolbar/nextPageOn.png @@ -478,7 +478,7 @@ - + :/images/toolbar/reload.png:/images/toolbar/reload.png @@ -490,7 +490,7 @@ - + :/images/toolbar/home.png:/images/toolbar/home.png @@ -502,7 +502,7 @@ - + :/images/toolbar/bookmarks.png:/images/toolbar/bookmarks.png @@ -514,7 +514,7 @@ - + :/images/toolbar/addBookmark.png:/images/toolbar/addBookmark.png @@ -526,7 +526,7 @@ - + :/images/toolbar/board.png:/images/toolbar/board.png @@ -544,7 +544,7 @@ true - + :/images/toolbar/clearPage.png:/images/toolbar/clearPage.png @@ -556,7 +556,7 @@ - + :/images/toolbar/settings.png:/images/toolbar/settings.png @@ -571,7 +571,7 @@ true - + :/images/toolbar/library.png:/images/toolbar/library.png @@ -586,7 +586,7 @@ - + :/images/toolbar/menu.png:/images/toolbar/menu.png @@ -598,7 +598,7 @@ - + :/images/toolbar/display.png:/images/toolbar/display.png @@ -613,7 +613,7 @@ - + :/images/stylusPalette/zoomIn.png:/images/stylusPalette/zoomIn.png @@ -628,7 +628,7 @@ - + :/images/stylusPalette/zoomOut.png:/images/stylusPalette/zoomOut.png @@ -643,7 +643,7 @@ - + :/images/toolbar/newFolder.png:/images/toolbar/newFolder.png @@ -655,7 +655,7 @@ - + :/images/toolbar/newDocument.png:/images/toolbar/newDocument.png @@ -667,7 +667,7 @@ - + :/images/toolbar/import.png:/images/toolbar/import.png @@ -679,7 +679,7 @@ - + :/images/toolbar/export.png:/images/toolbar/export.png @@ -691,7 +691,7 @@ - + :/images/toolbar/open.png:/images/toolbar/open.png @@ -706,7 +706,7 @@ - + :/images/toolbar/duplicate.png:/images/toolbar/duplicate.png @@ -718,7 +718,7 @@ - + :/images/toolbar/deleteDocument.png:/images/toolbar/deleteDocument.png @@ -733,7 +733,7 @@ - + :/images/toolbar/addToWorkingDoc.png:/images/toolbar/addToWorkingDoc.png @@ -745,7 +745,7 @@ - + :/images/toolbar/addToPage.png:/images/toolbar/addToPage.png @@ -757,7 +757,7 @@ - + :/images/toolbar/rename.png:/images/toolbar/rename.png @@ -772,7 +772,7 @@ - + :/images/toolbar/tools.png:/images/toolbar/tools.png @@ -787,7 +787,7 @@ true - + :/images/toolbar/tools.png:/images/toolbar/tools.png @@ -805,7 +805,7 @@ true - + :/images/toolbar/display.png:/images/toolbar/display.png @@ -817,7 +817,7 @@ true - + :/images/toolbar/addToPage.png:/images/toolbar/addToPage.png @@ -838,7 +838,7 @@ true - + :/images/toolbar/addToPage.png:/images/toolbar/addToPage.png @@ -862,7 +862,7 @@ false - + :/images/toolbar/addToPage.png:/images/toolbar/addToPage.png @@ -880,7 +880,7 @@ - + :/images/toolbar/deleteDocument.png:/images/toolbar/deleteDocument.png @@ -892,7 +892,7 @@ - + :/images/toolbar/cut.png:/images/toolbar/cut.png @@ -904,7 +904,7 @@ - + :/images/toolbar/copy.png:/images/toolbar/copy.png @@ -916,7 +916,7 @@ - + :/images/toolbar/paste.png:/images/toolbar/paste.png @@ -931,7 +931,7 @@ - + :/images/extraPalette/blackout.png :/images/extraPalette/blackoutOn.png:/images/extraPalette/blackout.png @@ -947,7 +947,7 @@ true - + :/images/extraPalette/keyboard.png :/images/extraPalette/keyboardOn.png:/images/extraPalette/keyboard.png @@ -963,7 +963,7 @@ true - + :/images/backgroundPalette/background1.svg :/images/backgroundPalette/background1On.svg:/images/backgroundPalette/background1.svg @@ -982,7 +982,7 @@ true - + :/images/backgroundPalette/background2.svg :/images/backgroundPalette/background2On.svg:/images/backgroundPalette/background2.svg @@ -1001,7 +1001,7 @@ true - + :/images/backgroundPalette/background3.svg :/images/backgroundPalette/background3On.svg:/images/backgroundPalette/background3.svg @@ -1020,7 +1020,7 @@ true - + :/images/backgroundPalette/background4.svg :/images/backgroundPalette/background4On.svg:/images/backgroundPalette/background4.svg @@ -1039,7 +1039,7 @@ true - + :/images/toolbar/record.png:/images/toolbar/record.png @@ -1054,7 +1054,7 @@ true - + :/images/toolbar/record.png :/images/toolbar/stop.png:/images/toolbar/record.png @@ -1067,7 +1067,7 @@ - + :/images/erasePalette/eraseItem.svg:/images/erasePalette/eraseItem.svg @@ -1079,7 +1079,7 @@ - + :/images/erasePalette/eraseAnnotation.svg:/images/erasePalette/eraseAnnotation.svg @@ -1091,7 +1091,7 @@ - + :/images/erasePalette/eraseAll.svg:/images/erasePalette/eraseAll.svg @@ -1103,7 +1103,7 @@ - + :/images/toolbar/addToPage.png:/images/toolbar/addToPage.png @@ -1118,7 +1118,7 @@ true - + :/images/stylusPalette/pen.png :/images/stylusPalette/penOn.png:/images/stylusPalette/pen.png @@ -1137,7 +1137,7 @@ true - + :/images/stylusPalette/eraser.png :/images/stylusPalette/eraserOn.png:/images/stylusPalette/eraser.png @@ -1156,7 +1156,7 @@ true - + :/images/stylusPalette/marker.png :/images/stylusPalette/markerOn.png:/images/stylusPalette/marker.png @@ -1175,7 +1175,7 @@ true - + :/images/stylusPalette/arrow.png :/images/stylusPalette/arrowOn.png:/images/stylusPalette/arrow.png @@ -1194,7 +1194,7 @@ true - + :/images/stylusPalette/hand.png :/images/stylusPalette/handOn.png:/images/stylusPalette/hand.png @@ -1210,7 +1210,7 @@ true - + :/images/stylusPalette/zoomIn.png :/images/stylusPalette/zoomInOn.png:/images/stylusPalette/zoomIn.png @@ -1223,7 +1223,7 @@ true - + :/images/stylusPalette/zoomOut.png :/images/stylusPalette/zoomOutOn.png:/images/stylusPalette/zoomOut.png @@ -1236,7 +1236,7 @@ true - + :/images/stylusPalette/laser.png :/images/stylusPalette/laserOn.png:/images/stylusPalette/laser.png @@ -1255,7 +1255,7 @@ true - + :/images/stylusPalette/line.png :/images/stylusPalette/lineOn.png:/images/stylusPalette/line.png @@ -1274,7 +1274,7 @@ true - + :/images/stylusPalette/text.png :/images/stylusPalette/textOn.png:/images/stylusPalette/text.png @@ -1293,7 +1293,7 @@ true - + :/images/stylusPalette/captureArea.png :/images/stylusPalette/captureAreaOn.png:/images/stylusPalette/captureArea.png @@ -1306,7 +1306,7 @@ - + :/images/addItemToCurrentPage.svg:/images/addItemToCurrentPage.svg @@ -1321,7 +1321,7 @@ - + :/images/addItemToNewPage.svg:/images/addItemToNewPage.svg @@ -1333,7 +1333,7 @@ - + :/images/addItemToLibrary.svg:/images/addItemToLibrary.svg @@ -1348,7 +1348,7 @@ false - + :/images/toolbar/newDocument.png:/images/toolbar/newDocument.png @@ -1360,7 +1360,7 @@ - + :/images/addItemToCurrentPage.svg:/images/addItemToCurrentPage.svg @@ -1372,7 +1372,7 @@ - + :/images/addItemToNewPage.svg:/images/addItemToNewPage.svg @@ -1384,7 +1384,7 @@ - + :/images/addItemToLibrary.svg:/images/addItemToLibrary.svg @@ -1402,7 +1402,7 @@ false - + :/images/toolbar/pause.png:/images/toolbar/pause.png @@ -1414,7 +1414,7 @@ - + :/images/toolbar/settings.png:/images/toolbar/settings.png @@ -1426,7 +1426,7 @@ - + :/images/toolbar/addToolToLibrary.png:/images/toolbar/addToolToLibrary.png @@ -1441,7 +1441,7 @@ true - + :/images/extraPalette/webTrap.png :/images/extraPalette/webTrapEnabled.png:/images/extraPalette/webTrap.png @@ -1454,7 +1454,7 @@ - + :/images/toolbar/captureArea.png:/images/toolbar/captureArea.png @@ -1466,7 +1466,7 @@ - + :/images/toolbar/captureWindow.png:/images/toolbar/captureWindow.png @@ -1481,7 +1481,7 @@ false - + :/images/extraPalette/oEmbed.png:/images/extraPalette/oEmbed.png @@ -1496,7 +1496,7 @@ true - + :/images/toolbar/eyeClosed.png :/images/toolbar/eyeOpened.png:/images/toolbar/eyeClosed.png @@ -1515,7 +1515,7 @@ - + :/images/erasePalette/eraseAnnotation.svg:/images/erasePalette/eraseAnnotation.svg @@ -1527,7 +1527,7 @@ - + :/images/toolbar/addToolToLibrary.png:/images/toolbar/addToolToLibrary.png @@ -1539,7 +1539,7 @@ - + :/images/toolbar/tutorial.png:/images/toolbar/tutorial.png @@ -1551,7 +1551,7 @@ - + :/images/toolbar/updates.png:/images/toolbar/updates.png @@ -1560,7 +1560,7 @@ - + :/images/toolbar/hide.png:/images/toolbar/hide.png @@ -1581,7 +1581,7 @@ false - + :/images/toolbar/group.png :/images/toolbar/ungroup.png:/images/toolbar/group.png @@ -1597,7 +1597,7 @@ true - + :/images/stylusPalette/handPlay.png :/images/stylusPalette/handPlayOn.png:/images/stylusPalette/handPlay.png @@ -1610,7 +1610,7 @@ - + :/images/erasePalette/eraseBackground.svg:/images/erasePalette/eraseBackground.svg @@ -1622,7 +1622,7 @@ - + diff --git a/resources/forms/preferences.ui b/resources/forms/preferences.ui index 33465d5d..dc374871 100644 --- a/resources/forms/preferences.ui +++ b/resources/forms/preferences.ui @@ -24,7 +24,7 @@ - 3 + 5 @@ -637,12 +637,12 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Cantarell'; font-size:10pt; font-weight:400; font-style:normal;"> <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu';">Open-Sankoré version 2.0, Copyright (C) 2010-2012 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br /><br />Open-Sankoré est un logiciel libre : vous pouvez le redistribuer et/ou le modifier en respectant les termes de la GNU General Public Licence (GNU GPL) telle que publiée par la Free Software Foundation en version 3, avec une exception OpenSSL.<br />Vous pouvez consulter et charger le code source du logiciel sur </span><a href="https://github.com/Sankore"><span style=" font-family:'Ubuntu'; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-family:'Ubuntu';"><br />Open-Sankoré est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN OBJET PARTICULIER.<br />Veuillez consulter la licence GNU General Public Licence située dans l'onglet Licences ou consulter le site </span><a href="http://www.gnu.org/licenses/"><span style=" font-family:'Ubuntu'; text-decoration: underline; color:#0000ff;">&lt;http://www.gnu.org/licenses/&gt;</span></a><span style=" font-family:'Ubuntu';">.<br /><br />Open-Sankoré 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, version 3 of the License, with a specific linking exception for the OpenSSL project's &quot;OpenSSL&quot; library (or with modified versions of it that use the same license as the &quot;OpenSSL&quot; library). You can find the source code of this software at </span><a href="https://github.com/Sankore"><span style=" font-family:'Ubuntu'; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-family:'Ubuntu';"><br />Open-Sankoré 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 below for more details.<br /><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu';">Contact : <br />Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br />Délégation Interministérielle à l'Education Numérique en Afrique<br />20 Avenue Ségur Paris 75007<br />Téléphone : 01 43 17 68 08<br />email: </span><a href="mailto:contact@sankore.org"><span style=" font-family:'Ubuntu'; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-family:'Ubuntu';">&quot;</span></p></td></tr></table></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Open-Sankoré version 2.0, Copyright (C) 2010-2012 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br /><br />Open-Sankoré est un logiciel libre : vous pouvez le redistribuer et/ou le modifier en respectant les termes de la GNU General Public Licence (GNU GPL) telle que publiée par la Free Software Foundation en version 3, avec une exception OpenSSL.<br />Vous pouvez consulter et charger le code source du logiciel sur </span><a href="https://github.com/Sankore"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;"><br />Open-Sankoré est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION A UN OBJET PARTICULIER.<br />Veuillez consulter la licence GNU General Public Licence située dans l'onglet Licences ou consulter le site </span><a href="http://www.gnu.org/licenses/"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;http://www.gnu.org/licenses/&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;">.<br /><br />Open-Sankoré 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, version 3 of the License, with a specific linking exception for the OpenSSL project's &quot;OpenSSL&quot; library (or with modified versions of it that use the same license as the &quot;OpenSSL&quot; library). You can find the source code of this software at </span><a href="https://github.com/Sankore"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">&lt;https://github.com/Sankore&gt;</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;"><br />Open-Sankoré 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 below for more details.<br /><br /></span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Contact : <br />Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)<br />Délégation Interministérielle à l'Education Numérique en Afrique<br />20 Avenue Ségur Paris 75007<br />Téléphone : 01 43 17 68 08<br />email: </span><a href="mailto:contact@sankore.org"><span style=" font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-family:'Ubuntu'; font-size:11pt;">&quot;</span></p></td></tr></table></body></html> @@ -854,7 +854,7 @@ p, li { white-space: pre-wrap; } - zlib + zlib @@ -899,7 +899,7 @@ jloup@gzip.org madler@alumni.caltech.edu - Xpdf + Xpdf @@ -1611,7 +1611,7 @@ Public License instead of this License. But first, please read - QuaZIP + QuaZIP @@ -1981,7 +1981,7 @@ Public License instead of this License. - Open-Sankoré + OpenBoard @@ -1993,7 +1993,11 @@ Public License instead of this License. - Copyright (C) 2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) + This product was created by Open Education Foundation based on Open-Sankoré. + +Copyright (C) 2013 Open Education Foundation. + +Copyright (C) 2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) Open-Sankoré is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -2706,25 +2710,28 @@ Public License instead of this License. But first, please read <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:16pt; font-weight:600;">Translations</span></p> -<p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">A special thanks to:</span></p> -<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:10pt; font-weight:600;" style=" margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:medium; font-weight:400;">Alexander Angelov and Iva Ninova for Bulgarian</span></li> -<li style=" font-family:'Ubuntu'; font-size:10pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:medium;">Francesc Busquets for Catalan</span></li> -<li style=" font-family:'Ubuntu'; font-size:10pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:medium;">Jaroslav Krejčí, Janek Wagner for Czech</span></li> -<li style=" font-family:'Ubuntu'; font-size:10pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:medium;">Geert Kraeye and Derk Klomp for Dutch</span></li> -<li style=" font-family:'Ubuntu'; font-size:10pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:medium;">Christian Oïhénart and François Bocquet for French</span></li> -<li style=" font-family:'Ubuntu'; font-size:10pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:medium;">Hans-Peter Zahno and Klaus Tenner for German</span></li> -<li style=" font-family:'Ubuntu'; font-size:10pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:medium;">Yannis Kiolalis for Greek</span></li> -<li style=" font-family:'Ubuntu'; font-size:10pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:medium;">Antonello Comi and Marco Menardi for Italian</span></li> -<li style=" font-family:'Ubuntu'; font-size:10pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:medium;">Didier Clerc for Japanese</span></li> -<li style=" font-family:'Ubuntu'; font-size:10pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:medium;">Faraniaina Domoina Rabarijaona for Malagasy</span></li> -<li style=" font-family:'Ubuntu'; font-size:10pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:medium;">Patricia Fisch and César Marques for Portuguese</span></li> -<li style=" font-family:'Ubuntu'; font-size:10pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:medium;">Ilia Ryabokon for Russian</span></li> -<li style=" font-family:'Ubuntu'; font-size:10pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:medium;">Anki Chen for Traditional Chinese</span></li> -<li style=" font-family:'Ubuntu'; font-size:10pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:medium;">Jaroslav Ryník for Slovak</span></li> -<li style=" font-family:'Ubuntu'; font-size:10pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:medium;">Dorian Fuentes and Juan José Gutiérrez Aparicio for Spanish</span></li> -<li style=" font-family:'Ubuntu'; font-size:10pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:medium;">Ferhat Ozkasgarli for Turkish</span></li></ul></body></html> +</style></head><body style=" font-family:'Cantarell'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OpenBoard 1.00.00</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OpenBoard is copyright (c) 2013 . All rights reserved.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OpenBoard is derived from Open-Sankoré. Open-Sankoré is copyright © 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA). All right reserved.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OpenBoard 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, version 3 of the License, with a specific linking exception for the OpenSSL project's &quot;OpenSSL&quot; library (or with modified versions of it that use the same license as the &quot;OpenSSL&quot; library). You can find the source code of this software at &lt;https://github.com/uniboard&gt;</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OpenBoard 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 below for more details.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Contact :</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Open Education Foundation</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">c/o FBT Avocats SA</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Rue du 31-Décembre 47</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">1207 Genève</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="openeducationfoundation.org"><span style=" text-decoration: underline; color:#0000ff;">openeducationfoundation.org</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="oe-f.org"><span style=" text-decoration: underline; color:#0000ff;">oe-f.org</span></a></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">email: <a href="mailto:contact@oe-f.org"><span style=" text-decoration: underline; color:#0000ff;">contact@oe-f.org</span></a></p></body></html> + + + true diff --git a/resources/i18n/sankore_ar.ts b/resources/i18n/OpenBoard_ar.ts similarity index 100% rename from resources/i18n/sankore_ar.ts rename to resources/i18n/OpenBoard_ar.ts diff --git a/resources/i18n/sankore_bg.ts b/resources/i18n/OpenBoard_bg.ts similarity index 100% rename from resources/i18n/sankore_bg.ts rename to resources/i18n/OpenBoard_bg.ts diff --git a/resources/i18n/sankore_ca.ts b/resources/i18n/OpenBoard_ca.ts similarity index 100% rename from resources/i18n/sankore_ca.ts rename to resources/i18n/OpenBoard_ca.ts diff --git a/resources/i18n/sankore_cs.ts b/resources/i18n/OpenBoard_cs.ts similarity index 100% rename from resources/i18n/sankore_cs.ts rename to resources/i18n/OpenBoard_cs.ts diff --git a/resources/i18n/sankore_da.ts b/resources/i18n/OpenBoard_da.ts similarity index 100% rename from resources/i18n/sankore_da.ts rename to resources/i18n/OpenBoard_da.ts diff --git a/resources/i18n/sankore_de.ts b/resources/i18n/OpenBoard_de.ts similarity index 100% rename from resources/i18n/sankore_de.ts rename to resources/i18n/OpenBoard_de.ts diff --git a/resources/i18n/sankore_el.ts b/resources/i18n/OpenBoard_el.ts similarity index 100% rename from resources/i18n/sankore_el.ts rename to resources/i18n/OpenBoard_el.ts diff --git a/resources/i18n/sankore_en.ts b/resources/i18n/OpenBoard_en.ts similarity index 100% rename from resources/i18n/sankore_en.ts rename to resources/i18n/OpenBoard_en.ts diff --git a/resources/i18n/sankore_en_UK.ts b/resources/i18n/OpenBoard_en_UK.ts similarity index 100% rename from resources/i18n/sankore_en_UK.ts rename to resources/i18n/OpenBoard_en_UK.ts diff --git a/resources/i18n/sankore_es.ts b/resources/i18n/OpenBoard_es.ts similarity index 100% rename from resources/i18n/sankore_es.ts rename to resources/i18n/OpenBoard_es.ts diff --git a/resources/i18n/sankore_fr.ts b/resources/i18n/OpenBoard_fr.ts similarity index 100% rename from resources/i18n/sankore_fr.ts rename to resources/i18n/OpenBoard_fr.ts diff --git a/resources/i18n/sankore_fr_CH.ts b/resources/i18n/OpenBoard_fr_CH.ts similarity index 100% rename from resources/i18n/sankore_fr_CH.ts rename to resources/i18n/OpenBoard_fr_CH.ts diff --git a/resources/i18n/sankore_it.ts b/resources/i18n/OpenBoard_it.ts similarity index 100% rename from resources/i18n/sankore_it.ts rename to resources/i18n/OpenBoard_it.ts diff --git a/resources/i18n/sankore_iw.ts b/resources/i18n/OpenBoard_iw.ts similarity index 100% rename from resources/i18n/sankore_iw.ts rename to resources/i18n/OpenBoard_iw.ts diff --git a/resources/i18n/sankore_ja.ts b/resources/i18n/OpenBoard_ja.ts similarity index 100% rename from resources/i18n/sankore_ja.ts rename to resources/i18n/OpenBoard_ja.ts diff --git a/resources/i18n/sankore_ko.ts b/resources/i18n/OpenBoard_ko.ts similarity index 100% rename from resources/i18n/sankore_ko.ts rename to resources/i18n/OpenBoard_ko.ts diff --git a/resources/i18n/sankore_mg.ts b/resources/i18n/OpenBoard_mg.ts similarity index 100% rename from resources/i18n/sankore_mg.ts rename to resources/i18n/OpenBoard_mg.ts diff --git a/resources/i18n/sankore_nb.ts b/resources/i18n/OpenBoard_nb.ts similarity index 100% rename from resources/i18n/sankore_nb.ts rename to resources/i18n/OpenBoard_nb.ts diff --git a/resources/i18n/sankore_nl.ts b/resources/i18n/OpenBoard_nl.ts similarity index 100% rename from resources/i18n/sankore_nl.ts rename to resources/i18n/OpenBoard_nl.ts diff --git a/resources/i18n/sankore_pl.ts b/resources/i18n/OpenBoard_pl.ts similarity index 100% rename from resources/i18n/sankore_pl.ts rename to resources/i18n/OpenBoard_pl.ts diff --git a/resources/i18n/sankore_pt.ts b/resources/i18n/OpenBoard_pt.ts similarity index 100% rename from resources/i18n/sankore_pt.ts rename to resources/i18n/OpenBoard_pt.ts diff --git a/resources/i18n/sankore_ro.ts b/resources/i18n/OpenBoard_ro.ts similarity index 100% rename from resources/i18n/sankore_ro.ts rename to resources/i18n/OpenBoard_ro.ts diff --git a/resources/i18n/sankore_ru.ts b/resources/i18n/OpenBoard_ru.ts old mode 100755 new mode 100644 similarity index 100% rename from resources/i18n/sankore_ru.ts rename to resources/i18n/OpenBoard_ru.ts diff --git a/resources/i18n/sankore_sk.ts b/resources/i18n/OpenBoard_sk.ts similarity index 100% rename from resources/i18n/sankore_sk.ts rename to resources/i18n/OpenBoard_sk.ts diff --git a/resources/i18n/sankore_sv.ts b/resources/i18n/OpenBoard_sv.ts similarity index 100% rename from resources/i18n/sankore_sv.ts rename to resources/i18n/OpenBoard_sv.ts diff --git a/resources/i18n/sankore_tr.ts b/resources/i18n/OpenBoard_tr.ts similarity index 100% rename from resources/i18n/sankore_tr.ts rename to resources/i18n/OpenBoard_tr.ts diff --git a/resources/i18n/sankore_zh.ts b/resources/i18n/OpenBoard_zh.ts similarity index 100% rename from resources/i18n/sankore_zh.ts rename to resources/i18n/OpenBoard_zh.ts diff --git a/resources/i18n/sankore_zh_CN.ts b/resources/i18n/OpenBoard_zh_CN.ts similarity index 100% rename from resources/i18n/sankore_zh_CN.ts rename to resources/i18n/OpenBoard_zh_CN.ts diff --git a/resources/i18n/sankore_zh_TW.ts b/resources/i18n/OpenBoard_zh_TW.ts similarity index 100% rename from resources/i18n/sankore_zh_TW.ts rename to resources/i18n/OpenBoard_zh_TW.ts diff --git a/resources/images/uniboard.png b/resources/images/OpenBoard.png similarity index 100% rename from resources/images/uniboard.png rename to resources/images/OpenBoard.png diff --git a/resources/podcast/uniboard.prx b/resources/podcast/OpenBoard.prx similarity index 100% rename from resources/podcast/uniboard.prx rename to resources/podcast/OpenBoard.prx diff --git a/resources/win/uniboard.ico b/resources/win/OpenBoard.ico similarity index 100% rename from resources/win/uniboard.ico rename to resources/win/OpenBoard.ico diff --git a/resources/win/sankore.rc b/resources/win/OpenBoard.rc similarity index 82% rename from resources/win/sankore.rc rename to resources/win/OpenBoard.rc index 6ed7fcc5..29db4700 100644 --- a/resources/win/sankore.rc +++ b/resources/win/OpenBoard.rc @@ -2,8 +2,8 @@ /* Application Icon */ -IDI_ICON1 ICON DISCARDABLE "uniboard.ico" -IDI_ICON2 ICON DISCARDABLE "uniboardDoc.ico" +IDI_ICON1 ICON DISCARDABLE "OpenBoard.ico" +IDI_ICON2 ICON DISCARDABLE "OpenBoardDoc.ico" /* Version Info */ diff --git a/resources/win/uniboardDoc.ico b/resources/win/OpenBoardDoc.ico similarity index 100% rename from resources/win/uniboardDoc.ico rename to resources/win/OpenBoardDoc.ico diff --git a/resources/www/uniboard-web-player.html b/resources/www/OpenBoard-web-player.html similarity index 100% rename from resources/www/uniboard-web-player.html rename to resources/www/OpenBoard-web-player.html diff --git a/src/adaptors/UBExportDocument.cpp b/src/adaptors/UBExportDocument.cpp index 745cf998..bc7a724c 100644 --- a/src/adaptors/UBExportDocument.cpp +++ b/src/adaptors/UBExportDocument.cpp @@ -118,5 +118,5 @@ QString UBExportDocument::exportExtention() QString UBExportDocument::exportName() { - return tr("Export to Sankore Format"); + return tr("Export to OpenBoard Format"); } diff --git a/src/adaptors/UBExportWeb.cpp b/src/adaptors/UBExportWeb.cpp index ad9e0c89..9eb61b81 100644 --- a/src/adaptors/UBExportWeb.cpp +++ b/src/adaptors/UBExportWeb.cpp @@ -69,7 +69,7 @@ void UBExportWeb::persist(UBDocumentProxy* pDocumentProxy) { QString htmlPath = dirName + "/index.html"; - QFile html(":www/uniboard-web-player.html"); + QFile html(":www/OpenBoard-web-player.html"); html.copy(htmlPath); UBApplication::showMessage(tr("Export successful.")); diff --git a/src/adaptors/UBImportDocument.cpp b/src/adaptors/UBImportDocument.cpp index db88e77c..837215c8 100644 --- a/src/adaptors/UBImportDocument.cpp +++ b/src/adaptors/UBImportDocument.cpp @@ -60,7 +60,7 @@ QStringList UBImportDocument::supportedExtentions() QString UBImportDocument::importFileFilter() { - return tr("Open-Sankore (*.ubz)"); + return tr("OpenBoard (*.ubz)"); } @@ -173,7 +173,7 @@ UBDocumentProxy* UBImportDocument::importFile(const QFile& pFile, const QString& QString path = UBSettings::userDocumentDirectory(); QString documentRootFolder; - + if(!extractFileToDir(pFile, path, documentRootFolder)){ UBApplication::showMessage(tr("Import of file %1 failed.").arg(fi.baseName())); return NULL; @@ -197,7 +197,7 @@ bool UBImportDocument::addFileToDocument(UBDocumentProxy* pDocument, const QFile UBApplication::showMessage(tr("Import of file %1 failed.").arg(fi.baseName())); return false; } - + if (!UBPersistenceManager::persistenceManager()->addDirectoryContentToDocument(documentRootFolder, pDocument)) { UBApplication::showMessage(tr("Import of file %1 failed.").arg(fi.baseName())); diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index 8ba3c115..6014e7c9 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -116,9 +116,9 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing staticMemoryCleaner = new QObject(0); // deleted in UBApplication destructor - setOrganizationName("Sankore"); - setOrganizationDomain("sankore.org"); - setApplicationName("Open-Sankore"); + setOrganizationName("Open Education Foundation"); + setOrganizationDomain("oe-f.org"); + setApplicationName("OpenBoard"); setApplicationVersion(UBVERSION); @@ -154,7 +154,7 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing updateProtoActionsState(); #ifndef Q_WS_MAC - setWindowIcon(QIcon(":/images/uniboard.png")); + setWindowIcon(QIcon(":/images/OpenBoard.png")); #endif setStyle(new UBStyle()); // Style is owned and deleted by the application @@ -250,7 +250,7 @@ void UBApplication::setupTranslators(QStringList args) else{ mApplicationTranslator = new QTranslator(this); mQtGuiTranslator = new QTranslator(this); - mApplicationTranslator->load(UBPlatformUtils::translationPath(QString("sankore_"),language)); + mApplicationTranslator->load(UBPlatformUtils::translationPath(QString("OpenBoard_"),language)); installTranslator(mApplicationTranslator); QString qtGuiTranslationPath = UBPlatformUtils::translationPath("qt_", language); diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp index cc08cf46..44ad5dfe 100644 --- a/src/core/UBApplicationController.cpp +++ b/src/core/UBApplicationController.cpp @@ -473,12 +473,12 @@ void UBApplicationController::showDesktop(bool dontSwitchFrontProcess) void UBApplicationController::checkUpdate() { -// if(mHttp) -// delete mHttp; -// QUrl url("http://ftp.open-sankore.org/update.json"); -// mHttp = new QHttp(url.host()); -// connect(mHttp, SIGNAL(requestFinished(int,bool)), this, SLOT(updateRequestFinished(int,bool))); -// mHttp->get(url.path()); + if(mHttp) + delete mHttp; + QUrl url("http://oe-f.org/update.json"); + mHttp = new QHttp(url.host()); + connect(mHttp, SIGNAL(requestFinished(int,bool)), this, SLOT(updateRequestFinished(int,bool))); + mHttp->get(url.path()); } void UBApplicationController::updateRequestFinished(int id, bool error) diff --git a/src/core/UBPersistenceManager.cpp b/src/core/UBPersistenceManager.cpp index 5b061ff2..2f040867 100644 --- a/src/core/UBPersistenceManager.cpp +++ b/src/core/UBPersistenceManager.cpp @@ -682,7 +682,7 @@ QString UBPersistenceManager::generateUniqueDocumentPath(const QString& baseFold QDateTime now = QDateTime::currentDateTime(); QString dirName = now.toString("yyyy-MM-dd hh-mm-ss.zzz"); - return baseFolder + QString("/Sankore Document %1").arg(dirName); + return baseFolder + QString("/OpenBoard Document %1").arg(dirName); } QString UBPersistenceManager::generateUniqueDocumentPath() @@ -930,7 +930,7 @@ void UBPersistenceManager::checkIfDocumentRepositoryExists() QString humanPath = QDir::cleanPath(mDocumentRepositoryPath); humanPath = QDir::toNativeSeparators(humanPath); - UBApplication::mainWindow->warning(tr("Document Repository Loss"),tr("Sankore has lost access to the document repository '%1'. Unfortunately the application must shut down to avoid data corruption. Latest changes may be lost as well.").arg(humanPath)); + UBApplication::mainWindow->warning(tr("Document Repository Loss"),qApp->applicationName() + tr("has lost access to the document repository '%1'. Unfortunately the application must shut down to avoid data corruption. Latest changes may be lost as well.").arg(humanPath)); UBApplication::quit(); } diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index bc0a473d..0750c2dc 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -775,7 +775,7 @@ QString UBSettings::userDataDirectory() } dataDirPath = UBFileSystemUtils::normalizeFilePath(QDesktopServices::storageLocation(QDesktopServices::DataLocation)); - dataDirPath.replace("/Open-Sankore", ""); + dataDirPath.replace(qApp->organizationName() + "/" + qApp->organizationDomain(), ""); } return dataDirPath; } @@ -795,7 +795,7 @@ QString UBSettings::userImageDirectory() qCritical() << "failed to create image directory " << imageDirectory; } - imageDirectory = QDesktopServices::storageLocation(QDesktopServices::PicturesLocation) + "/Sankore"; + imageDirectory = QDesktopServices::storageLocation(QDesktopServices::PicturesLocation) + "/" + qApp->applicationName(); checkDirectory(imageDirectory); } return imageDirectory; @@ -821,7 +821,7 @@ QString UBSettings::userVideoDirectory() if(videoDirectory.isEmpty()) videoDirectory = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation) + "/" + tr("My Movies"); else - videoDirectory = videoDirectory + "/Sankore"; + videoDirectory = videoDirectory + "/" + qApp->applicationName(); checkDirectory(videoDirectory); } @@ -842,7 +842,7 @@ QString UBSettings::userAudioDirectory() qCritical() << "failed to create image directory " << audioDirectory; } - audioDirectory = QDesktopServices::storageLocation(QDesktopServices::MusicLocation) + "/Sankore"; + audioDirectory = QDesktopServices::storageLocation(QDesktopServices::MusicLocation) + "/" + qApp->applicationName(); checkDirectory(audioDirectory); } return audioDirectory; diff --git a/src/core/main.cpp b/src/core/main.cpp index af7c60e1..3110849e 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -76,7 +76,7 @@ void ub_message_output(QtMsgType type, const char *msg) { qInstallMsgHandler(previousHandler); } -int main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Uncomment next section to have memory leaks information @@ -87,7 +87,7 @@ int main(int argc, char *argv[]) #endif */ - Q_INIT_RESOURCE(sankore); + Q_INIT_RESOURCE(OpenBoard); qInstallMsgHandler(ub_message_output); @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) QApplication::setGraphicsSystem("raster"); #endif - UBApplication app("Sankore", argc, argv); + UBApplication app("OpenBoard", argc, argv); //BUGFIX: //when importing a sankore file that contains a non standard character diff --git a/src/desktop/UBDesktopPalette.cpp b/src/desktop/UBDesktopPalette.cpp index 4a531322..33ff38b8 100644 --- a/src/desktop/UBDesktopPalette.cpp +++ b/src/desktop/UBDesktopPalette.cpp @@ -46,7 +46,7 @@ UBDesktopPalette::UBDesktopPalette(QWidget *parent, UBRightPalette* _rightPalett { QList actions; - mActionUniboard = new QAction(QIcon(":/images/toolbar/board.png"), tr("Show Open-Sankore"), this); + mActionUniboard = new QAction(QIcon(":/images/toolbar/board.png"), tr("Show OpenBoard"), this); connect(mActionUniboard, SIGNAL(triggered()), this, SIGNAL(uniboardClick())); actions << mActionUniboard; diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp index 44e26da4..9de9d52e 100644 --- a/src/document/UBDocumentController.cpp +++ b/src/document/UBDocumentController.cpp @@ -1419,7 +1419,7 @@ bool UBDocumentController::isOKToOpenDocument(UBDocumentProxy* proxy) else { if (UBApplication::mainWindow->yesNoQuestion(tr("Open Document"), - tr("The document '%1' has been generated with a newer version of Sankore (%2). By opening it, you may lose some information. Do you want to proceed?") + tr("The document '%1' has been generated with a newer version of OpenBoard (%2). By opening it, you may lose some information. Do you want to proceed?") .arg(proxy->metaData(UBSettings::documentName).toString()) .arg(docVersion))) { diff --git a/src/frameworks/UBPlatformUtils_linux.cpp b/src/frameworks/UBPlatformUtils_linux.cpp index e9fd62e3..b429a3b4 100644 --- a/src/frameworks/UBPlatformUtils_linux.cpp +++ b/src/frameworks/UBPlatformUtils_linux.cpp @@ -70,9 +70,9 @@ QStringList UBPlatformUtils::availableTranslations() { QString translationsPath = applicationResourcesDirectory() + "/" + "i18n" + "/"; QStringList translationsList = UBFileSystemUtils::allFiles(translationsPath); - QRegExp sankoreTranslationFiles(".*sankore_.*.qm"); + QRegExp sankoreTranslationFiles(".*OpenBoard_.*.qm"); translationsList=translationsList.filter(sankoreTranslationFiles); - return translationsList.replaceInStrings(QRegExp("(.*)sankore_(.*).qm"),"\\2"); + return translationsList.replaceInStrings(QRegExp("(.*)OpenBoard_(.*).qm"),"\\2"); } QString UBPlatformUtils::translationPath(QString pFilePrefix,QString pLanguage) diff --git a/src/frameworks/UBPlatformUtils_mac.mm b/src/frameworks/UBPlatformUtils_mac.mm index 517e38d2..44af5869 100644 --- a/src/frameworks/UBPlatformUtils_mac.mm +++ b/src/frameworks/UBPlatformUtils_mac.mm @@ -71,8 +71,8 @@ void UBPlatformUtils::init() NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSString *currentPath = [[NSBundle mainBundle] pathForResource:@"Save PDF to Open-Sankore" ofType:@"workflow"]; - NSString *installedPath = [[[@"~/Library/PDF Services" stringByExpandingTildeInPath] stringByAppendingPathComponent:@"Save PDF to Open-Sankore"] stringByAppendingPathExtension:@"workflow"]; + NSString *currentPath = [[NSBundle mainBundle] pathForResource:@"Save PDF to OpenBoard" ofType:@"workflow"]; + NSString *installedPath = [[[@"~/Library/PDF Services" stringByExpandingTildeInPath] stringByAppendingPathComponent:@"Save PDF to OpenBoard"] stringByAppendingPathExtension:@"workflow"]; NSString *currentVersion = bundleShortVersion([NSBundle bundleWithPath:currentPath]); NSString *installedVersion = bundleShortVersion([NSBundle bundleWithPath:installedPath]); diff --git a/src/frameworks/UBPlatformUtils_win.cpp b/src/frameworks/UBPlatformUtils_win.cpp index e56974f4..3d512080 100644 --- a/src/frameworks/UBPlatformUtils_win.cpp +++ b/src/frameworks/UBPlatformUtils_win.cpp @@ -72,9 +72,9 @@ QStringList UBPlatformUtils::availableTranslations() { QString translationsPath = applicationResourcesDirectory() + "/" + "i18n" + "/"; QStringList translationsList = UBFileSystemUtils::allFiles(translationsPath); - QRegExp sankoreTranslationFiles(".*sankore_.*.qm"); + QRegExp sankoreTranslationFiles(".*OpenBoard_.*.qm"); translationsList=translationsList.filter(sankoreTranslationFiles); - return translationsList.replaceInStrings(QRegExp("(.*)sankore_(.*).qm"),"\\2"); + return translationsList.replaceInStrings(QRegExp("(.*)OpenBoard_(.*).qm"),"\\2"); } QString UBPlatformUtils::translationPath(QString pFilePrefix,QString pLanguage) @@ -147,7 +147,7 @@ void UBPlatformUtils::setWindowNonActivableFlag(QWidget* widget, bool nonAcivabl #define KEYBTDECL(s1, s2, clSwitch) KEYBT(s1, s2, clSwitch, 0, 0, KEYCODE(s1), KEYCODE(s2)) -KEYBT RUSSIAN_LOCALE [] = +KEYBT RUSSIAN_LOCALE [] = { /* Ј і */ KEYBTDECL(0x451, 0x401, true), /* 1 ! */ KEYBTDECL(0x31, 0x21, false), diff --git a/src/podcast/UBPodcastController.cpp b/src/podcast/UBPodcastController.cpp index 01fd9246..3e324047 100644 --- a/src/podcast/UBPodcastController.cpp +++ b/src/podcast/UBPodcastController.cpp @@ -354,7 +354,7 @@ void UBPodcastController::start() } else { - videoFileName = mPodcastRecordingPath + "/" + tr("Sankore Cast") + "." + mVideoEncoder->videoFileExtension(); + videoFileName = mPodcastRecordingPath + "/" + tr("OpenBoard Cast") + "." + mVideoEncoder->videoFileExtension(); } videoFileName = UBFileSystemUtils::nextAvailableFileName(videoFileName, " "); diff --git a/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp b/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp index 659f1cf2..7a6d7bdd 100644 --- a/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp +++ b/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp @@ -53,7 +53,7 @@ UBWindowsMediaVideoEncoder::~UBWindowsMediaVideoEncoder() bool UBWindowsMediaVideoEncoder::start() { - QString profile = UBFileSystemUtils::readTextFile(":/podcast/uniboard.prx"); + QString profile = UBFileSystemUtils::readTextFile(":/podcast/OpenBoard.prx"); profile.replace("{in.videoWidth}", QString("%1").arg(videoSize().width())); profile.replace("{in.videoHeight}", QString("%1").arg(videoSize().height())); diff --git a/src/podcast/youtube/UBYouTubePublisher.cpp b/src/podcast/youtube/UBYouTubePublisher.cpp index e6d22126..b8c62146 100644 --- a/src/podcast/youtube/UBYouTubePublisher.cpp +++ b/src/podcast/youtube/UBYouTubePublisher.cpp @@ -64,7 +64,7 @@ void UBYouTubePublisher::uploadVideo(const QString& videoFilePath) UBYouTubePublishingDialog pub(videoFilePath, UBApplication::mainWindow); pub.title->setText(QFileInfo(mVideoFilePath).completeBaseName()); - pub.keywords->setText(tr("Open-Sankore")); + pub.keywords->setText(qApp->applicationName()); QString defaultEMail = UBSettings::settings()->youTubeUserEMail->get().toString(); pub.email->setText(defaultEMail); @@ -111,7 +111,7 @@ void UBYouTubePublisher::postClientLoginRequest(const QString& userName, const Q QString payload = QString("Email=%1&Passwd=%2&service=youtube&source=%3") .arg(userName) .arg(password) - .arg(tr("OpenSankore")); + .arg(qApp->applicationName()); mAuthRequest->post(url, payload.toUtf8()); @@ -278,7 +278,7 @@ QString UBYouTubePublisher::youtubeMetadata() workingDescription = workingDescription.left(4900) + "..."; } - workingDescription += "\n\nhttp://www.open-sankore.org"; + workingDescription += "\n\nhttp://www.oe-f.org"; if(workingDescription.length() == 0) { diff --git a/src/web/browser/WBWebView.cpp b/src/web/browser/WBWebView.cpp index e943e5ff..4f9e2247 100644 --- a/src/web/browser/WBWebView.cpp +++ b/src/web/browser/WBWebView.cpp @@ -175,7 +175,7 @@ void WBWebPage::handleUnsupportedContent(QNetworkReply *reply) if (isPDF) { QMessageBox messageBox(mainWindow()); - messageBox.setText(tr("Download PDF Document: would you prefer to download the PDF file or add it to the current Sankore document?")); + messageBox.setText(tr("Download PDF Document: would you prefer to download the PDF file or add it to the current OpenBoard document?")); messageBox.addButton(tr("Download"), QMessageBox::AcceptRole); QAbstractButton *addButton = messageBox.addButton(tr("Add to Current Document"), QMessageBox::AcceptRole); @@ -380,7 +380,7 @@ QUrl WBWebView::url() const url = QWebView::url(); } catch(...) {} - + if (!url.isEmpty()) return url;