Merge branch 'master' of github.com:Sankore/Sankore-3.1

.gitignore

@@ -50,3 +50,8 @@ Thumbs.db
 ###############
 build
 install
+
+# Translation files #
+#####################
+*.qm
+

Open-Sankore.packproj

@@ -433,6 +433,8 @@
 					<dict>
 						<key>Path</key>
 						<string></string>
+						<key>Path Type</key>
+						<integer>2</integer>
 						<key>Status</key>
 						<false/>
 					</dict>

Sankore_3.1.pro

@@ -166,7 +166,7 @@ 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 Uniboard.workflow"
+   UB_MACX_EXTRAS.files = "resources/macx/Save PDF to Open-Sankore.workflow"
    UB_MACX_EXTRAS.path = "$$RESOURCES_DIR"
    UB_I18N.path = $$DESTDIR/i18n # not used
 

release.linux.sh

@@ -22,6 +22,7 @@ rm -rf install
 QT_PATH="/usr/local/Trolltech/Qt-4.7.3"
 PLUGINS_PATH="$QT_PATH/plugins"
 QMAKE_PATH="$QT_PATH/bin/qmake"
+LRELEASES="/usr/local/Trolltech/Qt-4.7.3/bin/lrelease"
 
 if [ ! -e "$QMAKE_PATH" ]; then
     echo "qmake command not found at $QMAKE_PATH"
@@ -38,6 +39,8 @@ $QMAKE_PATH -spec linux-g++
 
 make -j 4 release-install
 
+$LRELEASES "Sankore_3.1.pro"
+
 VERSION=`cat build/linux/release/version`
 if [ ! -f build/linux/release/version ]; then
     echo "version not found"

release.macx.sh

@@ -14,14 +14,16 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # ---------------------------------------------------------------------
 
+BASE_TROLLTECH_DIRECTORY=/usr/local/Trolltech/Qt-4.7.3
 # Executables
-QMAKE="/usr/local/Trolltech/Qt-4.7.3/bin/qmake"
-MACDEPLOYQT=/usr/local/Trolltech/Qt-4.7.3/bin/macdeployqt
+QMAKE=$BASE_TROLLTECH_DIRECTORY/bin/qmake
+MACDEPLOYQT=$BASE_TROLLTECH_DIRECTORY/bin/macdeployqt
 DMGUTIL="`pwd`/../Sankore-ThirdParty/refnum/dmgutil/dmgutil.pl"
 DSYMUTIL=/usr/bin/dsymutil
 STRIP=/usr/bin/strip
 PLISTBUDDY=/usr/libexec/PlistBuddy
 ICEBERG=/usr/local/bin/freeze
+LRELEASE=$BASE_TROLLTECH_DIRECTORY/bin/lrelease
 
 # Directories
 BUILD_DIR="build/macx/release"
@@ -69,7 +71,7 @@ checkExecutable "$DSYMUTIL"
 checkExecutable "$STRIP"
 checkExecutable "$PLISTBUDDY"
 checkExecutable "$ICEBERG"
-
+checkExecutable "$LRELEASE"
 
 # delete the build directory
 notify "Cleaning ..."
@@ -86,6 +88,8 @@ $QMAKE_CMD
 notify "Compiling ..."
 make -j4 release
 
+$LRELEASE "Sankore_3.1.pro"
+
 VERSION=`cat "$BUILD_DIR/version"`
 if [ ! -f "$BUILD_DIR/version" ]; then
     echo "version not found"
@@ -99,9 +103,9 @@ else
     fi
 fi
   
-#if [ $? != 0 ]; then
-#    abort "compilation failed"
-#fi
+if [ $? != 0 ]; then
+    abort "compilation failed"
+fi
 
 
 NAME="Open-Sankore"
@@ -135,7 +139,10 @@ $DSYMUTIL "$APP/Contents/MacOS/Open-Sankore" -o "$DSYM"
 $STRIP -S "$APP/Contents/MacOS/Open-Sankore"
 
 if [ "$1" == "pkg" ]; then
