From 2d2af6f51bc31751659b611ebf9269291c010831 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Fri, 7 Oct 2011 08:47:39 +0200 Subject: [PATCH 1/4] changed version --- Sankore_3.1.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index 90a5d85b..5233fd82 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -7,7 +7,7 @@ CONFIG += debug_and_release \ no_include_pwd VERSION_MAJ = 1 -VERSION_MIN = 26 +VERSION_MIN = 28 VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error VERSION_PATCH = 00 From cd976fef7765c88f0f5441fac2c2c01677bc2fda Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 7 Oct 2011 10:34:00 +0200 Subject: [PATCH 2/4] Resolved issue 255 --- src/board/UBBoardPaletteManager.cpp | 24 +++++++++++++++++++ src/board/UBBoardPaletteManager.h | 11 +++++++++ src/desktop/UBDesktopAnnotationController.cpp | 5 +++- src/gui/UBDockPalette.cpp | 3 +++ 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 460fdb0c..08d609bf 100755 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -76,6 +76,8 @@ UBBoardPaletteManager::UBBoardPaletteManager(QWidget* container, UBBoardControll , mpPageNavigWidget(NULL) , mpLibWidget(NULL) , mpCachePropWidget(NULL) + , mDesktopRightPalette(NULL) + , mpDesktopLibWidget(NULL) { setupPalettes(); connectPalettes(); @@ -117,6 +119,17 @@ UBBoardPaletteManager::~UBBoardPaletteManager() delete mStylusPalette; mStylusPalette = NULL; } + + if(NULL != mpDesktopLibWidget) + { + delete mpDesktopLibWidget; + mpDesktopLibWidget = NULL; + } + if(NULL != mDesktopRightPalette) + { + delete mDesktopRightPalette; + mDesktopRightPalette = NULL; + } } void UBBoardPaletteManager::initPalettesPosAtStartup() @@ -693,3 +706,14 @@ void UBBoardPaletteManager::changeStylusPaletteOrientation(QVariant var) connect(mStylusPalette, SIGNAL(stylusToolDoubleClicked(int)), UBApplication::boardController, SLOT(stylusToolDoubleClicked(int))); mStylusPalette->setVisible(bVisible); // always show stylus palette at startup } + +UBRightPalette* UBBoardPaletteManager::createDesktopRightPalette(QWidget* parent) +{ + mpDesktopLibWidget = new UBLibWidget(); + mDesktopRightPalette = new UBRightPalette(parent); + mDesktopRightPalette->registerWidget(mpDesktopLibWidget); + mDesktopRightPalette->addTabWidget(mpDesktopLibWidget); + mDesktopRightPalette->connectSignals(); + + return mDesktopRightPalette; +} diff --git a/src/board/UBBoardPaletteManager.h b/src/board/UBBoardPaletteManager.h index a4d0e08e..4ca00fd7 100644 --- a/src/board/UBBoardPaletteManager.h +++ b/src/board/UBBoardPaletteManager.h @@ -51,6 +51,7 @@ class UBBoardPaletteManager : public QObject void initPalettesPosAtStartup(); UBKeyboardPalette *mKeyboardPalette; + UBRightPalette* createDesktopRightPalette(QWidget* parent); public slots: @@ -78,6 +79,11 @@ class UBBoardPaletteManager : public QObject /** The right dock palette */ UBRightPalette* mRightPalette; + // HACK: here we duplicate the right palette for the desktop mode + // we MUST refactor the architecture in order to use only one + // right palette! + UBRightPalette* mDesktopRightPalette; + UBActionPalette *mBackgroundsPalette; UBActionPalette *mToolsPalette; UBActionPalette* mAddItemPalette; @@ -108,6 +114,11 @@ class UBBoardPaletteManager : public QObject /** The cache properties widget */ UBCachePropertiesWidget* mpCachePropWidget; + // HACK: here we duplicate the lib widget for the desktop mode + // we MUST refactor the architecture in order to use only one + // lib widget! + UBLibWidget* mpDesktopLibWidget; + private slots: void changeBackground(); diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp index 063359fc..90424d31 100644 --- a/src/desktop/UBDesktopAnnotationController.cpp +++ b/src/desktop/UBDesktopAnnotationController.cpp @@ -31,6 +31,7 @@ #include "board/UBBoardView.h" #include "board/UBDrawingController.h" #include "board/UBBoardController.h" +#include "board/UBBoardPaletteManager.h" #include "domain/UBGraphicsScene.h" @@ -87,7 +88,8 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent) mTransparentDrawingScene = new UBGraphicsScene(0); mTransparentDrawingView->setScene(mTransparentDrawingScene); - mRightPalette = new UBRightPalette(mTransparentDrawingView); + mRightPalette = UBApplication::boardController->paletteManager()->createDesktopRightPalette(mTransparentDrawingView); + //mRightPalette = new UBRightPalette(mTransparentDrawingView); mDesktopPalette = new UBDesktopPalette(mTransparentDrawingView); @@ -810,6 +812,7 @@ void UBDesktopAnnotationController::updateMask(bool bTransparent) } if(mRightPalette->isVisible()) { + qDebug() << ">>>>>> Drawing the mask for the right palette"; p.drawRect(mRightPalette->geometry().x(), mRightPalette->geometry().y(), mRightPalette->width(), mRightPalette->height()); } diff --git a/src/gui/UBDockPalette.cpp b/src/gui/UBDockPalette.cpp index 7e0e49fe..ca66ec4c 100644 --- a/src/gui/UBDockPalette.cpp +++ b/src/gui/UBDockPalette.cpp @@ -167,6 +167,9 @@ void UBDockPalette::mouseMoveEvent(QMouseEvent *event) resize(parentWidget()->width() - (this->x() + p.x()), height()); mResized = true; } + + qDebug() << ">>>>> UBRightPalette x=" << this->x() << ", y=" << this->y(); + break; case eUBDockOrientation_Top: case eUBDockOrientation_Bottom: From 2f245a94fa214d9f6d8190a4f64aefb4d4a9be90 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Fri, 7 Oct 2011 10:38:15 +0200 Subject: [PATCH 3/4] Removed a debug string --- src/gui/UBDockPalette.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gui/UBDockPalette.cpp b/src/gui/UBDockPalette.cpp index ca66ec4c..0882b611 100644 --- a/src/gui/UBDockPalette.cpp +++ b/src/gui/UBDockPalette.cpp @@ -168,8 +168,6 @@ void UBDockPalette::mouseMoveEvent(QMouseEvent *event) mResized = true; } - qDebug() << ">>>>> UBRightPalette x=" << this->x() << ", y=" << this->y(); - break; case eUBDockOrientation_Top: case eUBDockOrientation_Bottom: From 0ac61a5e43e02986d4b6c83604b3b6204e87088b Mon Sep 17 00:00:00 2001 From: Ivan Ilin Date: Fri, 7 Oct 2011 15:14:59 +0300 Subject: [PATCH 4/4] static foreground and background for tool tips --- src/gui/UBMainWindow.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/gui/UBMainWindow.cpp b/src/gui/UBMainWindow.cpp index 205dc2f3..11d8b41c 100644 --- a/src/gui/UBMainWindow.cpp +++ b/src/gui/UBMainWindow.cpp @@ -31,6 +31,13 @@ UBMainWindow::UBMainWindow(QWidget *parent, Qt::WindowFlags flags) { Ui::MainWindow::setupUi(this); + + //Setting tooltip colors staticly, since they look not quite well on different color themes + QPalette toolTipPalette; + toolTipPalette.setColor(QPalette::ToolTipBase, QColor("#FFFFDC")); + toolTipPalette.setColor(QPalette::ToolTipText, Qt::black); + QToolTip::setPalette(toolTipPalette); + QWidget* centralWidget = new QWidget(this); mStackedLayout = new QStackedLayout(centralWidget); setCentralWidget(centralWidget);