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

4dc61cc4 · Claudio Valerio · f9d482e1 · a6fb56e0 · 4dc61cc4 · 4dc61cc4
Commit 4dc61cc4 authored Nov 16, 2012 by Claudio Valerio
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 191 additions and 181 deletions

sankore_nb.ts resources/i18n/sankore_nb.ts +190 -180

UBBoardPaletteManager.cpp src/board/UBBoardPaletteManager.cpp +1 -1

No files found.
--- a/resources/i18n/sankore_nb.ts
+++ b/resources/i18n/sankore_nb.ts
--- a/src/board/UBBoardPaletteManager.cpp
+++ b/src/board/UBBoardPaletteManager.cpp
@@ -750,7 +750,7 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
                mLeftPalette->setVisible(leftPaletteVisible);
                mRightPalette->setVisible(rightPaletteVisible);
 #ifdef Q_WS_WIN
-                if (rightPaletteVisible)
+                if (rightPaletteVisible && UBSettings::settings()->appToolBarPositionedAtTop->get().toBool())
                    mRightPalette->setAdditionalVOffset(30);
 #endif