diff --git a/JournalDesModifications.pdf b/JournalDesModifications.pdf
index ca52c5d6..cb4a07e9 100644
Binary files a/JournalDesModifications.pdf and b/JournalDesModifications.pdf differ
diff --git a/ReleaseNotes.pdf b/ReleaseNotes.pdf
index 4d86e6e7..26bc0207 100644
Binary files a/ReleaseNotes.pdf and b/ReleaseNotes.pdf differ
diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro
index 66991470..9da0c92a 100644
--- a/Sankore_3.1.pro
+++ b/Sankore_3.1.pro
@@ -11,10 +11,20 @@ linux-g++-64 {
CONFIG += link_prl
}
+
+linux-g++-32 {
+ CONFIG += link_prl
+}
+
+
+linux-g++ {
+ CONFIG += link_prl
+}
+
VERSION_MAJ = 2
VERSION_MIN = 00
VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error
-VERSION_PATCH = 01
+VERSION_PATCH = 02
VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
VERSION = $$replace(VERSION, "\\.r", "")
@@ -352,6 +362,7 @@ macx {
linux-g++ {
LIBS += -lcrypto
+ LIBS += -lX11
QMAKE_CFLAGS += -fopenmp
QMAKE_CXXFLAGS += -fopenmp
QMAKE_LFLAGS += -fopenmp
@@ -367,6 +378,7 @@ linux-g++ {
linux-g++-32 {
LIBS += -lcrypto
+ LIBS += -lX11
QMAKE_CFLAGS += -fopenmp
QMAKE_CXXFLAGS += -fopenmp
QMAKE_LFLAGS += -fopenmp
diff --git a/release.win7.vc9.bat b/release.win7.vc9.bat
index af1f549b..b9a7fbf9 100644
--- a/release.win7.vc9.bat
+++ b/release.win7.vc9.bat
@@ -1,7 +1,7 @@
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 the Free Software Foundation, either version 2 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,
@@ -18,6 +18,7 @@ set QT_BIN=%QT_DIR%\bin
set PROGRAMS_FILE_PATH=C:\Program Files
+set SEVEN_ZIP_EXE="%PROGRAMS_FILE_PATH%\7-Zip\7z.exe"
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
@@ -46,7 +47,9 @@ set EDITION=MNEMIS_EDITION
%LRELEASE% Sankore_3.1.pro
%LRELEASE% %BASE_QT_TRANSLATIONS_DIRECTORY%\translations.pro
-REM set /p VERSION= < build\win32\release\version
+set /p VERSION= < build\win32\release\version
+REM remove the last character that is a space
+set VERSION=%VERSION: =%
REM git rev-list --tags --max-count=1 > tmp
REM set /p LAST_TAG= < tmp
REM erase tmp
@@ -78,3 +81,19 @@ set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe
call "%INNO_EXE%" "Sankore 3.1.iss" /F"%INSTALLER_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
+cd ..\..\
+GOTO END
+
+:EXIT_WITH_ERROR
+echo "Error found"
+GOTO :EOF
+
+:END
+echo "Open-Sankore's build finished"
+
+:EOF
diff --git a/resources/etc/freezedWidgetWrapper.html b/resources/etc/freezedWidgetWrapper.html
index 56f2f42a..00aaeb1b 100644
--- a/resources/etc/freezedWidgetWrapper.html
+++ b/resources/etc/freezedWidgetWrapper.html
@@ -9,9 +9,19 @@
width: 100%;
}
- div{
+ #freezed{
text-align: center;
- border: 5px #ccc outset;
+ border: 5px solid #ccc;
+ border-radius: 80px;
+ box-shadow: inset 0 0 30px rgba(66,66,66,0.5);
+ }
+
+ .loading{
+ color: #999;
+ font-weight: bold;
+ font-size: large;
+ margin-top: 5px;
+ margin-left: 5px;
}
- Widget freezed.
+ 
Loading ...