Merge branch 'SEM' of github.com:OpenEducationFoundation/OpenBoard into SEM

OpenBoard.pro

@@ -11,7 +11,7 @@ CONFIG += debug_and_release \
 VERSION_MAJ = 1
 VERSION_MIN = 03
 VERSION_TYPE = a # a = alpha, b = beta, rc = release candidate, r = release, other => error
-VERSION_PATCH = 00
+VERSION_PATCH = 01
 
 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
 VERSION = $$replace(VERSION, "\\.r", "")

resources/etc/OpenBoard.css

@@ -380,3 +380,9 @@ QLineEdit#ubWebBrowserLineEdit
     padding: 2 2px;
     background: white;
 }
+
+QSplitter
+{
+    background-color: #b3b3b3;
+    width : 15px;
+

resources/forms/documents.ui

@@ -40,8 +40,15 @@
      <property name="lineWidth">
       <number>0</number>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
+     <layout class="QVBoxLayout" name="verticalLayout_4">
       <item>
+       <widget class="QSplitter" name="splitter">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="childrenCollapsible">
+         <bool>false</bool>
+        </property>
         <widget class="QFrame" name="topLeftFrame">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -65,11 +72,17 @@
           <item>
            <widget class="UBDocumentTreeWidget" name="documentTreeWidget">
             <property name="sizePolicy">
-            <sizepolicy hsizetype="Maximum" vsizetype="Expanding">
+             <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="minimumSize">
+             <size>
+              <width>250</width>
+              <height>0</height>
+             </size>
+            </property>
             <property name="styleSheet">
              <string notr="true"/>
             </property>
@@ -103,8 +116,6 @@
           </item>
          </layout>
         </widget>
-      </item>
-      <item>
         <widget class="QWidget" name="topRightFrame" native="true">
          <property name="styleSheet">
           <string notr="true"/>
@@ -115,6 +126,12 @@
           </property>
           <item>
            <widget class="UBDocumentThumbnailWidget" name="thumbnailWidget">
+            <property name="minimumSize">
+             <size>
+              <width>250</width>
+              <height>0</height>
+             </size>
+            </property>
             <property name="contextMenuPolicy">
              <enum>Qt::NoContextMenu</enum>
             </property>
@@ -224,6 +241,7 @@
           </item>
          </layout>
         </widget>
+       </widget>
       </item>
      </layout>
     </widget>
@@ -243,8 +261,6 @@
    <header>gui/UBDocumentTreeWidget.h</header>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="../OpenBoard.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>

resources/forms/mainWindow.ui

@@ -148,7 +148,7 @@
    <attribute name="toolBarBreak">
     <bool>true</bool>
    </attribute>
-   <addaction name="actionDocumentTools"/>
+   <addaction name="actionVirtualKeyboard"/>
    <addaction name="separator"/>
    <addaction name="actionNewDocument"/>
    <addaction name="actionNewFolder"/>

src/core/UBSceneCache.cpp

@@ -128,7 +128,7 @@ void UBSceneCache::removeScene(UBDocumentProxy* proxy, int pageIndex)
 {
     UBGraphicsScene* scene = value(proxy, pageIndex);
 
-    if (scene && scene->views().size() == 0)
+    if (scene && !scene->isActive())
     {
         UBSceneCacheID key(proxy, pageIndex);
         int count = QHash<UBSceneCacheID, UBGraphicsScene*>::remove(key);

src/document/UBDocumentController.cpp

@@ -103,7 +103,9 @@ void UBDocumentController::createNewDocument()
 
     if (group)
     {
-        UBDocumentProxy *document = UBPersistenceManager::persistenceManager()->createDocument(group->groupName());
+        QString path = group->buildEntirePath();
+
+        UBDocumentProxy *document = UBPersistenceManager::persistenceManager()->createDocument(path);
 
         selectDocument(document);
     }
@@ -201,7 +203,19 @@ void UBDocumentController::createNewDocumentGroup()
 
     int trashIndex =  mDocumentUI->documentTreeWidget->indexOfTopLevelItem(mTrashTi);
 
+    UBDocumentGroupTreeItem* selected = selectedDocumentGroupTreeItem();
+
+    QString parentGroupName("");
+    if(selected->groupName().contains(mDefaultDocumentGroupName))
         mDocumentUI->documentTreeWidget->insertTopLevelItem(trashIndex, docGroupItem);
+    else
+        selected->addChild(docGroupItem);
+
+    parentGroupName = docGroupItem->buildEntirePath();
+
+    mMapOfPaths.insert(parentGroupName,docGroupItem);
+
+
     mDocumentUI->documentTreeWidget->setCurrentItem(docGroupItem);
     mDocumentUI->documentTreeWidget->expandItem(docGroupItem);
 }
@@ -293,8 +307,7 @@ void UBDocumentController::setupViews()
         mDocumentUI->documentZoomSlider->setValue(thumbWidth);
         mDocumentUI->thumbnailWidget->setThumbnailWidth(thumbWidth);
 
-        connect(mDocumentUI->documentZoomSlider, SIGNAL(valueChanged(int)), this,
-                SLOT(documentZoomSliderValueChanged(int)));
+        connect(mDocumentUI->documentZoomSlider, SIGNAL(valueChanged(int)), this, SLOT(documentZoomSliderValueChanged(int)));
 
         connect(mMainWindow->actionOpen, SIGNAL(triggered()), this, SLOT(openSelectedItem()));
         connect(mMainWindow->actionNewFolder, SIGNAL(triggered()), this, SLOT(createNewDocumentGroup()));
@@ -612,6 +625,38 @@ void UBDocumentController::moveDocumentToTrash(UBDocumentGroupTreeItem* groupTi,
     proxyTi->setFlags(proxyTi->flags() ^ Qt::ItemIsEditable);
 }
 
+
+QList<UBDocumentProxyTreeItem*> UBDocumentController::getProxies(QTreeWidgetItem* groupItem)
+{
+    QList<UBDocumentProxyTreeItem*> result;
+
+    for(int i = 0; i < groupItem->childCount(); i += 1){
+        UBDocumentProxyTreeItem* docProxy  = dynamic_cast<UBDocumentProxyTreeItem*>(groupItem->child(i));
+        if(docProxy)
+            result.append(docProxy);
+        else
+            result << getProxies(groupItem->child(i));
+    }
+
+    return result;
+}
+
+
+QList<UBDocumentGroupTreeItem*> UBDocumentController::getGroupTreeItem(QTreeWidgetItem* groupItem)
+{
+    QList<UBDocumentGroupTreeItem*> result;
+
+    for(int i = 0; i < groupItem->childCount(); i += 1){
+        UBDocumentGroupTreeItem* group  = dynamic_cast<UBDocumentGroupTreeItem*>(groupItem->child(i));
+        if(group)
+            result.append(group);
+        else
+            result << getGroupTreeItem(groupItem->child(i));
+    }
+
+    return result;
+}
+
 void UBDocumentController::moveFolderToTrash(UBDocumentGroupTreeItem* groupTi)
 {
     bool changeCurrentDocument = false;
@@ -625,14 +670,9 @@ void UBDocumentController::moveFolderToTrash(UBDocumentGroupTreeItem* groupTi)
         }
     }
 
-    QList<UBDocumentProxyTreeItem*> toBeDeleted;
 
-    for (int i = 0; i < groupTi->childCount(); i++)
-    {
-        UBDocumentProxyTreeItem* proxyTi = dynamic_cast<UBDocumentProxyTreeItem*>(groupTi->child(i));
-        if (proxyTi && proxyTi->proxy())
-            toBeDeleted << proxyTi;
-    }
+
+    QList<UBDocumentProxyTreeItem*> toBeDeleted = getProxies(groupTi);
 
     for (int i = 0; i < toBeDeleted.count(); i++)
     {
@@ -644,21 +684,38 @@ void UBDocumentController::moveFolderToTrash(UBDocumentGroupTreeItem* groupTi)
         proxyTi->proxy()->setMetaData(UBSettings::documentGroupName, UBSettings::trashedDocumentGroupNamePrefix + oldGroupName);
         UBPersistenceManager::persistenceManager()->persistDocumentMetadata(proxyTi->proxy());
 
-        groupTi->removeChild(proxyTi);
+        UBDocumentGroupTreeItem* parentDirectory = dynamic_cast<UBDocumentGroupTreeItem*>(mMapOfPaths.value(oldGroupName));
+        parentDirectory->removeChild(proxyTi);
         mTrashTi->addChild(proxyTi);
         proxyTi->setFlags(proxyTi->flags() ^ Qt::ItemIsEditable);
 
         showMessage(QString("%1 deleted").arg(groupTi->groupName()));
     }
 
+
+    QList<UBDocumentGroupTreeItem*> dirToDelete = getGroupTreeItem(groupTi);
+    for(int i = dirToDelete.count() - 1; i >= 0 ; i -= 1){
+        UBDocumentGroupTreeItem* parent = dynamic_cast<UBDocumentGroupTreeItem*>(dirToDelete.at(i)->parent());
+        if(parent){
+            mMapOfPaths.remove(dirToDelete.at(i)->buildEntirePath());
+            parent->removeChild(dirToDelete.at(i));
+        }
+    }
+
+
     // dont remove default group
     if (!groupTi->isDefaultFolder())
     {
         int index = mDocumentUI->documentTreeWidget->indexOfTopLevelItem(groupTi);
 
         if (index >= 0)
-        {
             mDocumentUI->documentTreeWidget->takeTopLevelItem(index);
+        else {
+            UBDocumentGroupTreeItem* parent = dynamic_cast<UBDocumentGroupTreeItem*>(groupTi->parent());
+            if(parent){
+                mMapOfPaths.remove(groupTi->buildEntirePath());
+                parent->removeChild(groupTi);
+            }
         }
     }
 
@@ -809,96 +866,56 @@ void UBDocumentController::documentZoomSliderValueChanged (int value)
 }
 
 
+UBDocumentGroupTreeItem* UBDocumentController::getCommonGroupItem(QString &path)
+{
+    QList<QString> paths = mMapOfPaths.keys();
+
+    if(paths.count() == 0)
+        return NULL;
+
+    QString commonPath = path;
+    do{
+        if(paths.contains(commonPath))
+            return mMapOfPaths.value(commonPath);
+        else{
+            int lastSeparatorIndex = commonPath.lastIndexOf("/");
+            if(lastSeparatorIndex>0)
+                commonPath = commonPath.left(lastSeparatorIndex);
+            else
+                commonPath = "";
+        }
+    }while(commonPath.length() > 0);
+
+    return NULL;
+}
+
 void UBDocumentController::loadDocumentProxies()
 {
     QList<QPointer<UBDocumentProxy> > proxies = UBPersistenceManager::persistenceManager()->documentProxies;
 
-    QStringList emptyGroupNames = UBSettings::settings()->value("Document/EmptyGroupNames", QStringList()).toStringList();
-
     mDocumentUI->documentTreeWidget->clear();
 
-    QMap<QString, UBDocumentGroupTreeItem*> groupNamesMap;
-
-    UBDocumentGroupTreeItem* emptyGroupNameTi = 0;
+    UBDocumentGroupTreeItem* emptyGroupNameTi =  new UBDocumentGroupTreeItem(0, false);
+    emptyGroupNameTi->setGroupName(mDefaultDocumentGroupName);
+    emptyGroupNameTi->setIcon(0, QIcon(":/images/toolbar/documents.png"));
+    mMapOfPaths.insert(mDefaultDocumentGroupName,emptyGroupNameTi);
 
     mTrashTi = new UBDocumentGroupTreeItem(0, false); // deleted by the tree widget
     mTrashTi->setGroupName(mDocumentTrashGroupName);
     mTrashTi->setIcon(0, QIcon(":/images/trash.png"));
+    mMapOfPaths.insert(mDocumentTrashGroupName,mTrashTi);
 
-    foreach (QPointer<UBDocumentProxy> proxy, proxies)
-    {
-        if (proxy)
-        {
-            QString docGroup = proxy->metaData(UBSettings::documentGroupName).toString();
-
-
-            bool isEmptyGroupName = false;
-            bool isInTrash = false;
-
-            if (docGroup.isEmpty()) // #see https://trac.assembla.com/uniboard/ticket/426
-            {
-                docGroup = mDefaultDocumentGroupName;
-                isEmptyGroupName = true;
-            }
-            else if (docGroup.startsWith(UBSettings::trashedDocumentGroupNamePrefix))
-            {
-                isInTrash = true;
-            }
-
-            QString docName = proxy->metaData(UBSettings::documentName).toString();
-
-            if (emptyGroupNames.contains(docGroup))
-                emptyGroupNames.removeAll(docGroup);
-
-            if (!groupNamesMap.contains(docGroup) && !isInTrash)
-            {
-                UBDocumentGroupTreeItem* docGroupItem = new UBDocumentGroupTreeItem(0, !isEmptyGroupName); // deleted by the tree widget
-                groupNamesMap.insert(docGroup, docGroupItem);
-                docGroupItem->setGroupName(docGroup);
-
-                if (isEmptyGroupName)
-                    emptyGroupNameTi = docGroupItem;
-            }
-
-            UBDocumentGroupTreeItem* docGroupItem;
-            if (isInTrash)
-                docGroupItem = mTrashTi;
-            else
-                docGroupItem = groupNamesMap.value(docGroup);
+    mDocumentUI->documentTreeWidget->addTopLevelItem(emptyGroupNameTi);
+    mDocumentUI->documentTreeWidget->addTopLevelItem(mTrashTi);
 
-            QTreeWidgetItem* docItem = new UBDocumentProxyTreeItem(docGroupItem, proxy, !isInTrash);
-            docItem->setText(0, docName);
 
-            if (mBoardController->selectedDocument() == proxy)
+    foreach (QPointer<UBDocumentProxy> proxy, proxies)
     {
-                mDocumentUI->documentTreeWidget->expandItem(docGroupItem);
-                mDocumentUI->documentTreeWidget->setCurrentItem(docGroupItem);
-            }
-        }
-    }
-
-    foreach (const QString emptyGroupName, emptyGroupNames)
+        if (proxy)
         {
-        UBDocumentGroupTreeItem* docGroupItem = new UBDocumentGroupTreeItem(0); // deleted by the tree widget
-        groupNamesMap.insert(emptyGroupName, docGroupItem);
-        docGroupItem->setGroupName(emptyGroupName);
+            addDocumentInTree(proxy);
         }
-
-    QList<QString> groupNamesList = groupNamesMap.keys();
-    qSort(groupNamesList);
-
-    foreach (const QString groupName, groupNamesList)
-    {
-        UBDocumentGroupTreeItem* ti = groupNamesMap.value(groupName);
-
-        if (ti != emptyGroupNameTi)
-            mDocumentUI->documentTreeWidget->addTopLevelItem(ti);
     }
-
-    if (emptyGroupNameTi)
-        mDocumentUI->documentTreeWidget->addTopLevelItem(emptyGroupNameTi);
-
-    mDocumentUI->documentTreeWidget->addTopLevelItem(mTrashTi);
 }
 
 
@@ -912,12 +929,27 @@ void UBDocumentController::itemClicked(QTreeWidgetItem * item, int column )
 }
 
 
