diff --git a/OpenBoard.packproj b/OpenBoard.packproj index a0933772..6aa13a51 100644 --- a/OpenBoard.packproj +++ b/OpenBoard.packproj @@ -75,7 +75,7 @@ GID 80 Path - build/macx/release/product/Open-Sankore.app + build/macx/release/product/OpenBoard.app Path Type 2 Privileges @@ -479,9 +479,9 @@ IFPkgDescriptionDeleteWarning IFPkgDescriptionDescription - Open-Sankore is an hardware independent interactive whiteboard + OpenBoard is an hardware independent interactive whiteboard IFPkgDescriptionTitle - Open-Sankoré + OpenBoard IFPkgDescriptionVersion 1.40.b.00 @@ -489,15 +489,15 @@ Display Information CFBundleGetInfoString - Open-Sankore 1.0 Copyrights © 2011 Open-Sankoré + OpenBoard 1.0 Copyrights © 2013 OpenBoard CFBundleIconFile - resources/macx/UniboardDmg.icns + resources/macx/OpenBoardDmg.icns CFBundleIconFile Path Type 2 CFBundleIdentifier - org.open-sankore.pkg.Open-Sankore + org.OpenBoard.pkg.OpenBoard CFBundleName - Open-Sankoré + OpenBoard CFBundleShortVersionString 1.40.b.00 @@ -534,7 +534,7 @@ IFPkgFlagPackageSelection 0 Name - Open-Sankore + OpenBoard Status 1 Type diff --git a/release.macx.sh b/release.macx.sh index 27dec389..f285973c 100755 --- a/release.macx.sh +++ b/release.macx.sh @@ -35,7 +35,7 @@ BASE_QT_TRANSLATIONS_DIRECTORY=../Qt4.8/translations function notify { GROWLNOTIFY=`which growlnotify` if [ -x "$GROWLNOTIFY" ]; then - $GROWLNOTIFY --name uniboard-build --iconpath /Developer/Applications/Xcode.app --message "$1" "Uniboard" + $GROWLNOTIFY --name OpenBoard-build --iconpath /Developer/Applications/Xcode.app --message "$1" "OpenBoard" fi printf "\033[32m--->\033[0m $1\n" } @@ -80,16 +80,16 @@ done } -trap "defaults write com.mnemis.Uniboard.release Running -bool NO" EXIT +trap "defaults write org.oe-f.OpenBoard.release Running -bool NO" EXIT -notify "Running Uniboard release script (`date`)" +notify "Running OpenBoard release script (`date`)" -script_is_running=`defaults read com.mnemis.Uniboard.release Running 2>/dev/null` +script_is_running=`defaults read org.oe-f.OpenBoard.release Running 2>/dev/null` if [[ $? -eq 0 ]] && [[ "$script_is_running" = "1" ]]; then trap EXIT abort "another release script already running" fi -defaults write com.mnemis.Uniboard.release Running -bool YES +defaults write org.oe-f.OpenBoard.release Running -bool YES # Check for executables checkExecutable "$QMAKE" @@ -135,8 +135,8 @@ else LAST_COMMITED_VERSION="`git describe $(git rev-list --tags --max-count=1)`" if [ "v$VERSION" != "$LAST_COMMITED_VERSION" ]; then echo creating a tag with the version $VERSION - git tag -a "v$VERSION" -m "Generated setup for v$VERSION" - git push origin --tags +# git tag -a "v$VERSION" -m "Generated setup for v$VERSION" +# git push origin --tags fi fi @@ -203,7 +203,7 @@ cp *.pdf "$VOLUME" cp -R "$APP" "$VOLUME" ln -s /Applications "$VOLUME" -$DMGUTIL --set --iconsize=96 --toolbar=false --icon=resources/macx/UniboardDmg.icns "$VOLUME" +$DMGUTIL --set --iconsize=96 --toolbar=false --icon=resources/macx/OpenBoard.icns "$VOLUME" $DMGUTIL --set --x=20 --y=60 --width=580 --height=440 "$VOLUME" $DMGUTIL --set --x=180 --y=120 "$VOLUME/`basename \"$APP\"`" $DMGUTIL --set --x=400 --y=120 "$VOLUME/Applications" diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc index 35dd8f34..2c86064b 100644 --- a/resources/OpenBoard.qrc +++ b/resources/OpenBoard.qrc @@ -208,7 +208,6 @@ webbrowser/notfound.html webbrowser/object-wrapper.html macx/PowerPointImport.applescript - macx/upgrade.sh podcast/OpenBoard.prx www/OpenBoard-web-player.html images/toolbar/tutorial.png diff --git a/resources/etc/Uniboard.css b/resources/etc/OpenBoard.css similarity index 100% rename from resources/etc/Uniboard.css rename to resources/etc/OpenBoard.css diff --git a/resources/macx/Info.plist b/resources/macx/Info.plist index c2bbbd02..79b49d76 100644 --- a/resources/macx/Info.plist +++ b/resources/macx/Info.plist @@ -8,14 +8,14 @@ CFBundleTypeIconFile ubz.icns CFBundleTypeName - com.mnemis.uniboard.document + org.oe-f.OpenBoard.document CFBundleTypeRole Editor LSHandlerRank Owner LSItemContentTypes - com.mnemis.uniboard.document + org.oe-f.OpenBoard.document @@ -49,19 +49,19 @@ CFBundleExecutable - Open-Sankore + OpenBoard CFBundleGetInfoString - Open-Sankore @SHORT_VERSION@ + OpenBoard @SHORT_VERSION@ CFBundleIconFile - Uniboard.icns + OpenBoard.icns CFBundleIdentifier - org.eduxia.open-sankore + org.oe-f.OpenBoard CFBundlePackageType APPL CFBundleShortVersionString 5.0.0 (rDEVELOPMENT) CFBundleSignature - UniB + OpenB CFBundleVersion 0 SUPublicDSAKeyFile @@ -70,9 +70,9 @@ UTTypeIdentifier - com.mnemis.uniboard.document + org.oe-f.OpenBoard.document UTTypeDescription - Open-Sankore document + OpenBoard document UTTypeConformsTo public.presentation diff --git a/resources/macx/Uniboard.icns b/resources/macx/OpenBoard.icns similarity index 100% rename from resources/macx/Uniboard.icns rename to resources/macx/OpenBoard.icns diff --git a/resources/macx/UniboardDmg.icns b/resources/macx/OpenBoardDmg.icns similarity index 100% rename from resources/macx/UniboardDmg.icns rename to resources/macx/OpenBoardDmg.icns diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Info.plist b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Info.plist similarity index 81% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Info.plist rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Info.plist index 93bab215..f60ec85e 100644 --- a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Info.plist +++ b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Info.plist @@ -3,11 +3,11 @@ CFBundleIdentifier - com.eduxia.pdfworkflow.savepdftoopensankore + org.oe-f.pdfworkflow.savepdftoopensankore CFBundleInfoDictionaryVersion 6.0 CFBundleName - Save PDF to Open-Sankoré + Save PDF to OpenBoard CFBundlePackageType BNDL CFBundleShortVersionString diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Dutch.lproj/InfoPlist.strings b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/Dutch.lproj/InfoPlist.strings similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Dutch.lproj/InfoPlist.strings rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/Dutch.lproj/InfoPlist.strings diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/English.lproj/InfoPlist.strings b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/English.lproj/InfoPlist.strings similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/English.lproj/InfoPlist.strings rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/English.lproj/InfoPlist.strings diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/French.lproj/InfoPlist.strings b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/French.lproj/InfoPlist.strings similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/French.lproj/InfoPlist.strings rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/French.lproj/InfoPlist.strings diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/German.lproj/InfoPlist.strings b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/German.lproj/InfoPlist.strings similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/German.lproj/InfoPlist.strings rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/German.lproj/InfoPlist.strings diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Italian.lproj/InfoPlist.strings b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/Italian.lproj/InfoPlist.strings similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Italian.lproj/InfoPlist.strings rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/Italian.lproj/InfoPlist.strings diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Japanese.lproj/InfoPlist.strings b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/Japanese.lproj/InfoPlist.strings similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Japanese.lproj/InfoPlist.strings rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/Japanese.lproj/InfoPlist.strings diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/da.lproj/InfoPlist.strings b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/da.lproj/InfoPlist.strings similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/da.lproj/InfoPlist.strings rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/da.lproj/InfoPlist.strings diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/fi.lproj/InfoPlist.strings b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/fi.lproj/InfoPlist.strings similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/fi.lproj/InfoPlist.strings rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/fi.lproj/InfoPlist.strings diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/ko.lproj/InfoPlist.strings b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/ko.lproj/InfoPlist.strings similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/ko.lproj/InfoPlist.strings rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/ko.lproj/InfoPlist.strings diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/no.lproj/InfoPlist.strings b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/no.lproj/InfoPlist.strings similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/no.lproj/InfoPlist.strings rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/no.lproj/InfoPlist.strings diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/pt.lproj/InfoPlist.strings b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/pt.lproj/InfoPlist.strings similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/pt.lproj/InfoPlist.strings rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/pt.lproj/InfoPlist.strings diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/ru.lproj/InfoPlist.strings b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/ru.lproj/InfoPlist.strings similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/ru.lproj/InfoPlist.strings rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/ru.lproj/InfoPlist.strings diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/sv.lproj/InfoPlist.strings b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/sv.lproj/InfoPlist.strings similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/sv.lproj/InfoPlist.strings rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/sv.lproj/InfoPlist.strings diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/zh_CN.lproj/InfoPlist.strings b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/zh_CN.lproj/InfoPlist.strings similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/zh_CN.lproj/InfoPlist.strings rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/zh_CN.lproj/InfoPlist.strings diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/zh_TW.lproj/InfoPlist.strings b/resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/zh_TW.lproj/InfoPlist.strings similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/zh_TW.lproj/InfoPlist.strings rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/Resources/zh_TW.lproj/InfoPlist.strings diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/document.wflow b/resources/macx/Save PDF to OpenBoard.workflow/Contents/document.wflow similarity index 100% rename from resources/macx/Save PDF to Open-Sankore.workflow/Contents/document.wflow rename to resources/macx/Save PDF to OpenBoard.workflow/Contents/document.wflow diff --git a/resources/macx/appcast-mac.xml b/resources/macx/appcast-mac.xml deleted file mode 100644 index 2d3e6fff..00000000 --- a/resources/macx/appcast-mac.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - Uniboard - http://www.mnemis.com - Uniboard Appcast - - Uniboard 4.5.4 - Download the new version of Uniboard 4 - http://assets.getuniboard.com/installer/Uniboard 4.5.4.dmg - 4.5.4.3093 - Thu, 9 Apr 2010 14:44:00 CET - - - Uniboard <%= version %> - Download the new version of Uniboard 4 - http://assets.getuniboard.com/installer/<%= installer_filename %> - <%= long_version %> - <%= rssdatetime %> - - - diff --git a/resources/macx/growl.applescript b/resources/macx/growl.applescript deleted file mode 100644 index 3c6b3662..00000000 --- a/resources/macx/growl.applescript +++ /dev/null @@ -1,28 +0,0 @@ -tell application "System Events" - set isRunning to  - (count of (every process whose name is "GrowlHelperApp")) > 0 -end tell - -if isRunning then - - tell application "GrowlHelperApp" - -- Make a list of all the notification types - -- that this script will ever send: - set the allNotificationsList to  - {"Uniboard Update Install"} - - set the enabledNotificationsList to  - {"Uniboard Update Install"} - - register as application  - "Uniboard" all notifications allNotificationsList  - default notifications enabledNotificationsList  - icon of application "Uniboard" - - notify with name  - "Uniboard Update Install" title  - "Uniboard" description  - "Uniboard is installing a new version." application name "Uniboard" - - end tell -end if \ No newline at end of file diff --git a/resources/macx/upgrade.sh b/resources/macx/upgrade.sh deleted file mode 100644 index 8685cc26..00000000 --- a/resources/macx/upgrade.sh +++ /dev/null @@ -1,34 +0,0 @@ -# -------------------------------------------------------------------- -# This program 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, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# --------------------------------------------------------------------- - -#!/bin/bash - -# -# Usage: upgrade.sh "Uniboard 4.3.5" "/Users/Name/Downloads/Uniboard 4.3.5.dmg" "/Applications/Uniboard.app" -# - -DMG_NAME=$1 -DMG_PATH=$2 -TARGET_PATH=$3 - -umount "$DMG_NAME" 2> /dev/null -hdiutil attach "$DMG_PATH" -nobrowse - -rm -rf "$TARGET_PATH" -cp -R "/Volumes/$DMG_NAME/Uniboard.app" "$TARGET_PATH" - -hdiutil detach "/Volumes/$DMG_NAME" - -open $TARGET_PATH diff --git a/src/frameworks/UBPlatformUtils_mac.mm b/src/frameworks/UBPlatformUtils_mac.mm index 1db80252..3e35ec82 100644 --- a/src/frameworks/UBPlatformUtils_mac.mm +++ b/src/frameworks/UBPlatformUtils_mac.mm @@ -74,12 +74,12 @@ void UBPlatformUtils::init() NSFileManager *fileManager = [NSFileManager defaultManager]; [fileManager removeFileAtPath:installedPath handler:nil]; // removing the old version of the script named Save PDF to Uniboard - [fileManager removeFileAtPath:[[[@"~/Library/PDF Services" stringByExpandingTildeInPath] stringByAppendingPathComponent:@"Save PDF to Uniboard"] stringByAppendingPathExtension:@"workflow"] handler:nil]; + [fileManager removeFileAtPath:[[[@"~/Library/PDF Services" stringByExpandingTildeInPath] stringByAppendingPathComponent:@"Save PDF to OpenBoard"] stringByAppendingPathExtension:@"workflow"] handler:nil]; [fileManager createDirectoryAtPath:[installedPath stringByDeletingLastPathComponent] attributes:nil]; BOOL copyOK = [fileManager copyPath:currentPath toPath:installedPath handler:nil]; if (!copyOK) { - qWarning("Could not install the 'Save PDF to Open-Sankoré workflow"); + qWarning("Could not install the 'Save PDF to OpenBoard workflow"); } }