Merge branch 'master' of github.com:Sankore/Sankore-3.1

Sankore_3.1.pro

@@ -327,6 +327,25 @@ macx {
        TRANSLATION_ca.path = "$$RESOURCES_DIR/ca.lproj"
        QMAKE_BUNDLE_DATA += TRANSLATION_ca
    }
+
+   exists(resources/i18n/sankore_el.qm) {
+       TRANSLATION_el.files = resources/i18n/sankore_el.qm \
+           resources/i18n/Localizable.strings
+       TRANSLATION_el.path = "$$RESOURCES_DIR/el.lproj"
+       QMAKE_BUNDLE_DATA += TRANSLATION_el
+   }
+   exists(resources/i18n/sankore_tr.qm) {
+       TRANSLATION_tr.files = resources/i18n/sankore_tr.qm \
+           resources/i18n/Localizable.strings
+       TRANSLATION_tr.path = "$$RESOURCES_DIR/tr.lproj"
+       QMAKE_BUNDLE_DATA += TRANSLATION_tr
+   }
+   exists(resources/i18n/sankore_cs.qm) {
+       TRANSLATION_cs.files = resources/i18n/sankore_cs.qm \
+           resources/i18n/Localizable.strings
+       TRANSLATION_cs.path = "$$RESOURCES_DIR/cs.lproj"
+       QMAKE_BUNDLE_DATA += TRANSLATION_cs
+   }
    
    QMAKE_BUNDLE_DATA += UB_ETC \
        UB_LIBRARY \
@@ -391,7 +410,10 @@ TRANSLATIONS = resources/i18n/sankore_en.ts \
    resources/i18n/sankore_pt.ts \
    resources/i18n/sankore_sk.ts \
    resources/i18n/sankore_bg.ts \
-   resources/i18n/sankore_ca.ts
+   resources/i18n/sankore_ca.ts \
+   resources/i18n/sankore_el.ts \
+   resources/i18n/sankore_tr.ts \
+   resources/i18n/sankore_cs.ts
 
 INSTALLS = UB_ETC \
    UB_I18N \

resources/forms/mainWindow.ui

@@ -1632,6 +1632,9 @@
    </property>
   </action>
   <action name="actionGroupItems">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="enabled">
     <bool>false</bool>
    </property>
@@ -1641,7 +1644,7 @@
      <normalon>:/images/toolbar/ungroup.png</normalon>:/images/toolbar/group.png</iconset>
    </property>
    <property name="text">
-    <string>Group Items</string>
+    <string>Group</string>
    </property>
    <property name="toolTip">
     <string>Group items</string>

resources/library/interactivities/Transformation.wgt/css/ubw-main.css

@@ -6,6 +6,63 @@ html, body {
 	color: #666666;
 }
 
+::-webkit-scrollbar {
+    width: 14px;
+}
+
+
+::-webkit-scrollbar-thumb {
+    /*border-radius: 10px; */
+    background-color:lightgray;
+    border: 2px solid gray;
+}
+
+::-webkit-scrollbar-button:vertical:start{
+    border-top-right-radius: 10px;
+    border-top-left-radius: 10px;
+    background-color:lightgray;
+    background-image: url(images/trgUp.png);
+    background-size: 8px auto;
+    background-position: center;
+    background-repeat: no-repeat;
+    border: 2px solid gray;
+}
+
+::-webkit-scrollbar-button:vertical:end{
+    border-bottom-right-radius: 10px;
+    border-bottom-left-radius: 10px;
+    background-color:lightgray;
+    background-image: url(images/trgDown.png);
+    background-size: 8px auto;
+    background-position: center;
+    background-repeat: no-repeat;
+    border: 2px solid gray;
+}
+
+::-webkit-scrollbar-button:horizontal:start{
+    width: 14px;
+    border-bottom-left-radius: 10px;
+    border-top-left-radius: 10px;
+    background-color:lightgray;
+    background-image: url(images/trgLeft.png);
+    background-size: 8px auto;
+    background-position: center;
+    background-repeat: no-repeat;
+    border: 2px solid gray;
+}
+
+::-webkit-scrollbar-button:horizontal:end{
+    width: 14px;
+    border-bottom-right-radius: 10px;
+    border-top-right-radius: 10px;
+    background-color:lightgray;
+    background-image: url(images/trgRight.png);
+    background-size: 8px auto;
+    background-position: center;
+    background-repeat: no-repeat;
+    border: 2px solid gray;
+}
+
 #ubwidget {
 	position: absolute;
 	top: 0;