+void UBDocumentController::treeGroupItemRenamed(QString& oldPath,QString& newPath)
+{
+    if(oldPath.isEmpty() || newPath.isEmpty())
+        return;
+
+    QList<QString> keys = mMapOfPaths.keys();
+    for(int i = 0; i < keys.count(); i += 1){
+        QString key = keys.at(i);
+        if(key.startsWith(oldPath)){
+            UBDocumentGroupTreeItem* value = mMapOfPaths.take(key);
+            key = key.remove(0,oldPath.size());
+            mMapOfPaths.insert(key.prepend(newPath),value);
+        }
+    }
+}
+
 void UBDocumentController::itemChanged(QTreeWidgetItem * item, int column)
 {
     UBDocumentProxyTreeItem* proxyItem = dynamic_cast<UBDocumentProxyTreeItem*>(item);
 
-    disconnect(UBPersistenceManager::persistenceManager(), SIGNAL(documentMetadataChanged(UBDocumentProxy*))
-            , this, SLOT(updateDocumentInTree(UBDocumentProxy*)));
+    disconnect(UBPersistenceManager::persistenceManager(), SIGNAL(documentMetadataChanged(UBDocumentProxy*)) , this, SLOT(updateDocumentInTree(UBDocumentProxy*)));
 
     if (proxyItem)
     {
@@ -939,7 +971,6 @@ void UBDocumentController::itemChanged(QTreeWidgetItem * item, int column)
 
                 if (childItem)
                 {
-                    QString groupName;
                     if (0 != (item->flags() & Qt::ItemIsEditable))
                     {
                         childItem->proxy()->setMetaData(UBSettings::documentGroupName, item->text(column));
@@ -950,8 +981,7 @@ void UBDocumentController::itemChanged(QTreeWidgetItem * item, int column)
         }
     }
 
-    connect(UBPersistenceManager::persistenceManager(), SIGNAL(documentMetadataChanged(UBDocumentProxy*)),
-            this, SLOT(updateDocumentInTree(UBDocumentProxy*)));
+    connect(UBPersistenceManager::persistenceManager(), SIGNAL(documentMetadataChanged(UBDocumentProxy*)), this, SLOT(updateDocumentInTree(UBDocumentProxy*)));
 }
 
 
@@ -1341,42 +1371,51 @@ void UBDocumentController::addToDocument()
 }
 
 
