Merge branch 'release-1.30' of github.com:Sankore/Sankore-3.1 into release-1.30

Conflicts:
	resources/forms/mainWindow.ui

Sankore 3.1.iss

@@ -6,19 +6,19 @@
 ; 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 3.1
-AppVerName=Sankore 3.1
+AppName=Open-Sankor
+AppVerName=Open-Sankor
 AppPublisher=Sankore
 
 AppPublisherURL=http://dev.open-sankore.org
 AppSupportURL=http://dev.open-sankore.org
 AppUpdatesURL=http://dev.open-sankore.org
 
-DefaultDirName={pf}\Sankore 3.1
-DefaultGroupName=Sankore 3.1
+DefaultDirName={pf}\Open-Sankor
+DefaultGroupName=Open-Sankor
 
 OutputDir=.\install\win32\
-OutputBaseFilename=Sankore 3.1
+OutputBaseFilename=Open-Sankor
 SetupIconFile=.\resources\win\uniboard.ico
 Compression=lzma
 SolidCompression=yes
@@ -36,7 +36,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip
 
 [InstallDelete]
 
-Type: files ; Name: "{app}\Sankore 3.1.pdb"
+Type: files ; Name: "{app}\Open-Sankor.pdb"
 Type: filesandordirs ; Name: "{app}\library"
 Type: filesandordirs ; Name: "{app}\Microsoft.VC90.CRT"
 Type: filesandordirs ; Name: "{app}\plugins"
@@ -83,31 +83,31 @@ Source: "..\Qt-sankore3.1\plugins\phonon_backend\phonon_ds94.dll"; DestDir: "{ap
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: "{group}\Sankore 3.1"; Filename: "{app}\Sankore 3.1.exe"
+Name: "{group}\Open-Sankor"; Filename: "{app}\Open-Sankor.exe"
 Name: "{group}\{cm:UninstallProgram,Sankore 3.1}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\Sankore 3.1"; Filename: "{app}\Sankore 3.1.exe"; Tasks: desktopicon
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Sankore 3.1"; Filename: "{app}\Sankore 3.1.exe"; Tasks: quicklaunchicon
+Name: "{commondesktop}\Open-Sankor"; Filename: "{app}\Open-Sankor.exe"; Tasks: desktopicon
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Open-Sankor"; Filename: "{app}\Open-Sankor.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 3.1 document"; Flags: uninsdeletekey
-Root: HKCR; Subkey: "SankoreFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\Sankore 3.1.exe,1"
-Root: HKCR; Subkey: "SankoreFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\Sankore 3.1.exe"" ""%1"""
+Root: HKCR; Subkey: "SankoreFile"; ValueType: string; ValueName: ""; ValueData: "Open-Sankor document"; Flags: uninsdeletekey
+Root: HKCR; Subkey: "SankoreFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\Open-Sankor.exe,1"
+Root: HKCR; Subkey: "SankoreFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\Open-Sankor.exe"" ""%1"""
 
-Root: HKLM; Subkey: "SOFTWARE\Sankore 3.1"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Sankore 3.1.exe"; Flags: uninsdeletevalue; Check: isProcessorNotX64
-Root: HKLM; Subkey: "SOFTWARE\Sankore 3.1"; ValueType: dword; ValueName: "Transfer mode"; ValueData: "0"; Flags: uninsdeletevalue; Check: isProcessorNotX64
-Root: HKLM; Subkey: "SOFTWARE\Sankore 3.1"; ValueType: dword; ValueName: "EMF: Hide page"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorNotX64
-Root: HKLM; Subkey: "SOFTWARE\Sankore 3.1\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorNotX64
+Root: HKLM; Subkey: "SOFTWARE\Open-Sankor"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Open-Sankor.exe"; Flags: uninsdeletevalue; Check: isProcessorNotX64
+Root: HKLM; Subkey: "SOFTWARE\Open-Sankor"; ValueType: dword; ValueName: "Transfer mode"; ValueData: "0"; Flags: uninsdeletevalue; Check: isProcessorNotX64
+Root: HKLM; Subkey: "SOFTWARE\Open-Sankor"; ValueType: dword; ValueName: "EMF: Hide page"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorNotX64
+Root: HKLM; Subkey: "SOFTWARE\Open-Sankor\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorNotX64
 
-Root: HKLM64; Subkey: "SOFTWARE\Sankore 3.1"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Sankore 3.1.exe"; Flags: uninsdeletevalue; Check: isProcessorX64
-Root: HKLM64; Subkey: "SOFTWARE\Sankore 3.1"; ValueType: dword; ValueName: "Transfer mode"; ValueData: "0"; Flags: uninsdeletevalue; Check: isProcessorX64
-Root: HKLM64; Subkey: "SOFTWARE\Sankore 3.1"; ValueType: dword; ValueName: "EMF: Hide page"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64
-Root: HKLM64; Subkey: "SOFTWARE\Sankore 3.1\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64
+Root: HKLM64; Subkey: "SOFTWARE\Open-Sankor"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Open-Sankor.exe"; Flags: uninsdeletevalue; Check: isProcessorX64
+Root: HKLM64; Subkey: "SOFTWARE\Open-Sankor"; ValueType: dword; ValueName: "Transfer mode"; ValueData: "0"; Flags: uninsdeletevalue; Check: isProcessorX64
+Root: HKLM64; Subkey: "SOFTWARE\Open-Sankor"; ValueType: dword; ValueName: "EMF: Hide page"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64
+Root: HKLM64; Subkey: "SOFTWARE\Open-Sankor\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64
 
 [Run]
 Filename: "{tmp}\vcredist_x86.exe";WorkingDir:"{tmp}"
-Filename: "{app}\Sankore 3.1.exe"; Description: "{cm:LaunchProgram,Sankore 3.1}"; Flags: nowait postinstall
+Filename: "{app}\Open-Sankor.exe"; Description: "{cm:LaunchProgram,Sankore 3.1}"; Flags: nowait postinstall
 
 [UninstallDelete]
 ; cleanup and delete whole installation directory

Sankore_3.1.pro

-TARGET = "Sankore 3.1"
+TARGET = "Open-Sankore"
 TEMPLATE = app
 
 THIRD_PARTY_PATH=../Sankore-ThirdParty

release.win7.vc9.bat

@@ -50,13 +50,13 @@ erase tmp
 echo %VERSION%
 echo %LAST_TAG_VERSION%
 
-if not v%VERSION%==%LAST_TAG_VERSION% GOTO EXIT_WITH_ERROR
+REM if not v%VERSION%==%LAST_TAG_VERSION% GOTO EXIT_WITH_ERROR
 
 nmake release-install
 
 del ".\build\win32\release\product\Sankore 3.1.pdb"
 
-set INSTALLER_NAME=Sankore-3.1
+set INSTALLER_NAME=Open-Sankor
 
 set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe
 

src/core/UBPersistenceManager.cpp

@@ -1072,7 +1072,8 @@ void UBPersistenceManager::persistTeacherBar(UBDocumentProxy* pDocumentProxy, in
                     if(f.open(QIODevice::WriteOnly))
                     {
                         QDomElement rootElem = domDoc.documentElement();
-                        QDomNode teacherBarNode = domDoc.namedItem("teacherBar");
+                        QDomNode teacherBarNode = rootElem.namedItem("teacherBar");
+
                         if(teacherBarNode.isNull())
                         {
                             // Create the element

src/gui/UBTeacherBarWidget.cpp

-#include "UBTeacherBarWidget.h"
+ #include "UBTeacherBarWidget.h"
 
 #include "core/UBApplication.h"
 #include "core/UBPersistenceManager.h"