removed document mode

resources/etc/OpenBoard.css

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

resources/forms/documents.ui

@@ -40,15 +40,8 @@
      <property name="lineWidth">
       <number>0</number>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
+     <layout class="QHBoxLayout" name="horizontalLayout">
       <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">
@@ -72,17 +65,11 @@
           <item>
            <widget class="UBDocumentTreeWidget" name="documentTreeWidget">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <sizepolicy hsizetype="Maximum" 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>
@@ -116,6 +103,8 @@
           </item>
          </layout>
         </widget>
+      </item>
+      <item>
         <widget class="QWidget" name="topRightFrame" native="true">
          <property name="styleSheet">
           <string notr="true"/>
@@ -126,12 +115,6 @@
           </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>
@@ -241,7 +224,6 @@
           </item>
          </layout>
         </widget>
-       </widget>
       </item>
      </layout>
     </widget>
@@ -261,6 +243,8 @@
    <header>gui/UBDocumentTreeWidget.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../OpenBoard.qrc"/>
+ </resources>
  <connections/>
 </ui>

src/document/UBDocumentController.h

@@ -66,8 +66,6 @@ class UBDocumentController : public UBDocumentContainer
         QString documentTrashGroupName(){ return mDocumentTrashGroupName;}
         QString defaultDocumentGroupName(){ return mDefaultDocumentGroupName;}
 
-        void treeGroupItemRenamed(QString& oldPath,QString& newPath);
-
     signals:
         void exportDone();
 
@@ -130,14 +128,6 @@ 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::ISODate));
+    setMetaData(UBSettings::documentName, now.toString(Qt::SystemLocaleShortDate));
 
     setUuid(QUuid::createUuid());
 

src/gui/UBDocumentTreeWidget.cpp

@@ -33,9 +33,6 @@
 #include "core/UBMimeData.h"
 #include "core/UBApplicationController.h"
 #include "core/UBDocumentManager.h"
-
-#include "gui/UBMainWindow.h"
-
 #include "document/UBDocumentController.h"
 
 #include "adaptors/UBThumbnailAdaptor.h"
@@ -44,23 +41,22 @@
 
 #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(itemPressed(QTreeWidgetItem*,int)),this,SLOT(onItemPressed(QTreeWidgetItem*,int)));
+    connect(this, SIGNAL(itemChanged(QTreeWidgetItem *, int))
+            , this,  SLOT(itemChangedValidation(QTreeWidgetItem *, int)));
+    connect(mScrollTimer, SIGNAL(timeout())
+            , this, SLOT(autoScroll()));
 }
 
 
@@ -69,91 +65,33 @@ UBDocumentTreeWidget::~UBDocumentTreeWidget()
     // NOOP
 }
 
-
-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)
 {
 
-    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)
+    if (column == 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;
-        }
-    }
+
 
 
     UBDocumentGroupTreeItem* group = dynamic_cast<UBDocumentGroupTreeItem *>(item);
     if(group)
     {
-        QString name = group->text(column);
-        if(name.isEmpty()){
-            mFailedValidationForTreeItem = item;
-            mFailedValidationItemColumn = column;
-            UBApplication::mainWindow->warning(emptyNameWarningTitle,emptyNameWarningText);
-            QTimer::singleShot(100,this,SLOT(validationFailed()));
-            return;
-        }
+            QString name = group->text(0);
 
-        if(group->parent()){
-            for(int i = 0; i < group->parent()->childCount(); i++)
+            for(int i = 0; i < topLevelItemCount (); i++)
             {
-                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;
-                }
+                QTreeWidgetItem *someTopLevelItem = topLevelItem(i);
 
+                if (someTopLevelItem != group &&
+                        someTopLevelItem->text(0) == name)
+                {
+                    group->setText(0, tr("%1 (copy)").arg(name));
+                }
             }
         }
-        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
 {
     return Qt::MoveAction | Qt::CopyAction;
@@ -509,36 +447,6 @@ 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
 {
     return (0 == (flags() & Qt::ItemIsEditable)) &&  UBApplication::app()->documentController && (groupName() == UBApplication::app()->documentController->documentTrashGroupName());

src/gui/UBDocumentTreeWidget.h

@@ -54,9 +54,7 @@ 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;
@@ -64,10 +62,6 @@ class UBDocumentTreeWidget : public QTreeWidget
         QBrush mBackground;
         QTimer* mScrollTimer;
         int mScrollMagnitude;
-        QTreeWidgetItem* mFailedValidationForTreeItem;
-        int mFailedValidationItemColumn;
-        QString mLastItemCompletePath;
-        QString mLastItemName;
 };
 
 
@@ -98,11 +92,6 @@ class UBDocumentGroupTreeItem : public QTreeWidgetItem
 
         bool isTrashFolder() const;
         bool isDefaultFolder() const;
-
-        QString buildEntirePath();
-
-
-        void updateChildrenPath(int column, QString& previousText, const QString &text);
 };
 
 #endif /* UBDOCUMENTTREEWIDGET_H_ */