src/adaptors/UBCFFSubsetAdaptor.cpp

@@ -32,6 +32,7 @@
 #include "domain/UBGraphicsTextItem.h"
 #include "domain/UBGraphicsTextItemDelegate.h"
 #include "domain/UBGraphicsWidgetItem.h"
+#include "domain/UBGraphicsGroupContainerItem.h"
 
 #include "frameworks/UBFileSystemUtils.h"
 
@@ -128,8 +129,9 @@ bool UBCFFSubsetAdaptor::ConvertCFFFileToUbz(QString &cffSourceFile, UBDocumentP
 
     return result;
 }
-UBCFFSubsetAdaptor::UBCFFSubsetReader::UBCFFSubsetReader(UBDocumentProxy *proxy, QFile *content):
-    mProxy(proxy)
+UBCFFSubsetAdaptor::UBCFFSubsetReader::UBCFFSubsetReader(UBDocumentProxy *proxy, QFile *content)
+    : mProxy(proxy)
+    , mGSectionContainer(NULL)
 {
     int errorLine, errorColumn;
     QString errorStr;
@@ -168,6 +170,8 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parse()
 
 bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseGSection(const QDomElement &element)
 {
+    mGSectionContainer = new UBGraphicsGroupContainerItem();
+
     QDomElement currentSvgElement = element.firstChildElement();
     while (!currentSvgElement.isNull()) {
         if (!parseSvgElement(currentSvgElement))
@@ -176,6 +180,16 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseGSection(const QDomElement &ele
         currentSvgElement = currentSvgElement.nextSiblingElement();
     }
 
+    if (mGSectionContainer->childItems().count())
+    { 
+        mCurrentScene->addGroup(mGSectionContainer);
+    }
+    else 
+    {
+        delete mGSectionContainer;
+        mGSectionContainer = NULL;
+    }
+
     return true;
 }
 bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgSwitchSection(const QDomElement &element)
@@ -247,6 +261,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgRect(const QDomElement &elem
     repositionSvgItem(svgItem, width, height, x1, y1, transform);
     hashSceneItem(element, svgItem);
 
+    if (mGSectionContainer)
+    {
+        addItemToGSection(svgItem);
+    }
+
     delete generator;
 
     return true;
@@ -293,6 +312,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgEllipse(const QDomElement &e
     repositionSvgItem(svgItem, rx * 2, ry * 2, cx - 2*rx, cy+ry, transform);
     hashSceneItem(element, svgItem);
 
+    if (mGSectionContainer)
+    {
+        addItemToGSection(svgItem);
+    }
+
     delete generator;
 
     return true;
@@ -375,6 +399,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolygon(const QDomElement &e
     repositionSvgItem(svgItem, width +strokeWidth, height + strokeWidth, x1 - strokeWidth/2 + transform.m31(), y1 + strokeWidth/2 + transform.m32(), transform);
     hashSceneItem(element, svgItem);
 
+    if (mGSectionContainer)
+    {
+        addItemToGSection(svgItem);
+    }
+
     delete generator;
 
     return true;
@@ -454,6 +483,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolyline(const QDomElement &
     repositionSvgItem(svgItem, width +strokeWidth, height + strokeWidth, x1 + transform.m31() - strokeWidth/2, y1 + transform.m32() + strokeWidth/2, transform);
     hashSceneItem(element, svgItem);
 
+    if (mGSectionContainer)
+    {
+        addItemToGSection(svgItem);
+    }
+
     delete generator;
 
     return true;
@@ -593,6 +627,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgText(const QDomElement &elem
     repositionSvgItem(svgItem, width, height, x + transform.m31(), y + transform.m32(), transform);
     hashSceneItem(element, svgItem);
 
+    if (mGSectionContainer)
+    {
+        addItemToGSection(svgItem);
+    }
+
     delete generator;
     return true;
 }
@@ -712,6 +751,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgTextarea(const QDomElement &
     repositionSvgItem(svgItem, width, height, x + transform.m31(), y + transform.m32(), transform);
     hashSceneItem(element, svgItem);
 
+    if (mGSectionContainer)
+    {
+        addItemToGSection(svgItem);
+    }
+
     return true;
 }
 bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgImage(const QDomElement &element)
@@ -749,6 +793,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgImage(const QDomElement &ele
    repositionSvgItem(pixItem, width, height, x + transform.m31(), y + transform.m32(), transform);
    hashSceneItem(element, pixItem);
 
+   if (mGSectionContainer)
+   {
+       addItemToGSection(pixItem);
+   }
+
    return true;
 }
 bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgFlash(const QDomElement &element)
@@ -791,6 +840,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgFlash(const QDomElement &ele
     repositionSvgItem(flashItem, width, height, x + transform.m31(), y + transform.m32(), transform);
     hashSceneItem(element, flashItem);
 
+    if (mGSectionContainer)
+    {
+        addItemToGSection(flashItem);
+    }
+
     return true;
 }
 
@@ -829,6 +883,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgAudio(const QDomElement &ele
     repositionSvgItem(audioItem, audioItem->boundingRect().width(), audioItem->boundingRect().height(), x + transform.m31(), y + transform.m32(), transform);
     hashSceneItem(element, audioItem);
 
+    if (mGSectionContainer)
+    {
+        addItemToGSection(audioItem);
+    }
+
     return true;
 }
 bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgVideo(const QDomElement &element)
@@ -867,6 +926,11 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgVideo(const QDomElement &ele
     repositionSvgItem(videoItem, videoItem->boundingRect().width(), videoItem->boundingRect().height(), x + transform.m31(), y + transform.m32(), transform);
     hashSceneItem(element, videoItem);
 
+    if (mGSectionContainer)
+    {
+        addItemToGSection(videoItem);
+    }
+
     return true;
 }
 
@@ -877,6 +941,11 @@ void UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgSectionAttr(const QDomElemen
                   svgSection.attribute(aHeight).toInt());
 }
 
+void UBCFFSubsetAdaptor::UBCFFSubsetReader::addItemToGSection(QGraphicsItem *item)
+{
+    mGSectionContainer->addToGroup(item);
+}
+
 void UBCFFSubsetAdaptor::UBCFFSubsetReader::hashSceneItem(const QDomElement &element, UBGraphicsItem *item)
 {
 //    adding element pointer to hash to refer if needed

src/adaptors/UBCFFSubsetAdaptor.h

@@ -35,6 +35,7 @@ class QGraphicsItem;
 class QTextBlockFormat;
 class QTextCharFormat;
 class QTextCursor;
+class UBGraphicsStrokesGroup;
 
 
 class UBCFFSubsetAdaptor
@@ -66,6 +67,8 @@ private:
         QPointF mViewBoxCenter;
         QSize mSize;
         QPointF mShiftVector;
+        bool mSvgGSectionIsOpened;
+        UBGraphicsGroupContainerItem *mGSectionContainer;
 
     private:
         QDomDocument mDOMdoc;
@@ -73,6 +76,7 @@ private:
         QHash<QString, UBGraphicsItem*> persistedItems;
         QDir mTmpFlashDir;
 
+        void addItemToGSection(QGraphicsItem *item);
         bool hashElements();
         void addExtentionsToHash(QDomElement *parent, QDomElement *topGroup);
 

src/adaptors/UBSvgSubsetAdaptor.cpp

@@ -396,6 +396,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
                 if (!mScene)
                 {
                     mScene = new UBGraphicsScene(mProxy);
+                    mScene->setURStackEnable(false);
                 }
 
                 // introduced in UB 4.2
@@ -1013,6 +1014,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
             delete annotationGroup;
     }
 
+    mScene->setURStackEnable(true);
     return mScene;
 }
 

src/board/UBBoardController.cpp

@@ -880,7 +880,7 @@ void UBBoardController::groupButtonClicked()
     }
 
     if (groupAction->text() == UBSettings::settings()->actionGroupText) { //The only way to get information from item, considering using smth else
-        UBGraphicsGroupContainerItem *groupItem = activeScene()->createGroup(selItems);
+    	UBGraphicsGroupContainerItem *groupItem = activeScene()->createGroup(selItems);
         groupItem->setSelected(true);
         UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector);
 
@@ -1102,7 +1102,7 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri
             QUuid uuid = QUuid::createUuid();
 
             QUrl url = QUrl::fromLocalFile(UBPersistenceManager::persistenceManager()
-                ->addVideoFileToDocument(selectedDocument(), sourceUrl, pData, uuid));
+                ->addAudioFileToDocument(selectedDocument(), sourceUrl, pData, uuid));
 
             audioMediaItem = mActiveScene->addMedia(url, false, pPos);
 

src/board/UBBoardView.cpp

@@ -106,8 +106,7 @@ UBBoardView::~UBBoardView () {
         delete suspendedMousePressEvent;
 }
 
-void
-UBBoardView::init ()
+void UBBoardView::init ()
 {
   connect (UBSettings::settings ()->boardPenPressureSensitive, SIGNAL (changed (QVariant)),
            this, SLOT (settingChanged (QVariant)));
@@ -1439,4 +1438,3 @@ UBBoardView::setToolCursor (int tool)
       controlViewport->setCursor (UBResources::resources ()->penCursor);
     }
 }
-

src/board/UBDrawingController.cpp

@@ -18,8 +18,10 @@
 #include "core/UBSettings.h"
 #include "core/UBApplication.h"
 
-#include "gui/UBMainWindow.h"
+#include "domain/UBGraphicsScene.h"
+#include "board/UBBoardController.h"
 
+#include "gui/UBMainWindow.h"
 #include "core/memcheck.h"
 
 UBDrawingController* UBDrawingController::sDrawingController = 0;
@@ -87,6 +89,7 @@ void UBDrawingController::setStylusTool(int tool)
 {
     if (tool != mStylusTool)
     {
+    	UBApplication::boardController->activeScene()->deselectAllItems();
         if (mStylusTool == UBStylusTool::Pen || mStylusTool == UBStylusTool::Marker
                 || mStylusTool == UBStylusTool::Line)
         {

src/core/UB.h

@@ -117,6 +117,9 @@ struct UBGraphicsItemData
         , ItemOwnZValue
         , itemLayerType //use instead of deprecated ItemLayerType
         , ItemUuid //storing uuid in QGraphicsItem for fast finding operations
+        //Duplicating delegate's functions to make possible working with pure QGraphicsItem
+        , ItemFlippable // (bool)
+        , ItemRotatable // (bool)
     };
 };
 

src/core/UBSettings.cpp

@@ -399,8 +399,8 @@ void UBSettings::init()
 
     libIconSize = new UBSetting(this, "Library", "LibIconSize", defaultLibraryIconSize);
 
-    actionGroupText = "Group items";
-    actionUngroupText = "Ungroup items";
+    actionGroupText = tr("Group");
+    actionUngroupText = tr("Ungroup");
 }
 
 

src/domain/UBGraphicsGroupContainerItem.cpp

@@ -29,6 +29,7 @@ UBGraphicsGroupContainerItem::UBGraphicsGroupContainerItem(QGraphicsItem *parent
 
     setData(UBGraphicsItemData::itemLayerType, QVariant(itemLayerType::ObjectItem)); //Necessary to set if we want z value to be assigned correctly
 
+
 }
 
 void UBGraphicsGroupContainerItem::addToGroup(QGraphicsItem *item)
@@ -42,6 +43,19 @@ void UBGraphicsGroupContainerItem::addToGroup(QGraphicsItem *item)
         return;
     }
 