+UBDocumentGroupTreeItem* UBDocumentController::getParentTreeItem(QString& documentGroup)
+{
+    QString pathNotYetCreated = documentGroup;
+    UBDocumentGroupTreeItem* result = getCommonGroupItem(documentGroup);
+    if(result)
+        pathNotYetCreated = pathNotYetCreated.remove(0,result->buildEntirePath().size());
+
+    if(pathNotYetCreated.startsWith("/")) pathNotYetCreated = pathNotYetCreated.remove(0,1);
+    QString completePath = result ? result->groupName() + "/" : "";
+
+    QStringList folders = pathNotYetCreated.split("/");
+    for(int i = 0; i < folders.count(); i += 1 ){
+        if(!folders.at(i).isEmpty()){
+            completePath = completePath + folders.at(i);
+            UBDocumentGroupTreeItem* newTreeItem = new UBDocumentGroupTreeItem(result, true);
+            newTreeItem->setGroupName(folders.at(i));
+            if(completePath.indexOf("/") == -1)
+                mDocumentUI->documentTreeWidget->insertTopLevelItem(0,newTreeItem);
+            mMapOfPaths.insert(completePath,newTreeItem);
+            result = newTreeItem;
+            completePath += "/";
+        }
+    }
+
+    return result;
+}
+
 void UBDocumentController::addDocumentInTree(UBDocumentProxy* pDocument)
 {
     QString documentName = pDocument->name();
     QString documentGroup = pDocument->groupName();
+
     if (documentGroup.isEmpty())
-    {
         documentGroup = mDefaultDocumentGroupName;
-    }
-    UBDocumentGroupTreeItem* group = 0;
+
+    UBDocumentGroupTreeItem* group = NULL;
+
     if (documentGroup.startsWith(UBSettings::trashedDocumentGroupNamePrefix))
-    {
         group = mTrashTi;
-    }
     else
-    {
-        for (int i = 0; i < mDocumentUI->documentTreeWidget->topLevelItemCount(); i++)
-        {
-            QTreeWidgetItem* item = mDocumentUI->documentTreeWidget->topLevelItem(i);
-            UBDocumentGroupTreeItem* groupItem = dynamic_cast<UBDocumentGroupTreeItem*>(item);
-            if (groupItem->groupName() == documentGroup)
-            {
-                group = groupItem;
-                break;
-            }
-        }
-    }
-
-    if (group == 0)
-    {
-        group = new UBDocumentGroupTreeItem(0); // deleted by the tree widget
-        group->setGroupName(documentGroup);
-        mDocumentUI->documentTreeWidget->addTopLevelItem(group);
-    }
+        group = getParentTreeItem(documentGroup);
 
     UBDocumentProxyTreeItem *ti = new UBDocumentProxyTreeItem(group, pDocument, !group->isTrashFolder());
     ti->setText(0, documentName);
+    mDocumentUI->documentTreeWidget->editItem(ti,0);
 }
 
 
