From 90c769c013e00076fc5afcdc9b2feb84c15d5445 Mon Sep 17 00:00:00 2001 From: blacksun Date: Thu, 18 Feb 2016 16:56:08 +0000 Subject: [PATCH] Minor fix with the insertion of new item in the new element panel git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4351 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/ElementsCollection/elementcollectionitem.cpp | 2 +- sources/ElementsCollection/elementlocation.cpp | 8 ++++---- sources/ElementsCollection/fileelementcollectionitem.h | 3 --- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sources/ElementsCollection/elementcollectionitem.cpp b/sources/ElementsCollection/elementcollectionitem.cpp index 84bdad4b3..210e75768 100644 --- a/sources/ElementsCollection/elementcollectionitem.cpp +++ b/sources/ElementsCollection/elementcollectionitem.cpp @@ -164,7 +164,7 @@ int ElementCollectionItem::rowForInsertItem(const QString &collection_name) if (eci->collectionName() > collection_name) return indexOfChild(eci); - return childCount(); + return (indexOfChild(child.last())+1); } /** diff --git a/sources/ElementsCollection/elementlocation.cpp b/sources/ElementsCollection/elementlocation.cpp index da577c528..711e38590 100644 --- a/sources/ElementsCollection/elementlocation.cpp +++ b/sources/ElementsCollection/elementlocation.cpp @@ -167,13 +167,13 @@ bool ElementLocation::setPath(QString path) m_file_system_path = path; if (path.startsWith(QETApp::commonElementsDirN())) { - path.remove(QETApp::commonElementsDirN() + "/"); + path.remove(QETApp::commonElementsDirN()+="/"); path.prepend("common://"); m_collection_path = path; } else if (path.startsWith(QETApp::customElementsDirN())) { - path.remove(QETApp::customElementsDirN() + "/"); + path.remove(QETApp::customElementsDirN()+="/"); path.prepend("custom://"); m_collection_path = path; } @@ -184,13 +184,13 @@ bool ElementLocation::setPath(QString path) m_file_system_path = path; if (path.startsWith(QETApp::commonElementsDirN())) { - path.remove(QETApp::commonElementsDirN() + "/"); + path.remove(QETApp::commonElementsDirN()+="/"); path.prepend("common://"); m_collection_path = path; } else if (path.startsWith(QETApp::customElementsDirN())) { - path.remove(QETApp::customElementsDirN()) + "/"; + path.remove(QETApp::customElementsDirN()+="/"); path.prepend("custom://"); m_collection_path = path; } diff --git a/sources/ElementsCollection/fileelementcollectionitem.h b/sources/ElementsCollection/fileelementcollectionitem.h index e3f7e756e..a53d2a448 100644 --- a/sources/ElementsCollection/fileelementcollectionitem.h +++ b/sources/ElementsCollection/fileelementcollectionitem.h @@ -64,9 +64,6 @@ class FileElementCollectionItem : public ElementCollectionItem private: void setPathName(QString path_name); void populate(); -// bool handleElementDrop (const QMimeData *data); -// bool handleDirectoryDrop (const QMimeData *data); -// bool createSubDir (QDir dir_to_copy, QDir destination); private: QString m_path;