From c0089c9feba243d4e0847b2bb3f78cdba3f11ab0 Mon Sep 17 00:00:00 2001 From: Ivan Ilin Date: Mon, 26 Sep 2011 19:47:17 +0300 Subject: [PATCH] issue Sankore-165 resolved --- src/board/UBLibraryController.cpp | 7 ++++++- src/board/UBLibraryController.h | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp index 28b8008a..9a7e1c9c 100644 --- a/src/board/UBLibraryController.cpp +++ b/src/board/UBLibraryController.cpp @@ -72,7 +72,9 @@ UBLibraryController::UBLibraryController(QWidget *pParentWidget) : bool UBLibraryController::canItemsOnElementBeDeleted(UBLibElement *pElement) { - return !pElement->path().toLocalFile().startsWith(UBSettings::settings()->uniboardShapeLibraryDirectory()); + return !pElement->path().toLocalFile().startsWith(UBSettings::settings()->uniboardShapeLibraryDirectory()) && + !pElement->path().toLocalFile().startsWith(UBSettings::settings()->sankoreDistributedInteractiveDirectory()) && + pElement->isDeletable(); } void UBLibraryController::createInternalWidgetItems() @@ -696,6 +698,7 @@ UBLibElement::UBLibElement() { mType = eUBLibElementType_Category; mName = QObject::tr("/Home", "Category list label on navigation tool bar"); mbMoveable = false; + mbDeletable = true; } UBLibElement::UBLibElement(UBLibElement* element) @@ -707,6 +710,7 @@ UBLibElement::UBLibElement(UBLibElement* element) mName = element->name(); mExtension = element->extension(); mbMoveable = element->isMoveable(); + mbDeletable = element->isDeletable(); } @@ -717,6 +721,7 @@ UBLibElement::UBLibElement(eUBLibElementType type, const QUrl &path, const QStri mName = name; mInfo = ""; mbMoveable = true; + mbDeletable = true; if (type == eUBLibElementType_Folder) mThumbnail = QImage(":images/libpalette/folder.svg"); diff --git a/src/board/UBLibraryController.h b/src/board/UBLibraryController.h index 26b6fe61..009114ef 100644 --- a/src/board/UBLibraryController.h +++ b/src/board/UBLibraryController.h @@ -61,6 +61,8 @@ public: void setExtension(QString &extension){ mExtension = extension;} bool isMoveable(){return mbMoveable;} void setMoveable(bool bState){mbMoveable = bState;} + bool isDeletable() const {return mbDeletable;} + void setDeletable(bool mState) {mbDeletable = mState;} private: eUBLibElementType mType; @@ -70,6 +72,7 @@ private: QString mName; QString mExtension; bool mbMoveable; + bool mbDeletable; }; class UBChainedLibElement