@@ -1401,12 +1440,25 @@ QStringList UBDocumentController::allGroupNames()
 {
     QStringList result;
 
+    UBDocumentGroupTreeItem* selectedGroup = selectedDocumentGroupTreeItem();
+    if(selectedGroup->isDefaultFolder()){
+
         for (int i = 0; i < mDocumentUI->documentTreeWidget->topLevelItemCount(); i++)
         {
             QTreeWidgetItem* item = mDocumentUI->documentTreeWidget->topLevelItem(i);
             UBDocumentGroupTreeItem* groupItem = dynamic_cast<UBDocumentGroupTreeItem*>(item);
             result << groupItem->groupName();
         }
+    }
+    else{
+        for (int i = 0; i < selectedGroup->childCount(); i++)
+        {
+            QTreeWidgetItem* item = selectedGroup->child(i);
+            UBDocumentGroupTreeItem* groupItem = dynamic_cast<UBDocumentGroupTreeItem*>(item);
+            if(groupItem)
+                result << groupItem->groupName();
+        }
+    }
 
     return result;
 }

src/document/UBDocumentController.h

@@ -66,6 +66,8 @@ class UBDocumentController : public UBDocumentContainer
         QString documentTrashGroupName(){ return mDocumentTrashGroupName;}
         QString defaultDocumentGroupName(){ return mDefaultDocumentGroupName;}
 
