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

Add in setting folio list position spinbox

Browse Source 
0 for first position
1 for second position
99999 always in the end
This commit is contained in:
Laurent Trinques
2019-08-17 11:41:59 +02:00
parent 603824aabb
commit 6c09dd31d2
3 changed files with 51 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sources/projectview.cpp
View File

@@ -362,7 +362,8 @@ void ProjectView::addNewDiagram() {
*/ */
void ProjectView::addNewDiagramFolioList() { void ProjectView::addNewDiagramFolioList() {
if (m_project -> isReadOnly()) return; 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 //< We use @i to move the folio list at second position in the project
foreach (Diagram *d, m_project -> addNewDiagramFolioList()) { foreach (Diagram *d, m_project -> addNewDiagramFolioList()) {
DiagramView *new_diagram_view = new DiagramView(d); DiagramView *new_diagram_view = new DiagramView(d);
@@ -370,6 +371,7 @@ void ProjectView::addNewDiagramFolioList() {
showDiagram(new_diagram_view); showDiagram(new_diagram_view);
m_tab->tabBar()->moveTab(diagram_views().size()-1, i); m_tab->tabBar()->moveTab(diagram_views().size()-1, i);
i++; i++;
m_project->setModified(true);
} }
} }
@@ -388,7 +390,7 @@ void ProjectView::addDiagram(DiagramView *diagram_view)
return; return;
// Add new tab for the diagram // 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); diagram_view->setFrameStyle(QFrame::Plain | QFrame::NoFrame);
m_diagram_view_list << diagram_view; m_diagram_view_list << diagram_view;
@@ -878,11 +880,12 @@ void ProjectView::loadDiagrams()
this->currentDiagram()->diagram()->loadElmtFolioSeq(); this->currentDiagram()->diagram()->loadElmtFolioSeq();
this->currentDiagram()->diagram()->loadCndFolioSeq(); this->currentDiagram()->diagram()->loadCndFolioSeq();
QSettings settings;
// If project have the folios list, move it at the beginning of the project // If project have the folios list, move it at the beginning of the project
if (m_project -> getFolioSheetsQuantity()) { if (m_project -> getFolioSheetsQuantity()) {
for (int i = 0; i < m_project->getFolioSheetsQuantity(); i++) 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); m_project->setModified(false);
} }
} }

2
sources/ui/configpage/generalconfigurationpage.cpp
View File

@@ -55,6 +55,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) :
ui->m_export_terminal->setChecked(settings.value("nomenclature-exportlist", true).toBool()); 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_border_0->setChecked(settings.value("border-columns_0", false).toBool());
ui->m_autosave_sb->setValue(settings.value("diagrameditor/autosave-interval", 0).toInt()); 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() + " " + QString fontInfos = settings.value("diagramitemfont").toString() + " " +
settings.value("diagramitemsize").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/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/zoom-out-beyond-of-folio", ui->m_zoom_out_beyond_folio->isChecked());
settings.setValue("diagrameditor/autosave-interval", ui->m_autosave_sb->value()); 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 //Grid step and key navigation
settings.setValue("diagrameditor/Xgrid", ui->DiagramEditor_xGrid_sb->value()); settings.setValue("diagrameditor/Xgrid", ui->DiagramEditor_xGrid_sb->value());
settings.setValue("diagrameditor/Ygrid", ui->DiagramEditor_yGrid_sb->value()); settings.setValue("diagrameditor/Ygrid", ui->DiagramEditor_yGrid_sb->value());

64
sources/ui/configpage/generalconfigurationpage.ui
View File

@@ -17,7 +17,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab_3"> <widget class="QWidget" name="tab_3">
<attribute name="title"> <attribute name="title">
@@ -93,14 +93,14 @@
<string>Projets</string> <string>Projets</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="2" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="m_export_terminal"> <widget class="QCheckBox" name="m_save_label_paste">
<property name="text"> <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> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="5" column="1">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@@ -113,13 +113,20 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="4" column="0"> <item row="5" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Sauvegarde automatique des projets (appliqué au prochain lancement de QElectroTech)</string> <string>Sauvegarde automatique des projets (appliqué au prochain lancement de QElectroTech)</string>
</property> </property>
</widget> </widget>
</item> </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"> <item row="3" column="0">
<widget class="QCheckBox" name="m_border_0"> <widget class="QCheckBox" name="m_border_0">
<property name="text"> <property name="text">
@@ -127,7 +134,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="2"> <item row="5" column="2">
<widget class="QSpinBox" name="m_autosave_sb"> <widget class="QSpinBox" name="m_autosave_sb">
<property name="frame"> <property name="frame">
<bool>true</bool> <bool>true</bool>
@@ -140,21 +147,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="6" 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">
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@@ -167,6 +160,33 @@
</property> </property>
</spacer> </spacer>
</item> </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="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>999999999</number>
</property>
<property name="value">
<number>2</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> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_5"> <widget class="QWidget" name="tab_5">