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

Sankore.iss

+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{E63D17F8-D9DA-479D-B9B5-0D101A03703B}
+AppName=Sankore
+AppVerName=Sankore
+AppPublisher=Sankore
+
+AppPublisherURL=http://dev.open-sankore.org
+AppSupportURL=http://dev.open-sankore.org
+AppUpdatesURL=http://dev.open-sankore.org
+
+DefaultDirName={pf}\Sankore
+DefaultGroupName=Sankore
+
+OutputDir=.\install\win32\
+OutputBaseFilename=Sankore
+SetupIconFile=.\resources\win\uniboard.ico
+Compression=lzma
+SolidCompression=yes
+
+[Languages]
+Name: "en"; MessagesFile: "compiler:Default.isl"
+Name: "fr"; MessagesFile: "compiler:Languages\French.isl"
+Name: "gr"; MessagesFile: "compiler:Languages\German.isl"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"
+Name: "sp"; MessagesFile: "compiler:Languages\Spanish.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[InstallDelete]
+
+Type: files ; Name: "{app}\Sankore.pdb"
+Type: filesandordirs ; Name: "{app}\library"
+Type: filesandordirs ; Name: "{app}\Microsoft.VC90.CRT"
+Type: filesandordirs ; Name: "{app}\plugins"
+Type: filesandordirs ; Name: "{app}\i18n"
+Type: files ; Name: "{app}\*.dll"
+
+[Files]
+Source: "..\Sankore-ThirdParty\microsoft\vcredist_x86.exe"; DestDir:"{tmp}"
+Source: ".\build\win32\release\product\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+
+;OpenSSL
+Source: "..\Sankore-ThirdParty\openssl\win32\libeay32.dll"; DestDir:"{app}"; Flags: ignoreversion
+Source: "..\Sankore-ThirdParty\openssl\win32\ssleay32.dll"; DestDir:"{app}"; Flags: ignoreversion
+
+;Qt base dll
+Source: "..\Qt-sankore3.1\lib\QtScript4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\lib\QtGui4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\lib\QtXml4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\lib\QtCore4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\lib\QtWebKit4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\lib\phonon4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\lib\QtNetwork4.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\lib\QtSvg4.dll"; DestDir: "{app}"; Flags: ignoreversion
+
+;Qt plugins
+Source: "..\Qt-sankore3.1\plugins\accessible\qtaccessiblecompatwidgets4.dll"; DestDir: "{app}\accessible"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\accessible\qtaccessiblewidgets4.dll"; DestDir: "{app}\accessible"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\bearer\qgenericbearer4.dll"; DestDir: "{app}\bearer"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\bearer\qnativewifibearer4.dll"; DestDir: "{app}\bearer"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\codecs\qcncodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\codecs\qjpcodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\codecs\qkrcodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\codecs\qtwcodecs4.dll"; DestDir: "{app}\codecs"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\graphicssystems\qglgraphicssystem4.dll"; DestDir: "{app}\graphicssystems"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\graphicssystems\qtracegraphicssystem4.dll"; DestDir: "{app}\graphicssystems"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\iconengines\qsvgicon4.dll"; DestDir: "{app}\iconengines"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\imageformats\qgif4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\imageformats\qico4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\imageformats\qjpeg4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\imageformats\qmng4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\imageformats\qsvg4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\imageformats\qtiff4.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
+Source: "..\Qt-sankore3.1\plugins\phonon_backend\phonon_ds94.dll"; DestDir: "{app}\phonon_backend"; Flags: ignoreversion
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\Sankore"; Filename: "{app}\Sankore.exe"
+Name: "{group}\{cm:UninstallProgram,Sankore}"; Filename: "{uninstallexe}"
+Name: "{commondesktop}\Sankore"; Filename: "{app}\Sankore.exe"; Tasks: desktopicon
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Sankore"; Filename: "{app}\Sankore.exe"; Tasks: quicklaunchicon
+;Name: "{group}\Printing Preferences"; Filename: "{app}\properties.exe"; WorkingDir: {app}
+
+[Registry]
+Root: HKCR; Subkey: ".ubz"; ValueType: string; ValueName: ""; ValueData: "SankoreFile"; Flags: uninsdeletevalue
+Root: HKCR; Subkey: "SankoreFile"; ValueType: string; ValueName: ""; ValueData: "Sankore document"; Flags: uninsdeletekey
+Root: HKCR; Subkey: "SankoreFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\Sankore.exe,1"
+Root: HKCR; Subkey: "SankoreFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\Sankore.exe"" ""%1"""
+
+Root: HKLM; Subkey: "SOFTWARE\Sankore"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Sankore.exe"; Flags: uninsdeletevalue; Check: isProcessorNotX64
+Root: HKLM; Subkey: "SOFTWARE\Sankore"; ValueType: dword; ValueName: "Transfer mode"; ValueData: "0"; Flags: uninsdeletevalue; Check: isProcessorNotX64
+Root: HKLM; Subkey: "SOFTWARE\Sankore"; ValueType: dword; ValueName: "EMF: Hide page"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorNotX64
+Root: HKLM; Subkey: "SOFTWARE\Sankore\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorNotX64
+
+Root: HKLM; Subkey: "SOFTWARE\Microsoft\Internet Explorer\Low Rights\DragDrop\{{E63D17F8-D9DA-479D-B9B5-0D101A03703B}"; ValueType: dword; ValueName: "Policy"; ValueData: "3"; Flags: uninsdeletevalue; Check: isProcessorNotX64
+Root: HKLM; Subkey: "SOFTWARE\Microsoft\Internet Explorer\Low Rights\DragDrop\{{E63D17F8-D9DA-479D-B9B5-0D101A03703B}"; ValueType: string; ValueName: "AppName"; ValueData: "Sankore.exe"; Flags: uninsdeletevalue; Check: isProcessorNotX64
+Root: HKLM; Subkey: "SOFTWARE\Microsoft\Internet Explorer\Low Rights\DragDrop\{{E63D17F8-D9DA-479D-B9B5-0D101A03703B}"; ValueType: string; ValueName: "AppPath"; ValueData: "{app}"; Flags: uninsdeletevalue; Check: isProcessorNotX64
+
+Root: HKLM64; Subkey: "SOFTWARE\Sankore"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Sankore.exe"; Flags: uninsdeletevalue; Check: isProcessorX64
+Root: HKLM64; Subkey: "SOFTWARE\Sankore"; ValueType: dword; ValueName: "Transfer mode"; ValueData: "0"; Flags: uninsdeletevalue; Check: isProcessorX64
+Root: HKLM64; Subkey: "SOFTWARE\Sankore"; ValueType: dword; ValueName: "EMF: Hide page"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64
+Root: HKLM64; Subkey: "SOFTWARE\Sankore\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64
+
+Root: HKLM64; Subkey: "SOFTWARE\Wow6432Node\Microsoft\Internet Explorer\Low Rights\DragDrop\{{E63D17F8-D9DA-479D-B9B5-0D101A03703B}"; ValueType: dword; ValueName: "Policy"; ValueData: "3"; Flags: uninsdeletevalue; Check: isProcessorX64
+Root: HKLM64; Subkey: "SOFTWARE\Wow6432Node\Microsoft\Internet Explorer\Low Rights\DragDrop\{{E63D17F8-D9DA-479D-B9B5-0D101A03703B}"; ValueType: string; ValueName: "AppName"; ValueData: "Sankore.exe"; Flags: uninsdeletevalue; Check: isProcessorX64
+Root: HKLM64; Subkey: "SOFTWARE\Wow6432Node\Microsoft\Internet Explorer\Low Rights\DragDrop\{{E63D17F8-D9DA-479D-B9B5-0D101A03703B}"; ValueType: string; ValueName: "AppPath"; ValueData: "{app}"; Flags: uninsdeletevalue; Check: isProcessorX64
+
+[Run]
+Filename: "{tmp}\vcredist_x86.exe";WorkingDir:"{tmp}"
+Filename: "{app}\Sankore.exe"; Description: "{cm:LaunchProgram,Sankore}"; Flags: nowait postinstall
+
+[UninstallDelete]
+; cleanup and delete whole installation directory
+Name: {app}; Type: filesandordirs
+
+[Code]
+function isProcessorX64: Boolean;
+begin
+  Result := (ProcessorArchitecture = paX64);
+end;
+
+function isProcessorNotX64: Boolean;
+begin
+	Result := not isProcessorX64;
+end;
+