+    //Check if group is allready rotatable or flippable
+    if (childItems().count()) {
+        if (UBGraphicsItem::isFlippable(this) && !UBGraphicsItem::isFlippable(item)) {
+            mDelegate->setFlippable(false);
+        }
+        if (UBGraphicsItem::isRotatable(this) && !UBGraphicsItem::isRotatable(item)) {
+            mDelegate->setRotatable(false);
+        }
+    } else {
+        mDelegate->setFlippable(UBGraphicsItem::isFlippable(item));
+        mDelegate->setRotatable(UBGraphicsItem::isRotatable(item));
+    }
+
     // COMBINE
     bool ok;
     QTransform itemTransform = item->itemTransform(this, &ok);
@@ -80,7 +94,7 @@ void UBGraphicsGroupContainerItem::addToGroup(QGraphicsItem *item)
     // ### Expensive, we could maybe use dirtySceneTransform bit for optimization
 
     item->setTransform(newItemTransform);
-//    item->d_func()->setIsMemberOfGroup(true);
+    //    item->d_func()->setIsMemberOfGroup(true);
     prepareGeometryChange();
     itemsBoundingRect |= itemTransform.mapRect(item->boundingRect() | item->childrenBoundingRect());
     update();
@@ -270,6 +284,27 @@ void UBGraphicsGroupContainerItem::pRemoveFromGroup(QGraphicsItem *item)
 
     QGraphicsItem *newParent = parentItem();
 
