diff --git a/sources/projectview.cpp b/sources/projectview.cpp index 70c8e2983..a8f7b3c42 100644 --- a/sources/projectview.cpp +++ b/sources/projectview.cpp @@ -362,7 +362,8 @@ void ProjectView::addNewDiagram() { */ void ProjectView::addNewDiagramFolioList() { if (m_project -> isReadOnly()) return; - int i = 1; //< Each new diagram is added to the end of the project. + QSettings settings; + int i = (settings.value("projectview/foliolist_position").toInt()); //< Each new diagram is added to the end of the project. //< We use @i to move the folio list at second position in the project foreach (Diagram *d, m_project -> addNewDiagramFolioList()) { DiagramView *new_diagram_view = new DiagramView(d); @@ -370,6 +371,7 @@ void ProjectView::addNewDiagramFolioList() { showDiagram(new_diagram_view); m_tab->tabBar()->moveTab(diagram_views().size()-1, i); i++; + m_project->setModified(true); } } @@ -388,7 +390,7 @@ void ProjectView::addDiagram(DiagramView *diagram_view) return; // Add new tab for the diagram - m_tab->addTab(diagram_view, QET::Icons::Diagram, diagram_view -> title()); + m_tab->addTab(diagram_view, QET::Icons::Diagram, diagram_view -> title()); diagram_view->setFrameStyle(QFrame::Plain | QFrame::NoFrame); m_diagram_view_list << diagram_view; @@ -878,11 +880,12 @@ void ProjectView::loadDiagrams() this->currentDiagram()->diagram()->loadElmtFolioSeq(); this->currentDiagram()->diagram()->loadCndFolioSeq(); - + + QSettings settings; // If project have the folios list, move it at the beginning of the project if (m_project -> getFolioSheetsQuantity()) { for (int i = 0; i < m_project->getFolioSheetsQuantity(); i++) - m_tab -> tabBar() -> moveTab(diagram_views().size()-1, + 1); + m_tab -> tabBar() -> moveTab(diagram_views().size()-1, + (settings.value("projectview/foliolist_position").toInt())); m_project->setModified(false); } } diff --git a/sources/ui/configpage/generalconfigurationpage.cpp b/sources/ui/configpage/generalconfigurationpage.cpp index 80cbafc91..ec605c68d 100644 --- a/sources/ui/configpage/generalconfigurationpage.cpp +++ b/sources/ui/configpage/generalconfigurationpage.cpp @@ -55,6 +55,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ui->m_export_terminal->setChecked(settings.value("nomenclature-exportlist", true).toBool()); ui->m_border_0->setChecked(settings.value("border-columns_0", false).toBool()); ui->m_autosave_sb->setValue(settings.value("diagrameditor/autosave-interval", 0).toInt()); + ui->m_foliolist_sb->setValue(settings.value("projectview/foliolist_position", 0).toInt()); QString fontInfos = settings.value("diagramitemfont").toString() + " " + settings.value("diagramitemsize").toString() + " (" + @@ -174,6 +175,7 @@ void GeneralConfigurationPage::applyConf() settings.setValue("diagrameditor/highlight-integrated-elements", ui->m_highlight_integrated_elements->isChecked()); settings.setValue("diagrameditor/zoom-out-beyond-of-folio", ui->m_zoom_out_beyond_folio->isChecked()); settings.setValue("diagrameditor/autosave-interval", ui->m_autosave_sb->value()); + settings.setValue("projectview/foliolist_position", ui->m_foliolist_sb->value()); //Grid step and key navigation settings.setValue("diagrameditor/Xgrid", ui->DiagramEditor_xGrid_sb->value()); settings.setValue("diagrameditor/Ygrid", ui->DiagramEditor_yGrid_sb->value()); diff --git a/sources/ui/configpage/generalconfigurationpage.ui b/sources/ui/configpage/generalconfigurationpage.ui index 402988956..33400d223 100644 --- a/sources/ui/configpage/generalconfigurationpage.ui +++ b/sources/ui/configpage/generalconfigurationpage.ui @@ -17,7 +17,7 @@ - 0 + 1 @@ -93,14 +93,14 @@ Projets - - + + - Exporter les bornes dans la nomenclature + Ne pas conserver les labels des éléments lors des copier coller - + Qt::Horizontal @@ -113,13 +113,20 @@ - + Sauvegarde automatique des projets (appliqué au prochain lancement de QElectroTech) + + + + Utiliser les numéros de folio à la place de leur position dans le projet + + + @@ -127,7 +134,7 @@ - + true @@ -140,21 +147,7 @@ - - - - Ne pas conserver les labels des éléments lors des copier coller - - - - - - - Utiliser les numéros de folio à la place de leur position dans le projet - - - - + Qt::Vertical @@ -167,6 +160,33 @@ + + + + Exporter les bornes dans la nomenclature + + + + + + + 0 + + + 999999999 + + + 2 + + + + + + + Position de la liste des folios dans le projet + + +