Set defaut position to second page

0 for first position
1 for second position
99999 always in the end

snap/snapcraft.yaml

@@ -88,6 +88,7 @@ parts:
       - locales-all 
       - xdg-user-dirs
       - fcitx-frontend-qt5
+      - cups-bsd # for lpr used for printing in general (needs cups-control)
   
   qet-tb-generator:
     after: [desktop-qt5]
@@ -116,7 +117,7 @@ parts:
     source: .
     override-pull: |
       snapcraftctl pull
-      snap_version=$(git describe --dirty | sed -e 's/g//;s/-/+git/;y/-/./')
+      snap_version=$(git describe --dirty)
       modified_displayed_version=$snap_version".snap"
       sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h
       snapcraftctl set-version "$snap_version"

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);
 	}
 }

sources/ui/configpage/generalconfigurationpage.cpp

@@ -42,7 +42,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) :
 	ui->DiagramEditor_yKeyGrid_sb->setValue(settings.value("diagrameditor/key_Ygrid", 10).toInt());
 	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_system_color_cb->setChecked(settings.value("usesystemcolors", "true").toBool());
 	bool tabbed = settings.value("diagrameditor/viewmode", "tabbed") == "tabbed";
 	if(tabbed)
 		ui->m_use_tab_mode_rb->setChecked(true);
@@ -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", 1).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());

sources/ui/configpage/generalconfigurationpage.ui

@@ -17,7 +17,7 @@
    <item row="0" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="tab_3">
       <attribute name="title">
@@ -93,14 +93,14 @@
        <string>Projets</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
-       <item row="2" column="0">
-        <widget class="QCheckBox" name="m_export_terminal">
+       <item row="0" column="0">
+        <widget class="QCheckBox" name="m_save_label_paste">
          <property name="text">
-          <string>Exporter les bornes dans la nomenclature</string>
+          <string>Ne pas conserver les labels des éléments lors des copier coller</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
+       <item row="5" column="1">
         <spacer name="horizontalSpacer">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
@@ -113,13 +113,20 @@
          </property>
         </spacer>
        </item>
-       <item row="4" column="0">
+       <item row="5" column="0">
         <widget class="QLabel" name="label">
          <property name="text">
           <string>Sauvegarde automatique des projets (appliqué au prochain lancement de QElectroTech)</string>
          </property>
         </widget>
        </item>
+       <item row="1" column="0">
+        <widget class="QCheckBox" name="m_use_folio_label">
+         <property name="text">
+          <string>Utiliser les numéros de folio à la place de leur position dans le projet</string>
+         </property>
+        </widget>
+       </item>
        <item row="3" column="0">
         <widget class="QCheckBox" name="m_border_0">
          <property name="text">
@@ -127,7 +134,7 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="2">
+       <item row="5" column="2">
         <widget class="QSpinBox" name="m_autosave_sb">
          <property name="frame">
           <bool>true</bool>
@@ -140,21 +147,7 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="0">
-        <widget class="QCheckBox" name="m_save_label_paste">
-         <property name="text">
-          <string>Ne pas conserver les labels des éléments lors des copier coller</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QCheckBox" name="m_use_folio_label">
-         <property name="text">
-          <string>Utiliser les numéros de folio à la place de leur position dans le projet</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="0">
+       <item row="6" column="0">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -167,6 +160,36 @@
          </property>
         </spacer>
        </item>
+       <item row="2" column="0">
+        <widget class="QCheckBox" name="m_export_terminal">
+         <property name="text">
+          <string>Exporter les bornes dans la nomenclature</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="2">
+        <widget class="QSpinBox" name="m_foliolist_sb">
+         <property name="specialValueText">
+          <string/>
+         </property>
+         <property name="minimum">
+          <number>0</number>
+         </property>
+         <property name="maximum">
+          <number>999999999</number>
+         </property>
+         <property name="value">
+          <number>1</number>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Position de la liste des folios dans le projet</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_5">