+        void treeGroupItemRenamed(QString& oldPath,QString& newPath);
+
     signals:
         void exportDone();
 
@@ -128,6 +130,14 @@ class UBDocumentController : public UBDocumentContainer
         QString mDocumentTrashGroupName;
         QString mDefaultDocumentGroupName;
 
+        UBDocumentGroupTreeItem *getCommonGroupItem(QString& path);
+        QMap<QString, UBDocumentGroupTreeItem*> mMapOfPaths;
+        UBDocumentGroupTreeItem* getParentTreeItem(QString& documentGroup);
+        QList<UBDocumentProxyTreeItem*> getProxies(QTreeWidgetItem *groupItem);
+        QList<UBDocumentGroupTreeItem*> getGroupTreeItem(QTreeWidgetItem* groupItem);
+
+
+
     private slots:
         void documentZoomSliderValueChanged (int value);
         void loadDocumentProxies();

src/document/UBDocumentProxy.cpp

@@ -56,7 +56,7 @@ void UBDocumentProxy::init()
     setMetaData(UBSettings::documentGroupName, "");
 
     QDateTime now = QDateTime::currentDateTime();
-    setMetaData(UBSettings::documentName, now.toString(Qt::SystemLocaleShortDate));
+    setMetaData(UBSettings::documentName, now.toString(Qt::ISODate));
 
     setUuid(QUuid::createUuid());
 

