Commit 907c0848 authored by Claudio Valerio's avatar Claudio Valerio

first try on linux after changing name

parent f47733ee
......@@ -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
......
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 \
......
......@@ -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 <http://www.gnu.org/licenses/>.
# ---------------------------------------------------------------------
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 <http://www.gnu.org/licenses/>.
# ---------------------------------------------------------------------
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 <http://www.gnu.org/licenses/>.
# ---------------------------------------------------------------------
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 <claudio@open-sankore.org> `date`" >> "$CHANGE_LOG_FILE"
echo "-- Claudio Valerio <claudio.valerio@oe-f.org> `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 <dev@open-sankore.org>" >> "$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 <dev@oe-f.org>" >> "$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
......@@ -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/"
......
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 <http://www.gnu.org/licenses/>.
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
......@@ -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 <http://www.gnu.org/licenses/>.
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
<RCC>
<qresource prefix="/">
<file>images/uniboard.png</file>
<file>images/OpenBoard.png</file>
<file>images/bigUniboard.png</file>
<file>images/close.svg</file>
<file>images/increase.svg</file>
......@@ -209,8 +209,8 @@
<file>webbrowser/object-wrapper.html</file>
<file alias="PowerPointImport.applescript">macx/PowerPointImport.applescript</file>
<file>macx/upgrade.sh</file>
<file>podcast/uniboard.prx</file>
<file>www/uniboard-web-player.html</file>
<file>podcast/OpenBoard.prx</file>
<file>www/OpenBoard-web-player.html</file>
<file>images/toolbar/tutorial.png</file>
<file>images/edit-mode.svg</file>
<file>images/save.svg</file>
......
......@@ -189,7 +189,7 @@
</layout>
</widget>
<resources>
<include location="../sankore.qrc"/>
<include location="../OpenBoard.qrc"/>
</resources>
<connections/>
</ui>
......@@ -244,7 +244,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="../sankore.qrc"/>
<include location="../OpenBoard.qrc"/>
</resources>
<connections/>
</ui>
......@@ -14,8 +14,8 @@
<string>Open-Sankoré</string>
</property>
<property name="windowIcon">
<iconset resource="../sankore.qrc">
<normaloff>:/images/uniboard.png</normaloff>:/images/uniboard.png</iconset>
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/OpenBoard.png</normaloff>:/images/OpenBoard.png</iconset>
</property>
<property name="iconSize">
<size>
......@@ -178,7 +178,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/stylus.png</normaloff>:/images/toolbar/stylus.png</iconset>
</property>
<property name="text">
......@@ -196,7 +196,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/background.png</normaloff>:/images/toolbar/background.png</iconset>
</property>
<property name="text">
......@@ -208,7 +208,7 @@
</action>
<action name="actionUndo">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/undoOn.png</normaloff>:/images/toolbar/undoOn.png</iconset>
</property>
<property name="text">
......@@ -220,7 +220,7 @@
</action>
<action name="actionRedo">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/redoOn.png</normaloff>:/images/toolbar/redoOn.png</iconset>
</property>
<property name="text">
......@@ -232,7 +232,7 @@
</action>
<action name="actionBack">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/previousPageOn.png</normaloff>:/images/toolbar/previousPageOn.png</iconset>
</property>
<property name="text">
......@@ -247,7 +247,7 @@
</action>
<action name="actionForward">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/nextPageOn.png</normaloff>:/images/toolbar/nextPageOn.png</iconset>
</property>
<property name="text">
......@@ -265,7 +265,7 @@
<bool>false</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/documents.png</normaloff>:/images/toolbar/documents.png</iconset>
</property>
<property name="text">
......@@ -280,7 +280,7 @@
</action>
<action name="actionWeb">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/web.png</normaloff>:/images/toolbar/web.png</iconset>
</property>
<property name="text">
......@@ -301,7 +301,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/smallPen.png</normaloff>:/images/toolbar/smallPen.png</iconset>
</property>
<property name="text">
......@@ -316,7 +316,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/mediumPen.png</normaloff>:/images/toolbar/mediumPen.png</iconset>
</property>
<property name="text">
......@@ -331,7 +331,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/largePen.png</normaloff>:/images/toolbar/largePen.png</iconset>
</property>
<property name="text">
......@@ -343,7 +343,7 @@
</action>
<action name="actionQuit">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/quitOn.png</normaloff>:/images/toolbar/quitOn.png</iconset>
</property>
<property name="text">
......@@ -364,7 +364,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/smallEraser.png</normaloff>:/images/toolbar/smallEraser.png</iconset>
</property>
<property name="text">
......@@ -382,7 +382,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/mediumEraser.png</normaloff>:/images/toolbar/mediumEraser.png</iconset>
</property>
<property name="text">
......@@ -397,7 +397,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/largeEraser.png</normaloff>:/images/toolbar/largeEraser.png</iconset>
</property>
<property name="text">
......@@ -409,7 +409,7 @@
</action>
<action name="actionColor0">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/color.png</normaloff>:/images/toolbar/color.png</iconset>
</property>
<property name="text">
......@@ -421,7 +421,7 @@
</action>
<action name="actionColor1">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/color.png</normaloff>:/images/toolbar/color.png</iconset>
</property>
<property name="text">
......@@ -430,7 +430,7 @@
</action>
<action name="actionColor2">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/color.png</normaloff>:/images/toolbar/color.png</iconset>
</property>
<property name="text">
......@@ -439,7 +439,7 @@
</action>
<action name="actionColor3">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/color.png</normaloff>:/images/toolbar/color.png</iconset>
</property>
<property name="text">
......@@ -448,7 +448,7 @@
</action>
<action name="actionWebBack">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/previousPageOn.png</normaloff>:/images/toolbar/previousPageOn.png</iconset>
</property>
<property name="text">
......@@ -463,7 +463,7 @@
</action>
<action name="actionWebForward">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/nextPageOn.png</normaloff>:/images/toolbar/nextPageOn.png</iconset>
</property>
<property name="text">
......@@ -478,7 +478,7 @@
</action>
<action name="actionWebReload">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/reload.png</normaloff>:/images/toolbar/reload.png</iconset>
</property>
<property name="text">
......@@ -490,7 +490,7 @@
</action>
<action name="actionHome">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/home.png</normaloff>:/images/toolbar/home.png</iconset>
</property>
<property name="text">
......@@ -502,7 +502,7 @@
</action>
<action name="actionBookmarks">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/bookmarks.png</normaloff>:/images/toolbar/bookmarks.png</iconset>
</property>
<property name="text">
......@@ -514,7 +514,7 @@
</action>
<action name="actionAddBookmark">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/addBookmark.png</normaloff>:/images/toolbar/addBookmark.png</iconset>
</property>
<property name="text">
......@@ -526,7 +526,7 @@
</action>
<action name="actionBoard">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/board.png</normaloff>:/images/toolbar/board.png</iconset>
</property>
<property name="text">
......@@ -544,7 +544,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/clearPage.png</normaloff>:/images/toolbar/clearPage.png</iconset>
</property>
<property name="text">
......@@ -556,7 +556,7 @@
</action>
<action name="actionPreferences">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/settings.png</normaloff>:/images/toolbar/settings.png</iconset>
</property>
<property name="text">
......@@ -571,7 +571,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/library.png</normaloff>:/images/toolbar/library.png</iconset>
</property>
<property name="text">
......@@ -586,7 +586,7 @@
</action>
<action name="actionMenu">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/menu.png</normaloff>:/images/toolbar/menu.png</iconset>
</property>
<property name="text">
......@@ -598,7 +598,7 @@
</action>
<action name="actionDesktop">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/display.png</normaloff>:/images/toolbar/display.png</iconset>
</property>
<property name="text">
......@@ -613,7 +613,7 @@
</action>
<action name="actionWebBigger">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/stylusPalette/zoomIn.png</normaloff>:/images/stylusPalette/zoomIn.png</iconset>
</property>
<property name="text">
......@@ -628,7 +628,7 @@
</action>
<action name="actionWebSmaller">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/stylusPalette/zoomOut.png</normaloff>:/images/stylusPalette/zoomOut.png</iconset>
</property>
<property name="text">
......@@ -643,7 +643,7 @@
</action>
<action name="actionNewFolder">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/newFolder.png</normaloff>:/images/toolbar/newFolder.png</iconset>
</property>
<property name="text">
......@@ -655,7 +655,7 @@
</action>
<action name="actionNewDocument">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/newDocument.png</normaloff>:/images/toolbar/newDocument.png</iconset>
</property>
<property name="text">
......@@ -667,7 +667,7 @@
</action>
<action name="actionImport">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/import.png</normaloff>:/images/toolbar/import.png</iconset>
</property>
<property name="text">
......@@ -679,7 +679,7 @@
</action>
<action name="actionExport">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/export.png</normaloff>:/images/toolbar/export.png</iconset>
</property>
<property name="text">
......@@ -691,7 +691,7 @@
</action>
<action name="actionOpen">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/open.png</normaloff>:/images/toolbar/open.png</iconset>
</property>
<property name="text">
......@@ -706,7 +706,7 @@
</action>
<action name="actionDuplicate">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/duplicate.png</normaloff>:/images/toolbar/duplicate.png</iconset>
</property>
<property name="text">
......@@ -718,7 +718,7 @@
</action>
<action name="actionDelete">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/deleteDocument.png</normaloff>:/images/toolbar/deleteDocument.png</iconset>
</property>
<property name="text">
......@@ -733,7 +733,7 @@
</action>
<action name="actionAddToWorkingDocument">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/addToWorkingDoc.png</normaloff>:/images/toolbar/addToWorkingDoc.png</iconset>
</property>
<property name="text">
......@@ -745,7 +745,7 @@
</action>
<action name="actionDocumentAdd">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/addToPage.png</normaloff>:/images/toolbar/addToPage.png</iconset>
</property>
<property name="text">
......@@ -757,7 +757,7 @@
</action>
<action name="actionRename">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/rename.png</normaloff>:/images/toolbar/rename.png</iconset>
</property>
<property name="text">
......@@ -772,7 +772,7 @@
</action>
<action name="actionDocumentTools">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/tools.png</normaloff>:/images/toolbar/tools.png</iconset>
</property>
<property name="text">
......@@ -787,7 +787,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/tools.png</normaloff>:/images/toolbar/tools.png</iconset>
</property>
<property name="text">
......@@ -805,7 +805,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/display.png</normaloff>:/images/toolbar/display.png</iconset>
</property>
<property name="text">
......@@ -817,7 +817,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/addToPage.png</normaloff>:/images/toolbar/addToPage.png</iconset>
</property>
<property name="text">
......@@ -838,7 +838,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/addToPage.png</normaloff>:/images/toolbar/addToPage.png</iconset>
</property>
<property name="text">
......@@ -862,7 +862,7 @@
<bool>false</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/addToPage.png</normaloff>:/images/toolbar/addToPage.png</iconset>
</property>
<property name="text">
......@@ -880,7 +880,7 @@
</action>
<action name="actionStopLoading">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/deleteDocument.png</normaloff>:/images/toolbar/deleteDocument.png</iconset>
</property>
<property name="text">
......@@ -892,7 +892,7 @@
</action>
<action name="actionCut">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/cut.png</normaloff>:/images/toolbar/cut.png</iconset>
</property>
<property name="text">
......@@ -904,7 +904,7 @@
</action>
<action name="actionCopy">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/copy.png</normaloff>:/images/toolbar/copy.png</iconset>
</property>
<property name="text">
......@@ -916,7 +916,7 @@
</action>
<action name="actionPaste">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/paste.png</normaloff>:/images/toolbar/paste.png</iconset>
</property>
<property name="text">
......@@ -931,7 +931,7 @@
</action>
<action name="actionSleep">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/extraPalette/blackout.png</normaloff>
<normalon>:/images/extraPalette/blackoutOn.png</normalon>:/images/extraPalette/blackout.png</iconset>
</property>
......@@ -947,7 +947,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/extraPalette/keyboard.png</normaloff>
<normalon>:/images/extraPalette/keyboardOn.png</normalon>:/images/extraPalette/keyboard.png</iconset>
</property>
......@@ -963,7 +963,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/backgroundPalette/background1.svg</normaloff>
<normalon>:/images/backgroundPalette/background1On.svg</normalon>:/images/backgroundPalette/background1.svg</iconset>
</property>
......@@ -982,7 +982,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/backgroundPalette/background2.svg</normaloff>
<normalon>:/images/backgroundPalette/background2On.svg</normalon>:/images/backgroundPalette/background2.svg</iconset>
</property>
......@@ -1001,7 +1001,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/backgroundPalette/background3.svg</normaloff>
<normalon>:/images/backgroundPalette/background3On.svg</normalon>:/images/backgroundPalette/background3.svg</iconset>
</property>
......@@ -1020,7 +1020,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/backgroundPalette/background4.svg</normaloff>
<normalon>:/images/backgroundPalette/background4On.svg</normalon>:/images/backgroundPalette/background4.svg</iconset>
</property>
......@@ -1039,7 +1039,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/record.png</normaloff>:/images/toolbar/record.png</iconset>
</property>
<property name="text">
......@@ -1054,7 +1054,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/record.png</normaloff>
<normalon>:/images/toolbar/stop.png</normalon>:/images/toolbar/record.png</iconset>
</property>
......@@ -1067,7 +1067,7 @@
</action>
<action name="actionEraseItems">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/erasePalette/eraseItem.svg</normaloff>:/images/erasePalette/eraseItem.svg</iconset>
</property>
<property name="text">
......@@ -1079,7 +1079,7 @@
</action>
<action name="actionEraseAnnotations">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/erasePalette/eraseAnnotation.svg</normaloff>:/images/erasePalette/eraseAnnotation.svg</iconset>
</property>
<property name="text">
......@@ -1091,7 +1091,7 @@
</action>
<action name="actionClearPage">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/erasePalette/eraseAll.svg</normaloff>:/images/erasePalette/eraseAll.svg</iconset>
</property>
<property name="text">
......@@ -1103,7 +1103,7 @@
</action>
<action name="actionAdd">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/addToPage.png</normaloff>:/images/toolbar/addToPage.png</iconset>
</property>
<property name="text">
......@@ -1118,7 +1118,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/stylusPalette/pen.png</normaloff>
<normalon>:/images/stylusPalette/penOn.png</normalon>:/images/stylusPalette/pen.png</iconset>
</property>
......@@ -1137,7 +1137,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/stylusPalette/eraser.png</normaloff>
<normalon>:/images/stylusPalette/eraserOn.png</normalon>:/images/stylusPalette/eraser.png</iconset>
</property>
......@@ -1156,7 +1156,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/stylusPalette/marker.png</normaloff>
<normalon>:/images/stylusPalette/markerOn.png</normalon>:/images/stylusPalette/marker.png</iconset>
</property>
......@@ -1175,7 +1175,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/stylusPalette/arrow.png</normaloff>
<normalon>:/images/stylusPalette/arrowOn.png</normalon>:/images/stylusPalette/arrow.png</iconset>
</property>
......@@ -1194,7 +1194,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/stylusPalette/hand.png</normaloff>
<normalon>:/images/stylusPalette/handOn.png</normalon>:/images/stylusPalette/hand.png</iconset>
</property>
......@@ -1210,7 +1210,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/stylusPalette/zoomIn.png</normaloff>
<normalon>:/images/stylusPalette/zoomInOn.png</normalon>:/images/stylusPalette/zoomIn.png</iconset>
</property>
......@@ -1223,7 +1223,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/stylusPalette/zoomOut.png</normaloff>
<normalon>:/images/stylusPalette/zoomOutOn.png</normalon>:/images/stylusPalette/zoomOut.png</iconset>
</property>
......@@ -1236,7 +1236,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/stylusPalette/laser.png</normaloff>
<normalon>:/images/stylusPalette/laserOn.png</normalon>:/images/stylusPalette/laser.png</iconset>
</property>
......@@ -1255,7 +1255,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/stylusPalette/line.png</normaloff>
<normalon>:/images/stylusPalette/lineOn.png</normalon>:/images/stylusPalette/line.png</iconset>
</property>
......@@ -1274,7 +1274,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/stylusPalette/text.png</normaloff>
<normalon>:/images/stylusPalette/textOn.png</normalon>:/images/stylusPalette/text.png</iconset>
</property>
......@@ -1293,7 +1293,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/stylusPalette/captureArea.png</normaloff>
<normalon>:/images/stylusPalette/captureAreaOn.png</normalon>:/images/stylusPalette/captureArea.png</iconset>
</property>
......@@ -1306,7 +1306,7 @@
</action>
<action name="actionAddItemToCurrentPage">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/addItemToCurrentPage.svg</normaloff>:/images/addItemToCurrentPage.svg</iconset>
</property>
<property name="text">
......@@ -1321,7 +1321,7 @@
</action>
<action name="actionAddItemToNewPage">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/addItemToNewPage.svg</normaloff>:/images/addItemToNewPage.svg</iconset>
</property>
<property name="text">
......@@ -1333,7 +1333,7 @@
</action>
<action name="actionAddItemToLibrary">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/addItemToLibrary.svg</normaloff>:/images/addItemToLibrary.svg</iconset>
</property>
<property name="text">
......@@ -1348,7 +1348,7 @@
<bool>false</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/newDocument.png</normaloff>:/images/toolbar/newDocument.png</iconset>
</property>
<property name="text">
......@@ -1360,7 +1360,7 @@
</action>
<action name="actionNewPage">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/addItemToCurrentPage.svg</normaloff>:/images/addItemToCurrentPage.svg</iconset>
</property>
<property name="text">
......@@ -1372,7 +1372,7 @@
</action>
<action name="actionDuplicatePage">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/addItemToNewPage.svg</normaloff>:/images/addItemToNewPage.svg</iconset>
</property>
<property name="text">
......@@ -1384,7 +1384,7 @@
</action>
<action name="actionImportPage">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/addItemToLibrary.svg</normaloff>:/images/addItemToLibrary.svg</iconset>
</property>
<property name="text">
......@@ -1402,7 +1402,7 @@
<bool>false</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/pause.png</normaloff>:/images/toolbar/pause.png</iconset>
</property>
<property name="text">
......@@ -1414,7 +1414,7 @@
</action>
<action name="actionPodcastConfig">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/settings.png</normaloff>:/images/toolbar/settings.png</iconset>
</property>
<property name="text">
......@@ -1426,7 +1426,7 @@
</action>
<action name="actionWebTrapFlash">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/addToolToLibrary.png</normaloff>:/images/toolbar/addToolToLibrary.png</iconset>
</property>
<property name="text">
......@@ -1441,7 +1441,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/extraPalette/webTrap.png</normaloff>
<normalon>:/images/extraPalette/webTrapEnabled.png</normalon>:/images/extraPalette/webTrap.png</iconset>
</property>
......@@ -1454,7 +1454,7 @@
</action>
<action name="actionWebCustomCapture">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/captureArea.png</normaloff>:/images/toolbar/captureArea.png</iconset>
</property>
<property name="text">
......@@ -1466,7 +1466,7 @@
</action>
<action name="actionWebWindowCapture">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/captureWindow.png</normaloff>:/images/toolbar/captureWindow.png</iconset>
</property>
<property name="text">
......@@ -1481,7 +1481,7 @@
<bool>false</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/extraPalette/oEmbed.png</normaloff>:/images/extraPalette/oEmbed.png</iconset>
</property>
<property name="text">
......@@ -1496,7 +1496,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/eyeClosed.png</normaloff>
<normalon>:/images/toolbar/eyeOpened.png</normalon>:/images/toolbar/eyeClosed.png</iconset>
</property>
......@@ -1515,7 +1515,7 @@
</action>
<action name="actionEraseDesktopAnnotations">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/erasePalette/eraseAnnotation.svg</normaloff>:/images/erasePalette/eraseAnnotation.svg</iconset>
</property>
<property name="text">
......@@ -1527,7 +1527,7 @@
</action>
<action name="actionEduMedia">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/addToolToLibrary.png</normaloff>:/images/toolbar/addToolToLibrary.png</iconset>
</property>
<property name="text">
......@@ -1539,7 +1539,7 @@
</action>
<action name="actionTutorial">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/tutorial.png</normaloff>:/images/toolbar/tutorial.png</iconset>
</property>
<property name="text">
......@@ -1551,7 +1551,7 @@
</action>
<action name="actionCheckUpdate">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/updates.png</normaloff>:/images/toolbar/updates.png</iconset>
</property>
<property name="text">
......@@ -1560,7 +1560,7 @@
</action>
<action name="actionHideApplication">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/hide.png</normaloff>:/images/toolbar/hide.png</iconset>
</property>
<property name="text">
......@@ -1581,7 +1581,7 @@
<bool>false</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/toolbar/group.png</normaloff>
<normalon>:/images/toolbar/ungroup.png</normalon>:/images/toolbar/group.png</iconset>
</property>
......@@ -1597,7 +1597,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/stylusPalette/handPlay.png</normaloff>
<normalon>:/images/stylusPalette/handPlayOn.png</normalon>:/images/stylusPalette/handPlay.png</iconset>
</property>
......@@ -1610,7 +1610,7 @@
</action>
<action name="actionEraseBackground">
<property name="icon">
<iconset resource="../sankore.qrc">
<iconset resource="../OpenBoard.qrc">
<normaloff>:/images/erasePalette/eraseBackground.svg</normaloff>:/images/erasePalette/eraseBackground.svg</iconset>
</property>
<property name="text">
......@@ -1622,7 +1622,7 @@
</action>
</widget>
<resources>
<include location="../sankore.qrc"/>
<include location="../OpenBoard.qrc"/>
</resources>
<connections/>
</ui>
......@@ -24,7 +24,7 @@
<item row="1" column="0">
<widget class="QTabWidget" name="mainTabWidget">
<property name="currentIndex">
<number>3</number>
<number>5</number>
</property>
<widget class="QWidget" name="displayTab">
<attribute name="title">
......@@ -637,12 +637,12 @@
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
&lt;tr&gt;
&lt;td style=&quot;border: none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu';&quot;&gt;Open-Sankoré version 2.0, Copyright (C) 2010-2012 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)&lt;br /&gt;&lt;br /&gt;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.&lt;br /&gt;Vous pouvez consulter et charger le code source du logiciel sur &lt;/span&gt;&lt;a href=&quot;https://github.com/Sankore&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; text-decoration: underline; color:#0000ff;&quot;&gt;&amp;lt;https://github.com/Sankore&amp;gt;&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu';&quot;&gt;&lt;br /&gt;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.&lt;br /&gt;Veuillez consulter la licence GNU General Public Licence située dans l'onglet Licences ou consulter le site &lt;/span&gt;&lt;a href=&quot;http://www.gnu.org/licenses/&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; text-decoration: underline; color:#0000ff;&quot;&gt;&amp;lt;http://www.gnu.org/licenses/&amp;gt;&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu';&quot;&gt;.&lt;br /&gt;&lt;br /&gt;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 &amp;quot;OpenSSL&amp;quot; library (or with modified versions of it that use the same license as the &amp;quot;OpenSSL&amp;quot; library). You can find the source code of this software at &lt;/span&gt;&lt;a href=&quot;https://github.com/Sankore&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; text-decoration: underline; color:#0000ff;&quot;&gt;&amp;lt;https://github.com/Sankore&amp;gt;&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu';&quot;&gt;&lt;br /&gt;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.&lt;br /&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu';&quot;&gt;Contact : &lt;br /&gt;Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)&lt;br /&gt;Délégation Interministérielle à l'Education Numérique en Afrique&lt;br /&gt;20 Avenue Ségur Paris 75007&lt;br /&gt;Téléphone : 01 43 17 68 08&lt;br /&gt;email: &lt;/span&gt;&lt;a href=&quot;mailto:contact@sankore.org&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; text-decoration: underline; color:#0000ff;&quot;&gt;contact@sankore.org&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu';&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;Open-Sankoré version 2.0, Copyright (C) 2010-2012 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)&lt;br /&gt;&lt;br /&gt;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.&lt;br /&gt;Vous pouvez consulter et charger le code source du logiciel sur &lt;/span&gt;&lt;a href=&quot;https://github.com/Sankore&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;&quot;&gt;&amp;lt;https://github.com/Sankore&amp;gt;&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;&lt;br /&gt;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.&lt;br /&gt;Veuillez consulter la licence GNU General Public Licence située dans l'onglet Licences ou consulter le site &lt;/span&gt;&lt;a href=&quot;http://www.gnu.org/licenses/&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;&quot;&gt;&amp;lt;http://www.gnu.org/licenses/&amp;gt;&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;.&lt;br /&gt;&lt;br /&gt;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 &amp;quot;OpenSSL&amp;quot; library (or with modified versions of it that use the same license as the &amp;quot;OpenSSL&amp;quot; library). You can find the source code of this software at &lt;/span&gt;&lt;a href=&quot;https://github.com/Sankore&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;&quot;&gt;&amp;lt;https://github.com/Sankore&amp;gt;&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;&lt;br /&gt;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.&lt;br /&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;Contact : &lt;br /&gt;Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)&lt;br /&gt;Délégation Interministérielle à l'Education Numérique en Afrique&lt;br /&gt;20 Avenue Ségur Paris 75007&lt;br /&gt;Téléphone : 01 43 17 68 08&lt;br /&gt;email: &lt;/span&gt;&lt;a href=&quot;mailto:contact@sankore.org&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;&quot;&gt;contact@sankore.org&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;&amp;quot;&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
......@@ -854,7 +854,7 @@ p, li { white-space: pre-wrap; }
</widget>
<widget class="QWidget" name="zlibTab">
<attribute name="title">
<string>zlib</string>
<string notr="true">zlib</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
......@@ -899,7 +899,7 @@ jloup@gzip.org madler@alumni.caltech.edu</string>
</widget>
<widget class="QWidget" name="XpdfTab">
<attribute name="title">
<string>Xpdf</string>
<string notr="true">Xpdf</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
......@@ -1611,7 +1611,7 @@ Public License instead of this License. But first, please read
</widget>
<widget class="QWidget" name="QuaZIPTab">
<attribute name="title">
<string>QuaZIP</string>
<string notr="true">QuaZIP</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
......@@ -1981,7 +1981,7 @@ Public License instead of this License.
</widget>
<widget class="QWidget" name="sankoreTab">
<attribute name="title">
<string>Open-Sankoré</string>
<string notr="true">OpenBoard</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
......@@ -1993,7 +1993,11 @@ Public License instead of this License.
<string notr="true"/>
</property>
<property name="plainText">
<string notr="true">Copyright (C) 2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
<string notr="true">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
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:16pt; font-weight:600;&quot;&gt;Translations&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;A special thanks to:&lt;/span&gt;&lt;/p&gt;
&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:600;&quot; style=&quot; margin-top:16px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium; font-weight:400;&quot;&gt;Alexander Angelov and Iva Ninova for Bulgarian&lt;/span&gt;&lt;/li&gt;
&lt;li style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium;&quot;&gt;Francesc Busquets for Catalan&lt;/span&gt;&lt;/li&gt;
&lt;li style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium;&quot;&gt;Jaroslav Krejčí, Janek Wagner for Czech&lt;/span&gt;&lt;/li&gt;
&lt;li style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium;&quot;&gt;Geert Kraeye and Derk Klomp for Dutch&lt;/span&gt;&lt;/li&gt;
&lt;li style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium;&quot;&gt;Christian Oïhénart and François Bocquet for French&lt;/span&gt;&lt;/li&gt;
&lt;li style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium;&quot;&gt;Hans-Peter Zahno and Klaus Tenner for German&lt;/span&gt;&lt;/li&gt;
&lt;li style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium;&quot;&gt;Yannis Kiolalis for Greek&lt;/span&gt;&lt;/li&gt;
&lt;li style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium;&quot;&gt;Antonello Comi and Marco Menardi for Italian&lt;/span&gt;&lt;/li&gt;
&lt;li style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium;&quot;&gt;Didier Clerc for Japanese&lt;/span&gt;&lt;/li&gt;
&lt;li style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium;&quot;&gt;Faraniaina Domoina Rabarijaona for Malagasy&lt;/span&gt;&lt;/li&gt;
&lt;li style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium;&quot;&gt;Patricia Fisch and César Marques for Portuguese&lt;/span&gt;&lt;/li&gt;
&lt;li style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium;&quot;&gt;Ilia Ryabokon for Russian&lt;/span&gt;&lt;/li&gt;
&lt;li style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium;&quot;&gt;Anki Chen for Traditional Chinese&lt;/span&gt;&lt;/li&gt;
&lt;li style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium;&quot;&gt;Jaroslav Ryník for Slovak&lt;/span&gt;&lt;/li&gt;
&lt;li style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium;&quot;&gt;Dorian Fuentes and Juan José Gutiérrez Aparicio for Spanish&lt;/span&gt;&lt;/li&gt;
&lt;li style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium;&quot;&gt;Ferhat Ozkasgarli for Turkish&lt;/span&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;OpenBoard 1.00.00&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;OpenBoard is copyright (c) 2013 . All rights reserved.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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 &amp;quot;OpenSSL&amp;quot; library (or with modified versions of it that use the same license as the &amp;quot;OpenSSL&amp;quot; library). You can find the source code of this software at &amp;lt;https://github.com/uniboard&amp;gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Contact :&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Open Education Foundation&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;c/o FBT Avocats SA&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Rue du 31-Décembre 47&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;1207 Genève&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;openeducationfoundation.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;openeducationfoundation.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;oe-f.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;oe-f.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;email: &lt;a href=&quot;mailto:contact@oe-f.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;contact@oe-f.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
......
......@@ -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 */
......
......@@ -118,5 +118,5 @@ QString UBExportDocument::exportExtention()
QString UBExportDocument::exportName()
{
return tr("Export to Sankore Format");
return tr("Export to OpenBoard Format");
}
......@@ -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."));
......
......@@ -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()));
......
......@@ -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);
......
......@@ -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)
......
......@@ -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();
}
......
......@@ -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;
......
......@@ -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
......
......@@ -46,7 +46,7 @@ UBDesktopPalette::UBDesktopPalette(QWidget *parent, UBRightPalette* _rightPalett
{
QList<QAction*> 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;
......
......@@ -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)))
{
......
......@@ -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)
......
......@@ -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]);
......
......@@ -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),
......
......@@ -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, " ");
......
......@@ -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()));
......
......@@ -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)
{
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment