").appendTo(img_block);
$("").appendTo(img_block);
@@ -743,4 +742,4 @@ function onDropTarget(obj, event) {
event.cancelBubble = true;
}
return false;
-}
\ No newline at end of file
+}
diff --git a/resources/library/interactivities/etudier.wgt/js/script.js b/resources/library/interactivities/etudier.wgt/js/script.js
index 52cbbf28..f823c713 100644
--- a/resources/library/interactivities/etudier.wgt/js/script.js
+++ b/resources/library/interactivities/etudier.wgt/js/script.js
@@ -529,7 +529,6 @@ function onDropTarget(obj, event) {
textData = stringToXML(textData);
var tmp = textData.getElementsByTagName("path")[0].firstChild.textContent;
var tmp_type = textData.getElementsByTagName("type")[0].firstChild.textContent;
- tmp = tmp.substr(1, tmp.length);
if(tmp_type.substr(0, 5) == "audio"){
var audio_block = $("
").draggable().appendTo($(obj));
audio_block.css("position","absolute").css("top",event.clientY).css("left",event.clientX);
@@ -587,4 +586,4 @@ $(window).resize(function(){
$(this).width(slider.width()).height(slider.height());
});
slider.setSize(slider.width(), slider.height());
-})
\ No newline at end of file
+})
diff --git a/resources/library/interactivities/ordonner_des_images.wgt/js/script.js b/resources/library/interactivities/ordonner_des_images.wgt/js/script.js
index 2dc90199..bd11f808 100644
--- a/resources/library/interactivities/ordonner_des_images.wgt/js/script.js
+++ b/resources/library/interactivities/ordonner_des_images.wgt/js/script.js
@@ -444,7 +444,6 @@ function onDropTarget(obj, event) {
}
textData = stringToXML(textData);
var tmp = textData.getElementsByTagName("path")[0].firstChild.textContent;
- tmp = tmp.substr(1, tmp.length);
var tmp_img = $("![]()
").attr("src", tmp);
$(obj).append(tmp_img);
setTimeout(function(){
diff --git a/resources/library/interactivities/ordonner_des_letters.wgt/js/script.js b/resources/library/interactivities/ordonner_des_letters.wgt/js/script.js
index 2cf9d4bf..bca8ff38 100644
--- a/resources/library/interactivities/ordonner_des_letters.wgt/js/script.js
+++ b/resources/library/interactivities/ordonner_des_letters.wgt/js/script.js
@@ -438,7 +438,6 @@ function onDropAudio(obj, event) {
var tmp_type = textData.getElementsByTagName("type")[0].firstChild.textContent;
if(tmp_type.substr(0, 5) == "audio"){
var audio_block = $(obj).find(".audio_block");
- tmp = tmp.substr(1, tmp.length);
$(obj).find("audio").remove();
audio_block.find(":first-child").removeClass("stop").addClass("play");
var source = $("
").insertBefore($(obj).find(".add_img"));
var audio_block = $("
").appendTo(img_tmp)
diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp
index 8148b66c..f8a98903 100644
--- a/src/adaptors/UBSvgSubsetAdaptor.cpp
+++ b/src/adaptors/UBSvgSubsetAdaptor.cpp
@@ -2314,6 +2314,22 @@ UBGraphicsTextItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::textItemFromSvg()
QStringRef ubFillOnDarkBackground = mXmlReader.attributes().value(mNamespaceUri, "fill-on-dark-background");
QStringRef ubFillOnLightBackground = mXmlReader.attributes().value(mNamespaceUri, "fill-on-light-background");
+ if (!ubFillOnDarkBackground.isNull()) {
+ QColor color;
+ color.setNamedColor(ubFillOnDarkBackground.toString());
+ if (!color.isValid())
+ color = Qt::white;
+ textItem->setColorOnDarkBackground(color);
+ }
+
+ if (!ubFillOnLightBackground.isNull()) {
+ QColor color;
+ color.setNamedColor(ubFillOnLightBackground.toString());
+ if (!color.isValid())
+ color = Qt::black;
+ textItem->setColorOnLightBackground(color);
+ }
+
QString text;
while (!(mXmlReader.isEndElement() && (mXmlReader.name() == "font" || mXmlReader.name() == "foreignObject")))
@@ -2382,22 +2398,6 @@ UBGraphicsTextItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::textItemFromSvg()
textItem->setDefaultTextColor(textColor);
}
- if (!ubFillOnDarkBackground.isNull()) {
- QColor color;
- color.setNamedColor(ubFillOnDarkBackground.toString());
- if (!color.isValid())
- color = Qt::white;
- textItem->setColorOnDarkBackground(color);
- }
-
- if (!ubFillOnLightBackground.isNull()) {
- QColor color;
- color.setNamedColor(ubFillOnLightBackground.toString());
- if (!color.isValid())
- color = Qt::black;
- textItem->setColorOnLightBackground(color);
- }
-
while (!(mXmlReader.isEndElement() && mXmlReader.name() == "font")) {
if (mXmlReader.hasError()) {
break;
diff --git a/src/api/UBWidgetUniboardAPI.cpp b/src/api/UBWidgetUniboardAPI.cpp
index 260734ad..71a22881 100644
--- a/src/api/UBWidgetUniboardAPI.cpp
+++ b/src/api/UBWidgetUniboardAPI.cpp
@@ -467,7 +467,10 @@ void UBWidgetUniboardAPI::sendFileMetadata(QString metaData)
void UBWidgetUniboardAPI::enableDropOnWidget(bool enable)
{
- mGraphicsWidget->setAcceptDrops(enable);
+ if (mGraphicsWidget)
+ {
+ mGraphicsWidget->setAcceptDrops(enable);
+ }
}
void UBWidgetUniboardAPI::ProcessDropEvent(QDropEvent *event)
diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index c1f86511..a14330c1 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -1823,8 +1823,7 @@ UBGraphicsWidgetItem *UBBoardController::addW3cWidget(const QUrl &pUrl, const QP
tmpItem->widgetWebView()->takeSnapshot().save(snapshotPath, "PNG");
}
-
- return 0;
+ return w3cWidgetItem;
}
void UBBoardController::cut()
@@ -1959,8 +1958,12 @@ void UBBoardController::processMimeData(const QMimeData* pMimeData, const QPoint
if("" != url)
{
downloadURL(url, pPos);
- return;
}
+ else
+ {
+ mActiveScene->addTextHtml(qsHtml, pPos);
+ }
+ return;
}
if (pMimeData->hasUrls())
@@ -1996,11 +1999,11 @@ void UBBoardController::processMimeData(const QMimeData* pMimeData, const QPoint
if("" != pMimeData->text()){
// Sometimes, it is possible to have an URL as text. we check here if it is the case
QString qsTmp = pMimeData->text().remove(QRegExp("[\\0]"));
- if(qsTmp.startsWith("http")){
+ if(qsTmp.startsWith("http://") || qsTmp.startsWith("https://")){
downloadURL(QUrl(qsTmp), pPos);
}
else{
- mActiveScene->addTextHtml(pMimeData->html(), pPos);
+ mActiveScene->addTextHtml(pMimeData->text(), pPos);
}
}
else{
diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp
index 670f0ed8..23bfab89 100644
--- a/src/board/UBBoardView.cpp
+++ b/src/board/UBBoardView.cpp
@@ -49,9 +49,6 @@
#include "document/UBDocumentProxy.h"
-#include "customWidgets/UBDraggableLabel.h"
-#include "customWidgets/UBDraggableMedia.h"
-
#include "tools/UBGraphicsCompass.h"
#include "tools/UBGraphicsCache.h"
#include "tools/UBGraphicsTriangle.h"
@@ -426,6 +423,7 @@ UBBoardView::mousePressEvent (QMouseEvent *event)
if (!movingItem
|| movingItem->isSelected()
+ || movingItem->data(UBGraphicsItemData::ItemLocked).toBool()
|| movingItem->type() == UBGraphicsDelegateFrame::Type
|| movingItem->type() == DelegateButton::Type
|| movingItem->type() == UBGraphicsCompass::Type
@@ -812,14 +810,11 @@ void UBBoardView::dropEvent (QDropEvent *event)
UBGraphicsWidgetItem* graphicsWidget = dynamic_cast(graphicsItemAtPos);
if (graphicsWidget && graphicsWidget->acceptDrops()) {
-
graphicsWidget->processDropEvent(event);
event->acceptProposedAction();
- } else if (!event->source() || dynamic_cast(event->source())
- || dynamic_cast(event->source()) || dynamic_cast(event->source())
- || dynamic_cast(event->source()) || dynamic_cast(event->source())) {
-
+ }
+ else if (!event->source() || dynamic_cast(event->source()) || dynamic_cast(event->source())){
mController->processMimeData (event->mimeData (), mapToScene (event->pos ()));
event->acceptProposedAction();
}
diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp
index addf65cc..5ba57bbb 100644
--- a/src/board/UBLibraryController.cpp
+++ b/src/board/UBLibraryController.cpp
@@ -155,7 +155,7 @@ void UBLibraryController::routeItem(QString& pItem, QString pMiddleDirectory)
}
destination = UBFileSystemUtils::normalizeFilePath(destination + "/" + itemToRoute.fileName());
- QFile::copy(pItem, destination);
+ UBFileSystemUtils::copyFile(QUrl(pItem).toLocalFile(), destination, false);
}
}
diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp
index 78d3fd54..b8450d19 100644
--- a/src/core/UBSettings.cpp
+++ b/src/core/UBSettings.cpp
@@ -204,11 +204,14 @@ void UBSettings::init()
appEnableAutomaticSoftwareUpdates = new UBSetting(this, "App", "EnableAutomaticSoftwareUpdates", true);
appEnableSoftwareUpdates = new UBSetting(this, "App", "EnableSoftwareUpdates", true);
appToolBarOrientationVertical = new UBSetting(this, "App", "ToolBarOrientationVertical", false);
- navigPaletteWidth = new UBSetting(this, "Board", "NavigPaletteWidth", 270);
- rightLibPaletteWidth = new UBSetting(this, "Board", "RightLibPaletteWidth", 270);
- rightLibPaletteIsCollapsed = new UBSetting(this,"Board", "RightLibPaletteIsCollapsed",false);
- leftLibPaletteWidth = new UBSetting(this, "Board", "LeftLibPaletteWidth",270);
- leftLibPaletteIsCollapsed = new UBSetting(this,"Board","LeftLibPaletteIsCollapsed",false);
+ rightLibPaletteBoardModeWidth = new UBSetting(this, "Board", "RightLibPaletteBoardModeWidth", 270);
+ rightLibPaletteBoardModeIsCollapsed = new UBSetting(this,"Board", "RightLibPaletteBoardModeIsCollapsed",false);
+ rightLibPaletteDesktopModeWidth = new UBSetting(this, "Board", "RightLibPaletteDesktopModeWidth", 270);
+ rightLibPaletteDesktopModeIsCollapsed = new UBSetting(this,"Board", "RightLibPaletteDesktopModeIsCollapsed",false);
+ leftLibPaletteBoardModeWidth = new UBSetting(this, "Board", "LeftLibPaletteBoardModeWidth",270);
+ leftLibPaletteBoardModeIsCollapsed = new UBSetting(this,"Board","LeftLibPaletteBoardModeIsCollapsed",false);
+ leftLibPaletteDesktopModeWidth = new UBSetting(this, "Board", "LeftLibPaletteDesktopModeWidth",270);
+ leftLibPaletteDesktopModeIsCollapsed = new UBSetting(this,"Board","LeftLibPaletteDesktopModeIsCollapsed",false);
appIsInSoftwareUpdateProcess = new UBSetting(this, "App", "IsInSoftwareUpdateProcess", false);
appLastSessionDocumentUUID = new UBSetting(this, "App", "LastSessionDocumentUUID", "");
diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h
index acb4b28a..c928b6fa 100644
--- a/src/core/UBSettings.h
+++ b/src/core/UBSettings.h
@@ -314,11 +314,14 @@ class UBSettings : public QObject
UBSetting* gipThumbnailWidth;
UBSetting* soundThumbnailWidth;
- UBSetting* navigPaletteWidth;
- UBSetting* rightLibPaletteWidth;
- UBSetting* rightLibPaletteIsCollapsed;
- UBSetting* leftLibPaletteWidth;
- UBSetting* leftLibPaletteIsCollapsed;
+ UBSetting* rightLibPaletteBoardModeWidth;
+ UBSetting* rightLibPaletteBoardModeIsCollapsed;
+ UBSetting* rightLibPaletteDesktopModeWidth;
+ UBSetting* rightLibPaletteDesktopModeIsCollapsed;
+ UBSetting* leftLibPaletteBoardModeWidth;
+ UBSetting* leftLibPaletteBoardModeIsCollapsed;
+ UBSetting* leftLibPaletteDesktopModeWidth;
+ UBSetting* leftLibPaletteDesktopModeIsCollapsed;
UBSetting* communityUser;
UBSetting* communityPsw;
diff --git a/src/customWidgets/UBActionableWidget.cpp b/src/customWidgets/UBActionableWidget.cpp
deleted file mode 100644
index 65e440a3..00000000
--- a/src/customWidgets/UBActionableWidget.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include
-#include
-
-#include "UBActionableWidget.h"
-
-UBActionableWidget::UBActionableWidget(QWidget *parent, const char *name):QWidget(parent)
- , mShowActions(false)
-{
- setObjectName(name);
- mActions.clear();
- mCloseButtons.setIcon(QIcon(QPixmap(":images/close.svg")));
- mCloseButtons.setGeometry(0, 0, 2*ACTIONSIZE, ACTIONSIZE);
- mCloseButtons.setVisible(false);
- connect(&mCloseButtons, SIGNAL(clicked()), this, SLOT(onCloseClicked()));
-}
-
-UBActionableWidget::~UBActionableWidget()
-{
-
-}
-
-void UBActionableWidget::addAction(eAction act)
-{
- if(!mActions.contains(act)){
- mActions << act;
- }
-}
-
-void UBActionableWidget::removeAction(eAction act)
-{
- if(mActions.contains(act)){
- mActions.remove(mActions.indexOf(act));
- }
-}
-
-void UBActionableWidget::removeAllActions()
-{
- mActions.clear();
-}
-
-void UBActionableWidget::setActionsVisible(bool bVisible)
-{
- if(!mActions.empty() && mActions.contains(eAction_Close)){
- mCloseButtons.setVisible(bVisible);
- }
-}
-
-void UBActionableWidget::onCloseClicked()
-{
- emit close(this);
-}
-
-void UBActionableWidget::setActionsParent(QWidget *parent)
-{
- if(mActions.contains(eAction_Close)){
- mCloseButtons.setParent(parent);
- }
-}
-
-void UBActionableWidget::unsetActionsParent()
-{
- if(mActions.contains(eAction_Close)){
- mCloseButtons.setParent(this);
- }
-}
diff --git a/src/customWidgets/UBActionableWidget.h b/src/customWidgets/UBActionableWidget.h
deleted file mode 100644
index 683463df..00000000
--- a/src/customWidgets/UBActionableWidget.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef UBACTIONABLEWIDGET_H
-#define UBACTIONABLEWIDGET_H
-
-#include
-#include
-#include
-#include
-
-#define ACTIONSIZE 16
-
-typedef enum{
- eAction_Close,
- eAction_MoveUp,
- eAction_MoveDown
-}eAction;
-
-class UBActionableWidget : public QWidget
-{
- Q_OBJECT
-public:
- UBActionableWidget(QWidget* parent=0, const char* name="UBActionableWidget");
- ~UBActionableWidget();
- void addAction(eAction act);
- void removeAction(eAction act);
- void removeAllActions();
- void setActionsVisible(bool bVisible);
-
-signals:
- void close(QWidget* w);
-
-protected:
- void setActionsParent(QWidget* parent);
- void unsetActionsParent();
- QVector mActions;
- QPushButton mCloseButtons;
-
-private slots:
- void onCloseClicked();
-
-private:
- bool mShowActions;
-
-};
-
-#endif // UBACTIONABLEWIDGET_H
diff --git a/src/customWidgets/UBDraggableLabel.cpp b/src/customWidgets/UBDraggableLabel.cpp
deleted file mode 100644
index 200205b9..00000000
--- a/src/customWidgets/UBDraggableLabel.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include
-#include
-#include
-
-#include "UBDraggableLabel.h"
-
-
-UBDraggableLabel::UBDraggableLabel(QWidget *parent) :
- QLabel(parent)
-{
-}
-
-UBDraggableLabel::~UBDraggableLabel()
-{
- //NOOP
-}
-
-void UBDraggableLabel::loadImage(QString imagePath)
-{
- mSourcePath = imagePath;
- QPixmap pix = QPixmap(mSourcePath);
- setPixmap(pix);
- setScaledContents(true);
-}
-
-void UBDraggableLabel::mousePressEvent(QMouseEvent *event)
-{
- Q_UNUSED(event);
- QMimeData *mimeData = new QMimeData;
- QList urls;
- urls << QUrl::fromLocalFile(mSourcePath);
- mimeData->setUrls(urls);
- mimeData->setText(mSourcePath);
-
-
- QDrag *drag = new QDrag(this);
- drag->setMimeData(mimeData);
- drag->start();
-}
diff --git a/src/customWidgets/UBDraggableLabel.h b/src/customWidgets/UBDraggableLabel.h
deleted file mode 100644
index 384b313e..00000000
--- a/src/customWidgets/UBDraggableLabel.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef UBDRAGGABLELABEL_H
-#define UBDRAGGABLELABEL_H
-
-#include
-
-class UBDraggableLabel : public QLabel
-{
- Q_OBJECT
-public:
- UBDraggableLabel(QWidget *parent = 0);
- ~UBDraggableLabel();
- void loadImage(QString imagePath);
-signals:
-
-public slots:
-
-protected:
- QString mSourcePath;
- void mousePressEvent(QMouseEvent *event);
-
-};
-
-#endif // UBDRAGGABLELABEL_H
diff --git a/src/customWidgets/UBDraggableMedia.cpp b/src/customWidgets/UBDraggableMedia.cpp
deleted file mode 100644
index 4136f742..00000000
--- a/src/customWidgets/UBDraggableMedia.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include
-#include
-
-#include "UBDraggableMedia.h"
-
-UBDraggableMedia::UBDraggableMedia(eMediaType type, QWidget *parent, const char *name):UBMediaWidget(type, parent, name)
-{
- removeAllActions();
-}
-
-UBDraggableMedia::~UBDraggableMedia()
-{
-
-}
-
-void UBDraggableMedia::mousePressEvent(QMouseEvent* ev)
-{
- if(Qt::LeftButton == ev->button()){
- mDragStartPos = ev->pos();
- }
-}
-
-void UBDraggableMedia::mouseMoveEvent(QMouseEvent* ev)
-{
- if(!(ev->buttons() & Qt::LeftButton)){
- return;
- }
- if((ev->pos() - mDragStartPos).manhattanLength() < QApplication::startDragDistance()){
- return;
- }
- QDrag *drag = new QDrag(this);
- QMimeData *mimeData = new QMimeData;
-
- QList urls;
- urls << QUrl(mFilePath);
- mimeData->setText(mFilePath);
- mimeData->setUrls(urls);
-
- drag->setMimeData(mimeData);
-
- drag->exec(Qt::CopyAction | Qt::MoveAction);
-}
diff --git a/src/customWidgets/UBDraggableMedia.h b/src/customWidgets/UBDraggableMedia.h
deleted file mode 100644
index b45c9391..00000000
--- a/src/customWidgets/UBDraggableMedia.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef UBDRAGGABLEMEDIA_H
-#define UBDRAGGABLEMEDIA_H
-
-#include "UBMediaWidget.h"
-
-class UBDraggableMedia : public UBMediaWidget
-{
-public:
- UBDraggableMedia(eMediaType type = eMediaType_Video, QWidget* parent=0, const char* name="UBDraggableMedia");
- ~UBDraggableMedia();
-protected:
- void mousePressEvent(QMouseEvent* ev);
- void mouseMoveEvent(QMouseEvent* ev);
-
-private:
- QPoint mDragStartPos;
-};
-
-#endif // UBDRAGGABLEMEDIA_H
diff --git a/src/customWidgets/UBMediaWidget.cpp b/src/customWidgets/UBMediaWidget.cpp
deleted file mode 100644
index 4bef693b..00000000
--- a/src/customWidgets/UBMediaWidget.cpp
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-
-#include "interfaces/IResizeable.h"
-#include "UBActionableWidget.h"
-
-#define UBMEDIABUTTON_SIZE 32
-#define TICK_INTERVAL 1000
-
-/**
- * \brief The media type
- */
-typedef enum{
- eMediaType_Video,
- eMediaType_Audio
-}eMediaType;
-
-class UBMediaButton : public QLabel
-{
- Q_OBJECT
-public:
- UBMediaButton(QWidget* parent=0, const char* name="UBMediaButton");
- ~UBMediaButton();
-
-signals:
- void clicked();
-
-protected:
- void mousePressEvent(QMouseEvent* ev);
- void mouseReleaseEvent(QMouseEvent* ev);
-
-private:
- /** And indicator of the press event in progress */
- bool mPressed;
-};
-
-class UBMediaWidget : public UBActionableWidget
-{
- Q_OBJECT
-public:
- UBMediaWidget(eMediaType type = eMediaType_Video, QWidget* parent=0, const char* name="UBMediaWidget");
- ~UBMediaWidget();
- void setFile(const QString& filePath);
- eMediaType mediaType();
- int border();
- void setAudioCover(const QString& coverPath);
- void setUrl(const QString& url){mUrl = url;}
- QString url(){return mUrl;}
-
-protected:
- void resizeEvent(QResizeEvent* ev);
- void showEvent(QShowEvent* event);
- /** The current media file path */
- QString mFilePath;
-
-private slots:
- void onPlayStopClicked();
- void onPauseClicked();
- void onStateChanged(Phonon::State newState, Phonon::State oldState);
- void onTotalTimeChanged(qint64 total);
- void onTick(qint64 currentTime);
- void onSliderChanged(int value);
-
-private:
- void createMediaPlayer();
- void adaptSizeToVideo();
-
- /** The current media type */
- eMediaType mType;
- /** The media object */
- Phonon::MediaObject* mpMediaObject;
- /** The video renderer */
- Phonon::VideoWidget* mpVideoWidget;
- /** The audio renderer */
- Phonon::AudioOutput* mpAudioOutput;
- /** The principal layout of this widget */
- QVBoxLayout mLayout;
- /** The seeker layout */
- QHBoxLayout mSeekerLayout;
- /** The play-stop button */
- UBMediaButton* mpPlayStopButton;
- /** The pause button */
- UBMediaButton* mpPauseButton;
- /** The seeker slider */
- QSlider* mpSlider;
- /** An indicator of the seeker auto update in progress */
- bool mAutoUpdate;
- /** An indicator of the thumbnail generation in progress */
- bool mGeneratingThumbnail;
- /** The border */
- int mBorder;
- /** A widget that will contain the media */
- QWidget* mpMediaContainer;
- /** The media layout */
- QHBoxLayout mMediaLayout;
- /** The audio cover */
- QLabel* mpCover;
- /** The media url */
- QString mUrl;
-};
-
-#endif // UBMEDIAWIDGET_H
diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp
deleted file mode 100644
index a9e9a305..00000000
--- a/src/customWidgets/UBWidgetList.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-#include
-#include
-#include
-#include
-
-#include "globals/UBGlobals.h"
-#include "UBWidgetList.h"
-
-UBWidgetList::UBWidgetList(QWidget* parent, eWidgetListOrientation orientation, const char* name):QScrollArea(parent)
- , mCanRemove(true)
- , mpLayout(NULL)
- , mpContainer(NULL)
- , mMargin(10)
- , mListElementsSpacing(10)
- , mpEmptyLabel(NULL)
- , mpCurrentWidget(NULL)
-{
- setObjectName(name);
- mOrientation = orientation;
- mpContainer = new QWidget(this);
- mpEmptyLabel = new QLabel(this);
- mpEmptyLabel->setObjectName("emptyString");
- mpEmptyLabel->setWordWrap(true);
- mpEmptyLabel->setAlignment(Qt::AlignCenter);
-
- if(eWidgetListOrientation_Vertical == orientation){
- setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
- setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- mpLayout = new QVBoxLayout(mpContainer);
- }
- else{
- setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
- setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- mpLayout = new QHBoxLayout(mpContainer);
- }
- mpLayout->setContentsMargins(margin(), margin(), margin(), margin());
- mpContainer->setLayout(mpLayout);
- setWidget(mpContainer);
-}
-
-UBWidgetList::~UBWidgetList()
-{
- DELETEPTR(mpEmptyLabel);
- DELETEPTR(mpLayout);
- DELETEPTR(mpContainer);
-}
-
-void UBWidgetList::addWidget(QWidget *widget)
-{
- if(NULL != mpLayout && NULL != widget){
- widget->setParent(mpContainer);
- mpEmptyLabel->setVisible(false);
- mWidgetInfo[widget] = widget->size();
- updateView(size());
- mpLayout->addWidget(widget);
-
- // This call is used only to refresh the size of the widgets
- updateSizes();
- }
-}
-
-void UBWidgetList::removeWidget(QWidget *widget)
-{
- if(NULL != mpLayout && NULL != widget){
- mpLayout->removeWidget(widget);
- mWidgetInfo.remove(widget);
- widget->setVisible(false);
- updateView(size());
- if(0 == mpLayout->count()){
- mpEmptyLabel->setVisible(true);
- }
- if(mpCurrentWidget == widget){
- mpCurrentWidget = NULL;
- }
- }
-}
-
-
-int UBWidgetList::scaleWidgets(QSize pSize)
-{
- // to remove the first spacing that shouldn't be there.
- int result = -mListElementsSpacing;
- foreach(QWidget* eachWidget, mWidgetInfo.keys()){
- qreal scaleFactor = 0;
- int newWidgetWidth = pSize.width();
- int newWidgetHeight = pSize.height();
- if(eWidgetListOrientation_Vertical == mOrientation){
- scaleFactor = (float)mWidgetInfo[eachWidget].width() / (float)pSize.width();
- newWidgetHeight = mWidgetInfo[eachWidget].height()/scaleFactor;
- result += newWidgetHeight;
- eachWidget->setMinimumHeight(newWidgetHeight- 1);
- eachWidget->setMaximumHeight(newWidgetHeight);
- }
- else{
- scaleFactor = (float)mWidgetInfo[eachWidget].height() / (float)pSize.height();
- newWidgetWidth = mWidgetInfo[eachWidget].width()/scaleFactor;
- result += newWidgetWidth;
- eachWidget->setMinimumWidth(newWidgetWidth - 1);
- eachWidget->setMaximumWidth(newWidgetWidth);
- }
- //Adding a vertical/horizontal space between each element of the list
- result += mListElementsSpacing;
- }
- return result;
-}
-
-void UBWidgetList::scaleContainer(QSize pSize, int updateValue)
-{
- if(eWidgetListOrientation_Vertical == mOrientation)
- mpContainer->resize(pSize.width(), updateValue);
- else
- mpContainer->resize(updateValue, pSize.height());
-}
-
-
-void UBWidgetList::updateView(QSize pSize)
-{
- // Widgets on list are resized automatically to fit the mpcontainer.
- // so if you want to keep the aspect ratio you have to calculate
- // the sum of the new widget height and give it to the mpContainer.
- // The container resize will trig the widgets resize and the good
- // height permits to respect the aspect ratio.
- int updatedValue = scaleWidgets(pSize);
- scaleContainer(pSize,updatedValue);
-}
-
-
-
-void UBWidgetList::resizeEvent(QResizeEvent *ev)
-{
- Q_UNUSED(ev);
- mpEmptyLabel->setGeometry((width() - mpEmptyLabel->width()) / 2,
- (height() - mpEmptyLabel->height()) /2,
- mpEmptyLabel->width(),
- mpEmptyLabel->height());
- updateView(size());
- updateSizes();
-}
-
-void UBWidgetList::mousePressEvent(QMouseEvent *ev)
-{
- Q_UNUSED(ev);
- if(mCanRemove){
- QWidget* pWAt = widgetAt(ev->pos());
- if(NULL != mpCurrentWidget){
- if(pWAt != mpCurrentWidget){
- mpCurrentWidget->setActionsVisible(false);
- update();
- }
- }
- mpCurrentWidget = dynamic_cast(pWAt);
- if(NULL != mpCurrentWidget){
- mpCurrentWidget->setActionsVisible(true);
- update();
- }
- }
- update();
-}
-
-QWidget* UBWidgetList::widgetAt(QPoint p)
-{
- QWidget* pW = NULL;
- pW = childAt(p);
- if(NULL != pW){
- do{
- if( "UBTeacherStudentAction" == pW->objectName() ||
- "UBUrlWidget" == pW->objectName() ||
- "UBTBMediaPicture" == pW->objectName() ||
- "UBMediaWidget" == pW->objectName()){
- return pW;
- }else{
- pW = pW->parentWidget();
- }
- }while(NULL != pW && this != pW);
- }
-
- return pW;
-}
-
-void UBWidgetList::updateSizes()
-{
- // Resize all the widgets
- foreach(QWidget* eachWidget, mWidgetInfo.keys()){
- if(NULL != eachWidget){
- QSize originalSize = mWidgetInfo[eachWidget];
- int currentWidth = mpContainer->width();
- int currentHeight = mpContainer->height();
- if(eWidgetListOrientation_Vertical == mOrientation){
- if(verticalScrollBar()->isVisible()){
- currentWidth -= verticalScrollBar()->width();
- eachWidget->setStyleSheet(QString("margin-right:%0;").arg(verticalScrollBar()->width()));
- }
- float scaleFactor = (float)currentWidth/(float)originalSize.width();
- currentHeight = originalSize.height()*scaleFactor;
- }else{
- if(horizontalScrollBar()->isVisible()){
- currentHeight -= horizontalScrollBar()->height();
- eachWidget->setStyleSheet(QString("padding-bottom:%0;").arg(horizontalScrollBar()->height()));
- }
- float scaleFactor = (float)currentHeight/(float)originalSize.height();
- currentWidth = originalSize.width()*scaleFactor;
- }
-
- eachWidget->resize(currentWidth, currentHeight);
- }
- }
-}
-
-void UBWidgetList::setMargin(int margin)
-{
- mMargin = margin;
-}
-
-int UBWidgetList::margin()
-{
- return mMargin;
-}
-
-void UBWidgetList::setEmptyText(const QString &text)
-{
- if(NULL != mpEmptyLabel){
- mpEmptyLabel->setText(text);
- }
-}
-
-bool UBWidgetList::empty()
-{
- return mWidgetInfo.empty();
-}
diff --git a/src/customWidgets/UBWidgetList.h b/src/customWidgets/UBWidgetList.h
deleted file mode 100644
index d2cd3a6c..00000000
--- a/src/customWidgets/UBWidgetList.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef UBWIDGETLIST_H
-#define UBWIDGETLIST_H
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "interfaces/IResizeable.h"
-#include "customWidgets/UBActionableWidget.h"
-
-typedef enum{
- eWidgetListOrientation_Vertical,
- eWidgetListOrientation_Horizontal
-}eWidgetListOrientation;
-
-
-class UBWidgetList : public QScrollArea
-{
- Q_OBJECT
-
- typedef struct
- {
- QSize size;
- bool isResizable;
- } sWidgetProperties;
-
-public:
- UBWidgetList(QWidget* parent=0, eWidgetListOrientation orientation = eWidgetListOrientation_Vertical, const char* name = "UBWidgetList");
- ~UBWidgetList();
- void addWidget(QWidget* widget);
- void removeWidget(QWidget* widget);
- void setMargin(int margin);
- void setEmptyText(const QString& text);
- int margin();
- bool empty();
- void setListElementSpacing(int margin) { mListElementsSpacing = margin; }
- int listElementsSpacing() {return mListElementsSpacing; }
-
-signals:
- void closeWidget(QWidget* w);
-
-protected:
- bool mCanRemove;
-
- void resizeEvent(QResizeEvent* ev);
- void mousePressEvent(QMouseEvent* ev);
-
-private:
- QWidget* widgetAt(QPoint p);
- int scaleWidgets(QSize pSize);
- void scaleContainer(QSize pSize, int updateValue);
- void updateView(QSize pSize);
- void updateSizes();
- QBoxLayout* mpLayout;
- QWidget* mpContainer;
- eWidgetListOrientation mOrientation;
- int mMargin;
- int mListElementsSpacing;
- QMap mWidgetInfo;
- QLabel* mpEmptyLabel;
- UBActionableWidget* mpCurrentWidget;
-};
-
-#endif // UBWIDGETLIST_H
diff --git a/src/customWidgets/customWidgets.pri b/src/customWidgets/customWidgets.pri
deleted file mode 100644
index c531d4b3..00000000
--- a/src/customWidgets/customWidgets.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-
-HEADERS += src/customWidgets/UBWidgetList.h \
- src/customWidgets/UBDraggableLabel.h \
- src/customWidgets/UBMediaWidget.h \
- src/globals/UBGlobals.h \
- src/customWidgets/UBDraggableMedia.h \
- src/customWidgets/UBActionableWidget.h
-
-SOURCES += src/customWidgets/UBWidgetList.cpp \
- src/customWidgets/UBDraggableLabel.cpp \
- src/customWidgets/UBMediaWidget.cpp \
- src/customWidgets/UBDraggableMedia.cpp \
- src/customWidgets/UBActionableWidget.cpp
diff --git a/src/domain/UBGraphicsAudioItem.cpp b/src/domain/UBGraphicsAudioItem.cpp
index d38e27b7..7325a852 100644
--- a/src/domain/UBGraphicsAudioItem.cpp
+++ b/src/domain/UBGraphicsAudioItem.cpp
@@ -93,6 +93,7 @@ UBItem* UBGraphicsAudioItem::deepCopy() const
QUrl audioUrl = this->mediaFileUrl();
UBGraphicsAudioItem *copy = new UBGraphicsAudioItem(audioUrl, parentItem());
+ connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), copy, SLOT(activeSceneChanged()));
copy->setPos(this->pos());
// copy->setZValue(this->zValue());
diff --git a/src/domain/UBGraphicsItemDelegate.cpp b/src/domain/UBGraphicsItemDelegate.cpp
index de710f82..ae6dd703 100644
--- a/src/domain/UBGraphicsItemDelegate.cpp
+++ b/src/domain/UBGraphicsItemDelegate.cpp
@@ -181,27 +181,31 @@ void UBGraphicsItemDelegate::setMimeData(QMimeData *mimeData)
bool UBGraphicsItemDelegate::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{
- if((NULL != mMimeData) && ((event->pos() - mDragStartPosition).manhattanLength() < QApplication::startDragDistance()))
- {
- QDrag* mDrag = new QDrag(event->widget());
- mDrag->setMimeData(mMimeData);
- if (!mDragPixmap.isNull()) {
- mDrag->setPixmap(mDragPixmap);
- mDrag->setHotSpot(mDragPixmap.rect().center());
- }
- mDrag->exec();
- mDragPixmap = QPixmap();
-
- return true;
+ if(mMimeData)
+ {
+ QDrag* mDrag = new QDrag(event->widget());
+ mDrag->setMimeData(mMimeData);
+ if (!mDragPixmap.isNull()) {
+ mDrag->setPixmap(mDragPixmap);
+ mDrag->setHotSpot(mDragPixmap.rect().center());
}
+ mDrag->exec();
+ mDragPixmap = QPixmap();
+
+ return true;
+ }
if(isLocked())
{
event->accept();
return true;
}
+ else
+ {
+ return false;
+ }
- return true;
+
}
bool UBGraphicsItemDelegate::weelEvent(QGraphicsSceneWheelEvent *event)
diff --git a/src/domain/UBGraphicsVideoItem.cpp b/src/domain/UBGraphicsVideoItem.cpp
index a7d12d35..a1b99d29 100644
--- a/src/domain/UBGraphicsVideoItem.cpp
+++ b/src/domain/UBGraphicsVideoItem.cpp
@@ -67,6 +67,8 @@ UBItem* UBGraphicsVideoItem::deepCopy() const
UBGraphicsVideoItem *copy = new UBGraphicsVideoItem(videoUrl, parentItem());
+ connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), copy, SLOT(activeSceneChanged()));
+
copy->setPos(this->pos());
// copy->setZValue(this->zValue());
UBGraphicsItem::assignZValue(copy, this->zValue());
@@ -120,6 +122,9 @@ void UBGraphicsVideoItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
void UBGraphicsVideoItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{
+ if (mDelegate->delegated()->data(UBGraphicsItemData::ItemLocked).toBool())
+ return;
+
if(mShouldMove && (event->buttons() & Qt::LeftButton))
{
QPointF offset = event->scenePos() - mMousePressPos;
diff --git a/src/gui/UBDockPalette.cpp b/src/gui/UBDockPalette.cpp
index 935f8549..293684fd 100644
--- a/src/gui/UBDockPalette.cpp
+++ b/src/gui/UBDockPalette.cpp
@@ -531,9 +531,10 @@ void UBDockPalette::setVisible(bool visible)
bool UBDockPalette::switchMode(eUBDockPaletteWidgetMode mode)
{
+ mCurrentMode = mode;
bool hasVisibleElements = false;
//-------------------------------//
- // get full right palette widgets list, parse it, show all widgets for BOARD mode, and hide all other
+ // get full palette widgets list, parse it, show all widgets for BOARD mode, and hide all other
for(int i = 0; i < mRegisteredWidgets.size(); i++)
{
UBDockPaletteWidget* pNextWidget = mRegisteredWidgets.at(i);
diff --git a/src/gui/UBDockPalette.h b/src/gui/UBDockPalette.h
index a513db75..569f391b 100644
--- a/src/gui/UBDockPalette.h
+++ b/src/gui/UBDockPalette.h
@@ -79,8 +79,7 @@ private:
typedef enum
{
eUBDockPaletteType_LEFT,
- eUBDockPaletteType_RIGHT,
- eUBDockPaletteType_NAVIGATOR,
+ eUBDockPaletteType_RIGHT
} eUBDockPaletteType;
@@ -116,6 +115,8 @@ public:
bool switchMode(eUBDockPaletteWidgetMode mode);
+ eUBDockPaletteWidgetMode mCurrentMode;
+
QVector GetWidgetsList() { return mRegisteredWidgets; }
public:
diff --git a/src/gui/UBLeftPalette.cpp b/src/gui/UBLeftPalette.cpp
index 21b3521b..fab827c6 100644
--- a/src/gui/UBLeftPalette.cpp
+++ b/src/gui/UBLeftPalette.cpp
@@ -25,11 +25,19 @@ UBLeftPalette::UBLeftPalette(QWidget *parent, const char *name):
{
setObjectName(name);
setOrientation(eUBDockOrientation_Left);
-
- mLastWidth = UBSettings::settings()->leftLibPaletteWidth->get().toInt();
mCollapseWidth = 150;
- if(UBSettings::settings()->leftLibPaletteIsCollapsed->get().toBool())
+ bool isCollapsed = false;
+ if(mCurrentMode == eUBDockPaletteWidget_BOARD){
+ mLastWidth = UBSettings::settings()->leftLibPaletteBoardModeWidth->get().toInt();
+ isCollapsed = UBSettings::settings()->leftLibPaletteBoardModeIsCollapsed->get().toBool();
+ }
+ else{
+ mLastWidth = UBSettings::settings()->leftLibPaletteDesktopModeWidth->get().toInt();
+ isCollapsed = UBSettings::settings()->leftLibPaletteDesktopModeIsCollapsed->get().toBool();
+ }
+
+ if(isCollapsed)
resize(0,parentWidget()->height());
else
resize(mLastWidth, parentWidget()->height());
@@ -58,8 +66,35 @@ void UBLeftPalette::updateMaxWidth()
void UBLeftPalette::resizeEvent(QResizeEvent *event)
{
int newWidth = width();
- if(newWidth > mCollapseWidth)
- UBSettings::settings()->leftLibPaletteWidth->set(newWidth);
- UBSettings::settings()->leftLibPaletteIsCollapsed->set(newWidth == 0);
+ if(mCurrentMode == eUBDockPaletteWidget_BOARD){
+ if(newWidth > mCollapseWidth)
+ UBSettings::settings()->leftLibPaletteBoardModeWidth->set(newWidth);
+ UBSettings::settings()->leftLibPaletteBoardModeIsCollapsed->set(newWidth == 0);
+ }
+ else{
+ if(newWidth > mCollapseWidth)
+ UBSettings::settings()->leftLibPaletteDesktopModeWidth->set(newWidth);
+ UBSettings::settings()->leftLibPaletteDesktopModeIsCollapsed->set(newWidth == 0);
+ }
UBDockPalette::resizeEvent(event);
}
+
+
+bool UBLeftPalette::switchMode(eUBDockPaletteWidgetMode mode)
+{
+ int newModeWidth;
+ if(mode == eUBDockPaletteWidget_BOARD){
+ mLastWidth = UBSettings::settings()->leftLibPaletteBoardModeWidth->get().toInt();
+ newModeWidth = mLastWidth;
+ if(UBSettings::settings()->leftLibPaletteBoardModeIsCollapsed->get().toBool())
+ newModeWidth = 0;
+ }
+ else{
+ mLastWidth = UBSettings::settings()->leftLibPaletteDesktopModeWidth->get().toInt();
+ newModeWidth = mLastWidth;
+ if(UBSettings::settings()->leftLibPaletteDesktopModeIsCollapsed->get().toBool())
+ newModeWidth = 0;
+ }
+ resize(newModeWidth,height());
+ return UBDockPalette::switchMode(mode);
+}
diff --git a/src/gui/UBLeftPalette.h b/src/gui/UBLeftPalette.h
index cdb49330..8ae3bdf3 100644
--- a/src/gui/UBLeftPalette.h
+++ b/src/gui/UBLeftPalette.h
@@ -23,6 +23,8 @@ public:
UBLeftPalette(QWidget* parent=0, const char* name="UBLeftPalette");
~UBLeftPalette();
+ bool switchMode(eUBDockPaletteWidgetMode mode);
+
protected:
void updateMaxWidth();
void resizeEvent(QResizeEvent *event);
diff --git a/src/gui/UBLibraryWidget.cpp b/src/gui/UBLibraryWidget.cpp
index f321680d..8b71e022 100644
--- a/src/gui/UBLibraryWidget.cpp
+++ b/src/gui/UBLibraryWidget.cpp
@@ -362,16 +362,8 @@ void UBLibraryWidget::dropEvent(QDropEvent *event)
if (pMimeData->hasUrls()){
QList urlList = pMimeData->urls();
for (int i = 0; i < urlList.size() && i < 32; ++i){
- QString filePath;
QString crntPath = urlList.at(i).toString();
-
- if(crntPath.startsWith("file:") || crntPath.startsWith("/")){
- filePath = QUrl(crntPath).toLocalFile();
- }else{
- filePath = crntPath;
- }
-
- mLibraryController->importItemOnLibrary(filePath);
+ mLibraryController->importItemOnLibrary(crntPath);
bDropAccepted = true;
}
}
diff --git a/src/gui/UBNavigatorPalette.cpp b/src/gui/UBNavigatorPalette.cpp
index a389e3c3..df67c67e 100644
--- a/src/gui/UBNavigatorPalette.cpp
+++ b/src/gui/UBNavigatorPalette.cpp
@@ -24,18 +24,13 @@
* @param name as the object name
*/
UBNavigatorPalette::UBNavigatorPalette(QWidget *parent, const char *name):
- UBDockPalette(eUBDockPaletteType_NAVIGATOR, parent, name)
+ UBDockPalette(eUBDockPaletteType_LEFT, parent, name)
, mNavigator(NULL)
, mLayout(NULL)
, mHLayout(NULL)
, mPageNbr(NULL)
, mClock(NULL)
{
- setOrientation(eUBDockOrientation_Left);
- setMaximumWidth(300);
- resize(UBSettings::settings()->navigPaletteWidth->get().toInt(), height());
- mLastWidth = 300;
-
// Build the gui
mLayout = new QVBoxLayout(this);
mLayout->setContentsMargins(customMargin(), customMargin(), 2*border() + customMargin(), customMargin());
@@ -150,7 +145,6 @@ void UBNavigatorPalette::resizeEvent(QResizeEvent *event)
{
mNavigator->setMinimumHeight(height() - 2*border());
}
- UBSettings::settings()->navigPaletteWidth->set(width());
}
void UBNavigatorPalette::timerEvent(QTimerEvent *event)
diff --git a/src/gui/UBRightPalette.cpp b/src/gui/UBRightPalette.cpp
index 9762b5e8..be8205c2 100644
--- a/src/gui/UBRightPalette.cpp
+++ b/src/gui/UBRightPalette.cpp
@@ -28,9 +28,16 @@ UBRightPalette::UBRightPalette(QWidget *parent, const char *name):
setObjectName(name);
setOrientation(eUBDockOrientation_Right);
mCollapseWidth = 150;
-
- mLastWidth = UBSettings::settings()->rightLibPaletteWidth->get().toInt();
- if(UBSettings::settings()->rightLibPaletteIsCollapsed->get().toBool())
+ bool isCollapsed = false;
+ if(mCurrentMode == eUBDockPaletteWidget_BOARD){
+ mLastWidth = UBSettings::settings()->rightLibPaletteBoardModeWidth->get().toInt();
+ isCollapsed = UBSettings::settings()->rightLibPaletteBoardModeIsCollapsed->get().toBool();
+ }
+ else{
+ mLastWidth = UBSettings::settings()->rightLibPaletteDesktopModeWidth->get().toInt();
+ isCollapsed = UBSettings::settings()->rightLibPaletteDesktopModeIsCollapsed->get().toBool();
+ }
+ if(isCollapsed)
resize(0,parentWidget()->height());
else
resize(mLastWidth, parentWidget()->height());
@@ -62,10 +69,17 @@ void UBRightPalette::mouseMoveEvent(QMouseEvent *event)
void UBRightPalette::resizeEvent(QResizeEvent *event)
{
int newWidth = width();
- if(newWidth > mCollapseWidth)
- UBSettings::settings()->rightLibPaletteWidth->set(newWidth);
- UBSettings::settings()->rightLibPaletteIsCollapsed->set(newWidth == 0);
- UBDockPalette::resizeEvent(event);
+ if(mCurrentMode == eUBDockPaletteWidget_BOARD){
+ if(newWidth > mCollapseWidth)
+ UBSettings::settings()->rightLibPaletteBoardModeWidth->set(newWidth);
+ UBSettings::settings()->rightLibPaletteBoardModeIsCollapsed->set(newWidth == 0);
+ }
+ else{
+ if(newWidth > mCollapseWidth)
+ UBSettings::settings()->rightLibPaletteDesktopModeWidth->set(newWidth);
+ UBSettings::settings()->rightLibPaletteDesktopModeIsCollapsed->set(newWidth == 0);
+ }
+ UBDockPalette::resizeEvent(event);
emit resized();
}
@@ -78,3 +92,22 @@ void UBRightPalette::updateMaxWidth()
setMaximumHeight(parentWidget()->height());
setMinimumHeight(parentWidget()->height());
}
+
+bool UBRightPalette::switchMode(eUBDockPaletteWidgetMode mode)
+{
+ int newModeWidth;
+ if(mode == eUBDockPaletteWidget_BOARD){
+ mLastWidth = UBSettings::settings()->rightLibPaletteBoardModeWidth->get().toInt();
+ newModeWidth = mLastWidth;
+ if(UBSettings::settings()->rightLibPaletteBoardModeIsCollapsed->get().toBool())
+ newModeWidth = 0;
+ }
+ else{
+ mLastWidth = UBSettings::settings()->rightLibPaletteDesktopModeWidth->get().toInt();
+ newModeWidth = mLastWidth;
+ if(UBSettings::settings()->rightLibPaletteDesktopModeIsCollapsed->get().toBool())
+ newModeWidth = 0;
+ }
+ resize(newModeWidth,height());
+ return UBDockPalette::switchMode(mode);
+}
diff --git a/src/gui/UBRightPalette.h b/src/gui/UBRightPalette.h
index df0e82e5..00e6dd14 100644
--- a/src/gui/UBRightPalette.h
+++ b/src/gui/UBRightPalette.h
@@ -23,6 +23,7 @@ class UBRightPalette : public UBDockPalette
public:
UBRightPalette(QWidget* parent=0, const char* name="UBRightPalette");
~UBRightPalette();
+ bool switchMode(eUBDockPaletteWidgetMode mode);
signals:
void resized();
@@ -31,6 +32,7 @@ protected:
void updateMaxWidth();
void mouseMoveEvent(QMouseEvent *event);
void resizeEvent(QResizeEvent *event);
+
};
#endif // UBRIGHTPALETTE_H