Your ROOT_URL in app.ini is http://git.osmesh.ru/ but you are visiting http://91.221.70.94:3000/MOS/OpenBoard/commit/d9b8c1b7e94707768134cda90c24764acec3020a?style=split&whitespace=ignore-change You should set ROOT_URL correctly, otherwise the web may not work correctly.
MOS
/
OpenBoard
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	resources/forms/mainWindow.ui
preferencesAboutTextFull
Claudio Valerio 14 years ago
parent 52f5262399 0a9483d4cb
commit d9b8c1b7e9
5 changed files with 27 additions and 26 deletions
  1. 42
      Sankore 3.1.iss
  2. 2
      Sankore_3.1.pro
  3. 4
      release.win7.vc9.bat
  4. 3
      src/core/UBPersistenceManager.cpp
  5. 2
      src/gui/UBTeacherBarWidget.cpp

42
Sankore 3.1.iss
Unescape View File

@ -6,19 +6,19 @@
; Do not use the same AppId value in installers for other applications. ; Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{E63D17F8-D9DA-479D-B9B5-0D101A03703B} AppId={{E63D17F8-D9DA-479D-B9B5-0D101A03703B}
AppName=Sankore 3.1 AppName=Open-Sankoré
AppVerName=Sankore 3.1 AppVerName=Open-Sankoré
AppPublisher=Sankore AppPublisher=Sankore
AppPublisherURL=http://dev.open-sankore.org AppPublisherURL=http://dev.open-sankore.org
AppSupportURL=http://dev.open-sankore.org AppSupportURL=http://dev.open-sankore.org
AppUpdatesURL=http://dev.open-sankore.org AppUpdatesURL=http://dev.open-sankore.org
DefaultDirName={pf}\Sankore 3.1 DefaultDirName={pf}\Open-Sankoré
DefaultGroupName=Sankore 3.1 DefaultGroupName=Open-Sankoré
OutputDir=.\install\win32\ OutputDir=.\install\win32\
OutputBaseFilename=Sankore 3.1 OutputBaseFilename=Open-Sankoré
SetupIconFile=.\resources\win\uniboard.ico SetupIconFile=.\resources\win\uniboard.ico
Compression=lzma Compression=lzma
SolidCompression=yes SolidCompression=yes
@ -36,7 +36,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip
[InstallDelete] [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}\library"
Type: filesandordirs ; Name: "{app}\Microsoft.VC90.CRT" Type: filesandordirs ; Name: "{app}\Microsoft.VC90.CRT"
Type: filesandordirs ; Name: "{app}\plugins" 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 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons] [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: "{group}\{cm:UninstallProgram,Sankore 3.1}"; Filename: "{uninstallexe}"
Name: "{commondesktop}\Sankore 3.1"; Filename: "{app}\Sankore 3.1.exe"; Tasks: desktopicon Name: "{commondesktop}\Open-Sankoré"; Filename: "{app}\Open-Sankoré.exe"; Tasks: desktopicon
Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Sankore 3.1"; Filename: "{app}\Sankore 3.1.exe"; Tasks: quicklaunchicon 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} ;Name: "{group}\Printing Preferences"; Filename: "{app}\properties.exe"; WorkingDir: {app}
[Registry] [Registry]
Root: HKCR; Subkey: ".ubz"; ValueType: string; ValueName: ""; ValueData: "SankoreFile"; Flags: uninsdeletevalue 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"; ValueType: string; ValueName: ""; ValueData: "Open-Sankoré document"; Flags: uninsdeletekey
Root: HKCR; Subkey: "SankoreFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\Sankore 3.1.exe,1" 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}\Sankore 3.1.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\Open-Sankoré"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Open-Sankoré.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\Open-Sankoré"; 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\Open-Sankoré"; 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é\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\Open-Sankoré"; ValueType: string; ValueName: "Client application"; ValueData: "{app}\Open-Sankoré.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\Open-Sankoré"; 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\Open-Sankoré"; 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é\Defaults"; ValueType: dword; ValueName: "PDF: Enabled"; ValueData: "1"; Flags: uninsdeletevalue; Check: isProcessorX64
[Run] [Run]
Filename: "{tmp}\vcredist_x86.exe";WorkingDir:"{tmp}" 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] [UninstallDelete]
; cleanup and delete whole installation directory ; cleanup and delete whole installation directory

2
Sankore_3.1.pro
Unescape View File

@ -1,4 +1,4 @@
TARGET = "Sankore 3.1" TARGET = "Open-Sankore"
TEMPLATE = app TEMPLATE = app
THIRD_PARTY_PATH=../Sankore-ThirdParty THIRD_PARTY_PATH=../Sankore-ThirdParty

4
release.win7.vc9.bat
Unescape View File

@ -50,13 +50,13 @@ erase tmp
echo %VERSION% echo %VERSION%
echo %LAST_TAG_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 nmake release-install
del ".\build\win32\release\product\Sankore 3.1.pdb" 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 set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe

3
src/core/UBPersistenceManager.cpp
Unescape View File

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

2
src/gui/UBTeacherBarWidget.cpp
Unescape View File

@ -1,4 +1,4 @@
#include "UBTeacherBarWidget.h" #include "UBTeacherBarWidget.h"
#include "core/UBApplication.h" #include "core/UBApplication.h"
#include "core/UBPersistenceManager.h" #include "core/UBPersistenceManager.h"

Write Preview
Loading…
Cancel
Save