diff --git a/resources/library/applications/Grapheur.wgt/Grapheur.xhtml b/resources/library/applications/Grapheur.wgt/Grapheur.xhtml
index 3a94a9d3..bfca757c 100644
--- a/resources/library/applications/Grapheur.wgt/Grapheur.xhtml
+++ b/resources/library/applications/Grapheur.wgt/Grapheur.xhtml
@@ -218,7 +218,6 @@
return true;
});
$("label[for*='checkAire']").text(sankoreLang[lang].draw);
- $("label[for*='checkMaJ']").text(sankoreLang[lang].auto_update);
$("#menuOptions td").eq(0).html(sankoreLang[lang].widget);
$("#menuOptions h3").eq(0).text(sankoreLang[lang].widget_options);
$("#menuOptions2D h3").eq(0).text(sankoreLang[lang].options + " 2D");
@@ -1033,13 +1032,10 @@
Control options:
Save a widget options in cookies or load an options from cookies or delete a registered options.
-
-
Cookies are disabled. You cannot save an options...
You are using the last version of this widget.
-
diff --git a/resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js b/resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js
index 34de0859..3fbfd9aa 100644
--- a/resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js
+++ b/resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js
@@ -326,6 +326,15 @@ function init(){
$(".closeItem").live("click", function(){
if(!shadowOver){
$(this).parent().remove();
+ if($(".editContainer").size() > 0){
+ var prev = $(".editContainer:first");
+ if((prev.position().left == 54) && (prev.position().top != 60))
+ prev.css("top", "60px");
+ var prevBottom = prev.position().top + prev.height(),
+ prevLeft = prev.position().left;
+ if(prev.next().length)
+ recursionCall(prevBottom, prevLeft, prev.next());
+ }
}
});
@@ -339,8 +348,7 @@ function init(){
})
function recursionCall(prevBottom, prevLeft, curr){
- var curTop = curr.position().top,
- curHeight = curr.height(),
+ var curHeight = curr.height(),
curLeft = curr.position().left;
if(prevLeft == curLeft){
if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
@@ -351,7 +359,7 @@ function init(){
if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
curr.css("top", prevBottom + 15 + "px").css("left", prevLeft + "px");
else
- curr.css("top", "60px");
+ curr.css("top", "60px").css("left", prevLeft + 255 + "px");
}
prevBottom = curr.position().top + curr.height(),
prevLeft = curr.position().left;
@@ -364,7 +372,20 @@ function init(){
popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
$(window).resize(function(){
- //$("#leftDiv,#rightDiv,#shadowDiv").css("height", $(window).height());
+ if($("#wgt_edit").hasClass("selected")){
+ if($(".editContainer").size() > 1){
+ var prev = $(".editContainer:first"),
+ prevBottom = prev.position().top + prev.height(),
+ prevLeft = prev.position().left;
+ recursionCall(prevBottom, prevLeft, prev.next());
+ }
+ } else {
+ var tmp_array = [];
+ $(".readyTask").each(function(){
+ tmp_array.push($(this));
+ });
+ orderItems(tmp_array);
+ }
popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%");
popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
});
@@ -564,4 +585,4 @@ function changeStyle(val){
}
if($("#wgt_edit").hasClass("selected"))
$(document).enableTextSelect();
-}
\ No newline at end of file
+}
diff --git a/resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js b/resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js
index fce0a9af..fc0eb152 100644
--- a/resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js
+++ b/resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js
@@ -326,6 +326,15 @@ function init(){
$(".closeItem").live("click", function(){
if(!shadowOver){
$(this).parent().remove();
+ if($(".editContainer").size() > 0){
+ var prev = $(".editContainer:first");
+ if((prev.position().left == 54) && (prev.position().top != 60))
+ prev.css("top", "60px");
+ var prevBottom = prev.position().top + prev.height(),
+ prevLeft = prev.position().left;
+ if(prev.next().length)
+ recursionCall(prevBottom, prevLeft, prev.next());
+ }
}
});
@@ -339,8 +348,7 @@ function init(){
})
function recursionCall(prevBottom, prevLeft, curr){
- var curTop = curr.position().top,
- curHeight = curr.height(),
+ var curHeight = curr.height(),
curLeft = curr.position().left;
if(prevLeft == curLeft){
if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
@@ -351,7 +359,7 @@ function init(){
if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
curr.css("top", prevBottom + 15 + "px").css("left", prevLeft + "px");
else
- curr.css("top", "60px");
+ curr.css("top", "60px").css("left", prevLeft + 255 + "px");
}
prevBottom = curr.position().top + curr.height(),
prevLeft = curr.position().left;
@@ -364,7 +372,20 @@ function init(){
popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
$(window).resize(function(){
- //$("#leftDiv,#rightDiv,#shadowDiv").css("height", $(window).height());
+ if($("#wgt_edit").hasClass("selected")){
+ if($(".editContainer").size() > 1){
+ var prev = $(".editContainer:first"),
+ prevBottom = prev.position().top + prev.height(),
+ prevLeft = prev.position().left;
+ recursionCall(prevBottom, prevLeft, prev.next());
+ }
+ } else {
+ var tmp_array = [];
+ $(".readyTask").each(function(){
+ tmp_array.push($(this));
+ });
+ orderItems(tmp_array);
+ }
popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%");
popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
});
@@ -564,4 +585,4 @@ function changeStyle(val){
}
if($("#wgt_edit").hasClass("selected"))
$(document).enableTextSelect();
-}
\ No newline at end of file
+}
diff --git a/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js b/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js
index 27035aaf..89e6df3f 100644
--- a/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js
+++ b/resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js
@@ -326,6 +326,15 @@ function init(){
$(".closeItem").live("click", function(){
if(!shadowOver){
$(this).parent().remove();
+ if($(".editContainer").size() > 0){
+ var prev = $(".editContainer:first");
+ if((prev.position().left == 54) && (prev.position().top != 60))
+ prev.css("top", "60px");
+ var prevBottom = prev.position().top + prev.height(),
+ prevLeft = prev.position().left;
+ if(prev.next().length)
+ recursionCall(prevBottom, prevLeft, prev.next());
+ }
}
});
@@ -339,8 +348,7 @@ function init(){
})
function recursionCall(prevBottom, prevLeft, curr){
- var curTop = curr.position().top,
- curHeight = curr.height(),
+ var curHeight = curr.height(),
curLeft = curr.position().left;
if(prevLeft == curLeft){
if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
@@ -351,7 +359,7 @@ function init(){
if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
curr.css("top", prevBottom + 15 + "px").css("left", prevLeft + "px");
else
- curr.css("top", "60px");
+ curr.css("top", "60px").css("left", prevLeft + 255 + "px");
}
prevBottom = curr.position().top + curr.height(),
prevLeft = curr.position().left;
@@ -364,7 +372,20 @@ function init(){
popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
$(window).resize(function(){
- //$("#leftDiv,#rightDiv,#shadowDiv").css("height", $(window).height());
+ if($("#wgt_edit").hasClass("selected")){
+ if($(".editContainer").size() > 1){
+ var prev = $(".editContainer:first"),
+ prevBottom = prev.position().top + prev.height(),
+ prevLeft = prev.position().left;
+ recursionCall(prevBottom, prevLeft, prev.next());
+ }
+ } else {
+ var tmp_array = [];
+ $(".readyTask").each(function(){
+ tmp_array.push($(this));
+ });
+ orderItems(tmp_array);
+ }
popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%");
popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
});
diff --git a/resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css b/resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css
index 6589dcef..401a2bea 100644
--- a/resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css
+++ b/resources/library/interactivities/Ordre phrase.wgt/styles/of_puppets.css
@@ -33,7 +33,6 @@ body{
font: 28px tahoma;
text-align: center;
cursor: pointer;
- text-transform: uppercase;
overflow: hidden;
}
diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp
index 5c55521c..2652bb15 100644
--- a/src/board/UBBoardPaletteManager.cpp
+++ b/src/board/UBBoardPaletteManager.cpp
@@ -710,9 +710,7 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
mLeftPalette->assignParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView());
mRightPalette->assignParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView());
mStylusPalette->raise();
- // Maybe threre is a reason to keep that functions but with them right palette in desktop mode is not interactable
- // mRightPalette->lower();
- // mLeftPalette->lower();
+
if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL)
{
diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp
index 9dab0121..ed75f550 100644
--- a/src/board/UBBoardView.cpp
+++ b/src/board/UBBoardView.cpp
@@ -75,6 +75,7 @@ UBBoardView::UBBoardView (UBBoardController* pController, QWidget* pParent, bool
, mIsDragInProgress(false)
, mMultipleSelectionIsEnabled(false)
, isControl(pIsControl)
+, mRubberBandInPlayMode(false) //enables rubberband with play tool
{
init ();
@@ -1020,38 +1021,41 @@ UBBoardView::mouseMoveEvent (QMouseEvent *event)
return;
}
- if (!movingItem && (mMouseButtonIsPressed || mTabletStylusIsPressed) && mUBRubberBand && mUBRubberBand->isVisible()) {
+ if (currentTool != UBStylusTool::Play || mRubberBandInPlayMode) {
- QRect bandRect(mMouseDownPos, event->pos());
+ if (!movingItem && (mMouseButtonIsPressed || mTabletStylusIsPressed) && mUBRubberBand && mUBRubberBand->isVisible()) {
- bandRect = bandRect.normalized();
+ QRect bandRect(mMouseDownPos, event->pos());
- mUBRubberBand->setGeometry(bandRect);
+ bandRect = bandRect.normalized();
- QList rubberItems = items(bandRect);
- foreach (QGraphicsItem *item, mJustSelectedItems) {
- if (!rubberItems.contains(item)) {
- item->setSelected(false);
- mJustSelectedItems.remove(item);
- }
- }
-
- if (currentTool == UBStylusTool::Selector)
- foreach (QGraphicsItem *item, items(bandRect)) {
+ mUBRubberBand->setGeometry(bandRect);
- if (item->type() == UBGraphicsW3CWidgetItem::Type
- || item->type() == UBGraphicsPixmapItem::Type
- || item->type() == UBGraphicsMediaItem::Type
- || item->type() == UBGraphicsSvgItem::Type
- || item->type() == UBGraphicsTextItem::Type
- || item->type() == UBGraphicsStrokesGroup::Type
- || item->type() == UBGraphicsGroupContainerItem::Type) {
-
- if (!mJustSelectedItems.contains(item)) {
- item->setSelected(true);
- mJustSelectedItems.insert(item);
+ QList rubberItems = items(bandRect);
+ foreach (QGraphicsItem *item, mJustSelectedItems) {
+ if (!rubberItems.contains(item)) {
+ item->setSelected(false);
+ mJustSelectedItems.remove(item);
}
}
+
+ if (currentTool == UBStylusTool::Selector)
+ foreach (QGraphicsItem *item, items(bandRect)) {
+
+ if (item->type() == UBGraphicsW3CWidgetItem::Type
+ || item->type() == UBGraphicsPixmapItem::Type
+ || item->type() == UBGraphicsMediaItem::Type
+ || item->type() == UBGraphicsSvgItem::Type
+ || item->type() == UBGraphicsTextItem::Type
+ || item->type() == UBGraphicsStrokesGroup::Type
+ || item->type() == UBGraphicsGroupContainerItem::Type) {
+
+ if (!mJustSelectedItems.contains(item)) {
+ item->setSelected(true);
+ mJustSelectedItems.insert(item);
+ }
+ }
+ }
}
}
diff --git a/src/board/UBBoardView.h b/src/board/UBBoardView.h
index 0794d76c..5c486a30 100644
--- a/src/board/UBBoardView.h
+++ b/src/board/UBBoardView.h
@@ -154,6 +154,7 @@ class UBBoardView : public QGraphicsView
bool mIsDragInProgress;
bool mMultipleSelectionIsEnabled;
bool isControl;
+ bool mRubberBandInPlayMode;
static bool hasSelectedParents(QGraphicsItem * item);
diff --git a/src/board/UBFeaturesController.cpp b/src/board/UBFeaturesController.cpp
index 57019aac..6c777e73 100644
--- a/src/board/UBFeaturesController.cpp
+++ b/src/board/UBFeaturesController.cpp
@@ -36,7 +36,6 @@ const QString UBFeaturesController::webSearchPath = rootPath + "/Web search";
void UBFeaturesComputingThread::scanFS(const QUrl & currentPath, const QString & currVirtualPath, const QSet &pFavoriteSet)
{
-
Q_ASSERT(QFileInfo(currentPath.toLocalFile()).exists());
QFileInfoList fileInfoList = UBFileSystemUtils::allElementsInDirectory(currentPath.toLocalFile());
@@ -73,16 +72,16 @@ void UBFeaturesComputingThread::scanFS(const QUrl & currentPath, const QString &
}
}
-void UBFeaturesComputingThread::scanAll(QList > pScanningData, const QSet &pFavoriteSet)
+void UBFeaturesComputingThread::scanAll(QList > pScanningData, const QSet &pFavoriteSet)
{
for (int i = 0; i < pScanningData.count(); i++) {
if (abort) {
return;
}
- QPair curPair = pScanningData.at(i);
+ QPair curPair = pScanningData.at(i);
- emit scanCategory(UBFeaturesController::categoryNameForVirtualPath(curPair.second));
- scanFS(curPair.first, curPair.second, pFavoriteSet);
+ emit scanCategory(curPair.second.getDisplayName());
+ scanFS(curPair.first, curPair.second.getFullVirtualPath(), pFavoriteSet);
}
}
@@ -109,11 +108,11 @@ int UBFeaturesComputingThread::featuresCount(const QUrl &pPath)
return noItems;
}
-int UBFeaturesComputingThread::featuresCountAll(QList > pScanningData)
+int UBFeaturesComputingThread::featuresCountAll(QList > pScanningData)
{
int noItems = 0;
for (int i = 0; i < pScanningData.count(); i++) {
- QPair curPair = pScanningData.at(i);
+ QPair curPair = pScanningData.at(i);
noItems += featuresCount(curPair.first);
}
@@ -127,7 +126,7 @@ QThread(parent)
abort = false;
}
-void UBFeaturesComputingThread::compute(const QList > &pScanningData, QSet *pFavoritesSet)
+void UBFeaturesComputingThread::compute(const QList > &pScanningData, QSet *pFavoritesSet)
{
QMutexLocker curLocker(&mMutex);
@@ -148,7 +147,7 @@ void UBFeaturesComputingThread::run()
qDebug() << "Custom thread started execution";
mMutex.lock();
- QList > searchData = mScanningData;
+ QList > searchData = mScanningData;
QSet favoriteSet = mFavoriteSet;
mMutex.unlock();
@@ -339,24 +338,24 @@ UBFeaturesController::UBFeaturesController(QWidget *pParentWidget) :
void UBFeaturesController::startThread()
{
- QList > computingData;
+ QList > computingData;
- computingData << QPair(mLibAudiosDirectoryPath, audiosPath)
- << QPair(mLibVideosDirectoryPath, moviesPath)
- << QPair(mLibAnimationsDirectoryPath, flashPath)
- << QPair(mLibPicturesDirectoryPath, picturesPath)
+ computingData << QPair(mLibAudiosDirectoryPath, audiosElement)
+ << QPair(mLibVideosDirectoryPath, moviesElement)
+ << QPair(mLibAnimationsDirectoryPath, flashElement)
+ << QPair(mLibPicturesDirectoryPath, picturesElement)
- << QPair(mUserInteractiveDirectoryPath, appPath)
- << QPair(mUserAudioDirectoryPath, audiosPath)
- << QPair(mUserPicturesDirectoryPath, picturesPath)
- << QPair(mUserVideoDirectoryPath, moviesPath)
- << QPair(mUserAnimationDirectoryPath, flashPath)
+ << QPair(mUserInteractiveDirectoryPath, applicationsElement)
+ << QPair(mUserAudioDirectoryPath, audiosElement)
+ << QPair(mUserPicturesDirectoryPath, picturesElement)
+ << QPair(mUserVideoDirectoryPath, moviesElement)
+ << QPair(mUserAnimationDirectoryPath, flashElement)
- << QPair(mLibApplicationsDirectoryPath, appPath)
- << QPair(mLibShapesDirectoryPath, shapesPath)
- << QPair(mLibInteractiveDirectoryPath, interactPath)
- << QPair(trashDirectoryPath, trashPath)
- << QPair(mLibSearchDirectoryPath, rootPath + "/" + "Web search");
+ << QPair(mLibApplicationsDirectoryPath, applicationsElement)
+ << QPair(mLibShapesDirectoryPath, shapesElement)
+ << QPair(mLibInteractiveDirectoryPath, interactElement)
+ << QPair(trashDirectoryPath, trashElement)
+ << QPair(mLibSearchDirectoryPath, webSearchElement);
mCThread.compute(computingData, favoriteSet);
}
diff --git a/src/board/UBFeaturesController.h b/src/board/UBFeaturesController.h
index 92c31224..b48f3d62 100644
--- a/src/board/UBFeaturesController.h
+++ b/src/board/UBFeaturesController.h
@@ -33,7 +33,7 @@ class UBFeaturesComputingThread : public QThread
public:
explicit UBFeaturesComputingThread(QObject *parent = 0);
virtual ~UBFeaturesComputingThread();
- void compute(const QList > &pScanningData, QSet *pFavoritesSet);
+ void compute(const QList > &pScanningData, QSet *pFavoritesSet);
protected:
void run();
@@ -51,16 +51,16 @@ public slots:
private:
void scanFS(const QUrl & currentPath, const QString & currVirtualPath, const QSet &pFavoriteSet);
- void scanAll(QList > pScanningData, const QSet &pFavoriteSet);
+ void scanAll(QList > pScanningData, const QSet &pFavoriteSet);
int featuresCount(const QUrl &pPath);
- int featuresCountAll(QList > pScanningData);
+ int featuresCountAll(QList > pScanningData);
private:
QMutex mMutex;
QWaitCondition mWaitCondition;
QUrl mScanningPath;
QString mScanningVirtualPath;
- QList > mScanningData;
+ QList > mScanningData;
QSet mFavoriteSet;
bool restart;
bool abort;
diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp
index 6ca9ba87..e86dca46 100644
--- a/src/desktop/UBDesktopAnnotationController.cpp
+++ b/src/desktop/UBDesktopAnnotationController.cpp
@@ -86,7 +86,7 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
mTransparentDrawingView->setScene(mTransparentDrawingScene);
mTransparentDrawingScene->setDrawingMode(true);
- mDesktopPalette = new UBDesktopPalette(mTransparentDrawingView);
+ mDesktopPalette = new UBDesktopPalette(NULL); // FIX #633: The palette must be 'floating' in order to stay on top of the library palette
if (UBPlatformUtils::hasVirtualKeyboard())
{
@@ -119,13 +119,13 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
connect(UBDrawingController::drawingController(), SIGNAL(stylusToolChanged(int)), this, SLOT(stylusToolChanged(int)));
// Add the desktop associated palettes
- mDesktopPenPalette = new UBDesktopPenPalette(mTransparentDrawingView);
+ mDesktopPenPalette = new UBDesktopPenPalette(NULL); // FIX #633: The palette must be 'floating' in order to stay on top of the library palette
connect(mDesktopPalette, SIGNAL(maximized()), mDesktopPenPalette, SLOT(onParentMaximized()));
connect(mDesktopPalette, SIGNAL(minimizeStart(eMinimizedLocation)), mDesktopPenPalette, SLOT(onParentMinimized()));
- mDesktopMarkerPalette = new UBDesktopMarkerPalette(mTransparentDrawingView);
- mDesktopEraserPalette = new UBDesktopEraserPalette(mTransparentDrawingView);
+ mDesktopMarkerPalette = new UBDesktopMarkerPalette(NULL); // FIX #633: The palette must be 'floating' in order to stay on top of the library palette
+ mDesktopEraserPalette = new UBDesktopEraserPalette(NULL); // FIX #633: The palette must be 'floating' in order to stay on top of the library palette
mDesktopPalette->setBackgroundBrush(UBSettings::settings()->opaquePaletteColor);
mDesktopPenPalette->setBackgroundBrush(UBSettings::settings()->opaquePaletteColor);
@@ -154,6 +154,12 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
connect(UBApplication::boardController->paletteManager()->rightPalette(), SIGNAL(resized()), this, SLOT(refreshMask()));
#endif
onDesktopPaletteMaximized();
+
+ // FIX #633: Ensure that these palettes stay on top of the other elements
+ mDesktopEraserPalette->raise();
+ mDesktopMarkerPalette->raise();
+ mDesktopPenPalette->raise();
+ mDesktopPalette->raise();
}
UBDesktopAnnotationController::~UBDesktopAnnotationController()
@@ -243,11 +249,7 @@ void UBDesktopAnnotationController::setAssociatedPalettePosition(UBActionPalette
if(act->objectName() == actionName)
{
int iAction = actions.indexOf(act);
- yPen = iAction * mDesktopPalette->buttonSize().height();
-
- // Add the borders
- yPen += (iAction) * (mDesktopPalette->border() + 4); // 4 has been set after some experiment. We must determine why this value is good
-
+ yPen = iAction * (mDesktopPalette->buttonSize().height() + 2 * mDesktopPalette->border() +6); // This is the mysterious value (6)
break;
}
}
diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp
index 78823404..ee052027 100644
--- a/src/gui/UBFeaturesWidget.cpp
+++ b/src/gui/UBFeaturesWidget.cpp
@@ -676,7 +676,7 @@ UBFeaturesProgressInfo::UBFeaturesProgressInfo(QWidget *parent) :
void UBFeaturesProgressInfo::setCommmonInfoText(const QString &str)
{
- mProgressBar->setFormat(str + tr(" load") + "(%p%)");
+ mProgressBar->setFormat(tr("Loading ") + str + " (%p%)");
}
void UBFeaturesProgressInfo::setDetailedInfoText(const QString &str)
diff --git a/src/gui/UBPropertyPalette.cpp b/src/gui/UBPropertyPalette.cpp
index 8d587c99..643f87a7 100644
--- a/src/gui/UBPropertyPalette.cpp
+++ b/src/gui/UBPropertyPalette.cpp
@@ -25,6 +25,7 @@ UBPropertyPalette::UBPropertyPalette(QWidget *parent, const char *name):UBAction
{
setObjectName(name);
mbGrip = false;
+ setMaximumHeight(MAX_HEIGHT);
}
/**
@@ -35,6 +36,7 @@ UBPropertyPalette::UBPropertyPalette(QWidget *parent, const char *name):UBAction
UBPropertyPalette::UBPropertyPalette(Qt::Orientation orientation, QWidget *parent):UBActionPalette(orientation, parent)
{
mbGrip = false;
+ setMaximumHeight(MAX_HEIGHT);
}
/**
diff --git a/src/gui/UBPropertyPalette.h b/src/gui/UBPropertyPalette.h
index 777e976e..47bacf13 100644
--- a/src/gui/UBPropertyPalette.h
+++ b/src/gui/UBPropertyPalette.h
@@ -20,6 +20,8 @@
#include "UBActionPalette.h"
+#define MAX_HEIGHT 20
+
class UBPropertyPalette : public UBActionPalette
{
Q_OBJECT
diff --git a/src/gui/UBThumbnailWidget.cpp b/src/gui/UBThumbnailWidget.cpp
index 24f7442f..3057761b 100644
--- a/src/gui/UBThumbnailWidget.cpp
+++ b/src/gui/UBThumbnailWidget.cpp
@@ -12,11 +12,13 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
+#include
#include
#include
#include "UBThumbnailWidget.h"
#include "UBRubberBand.h"
+#include "UBMainWindow.h"
#include "board/UBBoardController.h"
@@ -858,7 +860,9 @@ void UBSceneThumbnailNavigPixmap::updateButtonsState()
void UBSceneThumbnailNavigPixmap::deletePage()
{
- UBApplication::boardController->deleteScene(sceneIndex());
+ if(UBApplication::mainWindow->yesNoQuestion(QObject::tr("Remove Page"), QObject::tr("Are you sure you want to remove 1 page from the selected document '%0'?").arg(UBApplication::documentController->selectedDocument()->metaData(UBSettings::documentName).toString()))){
+ UBApplication::boardController->deleteScene(sceneIndex());
+ }
}
void UBSceneThumbnailNavigPixmap::duplicatePage()