Sankore_3.1.pro

-TARGET = "Sankore 3.1"
+TARGET = "Sankore"
 TEMPLATE = app
 
 THIRD_PARTY_PATH=../Sankore-ThirdParty
@@ -7,7 +7,7 @@ CONFIG += debug_and_release \
    no_include_pwd
 
 VERSION_MAJ = 1
-VERSION_MIN = 35 
+VERSION_MIN = 40 
 VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error
 VERSION_PATCH = 00
 

release.linux.sh

@@ -46,8 +46,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 "Generating setup for v$VERSION"
-#        git push origin --tags 
+        git tag -a "v$VERSION" -m "Generating setup for v$VERSION"
+        git push origin --tags 
     fi
 fi
 
@@ -93,10 +93,10 @@ copyQtLibrary libQtCore
 rm -rf install/linux
 mkdir -p install/linux
 
-mv build/linux/release/product build/linux/release/Sankore_3.1.$VERSION
+mv build/linux/release/product build/linux/release/Sankore.$VERSION
 cd build/linux/release
 
 # "Removing .svn directories ..."
 find . -name .svn -exec rm -rf {} \; 2> /dev/null
-tar cvzf ../../../install/linux/Sankore\ 3.1.tar.gz Sankore_3.1.$VERSION -C . 
+tar cvzf ../../../install/linux/Sankore.tar.gz Sankore.$VERSION -C . 
 echo "Build Finished"

