From 2b619b2232467ef7caccd70d63780c93fb089a9a Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 24 Nov 2011 13:29:57 +0100 Subject: [PATCH 1/4] =?UTF-8?q?=20changed=20the=20main=20windows=20name=20?= =?UTF-8?q?from=20Uniboard=20to=20Sankor=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/forms/mainWindow.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui index 22f94ccb..7e740881 100644 --- a/resources/forms/mainWindow.ui +++ b/resources/forms/mainWindow.ui @@ -11,7 +11,7 @@ - Uniboard + SankorĂ© From b447369b8f563fcc648ef49fc4f8a5dc0c388c0f Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Wed, 30 Nov 2011 14:03:04 +0100 Subject: [PATCH 2/4] Resolved an issue related to the teacherbar --- src/core/UBPersistenceManager.cpp | 4 +++- src/gui/UBTeacherBarWidget.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/core/UBPersistenceManager.cpp b/src/core/UBPersistenceManager.cpp index 8c2f3f95..5a845e0a 100644 --- a/src/core/UBPersistenceManager.cpp +++ b/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 @@ -1120,6 +1121,7 @@ sTeacherBarInfos UBPersistenceManager::getTeacherBarInfos(UBDocumentProxy* pDocu QDomDocument domDoc; if(domDoc.setContent(f.readAll())) { + qDebug() << domDoc.toString(); QDomElement rootElem = domDoc.documentElement(); QDomNode teacherBarNode = rootElem.namedItem("teacherBar"); diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index dd73b4c3..66547219 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -1,4 +1,4 @@ -#include "UBTeacherBarWidget.h" + #include "UBTeacherBarWidget.h" #include "core/UBApplication.h" #include "core/UBPersistenceManager.h" @@ -259,6 +259,7 @@ void UBTeacherBarWidget::saveContent() { sTeacherBarInfos infos; infos.title = mpTitle->text(); + qDebug() << "Title read: " << infos.title; infos.phasis = mpPhasis->currentIndex(); infos.Duration = mpDuration->currentIndex(); infos.material = mpEquipment->text(); @@ -276,6 +277,7 @@ void UBTeacherBarWidget::loadContent() { sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex()); mpTitle->setText(nextInfos.title); + qDebug() << "Title loaded: " << nextInfos.title << ", Title set: " << mpTitle->text(); mpPhasis->setCurrentIndex(nextInfos.phasis); mpDuration->setCurrentIndex(nextInfos.Duration); mpEquipment->setText(nextInfos.material); From cbe7747e951b6e5f6512576860fc0b1248a007c8 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Wed, 30 Nov 2011 14:04:35 +0100 Subject: [PATCH 3/4] Resolved an issue related to the teacherbar --- src/core/UBPersistenceManager.cpp | 1 - src/gui/UBTeacherBarWidget.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/core/UBPersistenceManager.cpp b/src/core/UBPersistenceManager.cpp index 5a845e0a..faf4a922 100644 --- a/src/core/UBPersistenceManager.cpp +++ b/src/core/UBPersistenceManager.cpp @@ -1121,7 +1121,6 @@ sTeacherBarInfos UBPersistenceManager::getTeacherBarInfos(UBDocumentProxy* pDocu QDomDocument domDoc; if(domDoc.setContent(f.readAll())) { - qDebug() << domDoc.toString(); QDomElement rootElem = domDoc.documentElement(); QDomNode teacherBarNode = rootElem.namedItem("teacherBar"); diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp index 66547219..8488cd89 100644 --- a/src/gui/UBTeacherBarWidget.cpp +++ b/src/gui/UBTeacherBarWidget.cpp @@ -259,7 +259,6 @@ void UBTeacherBarWidget::saveContent() { sTeacherBarInfos infos; infos.title = mpTitle->text(); - qDebug() << "Title read: " << infos.title; infos.phasis = mpPhasis->currentIndex(); infos.Duration = mpDuration->currentIndex(); infos.material = mpEquipment->text(); @@ -277,7 +276,6 @@ void UBTeacherBarWidget::loadContent() { sTeacherBarInfos nextInfos = UBPersistenceManager::persistenceManager()->getTeacherBarInfos(UBApplication::boardController->activeDocument(), UBApplication::boardController->activeSceneIndex()); mpTitle->setText(nextInfos.title); - qDebug() << "Title loaded: " << nextInfos.title << ", Title set: " << mpTitle->text(); mpPhasis->setCurrentIndex(nextInfos.phasis); mpDuration->setCurrentIndex(nextInfos.Duration); mpEquipment->setText(nextInfos.material); From 0a9483d4cbf7be05793205d3330a9b1c580f59a2 Mon Sep 17 00:00:00 2001 From: Claudio Valerio <=claudio@open-sankore.org> Date: Thu, 1 Dec 2011 11:08:41 +0100 Subject: [PATCH 4/4] changing application name --- Sankore 3.1.iss | 42 +++++++++++++++++++++--------------------- Sankore_3.1.pro | 2 +- release.win7.vc9.bat | 4 ++-- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Sankore 3.1.iss b/Sankore 3.1.iss index 0002ea7c..973d7813 100644 --- a/Sankore 3.1.iss +++ b/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 diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index 0e199344..cb2d403f 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -1,4 +1,4 @@ -TARGET = "Sankore 3.1" +TARGET = "Open-Sankore" TEMPLATE = app THIRD_PARTY_PATH=../Sankore-ThirdParty diff --git a/release.win7.vc9.bat b/release.win7.vc9.bat index a8e00b47..ec20b011 100644 --- a/release.win7.vc9.bat +++ b/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