-    ICEBERG_CONFIG_FILE="Open-Sankore.packproj"
+    BASE_ICEBERG_CONFIG_FILE="Open-Sankore.packproj"
+    #copy the standard file for working with
+    ICEBERG_CONFIG_FILE="Open-Sankore-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"
     $PLISTBUDDY -c "Set :Hierarchy:Attributes:Settings:Display\ Information:CFBundleShortVersionString $VERSION" "$ICEBERG_CONFIG_FILE"
@@ -149,6 +156,10 @@ if [ "$1" == "pkg" ]; then
 	mkdir -p "${PRODUCT_DIR}"
     fi
     $ICEBERG $ICEBERG_CONFIG_FILE 
+
+    #clean up mess
+    rm -rf $ICEBERG_CONFIG_FILE
+
     exit 0
 fi
 

release.win7.vc9.bat

@@ -23,6 +23,7 @@ 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 PATH=%QT_BIN%;%PATH%;%WIN_SDK_BIN%;%GIT_BIN%
 
@@ -41,6 +42,8 @@ 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

resources/macx/Info.plist

@@ -55,7 +55,7 @@
 		<key>CFBundleIconFile</key>
 		<string>Uniboard.icns</string>
 		<key>CFBundleIdentifier</key>
-		<string>com.sankore.open-sankore</string>
+		<string>org.eduxia.open-sankore</string>
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>

resources/macx/Save PDF to Uniboard.workflow/Contents/Info.plist → resources/macx/Save PDF to Open-Sankore.workflow/Contents/Info.plist

@@ -3,16 +3,16 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleIdentifier</key>
-	<string>com.mnemis.pdfworkflow.savepdftouniboard</string>
+	<string>com.eduxia.pdfworkflow.savepdftoopensankore</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Save PDF to Uniboard</string>
+	<string>Save PDF to Open-Sankoré</string>
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
-	<string>UniB</string>
+	<string>EduX</string>
 </dict>
 </plist>

resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Dutch.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/German.lproj/InfoPlist.strings → resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/English.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/French.lproj/InfoPlist.strings → resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/French.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/German.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Italian.lproj/InfoPlist.strings → resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Italian.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Dutch.lproj/InfoPlist.strings → resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Japanese.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/da.lproj/InfoPlist.strings → resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/da.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/fi.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/ko.lproj/InfoPlist.strings → resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/ko.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/no.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/pt.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/ru.lproj/InfoPlist.strings → resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/ru.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/sv.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/English.lproj/InfoPlist.strings → resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/zh_CN.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Japanese.lproj/InfoPlist.strings → resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/zh_TW.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */

resources/macx/Save PDF to Uniboard.workflow/Contents/document.wflow → resources/macx/Save PDF to Open-Sankore.workflow/Contents/document.wflow

@@ -55,7 +55,7 @@
 				<key>ActionParameters</key>
 				<dict>
 					<key>COMMAND_STRING</key>
-					<string>open -b com.mnemis.Uniboard "$1"</string>
+					<string>open -b org.eduxia.open-sankore "$1"</string>
 					<key>CheckedForUserDefaultShell</key>
 					<true/>
 					<key>inputMethod</key>

resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings

Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings and /dev/null differ

resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/fi.lproj/InfoPlist.strings

Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/fi.lproj/InfoPlist.strings and /dev/null differ

resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/no.lproj/InfoPlist.strings

Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/no.lproj/InfoPlist.strings and /dev/null differ

resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/pt.lproj/InfoPlist.strings

Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/pt.lproj/InfoPlist.strings and /dev/null differ

resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/sv.lproj/InfoPlist.strings

Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/sv.lproj/InfoPlist.strings and /dev/null differ

resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/zh_CN.lproj/InfoPlist.strings

Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/zh_CN.lproj/InfoPlist.strings and /dev/null differ

resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/zh_TW.lproj/InfoPlist.strings

Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/zh_TW.lproj/InfoPlist.strings and /dev/null differ

src/adaptors/publishing/UBDocumentPublisher.cpp

@@ -63,11 +63,6 @@ UBDocumentPublisher::UBDocumentPublisher(UBDocumentProxy* pDocument, QObject *pa
 
 UBDocumentPublisher::~UBDocumentPublisher()
 {
-    if(mSourceDocument){
-        delete mSourceDocument;
-        mSourceDocument = NULL;
-    }
-
     if(mPublishingDocument){
         delete mPublishingDocument;
         mPublishingDocument = NULL;

src/board/UBBoardView.cpp

@@ -554,7 +554,7 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event)
         {
           QRect rubberRect = mRubberBand->geometry ();
 
-          UBGraphicsTextItem* textItem = scene ()->addText ("", mapToScene (rubberRect.topLeft ()));
+          UBGraphicsTextItem* textItem = scene()->addTextHtml ("", mapToScene (rubberRect.topLeft ()));
           event->accept ();
 
           UBDrawingController::drawingController ()->setStylusTool (UBStylusTool::Selector);

src/domain/UBGraphicsScene.cpp

@@ -1321,7 +1321,7 @@ UBGraphicsTextItem* UBGraphicsScene::addTextWithFont(const QString& pString, con
 
     return textItem;
 }
-UBGraphicsTextItem *UBGraphicsScene::addTextHtml(const QString &pString)
+UBGraphicsTextItem *UBGraphicsScene::addTextHtml(const QString &pString, const QPointF& pTopLeft)
 {
     UBGraphicsTextItem *textItem = new UBGraphicsTextItem();
     textItem->setPlainText("");
@@ -1341,6 +1341,7 @@ UBGraphicsTextItem *UBGraphicsScene::addTextHtml(const QString &pString)
     textItem->setFocus();
 
     setDocumentUpdated();
+    textItem->setPos(pTopLeft);
 
     return textItem;
 }
@@ -1356,7 +1357,6 @@ void UBGraphicsScene::addItem(QGraphicsItem* item)
     mFastAccessItems << item;
 }
 
-
 void UBGraphicsScene::addItems(const QSet<QGraphicsItem*>& items)
 {
     setModified(true);
@@ -1369,7 +1369,6 @@ void UBGraphicsScene::addItems(const QSet<QGraphicsItem*>& items)
     mFastAccessItems += items.toList();
 }
 
-
 void UBGraphicsScene::removeItem(QGraphicsItem* item)
 {
     setModified(true);
@@ -1427,7 +1426,6 @@ QGraphicsItem* UBGraphicsScene::setAsBackgroundObject(QGraphicsItem* item, bool
         item->setData(UBGraphicsItemData::ItemLayerType, UBItemLayerType::FixedBackground);
 
         item->setZValue(backgroundLayerStart);
-        UBApplication::showMessage("ZValue of the background is " + QString::number(item->zValue(), 'f'));
 
         if (pAdaptTransformation)
         {

src/domain/UBGraphicsScene.h

@@ -89,9 +89,9 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem
         UBGraphicsSvgItem* addSvg(const QUrl& pSvgFileUrl, const QPointF& pPos = QPointF(0, 0));
         UBGraphicsTextItem* addText(const QString& pString, const QPointF& pTopLeft = QPointF(0, 0));
 
-        UBGraphicsTextItem* addTextWithFont(const QString& pString, const QPointF& pTopLeft = QPointF(0, 0)
+        UBGraphicsTextItem*  addTextWithFont(const QString& pString, const QPointF& pTopLeft = QPointF(0, 0)
                 , int pointSize = -1, const QString& fontFamily = "", bool bold = false, bool italic = false);
-        UBGraphicsTextItem* addTextHtml(const QString &pString = QString());
+        UBGraphicsTextItem* addTextHtml(const QString &pString = QString(), const QPointF& pTopLeft = QPointF(0, 0));
 
         UBGraphicsW3CWidgetItem* addOEmbed(const QUrl& pContentUrl, const QPointF& pPos = QPointF(0, 0));
 

src/domain/UBGraphicsTextItem.cpp

@@ -203,7 +203,7 @@ UBItem* UBGraphicsTextItem::deepCopy() const
 {
     UBGraphicsTextItem* copy = new UBGraphicsTextItem();
 
-    copy->setPlainText(this->toPlainText());
+    copy->setHtml(toHtml());
     copy->setPos(this->pos());
     copy->setZValue(this->zValue());
     copy->setTransform(this->transform());
@@ -211,10 +211,11 @@ UBItem* UBGraphicsTextItem::deepCopy() const
     copy->setFlag(QGraphicsItem::ItemIsSelectable, true);
     copy->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType));
     copy->setData(UBGraphicsItemData::ItemLocked, this->data(UBGraphicsItemData::ItemLocked));
-    copy->setDefaultTextColor(this->defaultTextColor());
-    copy->setFont(this->font());
-    copy->setColorOnDarkBackground(this->colorOnDarkBackground());
-    copy->setColorOnLightBackground(this->colorOnLightBackground());
+    copy->setData(UBGraphicsItemData::ItemEditable, data(UBGraphicsItemData::ItemEditable).toBool());
+//    copy->setDefaultTextColor(this->defaultTextColor());
+//    copy->setFont(this->font());
+//    copy->setColorOnDarkBackground(this->colorOnDarkBackground());
+//    copy->setColorOnLightBackground(this->colorOnLightBackground());
     copy->setTextWidth(this->textWidth());
     copy->setTextHeight(this->textHeight());
 

src/domain/UBItem.h

@@ -99,7 +99,9 @@ protected:
     }
 
 public:
+
     virtual UBGraphicsItemDelegate *Delegate() const  = 0;
+
     virtual void remove() = 0;
 
 };

src/frameworks/UBPlatformUtils_mac.mm

@@ -48,8 +48,8 @@ void UBPlatformUtils::init()
 
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
-    NSString *currentPath      = [[NSBundle mainBundle] pathForResource:@"Save PDF to Sankore" ofType:@"workflow"];
-    NSString *installedPath    = [[[@"~/Library/PDF Services" stringByExpandingTildeInPath] stringByAppendingPathComponent:@"Save PDF to Sankore"] stringByAppendingPathExtension:@"workflow"];
+    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 *currentVersion   = bundleShortVersion([NSBundle bundleWithPath:currentPath]);
     NSString *installedVersion = bundleShortVersion([NSBundle bundleWithPath:installedPath]);
 
@@ -57,16 +57,17 @@ 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 createDirectoryAtPath:[installedPath stringByDeletingLastPathComponent] attributes:nil];
         BOOL copyOK = [fileManager copyPath:currentPath toPath:installedPath handler:nil];
         if (!copyOK)
         {
-            qWarning("Could not install the 'Save PDF to Sankore' workflow");
+            qWarning("Could not install the 'Save PDF to Open-Sankoré workflow");
         }
     }
 
     [pool drain];
-
 }
 
 

src/gui/UBUpdateDlg.cpp

@@ -77,7 +77,7 @@ UBUpdateDlg::UBUpdateDlg(QWidget *parent, int nbFiles, const QString& bkpPath)
     mLayout->addWidget(mpDlgBttn);
 
     mpDlgBttn->button(QDialogButtonBox::Ok)->setText(tr("Update"));
-    mpDlgBttn->button(QDialogButtonBox::Cancel)->setText("Remind me later");
+    mpDlgBttn->button(QDialogButtonBox::Cancel)->setText(tr("Remind me later"));
 
     QObject::connect(mBrowseBttn, SIGNAL(clicked()), this, SLOT(onBrowse()));
     QObject::connect(mpDlgBttn, SIGNAL(accepted()), this, SLOT(onUpdate()));