From 8be4c32bd8d4fbe33056c36ddda7dde62c2e0194 Mon Sep 17 00:00:00 2001
From: Ivan Ilyin <ilin@scand.com>
Date: Sun, 29 Apr 2012 00:31:08 +0300
Subject: [PATCH] FeatureWidget is in master now

---
 Sankore_3.1.pro                     | 1 +
 src/board/UBBoardPaletteManager.cpp | 7 +++++--
 src/domain/UBGraphicsScene.cpp      | 2 +-
 src/gui/UBMagnifer.cpp              | 6 ------
 src/gui/UBThumbnailWidget.cpp       | 3 ++-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro
index 96c00aa1..6d4112ae 100644
--- a/Sankore_3.1.pro
+++ b/Sankore_3.1.pro
@@ -367,6 +367,7 @@ linux-g++-32 {
 
 linux-g++-64 { 
     LIBS += -lcrypto
+    LIBS += -lX11
     QMAKE_CFLAGS += -fopenmp
     QMAKE_CXXFLAGS += -fopenmp
     QMAKE_LFLAGS += -fopenmp
diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp
index 25f9d1d8..51b8622e 100644
--- a/src/board/UBBoardPaletteManager.cpp
+++ b/src/board/UBBoardPaletteManager.cpp
@@ -158,8 +158,11 @@ void UBBoardPaletteManager::setupDockPaletteWidgets()
 	mRightPalette->registerWidget(mpFeaturesWidget);
 	mRightPalette->addTab(mpFeaturesWidget);
 
-    mRightPalette->registerWidget(mpLibWidget);
-    mRightPalette->addTab(mpLibWidget);
+    //Do not show deprecated lib widget to prevent collisions. Uncomment to return lib widget
+//    mRightPalette->registerWidget(mpLibWidget);
+//    mRightPalette->addTab(mpLibWidget);
+
+
     // The cache widget will be visible only if a cache is put on the page
     mRightPalette->registerWidget(mpCachePropWidget);
 
diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp
index acc725d3..1494ce85 100644
--- a/src/domain/UBGraphicsScene.cpp
+++ b/src/domain/UBGraphicsScene.cpp
@@ -256,6 +256,7 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent)
     , mDocument(parent)
     , mDarkBackground(false)
     , mCrossedBackground(false)
+    , mIsDesktopMode(false)
     , mIsModified(true)
     , mBackgroundObject(0)
     , mPreviousWidth(0)
@@ -269,7 +270,6 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent)
     , magniferControlViewWidget(0)
     , magniferDisplayViewWidget(0)
     , mZLayerController(new UBZLayerController(this))
-    , mIsDesktopMode(false)
     , mpLastPolygon(NULL)
 {
     UBCoreGraphicsScene::setObjectName("BoardScene");
diff --git a/src/gui/UBMagnifer.cpp b/src/gui/UBMagnifer.cpp
index 93693797..e13ab4b3 100644
--- a/src/gui/UBMagnifer.cpp
+++ b/src/gui/UBMagnifer.cpp
@@ -314,9 +314,6 @@ void UBMagnifier::grabPoint()
 
     QPointF pfScLtF(UBApplication::boardController->controlView()->mapToScene(QPoint(itemPos.x(), itemPos.y())));
    
-    
-    QRect magnifierRect = rect();
-
     float x = pfScLtF.x() - zWidthHalf;
     float y = pfScLtF.y() - zHeightHalf;
 
@@ -351,9 +348,6 @@ void UBMagnifier::grabPoint(const QPoint &pGrab)
 
     QPointF pfScLtF(UBApplication::boardController->controlView()->mapToScene(QPoint(itemPos.x(), itemPos.y())));
    
-    
-    QRect magnifierRect = rect();
-
     float x = pfScLtF.x() - zWidthHalf;
     float y = pfScLtF.y() - zHeightHalf;
 
diff --git a/src/gui/UBThumbnailWidget.cpp b/src/gui/UBThumbnailWidget.cpp
index 96f448d9..a3c631fb 100644
--- a/src/gui/UBThumbnailWidget.cpp
+++ b/src/gui/UBThumbnailWidget.cpp
@@ -32,8 +32,9 @@ UBThumbnailWidget::UBThumbnailWidget(QWidget* parent)
     , mSpacing(UBSettings::thumbnailSpacing)
     , mLastSelectedThumbnail(0)
     , mSelectionSpan(0)
-    , mLassoRectItem(0)
     , mPrevLassoRect(QRect())
+    , mLassoRectItem(0)
+
 {
     // By default, the drag is possible
     bCanDrag = true;