From 711c8910fb73065526b985f0546e8dd8799fb0ed Mon Sep 17 00:00:00 2001
From: Ivan Ilyin <ilin@scand.com>
Date: Mon, 14 May 2012 11:42:02 +0200
Subject: [PATCH] Old libpalette document version
---
src/board/UBBoardPaletteManager.cpp | 5 ++++-
src/board/UBBoardPaletteManager.h | 2 +-
src/document/UBDocumentController.cpp | 3 ++-
src/domain/UBGraphicsScene.cpp | 3 ++-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp
index 52e6019d..2173de6b 100644
--- a/src/board/UBBoardPaletteManager.cpp
+++ b/src/board/UBBoardPaletteManager.cpp
@@ -160,9 +160,11 @@ void UBBoardPaletteManager::setupDockPaletteWidgets()
mRightPalette = new UBRightPalette(mContainer);
// RIGHT palette widgets
+#ifndef USE_WEB_WIDGET
mpFeaturesWidget = new UBFeaturesWidget();
mRightPalette->registerWidget(mpFeaturesWidget);
mRightPalette->addTab(mpFeaturesWidget);
+#endif
//Do not show deprecated lib widget to prevent collisions. Uncomment to return lib widget
@@ -728,7 +730,8 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
{
if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL)
{
- WBBrowserWindow* brWnd = UBApplication::webController->GetCurrentWebBrowser();
+// tmp variable?
+// WBBrowserWindow* brWnd = UBApplication::webController->GetCurrentWebBrowser();
if(mKeyboardPalette->m_isVisible)
{
diff --git a/src/board/UBBoardPaletteManager.h b/src/board/UBBoardPaletteManager.h
index 8e9cef3e..86ef4355 100644
--- a/src/board/UBBoardPaletteManager.h
+++ b/src/board/UBBoardPaletteManager.h
@@ -44,7 +44,7 @@ class UBApplicationController;
class UBDockTeacherGuideWidget;
// Uncomment this to use old-styles lib paletter
-// #define USE_WEB_WIDGET
+ #define USE_WEB_WIDGET
class UBBoardPaletteManager : public QObject
diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp
index d12ae4ea..96650d07 100644
--- a/src/document/UBDocumentController.cpp
+++ b/src/document/UBDocumentController.cpp
@@ -1423,7 +1423,8 @@ bool UBDocumentController::isOKToOpenDocument(UBDocumentProxy* proxy)
QString docVersion = proxy->metaData(UBSettings::documentVersion).toString();
if (docVersion.isEmpty() || docVersion.startsWith("4.1") || docVersion.startsWith("4.2")
- || docVersion.startsWith("4.3") || docVersion.startsWith("4.4") || docVersion.startsWith("4.5")) // TODO UB 4.7 update if necessary
+ || docVersion.startsWith("4.3") || docVersion.startsWith("4.4") || docVersion.startsWith("4.5")
+ || docVersion.startsWith("4.6")) // TODO UB 4.7 update if necessary
{
return true;
}
diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp
index 95801514..aaaaedc5 100644
--- a/src/domain/UBGraphicsScene.cpp
+++ b/src/domain/UBGraphicsScene.cpp
@@ -293,7 +293,8 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent)
UBApplication::applicationController->initialVScroll()));
}
- connect(this, SIGNAL(selectionChanged()), this, SLOT(selectionChangedProcessing()));
+// Just for debug. Do not delete please
+// connect(this, SIGNAL(selectionChanged()), this, SLOT(selectionChangedProcessing()));
connect(this, SIGNAL(selectionChanged()), this, SLOT(updateGroupButtonState()));
// just a stub don't treat as a result code
--
2.18.1