+    if (childItems().count()) {
+        if (!UBGraphicsItem::isFlippable(item) || !UBGraphicsItem::isRotatable(item)) {
+            bool flippableNow = true;
+            bool rotatableNow = true;
+
+            foreach (QGraphicsItem *item, childItems()) {
+                if (!UBGraphicsItem::isFlippable(item)) {
+                    flippableNow = false;
+                }
+                if (!UBGraphicsItem::isRotatable(item)) {
+                    rotatableNow = false;
+                }
+                if (!rotatableNow && !flippableNow) {
+                    break;
+                }
+            }
+            mDelegate->setFlippable(flippableNow);
+            mDelegate->setRotatable(rotatableNow);
+        }
+    }
+
     // COMBINE
     bool ok;
     QTransform itemTransform;

src/domain/UBGraphicsGroupContainerItemDelegate.cpp

@@ -16,7 +16,9 @@ UBGraphicsGroupContainerItemDelegate::UBGraphicsGroupContainerItemDelegate(QGrap
     UBGraphicsItemDelegate(pDelegated, parent, true, false, false), mDestroyGroupButton(0)
 
 {
-
+    //Wrapper function. Use it to set correct data() to QGraphicsItem as well
+    setFlippable(false);
+    setRotatable(false);
 }
 
 UBGraphicsGroupContainerItem *UBGraphicsGroupContainerItemDelegate::delegated()

src/domain/UBGraphicsStrokesGroup.cpp

@@ -9,6 +9,8 @@ UBGraphicsStrokesGroup::UBGraphicsStrokesGroup(QGraphicsItem *parent):QGraphicsI
     mDelegate = new UBGraphicsItemDelegate(this, 0, true, true, false);
     mDelegate->init();
     mDelegate->setFlippable(true);
+    mDelegate->setRotatable(true);
+
     setData(UBGraphicsItemData::ItemLayerType, UBItemLayerType::Object);
 
     setUuid(QUuid::createUuid());