kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve code style, Wrap code for better readability

Browse Source
This commit is contained in:
Simon De Backer
2020-08-16 14:21:55 +02:00
parent a83ee76f39
commit 4ed33109f4
6 changed files with 293 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/ElementsCollection/elementcollectionhandler.cpp
View File

@@ -25,7 +25,8 @@
/******************************************************/ /******************************************************/
ECHStrategy::ECHStrategy(ElementsLocation &source, ElementsLocation &destination) : ECHStrategy::ECHStrategy(ElementsLocation &source,
ElementsLocation &destination) :
m_source(source), m_source(source),
m_destination (destination) m_destination (destination)
{} {}

58
sources/ElementsCollection/elementcollectionhandler.h
View File

@@ -25,12 +25,14 @@ class QWidget;
/** /**
@brief The ECHStrategy class @brief The ECHStrategy class
Abstract class for manage copy of directory or element from a collection to another Abstract class for manage copy of directory
or element from a collection to another
*/ */
class ECHStrategy class ECHStrategy
{ {
public: public:
ECHStrategy(ElementsLocation &source, ElementsLocation &destination); ECHStrategy(ElementsLocation &source,
ElementsLocation &destination);
virtual ~ECHStrategy(); virtual ~ECHStrategy();
virtual ElementsLocation copy() =0; virtual ElementsLocation copy() =0;
@@ -39,43 +41,62 @@ class ECHStrategy
/** /**
@brief The ECHSFileToFile class @brief The ECHSFileToFile class
Manage the copy of directory or element from a file system collection to another file system collection Manage the copy of directory or element from a file system collection
to another file system collection
*/ */
class ECHSFileToFile : public ECHStrategy class ECHSFileToFile : public ECHStrategy
{ {
public: public:
ECHSFileToFile (ElementsLocation &source, ElementsLocation &destination); ECHSFileToFile (ElementsLocation &source,
ElementsLocation &destination);
ElementsLocation copy() override; ElementsLocation copy() override;
private: private:
ElementsLocation copyDirectory(ElementsLocation &source, ElementsLocation &destination, const QString& rename = QString()); ElementsLocation copyDirectory(
ElementsLocation copyElement(ElementsLocation &source, ElementsLocation &destination, const QString& rename = QString()); ElementsLocation &source,
ElementsLocation &destination,
const QString& rename = QString());
ElementsLocation copyElement(
ElementsLocation &source,
ElementsLocation &destination,
const QString& rename = QString());
}; };
/** /**
@brief The ECHSXmlToFile class @brief The ECHSXmlToFile class
Manage the copy of a directory or element from an xml collection to a file. Manage the copy of a directory or element from an xml collection
to a file.
*/ */
class ECHSXmlToFile : public ECHStrategy class ECHSXmlToFile : public ECHStrategy
{ {
public: public:
ECHSXmlToFile (ElementsLocation &source, ElementsLocation &destination); ECHSXmlToFile (ElementsLocation &source,
ElementsLocation &destination);
ElementsLocation copy() override; ElementsLocation copy() override;
private: private:
ElementsLocation copyDirectory(ElementsLocation &source, ElementsLocation &destination, const QString& rename = QString()); ElementsLocation copyDirectory(
ElementsLocation copyElement(ElementsLocation &source, ElementsLocation &destination, const QString& rename = QString()); ElementsLocation &source,
ElementsLocation &destination,
const QString& rename = QString());
ElementsLocation copyElement(
ElementsLocation &source,
ElementsLocation &destination,
const QString& rename = QString());
}; };
/** /**
@brief The ECHSToXml class @brief The ECHSToXml class
Manage the copy of a directory or element from a collection (no matter if the source is a file system collection or an xml collection) Manage the copy of a directory or element from a collection
(no matter if the source is a file system collection
or an xml collection)
to an xml collection to an xml collection
*/ */
class ECHSToXml : public ECHStrategy class ECHSToXml : public ECHStrategy
{ {
public: public:
ECHSToXml (ElementsLocation &source, ElementsLocation &destination); ECHSToXml (ElementsLocation &source,
ElementsLocation &destination);
ElementsLocation copy() override; ElementsLocation copy() override;
}; };
@@ -90,10 +111,15 @@ class ElementCollectionHandler
ElementCollectionHandler(); ElementCollectionHandler();
~ElementCollectionHandler(); ~ElementCollectionHandler();
ElementsLocation copy(ElementsLocation &source, ElementsLocation &destination); ElementsLocation copy(ElementsLocation &source,
ElementsLocation createDir(ElementsLocation &parent, const QString &name, const NamesList &name_list); ElementsLocation &destination);
bool importFromProject (QETProject *project, ElementsLocation &location); ElementsLocation createDir(ElementsLocation &parent,
bool setNames(ElementsLocation &location, const NamesList &name_list); const QString &name,
const NamesList &name_list);
bool importFromProject (QETProject *project,
ElementsLocation &location);
bool setNames(ElementsLocation &location,
const NamesList &name_list);
private: private:
ECHStrategy *m_strategy = nullptr; ECHStrategy *m_strategy = nullptr;

289
sources/ElementsCollection/elementscollectionwidget.cpp
View File

@@ -118,13 +118,15 @@ void ElementsCollectionWidget::highlightUnusedElement()
Set the current item to be the item for @location Set the current item to be the item for @location
@param location @param location
*/ */
void ElementsCollectionWidget::setCurrentLocation(const ElementsLocation &location) void ElementsCollectionWidget::setCurrentLocation(
const ElementsLocation &location)
{ {
if (!location.exist()) if (!location.exist())
return; return;
if (m_model) if (m_model)
m_tree_view->setCurrentIndex(m_model->indexFromLocation(location)); m_tree_view->setCurrentIndex(
m_model->indexFromLocation(location));
} }
void ElementsCollectionWidget::leaveEvent(QEvent *event) void ElementsCollectionWidget::leaveEvent(QEvent *event)
@@ -137,17 +139,29 @@ void ElementsCollectionWidget::leaveEvent(QEvent *event)
void ElementsCollectionWidget::setUpAction() void ElementsCollectionWidget::setUpAction()
{ {
m_open_dir = new QAction(QET::Icons::FolderOpen, tr("Ouvrir le dossier correspondant"), this); m_open_dir = new QAction(QET::Icons::FolderOpen,
m_edit_element = new QAction(QET::Icons::ElementEdit, tr("Éditer l'élément"), this); tr("Ouvrir le dossier correspondant"), this);
m_delete_element = new QAction(QET::Icons::ElementDelete, tr("Supprimer l'élément"), this); m_edit_element = new QAction(QET::Icons::ElementEdit,
m_delete_dir = new QAction(QET::Icons::FolderDelete, tr("Supprimer le dossier"), this); tr("Éditer l'élément"), this);
m_reload = new QAction(QET::Icons::ViewRefresh, tr("Recharger les collections"), this); m_delete_element = new QAction(QET::Icons::ElementDelete,
m_edit_dir = new QAction(QET::Icons::FolderEdit, tr("Éditer le dossier"), this); tr("Supprimer l'élément"), this);
m_new_directory = new QAction(QET::Icons::FolderNew, tr("Nouveau dossier"), this); m_delete_dir = new QAction(QET::Icons::FolderDelete,
m_new_element = new QAction(QET::Icons::ElementNew, tr("Nouvel élément"), this); tr("Supprimer le dossier"), this);
m_show_this_dir = new QAction(QET::Icons::FolderOnlyThis, tr("Afficher uniquement ce dossier"), this); m_reload = new QAction(QET::Icons::ViewRefresh,
m_show_all_dir = new QAction(QET::Icons::FolderShowAll, tr("Afficher tous les dossiers"), this); tr("Recharger les collections"), this);
m_dir_propertie = new QAction(QET::Icons::FolderProperties, tr("Propriété du dossier"), this); m_edit_dir = new QAction(QET::Icons::FolderEdit,
tr("Éditer le dossier"), this);
m_new_directory = new QAction(QET::Icons::FolderNew,
tr("Nouveau dossier"), this);
m_new_element = new QAction(QET::Icons::ElementNew,
tr("Nouvel élément"), this);
m_show_this_dir = new QAction(QET::Icons::FolderOnlyThis,
tr("Afficher uniquement ce dossier"),
this);
m_show_all_dir = new QAction(QET::Icons::FolderShowAll,
tr("Afficher tous les dossiers"), this);
m_dir_propertie = new QAction(QET::Icons::FolderProperties,
tr("Propriété du dossier"), this);
} }
/** /**
@@ -193,26 +207,44 @@ void ElementsCollectionWidget::setUpWidget()
*/ */
void ElementsCollectionWidget::setUpConnection() void ElementsCollectionWidget::setUpConnection()
{ {
connect(m_tree_view, &QTreeView::customContextMenuRequested, this, &ElementsCollectionWidget::customContextMenu); connect(m_tree_view, &QTreeView::customContextMenuRequested,
connect(m_search_field, &QLineEdit::textEdited, [this]() {m_search_timer.start();}); this, &ElementsCollectionWidget::customContextMenu);
connect(&m_search_timer, &QTimer::timeout, this, &ElementsCollectionWidget::search); connect(m_search_field, &QLineEdit::textEdited,
connect(m_open_dir, &QAction::triggered, this, &ElementsCollectionWidget::openDir); [this]() {m_search_timer.start();});
connect(m_edit_element, &QAction::triggered, this, &ElementsCollectionWidget::editElement); connect(&m_search_timer, &QTimer::timeout,
connect(m_delete_element, &QAction::triggered, this, &ElementsCollectionWidget::deleteElement); this, &ElementsCollectionWidget::search);
connect(m_delete_dir, &QAction::triggered, this, &ElementsCollectionWidget::deleteDirectory); connect(m_open_dir, &QAction::triggered,
connect(m_reload, &QAction::triggered, this, &ElementsCollectionWidget::reload); this, &ElementsCollectionWidget::openDir);
connect(m_edit_dir, &QAction::triggered, this, &ElementsCollectionWidget::editDirectory); connect(m_edit_element, &QAction::triggered,
connect(m_new_directory, &QAction::triggered, this, &ElementsCollectionWidget::newDirectory); this, &ElementsCollectionWidget::editElement);
connect(m_new_element, &QAction::triggered, this, &ElementsCollectionWidget::newElement); connect(m_delete_element, &QAction::triggered,
connect(m_show_this_dir, &QAction::triggered, this, &ElementsCollectionWidget::showThisDir); this, &ElementsCollectionWidget::deleteElement);
connect(m_show_all_dir, &QAction::triggered, this, &ElementsCollectionWidget::resetShowThisDir); connect(m_delete_dir, &QAction::triggered,
connect(m_dir_propertie, &QAction::triggered, this, &ElementsCollectionWidget::dirProperties); this, &ElementsCollectionWidget::deleteDirectory);
connect(m_reload, &QAction::triggered,
this, &ElementsCollectionWidget::reload);
connect(m_edit_dir, &QAction::triggered,
this, &ElementsCollectionWidget::editDirectory);
connect(m_new_directory, &QAction::triggered,
this, &ElementsCollectionWidget::newDirectory);
connect(m_new_element, &QAction::triggered,
this, &ElementsCollectionWidget::newElement);
connect(m_show_this_dir, &QAction::triggered,
this, &ElementsCollectionWidget::showThisDir);
connect(m_show_all_dir, &QAction::triggered,
this, &ElementsCollectionWidget::resetShowThisDir);
connect(m_dir_propertie, &QAction::triggered,
this, &ElementsCollectionWidget::dirProperties);
connect(m_tree_view, &QTreeView::doubleClicked, [this](const QModelIndex &index) { connect(m_tree_view, &QTreeView::doubleClicked,
[this](const QModelIndex &index)
{
this->m_index_at_context_menu = index ; this->m_index_at_context_menu = index ;
this->editElement();}); this->editElement();
});
connect(m_tree_view, &QTreeView::entered, [this] (const QModelIndex &index) { connect(m_tree_view, &QTreeView::entered,
[this] (const QModelIndex &index) {
QETDiagramEditor *qde = QETApp::diagramEditorAncestorOf(this); QETDiagramEditor *qde = QETApp::diagramEditorAncestorOf(this);
ElementCollectionItem *eci = elementCollectionItemForIndex(index); ElementCollectionItem *eci = elementCollectionItemForIndex(index);
if (qde && eci) if (qde && eci)
@@ -222,7 +254,7 @@ void ElementsCollectionWidget::setUpConnection()
/** /**
@brief ElementsCollectionWidget::customContextMenu @brief ElementsCollectionWidget::customContextMenu
Display the context menu of this widget at @point Display the context menu of this widget at point
@param point @param point
*/ */
void ElementsCollectionWidget::customContextMenu(const QPoint &point) void ElementsCollectionWidget::customContextMenu(const QPoint &point)
@@ -232,7 +264,8 @@ void ElementsCollectionWidget::customContextMenu(const QPoint &point)
m_context_menu->clear(); m_context_menu->clear();
ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu); ElementCollectionItem *eci = elementCollectionItemForIndex(
m_index_at_context_menu);
bool add_open_dir = false; bool add_open_dir = false;
if (eci->isElement()) if (eci->isElement())
@@ -241,7 +274,8 @@ void ElementsCollectionWidget::customContextMenu(const QPoint &point)
if (eci->type() == FileElementCollectionItem::Type) if (eci->type() == FileElementCollectionItem::Type)
{ {
add_open_dir = true; add_open_dir = true;
FileElementCollectionItem *feci = static_cast<FileElementCollectionItem*>(eci); FileElementCollectionItem *feci =
static_cast<FileElementCollectionItem*>(eci);
if (!feci->isCommonCollection()) if (!feci->isCommonCollection())
{ {
if (feci->isDir()) if (feci->isDir())
@@ -260,7 +294,8 @@ void ElementsCollectionWidget::customContextMenu(const QPoint &point)
} }
if (eci->type() == XmlProjectElementCollectionItem::Type) if (eci->type() == XmlProjectElementCollectionItem::Type)
{ {
XmlProjectElementCollectionItem *xpeci = static_cast<XmlProjectElementCollectionItem *>(eci); XmlProjectElementCollectionItem *xpeci =
static_cast<XmlProjectElementCollectionItem *>(eci);
if (xpeci->isCollectionRoot()) if (xpeci->isCollectionRoot())
add_open_dir = true; add_open_dir = true;
} }
@@ -288,7 +323,8 @@ void ElementsCollectionWidget::customContextMenu(const QPoint &point)
*/ */
void ElementsCollectionWidget::openDir() void ElementsCollectionWidget::openDir()
{ {
ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu); ElementCollectionItem *eci =
elementCollectionItemForIndex(m_index_at_context_menu);
if (!eci) return; if (!eci) return;
if (eci->type() == FileElementCollectionItem::Type) if (eci->type() == FileElementCollectionItem::Type)
@@ -324,7 +360,10 @@ void ElementsCollectionWidget::editElement()
app->openElementLocations(QList<ElementsLocation>() << location); app->openElementLocations(QList<ElementsLocation>() << location);
foreach (QETElementEditor *element_editor, app->elementEditors()) foreach (QETElementEditor *element_editor, app->elementEditors())
connect(element_editor, &QETElementEditor::saveToLocation, this, &ElementsCollectionWidget::locationWasSaved); connect(element_editor,
&QETElementEditor::saveToLocation,
this,
&ElementsCollectionWidget::locationWasSaved);
} }
/** /**
@@ -333,28 +372,39 @@ void ElementsCollectionWidget::editElement()
*/ */
void ElementsCollectionWidget::deleteElement() void ElementsCollectionWidget::deleteElement()
{ {
ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu); ElementCollectionItem *eci = elementCollectionItemForIndex(
m_index_at_context_menu);
if (!eci) return; if (!eci) return;
ElementsLocation loc(eci->collectionPath()); ElementsLocation loc(eci->collectionPath());
if (! (loc.isElement() && loc.exist() && loc.isFileSystem() && loc.collectionPath().startsWith("custom://")) ) return; if (! (loc.isElement()
&& loc.exist()
&& loc.isFileSystem()
&& loc.collectionPath().startsWith("custom://")) ) return;
if (QET::QetMessageBox::question(this, if (QET::QetMessageBox::question(
this,
tr("Supprimer l'élément ?", "message box title"), tr("Supprimer l'élément ?", "message box title"),
tr("Êtes-vous sûr de vouloir supprimer cet élément ?\n", "message box content"), tr("Êtes-vous sûr de vouloir supprimer cet élément ?\n",
"message box content"),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
{ {
QFile file(loc.fileSystemPath()); QFile file(loc.fileSystemPath());
if (file.remove()) if (file.remove())
{ {
m_model->removeRows(m_index_at_context_menu.row(), 1, m_index_at_context_menu.parent()); m_model->removeRows(m_index_at_context_menu.row(),
1,
m_index_at_context_menu.parent());
} }
else else
{ {
QET::QetMessageBox::warning(this, QET::QetMessageBox::warning(
tr("Suppression de l'élément", "message box title"), this,
tr("La suppression de l'élément a échoué.", "message box content")); tr("Suppression de l'élément",
"message box title"),
tr("La suppression de l'élément a échoué.",
"message box content"));
} }
} }
} }
@@ -365,14 +415,19 @@ void ElementsCollectionWidget::deleteElement()
*/ */
void ElementsCollectionWidget::deleteDirectory() void ElementsCollectionWidget::deleteDirectory()
{ {
ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu); ElementCollectionItem *eci = elementCollectionItemForIndex(
m_index_at_context_menu);
if (!eci) return; if (!eci) return;
ElementsLocation loc (eci->collectionPath()); ElementsLocation loc (eci->collectionPath());
if (! (loc.isDirectory() && loc.exist() && loc.isFileSystem() && loc.collectionPath().startsWith("custom://")) ) return; if (! (loc.isDirectory()
&& loc.exist()
&& loc.isFileSystem()
&& loc.collectionPath().startsWith("custom://")) ) return;
if (QET::QetMessageBox::question(this, if (QET::QetMessageBox::question(
this,
tr("Supprimer le dossier?", "message box title"), tr("Supprimer le dossier?", "message box title"),
tr("Êtes-vous sûr de vouloir supprimer le dossier ?\n" tr("Êtes-vous sûr de vouloir supprimer le dossier ?\n"
"Tout les éléments et les dossier contenus dans ce dossier seront supprimés.", "Tout les éléments et les dossier contenus dans ce dossier seront supprimés.",
@@ -382,13 +437,18 @@ void ElementsCollectionWidget::deleteDirectory()
QDir dir (loc.fileSystemPath()); QDir dir (loc.fileSystemPath());
if (dir.removeRecursively()) if (dir.removeRecursively())
{ {
m_model->removeRows(m_index_at_context_menu.row(), 1, m_index_at_context_menu.parent()); m_model->removeRows(m_index_at_context_menu.row(),
1,
m_index_at_context_menu.parent());
} }
else else
{ {
QET::QetMessageBox::warning(this, QET::QetMessageBox::warning(
tr("Suppression du dossier", "message box title"), this,
tr("La suppression du dossier a échoué.", "message box content")); tr("Suppression du dossier",
"message box title"),
tr("La suppression du dossier a échoué.",
"message box content"));
} }
} }
} }
@@ -399,11 +459,13 @@ void ElementsCollectionWidget::deleteDirectory()
*/ */
void ElementsCollectionWidget::editDirectory() void ElementsCollectionWidget::editDirectory()
{ {
ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu); ElementCollectionItem *eci = elementCollectionItemForIndex(
m_index_at_context_menu);
if (eci->type() != FileElementCollectionItem::Type) return; if (eci->type() != FileElementCollectionItem::Type) return;
FileElementCollectionItem *feci = static_cast<FileElementCollectionItem*>(eci); FileElementCollectionItem *feci =
static_cast<FileElementCollectionItem*>(eci);
if(feci->isCommonCollection()) return; if(feci->isCommonCollection()) return;
ElementsLocation location(feci->collectionPath()); ElementsLocation location(feci->collectionPath());
@@ -419,11 +481,13 @@ void ElementsCollectionWidget::editDirectory()
*/ */
void ElementsCollectionWidget::newDirectory() void ElementsCollectionWidget::newDirectory()
{ {
ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu); ElementCollectionItem *eci = elementCollectionItemForIndex(
m_index_at_context_menu);
if (eci->type() != FileElementCollectionItem::Type) return; if (eci->type() != FileElementCollectionItem::Type) return;
FileElementCollectionItem *feci = static_cast<FileElementCollectionItem*>(eci); FileElementCollectionItem *feci =
static_cast<FileElementCollectionItem*>(eci);
if(feci->isCommonCollection()) return; if(feci->isCommonCollection()) return;
ElementsLocation location(feci->collectionPath()); ElementsLocation location(feci->collectionPath());
@@ -438,13 +502,15 @@ void ElementsCollectionWidget::newDirectory()
*/ */
void ElementsCollectionWidget::newElement() void ElementsCollectionWidget::newElement()
{ {
ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu); ElementCollectionItem *eci = elementCollectionItemForIndex(
m_index_at_context_menu);
if (eci->type() != FileElementCollectionItem::Type) { if (eci->type() != FileElementCollectionItem::Type) {
return; return;
} }
FileElementCollectionItem *feci = static_cast<FileElementCollectionItem*>(eci); FileElementCollectionItem *feci =
static_cast<FileElementCollectionItem*>(eci);
if(feci->isCommonCollection()) { if(feci->isCommonCollection()) {
return; return;
} }
@@ -454,8 +520,12 @@ void ElementsCollectionWidget::newElement()
elmt_wizard.preselectedLocation(loc); elmt_wizard.preselectedLocation(loc);
elmt_wizard.exec(); elmt_wizard.exec();
foreach (QETElementEditor *element_editor, QETApp::instance()->elementEditors()) foreach (QETElementEditor *element_editor,
connect(element_editor, &QETElementEditor::saveToLocation, this, &ElementsCollectionWidget::locationWasSaved); QETApp::instance()->elementEditors())
connect(element_editor,
&QETElementEditor::saveToLocation,
this,
&ElementsCollectionWidget::locationWasSaved);
} }
/** /**
@@ -467,7 +537,8 @@ void ElementsCollectionWidget::showThisDir()
//Disable the yellow background of the previous index //Disable the yellow background of the previous index
if (m_showed_index.isValid()) if (m_showed_index.isValid())
{ {
ElementCollectionItem *eci = elementCollectionItemForIndex(m_showed_index); ElementCollectionItem *eci =
elementCollectionItemForIndex(m_showed_index);
if (eci) if (eci)
eci->setBackground(QBrush()); eci->setBackground(QBrush());
} }
@@ -477,7 +548,8 @@ void ElementsCollectionWidget::showThisDir()
{ {
hideCollection(true); hideCollection(true);
showAndExpandItem(m_showed_index, true, true); showAndExpandItem(m_showed_index, true, true);
ElementCollectionItem *eci = elementCollectionItemForIndex(m_showed_index); ElementCollectionItem *eci =
elementCollectionItemForIndex(m_showed_index);
if (eci) if (eci)
eci->setBackground(QBrush(QColor(255, 204, 0, 255))); eci->setBackground(QBrush(QColor(255, 204, 0, 255)));
search(); search();
@@ -495,7 +567,8 @@ void ElementsCollectionWidget::resetShowThisDir()
{ {
if (m_showed_index.isValid()) if (m_showed_index.isValid())
{ {
ElementCollectionItem *eci = elementCollectionItemForIndex(m_showed_index); ElementCollectionItem *eci = elementCollectionItemForIndex(
m_showed_index);
if (eci) if (eci)
eci->setBackground(QBrush()); eci->setBackground(QBrush());
} }
@@ -510,17 +583,26 @@ void ElementsCollectionWidget::resetShowThisDir()
*/ */
void ElementsCollectionWidget::dirProperties() void ElementsCollectionWidget::dirProperties()
{ {
ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu); ElementCollectionItem *eci = elementCollectionItemForIndex(
m_index_at_context_menu);
if (eci && eci->isDir()) { if (eci && eci->isDir()) {
QString txt1 = tr("Le dossier %1 contient").arg(eci->localName()); QString txt1 = tr("Le dossier %1 contient").arg(
QString txt2 = tr("%n élément(s), répartie(s)", "", eci->elementsChild().size()); eci->localName());
QString txt3 = tr("dans %n dossier(s).", "" , eci->directoriesChild().size()); QString txt2 = tr("%n élément(s), répartie(s)",
QString txt4 = tr("Chemin de la collection : %1").arg(eci->collectionPath()); "",
eci->elementsChild().size());
QString txt3 = tr("dans %n dossier(s).",
"" ,
eci->directoriesChild().size());
QString txt4 = tr("Chemin de la collection : %1").arg(
eci->collectionPath());
QString txt5; QString txt5;
if (eci->type() == FileElementCollectionItem::Type) { if (eci->type() == FileElementCollectionItem::Type) {
txt5 = tr("Chemin dans le système de fichiers : %1").arg(static_cast<FileElementCollectionItem*>(eci)->fileSystemPath()); txt5 = tr("Chemin dans le système de fichiers : %1")
.arg(static_cast<FileElementCollectionItem*>(eci)->fileSystemPath());
} }
QMessageBox::information(this, QMessageBox::information(
this,
tr("Propriété du dossier %1").arg(eci->localName()), tr("Propriété du dossier %1").arg(eci->localName()),
txt1 + " " + txt2 + " " + txt3 + "\n\n" + txt4 + "\n" + txt5); txt1 + " " + txt2 + " " + txt3 + "\n\n" + txt4 + "\n" + txt5);
} }
@@ -532,9 +614,13 @@ void ElementsCollectionWidget::dirProperties()
void ElementsCollectionWidget::reload() void ElementsCollectionWidget::reload()
{ {
m_progress_bar->show(); m_progress_bar->show();
m_progress_bar->setValue(1); //Force to repaint now, else progress bar will be not displayed immediately // Force to repaint now,
// else progress bar will be not displayed immediately
m_progress_bar->setValue(1);
m_tree_view->setDisabled(true); m_tree_view->setDisabled(true);
m_tree_view->repaint(); //Force to repaint now, else tree view will be not disabled immediately // Force to repaint now,
// else tree view will be not disabled immediately
m_tree_view->repaint();
QList <QETProject *> project_list; QList <QETProject *> project_list;
project_list.append(m_waiting_project); project_list.append(m_waiting_project);
@@ -546,9 +632,18 @@ void ElementsCollectionWidget::reload()
m_new_model->deleteLater(); m_new_model->deleteLater();
} }
m_new_model = new ElementsCollectionModel(m_tree_view); m_new_model = new ElementsCollectionModel(m_tree_view);
connect(m_new_model, &ElementsCollectionModel::loadingProgressRangeChanged, m_progress_bar, &QProgressBar::setRange); connect(m_new_model,
connect(m_new_model, &ElementsCollectionModel::loadingProgressValueChanged, m_progress_bar, &QProgressBar::setValue); &ElementsCollectionModel::loadingProgressRangeChanged,
connect(m_new_model, &ElementsCollectionModel::loadingFinished, this, &ElementsCollectionWidget::loadingFinished); m_progress_bar,
&QProgressBar::setRange);
connect(m_new_model,
&ElementsCollectionModel::loadingProgressValueChanged,
m_progress_bar,
&QProgressBar::setValue);
connect(m_new_model,
&ElementsCollectionModel::loadingFinished,
this,
&ElementsCollectionWidget::loadingFinished);
m_new_model->loadCollections(true, true, project_list); m_new_model->loadCollections(true, true, project_list);
} }
@@ -580,11 +675,13 @@ void ElementsCollectionWidget::loadingFinished()
/** /**
@brief ElementsCollectionWidget::locationWasSaved @brief ElementsCollectionWidget::locationWasSaved
This method is connected with the signal savedToLocation of Element editor (see ElementsCollectionWidget::editElement()) This method is connected with the signal savedToLocation
of Element editor (see ElementsCollectionWidget::editElement())
Update or add the item represented by location to m_model Update or add the item represented by location to m_model
@param location @param location
*/ */
void ElementsCollectionWidget::locationWasSaved(const ElementsLocation& location) void ElementsCollectionWidget::locationWasSaved(
const ElementsLocation& location)
{ {
//Because this method update an item in the model, location must //Because this method update an item in the model, location must
//represente an existing element (in file system of project) //represente an existing element (in file system of project)
@@ -607,8 +704,9 @@ void ElementsCollectionWidget::locationWasSaved(const ElementsLocation& location
/** /**
@brief ElementsCollectionWidget::search @brief ElementsCollectionWidget::search
Search every item (directory or element) that match the text of m_search_field Search every item (directory or element)
and display it, other item who does not match @text is hidden that match the text of m_search_field and display it,
other item who does not match text is hidden
*/ */
void ElementsCollectionWidget::search() void ElementsCollectionWidget::search()
{ {
@@ -646,8 +744,14 @@ void ElementsCollectionWidget::search()
#endif #endif
QModelIndexList match_index; QModelIndexList match_index;
foreach (QString txt, text_list) { foreach (QString txt, text_list) {
match_index << m_model->match(m_showed_index.isValid() ? m_model->index(0,0,m_showed_index) : m_model->index(0,0), match_index << m_model->match(m_showed_index.isValid()
Qt::UserRole+1, QVariant(txt), -1, Qt::MatchContains | Qt::MatchRecursive); ? m_model->index(0,0,m_showed_index)
: m_model->index(0,0),
Qt::UserRole+1,
QVariant(txt),
-1,
Qt::MatchContains
| Qt::MatchRecursive);
} }
foreach(QModelIndex index, match_index) foreach(QModelIndex index, match_index)
@@ -667,12 +771,15 @@ void ElementsCollectionWidget::hideCollection(bool hide)
/** /**
@brief ElementsCollectionWidget::hideItem @brief ElementsCollectionWidget::hideItem
Hide the item @index. If @recursive is true, hide all subchilds of @index Hide the item index. If @recursive is true,
hide all subchilds of index
@param hide- true = hide , false = visible @param hide- true = hide , false = visible
@param index- index to hide @param index- index to hide
@param recursive- true = apply to child , false = only for @index @param recursive- true = apply to child , false = only for index
*/ */
void ElementsCollectionWidget::hideItem(bool hide, const QModelIndex &index, bool recursive) void ElementsCollectionWidget::hideItem(bool hide,
const QModelIndex &index,
bool recursive)
{ {
m_tree_view->setRowHidden(index.row(), index.parent(), hide); m_tree_view->setRowHidden(index.row(), index.parent(), hide);
@@ -683,14 +790,16 @@ void ElementsCollectionWidget::hideItem(bool hide, const QModelIndex &index, boo
/** /**
@brief ElementsCollectionWidget::showAndExpandItem @brief ElementsCollectionWidget::showAndExpandItem
Show the item @index and expand it. Show the item index and expand it.
If parent is true, ensure parents of @index is show and expanded If parent is true, ensure parents of index is show and expanded
If child is true, ensure all childs of @index is show and expended If child is true, ensure all childs of index is show and expended
@param index- index to show @param index- index to show
@param parent- Apply to parent @param parent- Apply to parent
@param child- Apply to all childs @param child- Apply to all childs
*/ */
void ElementsCollectionWidget::showAndExpandItem(const QModelIndex &index, bool parent, bool child) void ElementsCollectionWidget::showAndExpandItem(const QModelIndex &index,
bool parent,
bool child)
{ {
if (index.isValid()) { if (index.isValid()) {
if (parent) if (parent)
@@ -706,9 +815,11 @@ void ElementsCollectionWidget::showAndExpandItem(const QModelIndex &index, bool
@param index @param index
@return The internal pointer of index casted to ElementCollectionItem; @return The internal pointer of index casted to ElementCollectionItem;
*/ */
ElementCollectionItem *ElementsCollectionWidget::elementCollectionItemForIndex(const QModelIndex &index) { ElementCollectionItem *ElementsCollectionWidget::elementCollectionItemForIndex(
const QModelIndex &index) {
if (!index.isValid()) if (!index.isValid())
return nullptr; return nullptr;
return static_cast<ElementCollectionItem*>(m_model->itemFromIndex(index)); return static_cast<ElementCollectionItem*>(
m_model->itemFromIndex(index));
} }