release.macx.sh

@@ -103,11 +103,11 @@ if [ $? != 0 ]; then
 fi
 
 
-NAME="Sankore 3.1"
+NAME="Sankore"
 
 DMG="$NAME.dmg"
 VOLUME="/Volumes/$NAME"
-APP="$PRODUCT_DIR/Sankore 3.1.app"
+APP="$PRODUCT_DIR/Sankore.app"
 DSYM_NAME="$NAME (r$SVN_REVISION).dSYM"
 DSYM="$PRODUCT_DIR/$DSYM_NAME"
 GSYM_i386="$PRODUCT_DIR/$NAME i386.sym"
@@ -128,8 +128,8 @@ notify "Bulding frameworks ..."
 $MACDEPLOYQT "$APP"
 
 notify "Extracting debug information ..."
-$DSYMUTIL "$APP/Contents/MacOS/Sankore 3.1" -o "$DSYM"
-$STRIP -S "$APP/Contents/MacOS/Sankore 3.1"
+$DSYMUTIL "$APP/Contents/MacOS/Sankore" -o "$DSYM"
+$STRIP -S "$APP/Contents/MacOS/Sankore"
 
 notify "Creating dmg ..."
 umount "$VOLUME" 2> /dev/null

release.win7.vc9.bat

@@ -57,13 +57,13 @@ if not v%VERSION%==%LAST_TAG_VERSION% GOTO EXIT_WITH_ERROR
 
 nmake release-install
 
-del ".\build\win32\release\product\Sankore 3.1.pdb"
+del ".\build\win32\release\product\Sankore.pdb"
 
-set INSTALLER_NAME=Sankore-3.1
+set INSTALLER_NAME=Sankore
 
 set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe
 
-call "%INNO_EXE%" "Sankore 3.1.iss" /F"%INSTALLER_NAME%"
+call "%INNO_EXE%" "Sankore.iss" /F"%INSTALLER_NAME%"
 
 :EXIT_WITH_ERROR
 	echo ERROR

src/core/UBSettings.cpp

@@ -763,7 +763,7 @@ QString UBSettings::uniboardDataDirectory()
         }
     }
     QString qtDataPath = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DataLocation));
-    qtDataPath.replace("/Sankore 3.1", "");
+    qtDataPath.replace("/Sankore", "");
     return qtDataPath;
 }
 

src/core/main.cpp

@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
 	QApplication::setGraphicsSystem("raster");
 #endif
 
-	UBApplication app("Sankore 3.1", argc, argv);
+        UBApplication app("Sankore", argc, argv);
 	
 	//BUGFIX:
 	//when importing a sankore file that contains a non standard character

src/frameworks/UBDesktopServices_mac.cpp

@@ -96,7 +96,7 @@ QString UBDesktopServices::storageLocation(StandardLocation type)
     QString path = getFullPath(ref);
 
     if (QDesktopServices::DataLocation == type || QDesktopServices::CacheLocation == type)
-        path += "/Sankore/Sankore 3.1";
+        path += "/Sankore/Sankore";
 
     return path;
 }

src/transition/UniboardSankoreTransition.cpp

@@ -31,7 +31,7 @@ UniboardSankoreTransition::UniboardSankoreTransition(QObject *parent) :
 
     mUniboardSourceDirectory = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DataLocation));
 #if defined(Q_WS_MACX)
-    mOldSankoreDirectory.replace("Sankore/Sankore 3.1", "Sankore 3.1");
+    mOldSankoreDirectory.replace("Sankore/Sankore 3.1", "Sankore");
     mUniboardSourceDirectory.replace("Sankore/Sankore 3.1", "Uniboard");
 #else
     mUniboardSourceDirectory.replace("Sankore/Sankore 3.1", "Mnemis/Uniboard");