src/gui/UBDocumentTreeWidget.cpp

@@ -22,10 +22,10 @@
  * along with OpenBoard. If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "UBDocumentTreeWidget.h"
 
 #include "document/UBDocumentProxy.h"
-//#include "document/UBDocumentContainer.h"
 
 #include "core/UBSettings.h"
 #include "core/UBApplication.h"
@@ -33,6 +33,9 @@
 #include "core/UBMimeData.h"
 #include "core/UBApplicationController.h"
 #include "core/UBDocumentManager.h"
+
+#include "gui/UBMainWindow.h"
+
 #include "document/UBDocumentController.h"
 
 #include "adaptors/UBThumbnailAdaptor.h"
@@ -41,22 +44,23 @@
 
 #include "core/memcheck.h"
 
+#include <QTimer>
+
 UBDocumentTreeWidget::UBDocumentTreeWidget(QWidget * parent)
     : QTreeWidget(parent)
     , mSelectedProxyTi(0)
     , mDropTargetProxyTi(0)
+    , mLastItemCompletePath("")
 {
     setDragDropMode(QAbstractItemView::InternalMove);
     setAutoScroll(true);
 
     mScrollTimer = new QTimer(this);
-    connect(UBDocumentManager::documentManager(), SIGNAL(documentUpdated(UBDocumentProxy*))
-            , this, SLOT(documentUpdated(UBDocumentProxy*)));
+    connect(UBDocumentManager::documentManager(), SIGNAL(documentUpdated(UBDocumentProxy*)), this, SLOT(documentUpdated(UBDocumentProxy*)));
 
-    connect(this, SIGNAL(itemChanged(QTreeWidgetItem *, int))
-            , this,  SLOT(itemChangedValidation(QTreeWidgetItem *, int)));
-    connect(mScrollTimer, SIGNAL(timeout())
-            , this, SLOT(autoScroll()));
+    connect(this, SIGNAL(itemChanged(QTreeWidgetItem *, int)) , this,  SLOT(itemChangedValidation(QTreeWidgetItem *, int)));
+    connect(mScrollTimer, SIGNAL(timeout()) , this, SLOT(autoScroll()));
+    connect(this,SIGNAL(itemPressed(QTreeWidgetItem*,int)),this,SLOT(onItemPressed(QTreeWidgetItem*,int)));
 }
 
 
