Merge branch 'master' of github.com:Sankore/Sankore-3.1

release.win7.vc9.bat

@@ -65,6 +65,9 @@ copy %BASE_QT_TRANSLATIONS_DIRECTORY%\qt_*.qm build\win32\release\product\i18n\
 mkdir build\win32\release\product\customizations
 xcopy /s resources\customizations\* build\win32\release\product\customizations
 
+copy plugins\cffadaptor\build\win32\release\lib\CFF_Adaptor.dll build\win32\release\product\
+
+
 del build\win32\release\product\i18n\qt_help*
 
 del "build\win32\release\product\Sankore.pdb"

src/gui/UBDocumentNavigator.cpp

@@ -264,14 +264,6 @@ void UBDocumentNavigator::resizeEvent(QResizeEvent *event)
     // Update the thumbnails width
     mThumbnailWidth = (width() > mThumbnailMinWidth) ? width() - 2*border() : mThumbnailMinWidth;
 
-    // Update the scene rect
-    //    QRect sceneRect;
-    //    sceneRect.setWidth(width() - 2*border());
-    //    sceneRect.setHeight(height() - 2*border());
-    //    sceneRect.moveLeft(border());
-    //    sceneRect.moveTop(border());
-    //    scene()->setSceneRect(sceneRect);
-
     // Refresh the scene
     refreshScene();
 }

src/gui/UBLeftPalette.cpp

@@ -45,7 +45,7 @@ UBLeftPalette::~UBLeftPalette()
  */
 void UBLeftPalette::updateMaxWidth()
 {
-    setMaximumWidth(270);
+	setMaximumWidth((int)(parentWidget()->width() * 0.45));
 }
 
 /**

src/gui/UBRightPalette.cpp

@@ -69,7 +69,7 @@ void UBRightPalette::resizeEvent(QResizeEvent *event)
  */
 void UBRightPalette::updateMaxWidth()
 {
-    setMaximumWidth((int)((parentWidget()->width() * 2)/3));
+    setMaximumWidth((int)(parentWidget()->width() * 0.45));
     setMaximumHeight(parentWidget()->height());
     setMinimumHeight(parentWidget()->height());
 }

src/gui/UBThumbnailWidget.cpp

@@ -887,11 +887,6 @@ void UBImgTextThumbnailElement::Place(int row, int col, qreal width, qreal heigh
         qreal scaleFactor = qMin(scaleWidth, scaleHeight);
         UBThumbnail* pix = dynamic_cast<UBThumbnail*>(this->thumbnail);
 
-        if(pix)
-        {
-            scaleFactor = qMin(scaleFactor, 1.0);
-        }
-
         QTransform transform;
         transform.scale(scaleFactor, scaleFactor);