From fbec9c9aa51ab96d13fef248e258c1a277bc527e Mon Sep 17 00:00:00 2001 From: Laurent Trinques Date: Tue, 7 Jan 2020 13:02:43 +0100 Subject: [PATCH] Add Checkbox to enable or disable the dialog to display the elpsaed time of collection loading --- .../ElementsCollection/elementscollectionmodel.cpp | 8 +++++++- sources/ui/configpage/generalconfigurationpage.cpp | 4 +++- sources/ui/configpage/generalconfigurationpage.ui | 13 ++++++++++--- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/sources/ElementsCollection/elementscollectionmodel.cpp b/sources/ElementsCollection/elementscollectionmodel.cpp index a2f537413..9583da915 100644 --- a/sources/ElementsCollection/elementscollectionmodel.cpp +++ b/sources/ElementsCollection/elementscollectionmodel.cpp @@ -27,6 +27,7 @@ #include #include #include +#include /** * @brief ElementsCollectionModel::ElementsCollectionModel @@ -251,8 +252,13 @@ void ElementsCollectionModel::loadCollections(bool common_collection, bool custo emit loadingProgressValue(futur.progressValue()); } int ms = t.elapsed(); - + + QSettings settings; + if (settings.value("m_use_timer").toBool()) + { QMessageBox::about(nullptr, tr("Chargement collection d'élément"), tr("Le chargement de la collection d'éléments à été éffectué en %1 ms").arg(ms)); + } + } /** diff --git a/sources/ui/configpage/generalconfigurationpage.cpp b/sources/ui/configpage/generalconfigurationpage.cpp index 3efcf6bd7..670749870 100644 --- a/sources/ui/configpage/generalconfigurationpage.cpp +++ b/sources/ui/configpage/generalconfigurationpage.cpp @@ -43,6 +43,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ui->DiagramEditor_xKeyGridFine_sb->setValue(settings.value("diagrameditor/key_fine_Xgrid", 1).toInt()); ui->DiagramEditor_yKeyGridFine_sb->setValue(settings.value("diagrameditor/key_fine_Ygrid", 1).toInt()); ui->m_use_system_color_cb->setChecked(settings.value("usesystemcolors", "true").toBool()); + ui->m_use_timer_widget->setChecked(settings.value("m_use_timer", true).toBool()); bool tabbed = settings.value("diagrameditor/viewmode", "tabbed") == "tabbed"; if(tabbed) ui->m_use_tab_mode_rb->setChecked(true); @@ -127,7 +128,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ui->m_custom_tbt_path_cb->blockSignals(false); } - ui->m_use_pugi_xml->setChecked(settings.value("use_pugixml").toBool()); + ui->m_use_pugi_xml->setChecked(settings.value("use_pugixml").toBool()); fillLang(); } @@ -160,6 +161,7 @@ void GeneralConfigurationPage::applyConf() //DIAGRAM VIEW settings.setValue("diagramview/gestures", ui->m_use_gesture_trackpad->isChecked()); + settings.setValue("m_use_timer", ui->m_use_timer_widget->isChecked()); //DIAGRAM COMMAND settings.setValue("diagramcommands/erase-label-on-copy", ui->m_save_label_paste->isChecked()); diff --git a/sources/ui/configpage/generalconfigurationpage.ui b/sources/ui/configpage/generalconfigurationpage.ui index 24b11d972..dc0217b36 100644 --- a/sources/ui/configpage/generalconfigurationpage.ui +++ b/sources/ui/configpage/generalconfigurationpage.ui @@ -7,7 +7,7 @@ 0 0 727 - 510 + 535 @@ -17,7 +17,7 @@ - 0 + 2 @@ -328,7 +328,14 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments - Utiliser pugi xml pour le chargement des collections. + Utiliser pugiXml pour le chargement des collections. + + + + + + + Afficher le temps de chargement des collections