@@ -66,30 +70,89 @@ UBDocumentTreeWidget::~UBDocumentTreeWidget()
 }
 
 
+void UBDocumentTreeWidget::onItemPressed(QTreeWidgetItem* item, int column)
+{
+    Q_UNUSED(column)
+
+    UBDocumentGroupTreeItem* group = dynamic_cast<UBDocumentGroupTreeItem *>(item);
+    if(group){
+        mLastItemCompletePath = group->buildEntirePath();
+        mLastItemName = group->groupName();
+    }
+}
+
 void UBDocumentTreeWidget::itemChangedValidation(QTreeWidgetItem * item, int column)
 {
-    if (column == 0)
-    {
-        UBDocumentGroupTreeItem *group = dynamic_cast< UBDocumentGroupTreeItem *>(item);
 
-        if (group)
+    QString emptyNameWarningTitle = tr("Empty name");
+    QString emptyNameWarningText = tr("The name should not be empty. Please enter a valid name.");
+    QString alreadyExistsNameWarningTitle = tr("Name already used");
+    QString alreadyExistsNameWarningText = tr("The actual name is in conflict with and existing. Please choose another one.");
+
+
+    UBDocumentProxyTreeItem* treeItem = dynamic_cast< UBDocumentProxyTreeItem *>(item);
+    if (treeItem)
     {
-            QString name = group->text(0);
+        QString name = treeItem->text(column);
+        if(name.isEmpty()){
+            mFailedValidationForTreeItem = item;
+            mFailedValidationItemColumn = column;
+            UBApplication::mainWindow->warning(emptyNameWarningTitle,emptyNameWarningText);
+            QTimer::singleShot(100,this,SLOT(validationFailed()));
+            return;
+        }
+    }
 
-            for(int i = 0; i < topLevelItemCount (); i++)
+
+    UBDocumentGroupTreeItem* group = dynamic_cast<UBDocumentGroupTreeItem *>(item);
+    if(group)
     {
-                QTreeWidgetItem *someTopLevelItem = topLevelItem(i);
+        QString name = group->text(column);
+        if(name.isEmpty()){
+            mFailedValidationForTreeItem = item;
+            mFailedValidationItemColumn = column;
+            UBApplication::mainWindow->warning(emptyNameWarningTitle,emptyNameWarningText);
+            QTimer::singleShot(100,this,SLOT(validationFailed()));
+            return;
+        }
 
-                if (someTopLevelItem != group &&
-                        someTopLevelItem->text(0) == name)
+        if(group->parent()){
+            for(int i = 0; i < group->parent()->childCount(); i++)
             {
-                    group->setText(0, tr("%1 (copy)").arg(name));
+                QTreeWidgetItem* childAtPosition = group->parent()->child(i);
+
+                if (childAtPosition != item && childAtPosition->text(column) == name){
+                UBApplication::mainWindow->warning(alreadyExistsNameWarningTitle,alreadyExistsNameWarningText);
+                    mFailedValidationForTreeItem = item;
+                    mFailedValidationItemColumn = column;
+                    QTimer::singleShot(100,this,SLOT(validationFailed()));
+                    return;
                 }
             }
         }
+        else{
+            // We are looking at the top level items;
+            for(int i = 0; i < topLevelItemCount(); i += 1){
+                if(topLevelItem(i) != item && dynamic_cast<UBDocumentGroupTreeItem*>(topLevelItem(i))->groupName() == group->groupName()){
+                    UBApplication::mainWindow->warning(tr("Name already in use"),tr("Please choose another name for the directory. The chosed name is already used."));
+                    mFailedValidationForTreeItem = item;
+                    mFailedValidationItemColumn = column;
+                    QTimer::singleShot(100,this,SLOT(validationFailed()));
+                    return;
+                }
+
+            }
+        }
+        QString newPath = group->buildEntirePath();
+        group->updateChildrenPath(column, mLastItemCompletePath, newPath);
+        UBApplication::documentController->treeGroupItemRenamed(mLastItemCompletePath, newPath);
     }
 }
 
+void UBDocumentTreeWidget::validationFailed()
+{
+    editItem(mFailedValidationForTreeItem,mFailedValidationItemColumn);
+}
 
 Qt::DropActions UBDocumentTreeWidget::supportedDropActions() const
 {
@@ -208,11 +271,6 @@ void UBDocumentTreeWidget::dragMoveEvent(QDragMoveEvent *event)
 
 void UBDocumentTreeWidget::focusInEvent(QFocusEvent *event)
 {
-    Q_UNUSED(event);
-
-    // Tolik
-    //itemSelectionChanged();
-
     QTreeWidget::focusInEvent(event);
 }
 
@@ -275,7 +333,6 @@ void UBDocumentTreeWidget::dropEvent(QDropEvent *event)
             if (groupItem->isTrashFolder())
                 mSelectedProxyTi->setFlags(mSelectedProxyTi->flags() ^ Qt::ItemIsEditable);
 
-            //clearSelection();
             expandItem(groupItem);
             scrollToItem(mSelectedProxyTi);
 
@@ -320,7 +377,6 @@ void UBDocumentTreeWidget::dropEvent(QDropEvent *event)
                         if (scene)
                         {
                             UBGraphicsScene* sceneClone = scene->sceneDeepCopy();
-//                            UBGraphicsScene* sceneClone = scene;
 
                             UBDocumentProxy *targetDocProxy = targetProxyTreeItem->proxy();
 
@@ -453,6 +509,35 @@ QString UBDocumentGroupTreeItem::groupName() const
     return text(0);
 }
 
+QString UBDocumentGroupTreeItem::buildEntirePath()
+{
+    QString result(groupName());
+    UBDocumentGroupTreeItem* item = this;
+    while(item->parent()){
+        item = dynamic_cast<UBDocumentGroupTreeItem*>(item->parent());
+        result = item->groupName() + "/" + result;
+    }
+
+    return result;
+}
+
+void UBDocumentGroupTreeItem::updateChildrenPath(int column, QString& previousText, const QString& text)
+{
+    for(int i = 0; i < childCount(); i += 1){
+        UBDocumentGroupTreeItem* groupTreeItem = dynamic_cast<UBDocumentGroupTreeItem*>(child(i));
+        if(groupTreeItem)
+            groupTreeItem->updateChildrenPath(column, previousText,text);
+        else{
+            UBDocumentProxyTreeItem* docProxyItem = dynamic_cast<UBDocumentProxyTreeItem*>(child(i));
+            QString groupName = docProxyItem->proxy()->metaData(UBSettings::documentGroupName).toString();
+            groupName = groupName.remove(0,previousText.length());
+            groupName = text + groupName;
+            docProxyItem->proxy()->setMetaData(UBSettings::documentGroupName, groupName);
+            UBPersistenceManager::persistenceManager()->persistDocumentMetadata(docProxyItem->proxy());
+        }
+    }
+}
+
 
 bool UBDocumentGroupTreeItem::isTrashFolder() const
 {

src/gui/UBDocumentTreeWidget.h

@@ -54,8 +54,9 @@ class UBDocumentTreeWidget : public QTreeWidget
         void documentUpdated(UBDocumentProxy *pDocument);
 
         void itemChangedValidation(QTreeWidgetItem * item, int column);
-
+        void onItemPressed(QTreeWidgetItem* item, int column);
         void autoScroll();
+        void validationFailed();
 
     private:
         UBDocumentProxyTreeItem *mSelectedProxyTi;
@@ -63,6 +64,10 @@ class UBDocumentTreeWidget : public QTreeWidget
         QBrush mBackground;
         QTimer* mScrollTimer;
         int mScrollMagnitude;
+        QTreeWidgetItem* mFailedValidationForTreeItem;
+        int mFailedValidationItemColumn;
+        QString mLastItemCompletePath;
+        QString mLastItemName;
 };
 
 
@@ -93,6 +98,11 @@ class UBDocumentGroupTreeItem : public QTreeWidgetItem
 
         bool isTrashFolder() const;
         bool isDefaultFolder() const;
+
+        QString buildEntirePath();
+
+
+        void updateChildrenPath(int column, QString& previousText, const QString &text);
 };
 
 #endif /* UBDOCUMENTTREEWIDGET_H_ */