diff --git a/sources/autoNum/ui/folioautonumbering.cpp b/sources/autoNum/ui/folioautonumbering.cpp index ca84a4ca8..ae8a8165d 100644 --- a/sources/autoNum/ui/folioautonumbering.cpp +++ b/sources/autoNum/ui/folioautonumbering.cpp @@ -86,20 +86,6 @@ int FolioAutonumberingW::newFoliosNumber(){ return ui->m_new_tabs_sb->value(); } -/** - * @brief FolioAutonumberingW::updateFolioList - * update Folio List in From and To ComboBox - */ -void FolioAutonumberingW::updateFolioList(){ - ui -> m_from_cb->clear(); - ui -> m_to_cb->clear(); - if (newFolios){ - this -> on_m_create_new_tabs_rb_clicked(); - } else { - this -> on_m_autonumber_tabs_rb_clicked(); - } -} - /** * @brief FolioAutonumberingW::on_m_create_new_tabs_rb_clicked * Enable New Tabs SpinBox @@ -189,7 +175,6 @@ void FolioAutonumberingW::on_buttonBox_clicked(QAbstractButton *button) { case QDialogButtonBox::ApplyRole: applyEnable(true); emit applyPressed(); - updateFolioList(); break; } } diff --git a/sources/autoNum/ui/folioautonumbering.h b/sources/autoNum/ui/folioautonumbering.h index e7b65848f..38036359d 100644 --- a/sources/autoNum/ui/folioautonumbering.h +++ b/sources/autoNum/ui/folioautonumbering.h @@ -66,7 +66,7 @@ class FolioAutonumberingW : public QWidget Ui::FolioAutonumberingW *ui; QList num_part_list_; NumerotationContext m_context; - void updateFolioList(); + }; #endif // FOLIOAUTONUMBERING_H diff --git a/sources/diagram.h b/sources/diagram.h index 550104744..3fa595c03 100644 --- a/sources/diagram.h +++ b/sources/diagram.h @@ -43,7 +43,6 @@ class QETProject; class Terminal; class DiagramImageItem; class DiagramEventInterface; -class DiagramFolioList; class QETProject; /** @@ -54,7 +53,6 @@ class QETProject; */ class Diagram : public QGraphicsScene { - friend DiagramFolioList; friend QETProject; Q_OBJECT diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index 1333dc236..09b5310d2 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -988,30 +988,7 @@ QFont QETApp::diagramTextsItemFont(qreal size) return(font_); } -/** - * @brief QETApp::foliolistTextsFont - * the font for to use in summary pages - * @param size - * @return - */ -QFont QETApp::foliolistTextsFont(qreal size) -{ - QSettings settings; - //Font to use - QString foliolist_texts_family = settings.value("foliolistfont", "Sans Serif").toString(); - qreal foliolist_texts_size = settings.value("foliolistsize", 9.0).toDouble(); - - if (size != -1.0) { - foliolist_texts_size = size; - } - QFont foliolist_texts_font = QFont(foliolist_texts_family); - foliolist_texts_font.setPointSizeF(foliolist_texts_size); - if (foliolist_texts_size <= 4.0) { - foliolist_texts_font.setWeight(QFont::Light); - } - return(foliolist_texts_font); -} /** * @brief QETApp::indiTextsItemFont diff --git a/sources/qetapp.h b/sources/qetapp.h index 71c26101a..f324ac6d9 100644 --- a/sources/qetapp.h +++ b/sources/qetapp.h @@ -135,7 +135,6 @@ class QETApp : public QObject static QFont diagramTextsFont(qreal = -1.0); static QFont diagramTextsItemFont(qreal = -1.0); static QFont dynamicTextsItemFont(qreal = -1.0); - static QFont foliolistTextsFont(qreal = -1.0); static QFont indiTextsItemFont (qreal = -1.0); static QETDiagramEditor *diagramEditorForFile(const QString &); static QETDiagramEditor *diagramEditorAncestorOf (const QWidget *child); diff --git a/sources/ui/configpage/generalconfigurationpage.cpp b/sources/ui/configpage/generalconfigurationpage.cpp index 391e87b26..4dc24d67d 100644 --- a/sources/ui/configpage/generalconfigurationpage.cpp +++ b/sources/ui/configpage/generalconfigurationpage.cpp @@ -62,10 +62,6 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ui->m_font_pb->setText(fontInfos); - QString foliolistfontInfos = settings.value("foliolistfont").toString() + " " + - settings.value("foliolistsize").toString() + " (" + - settings.value("folioliststyle").toString() + ")"; - ui->m_folio_list_pb->setText(foliolistfontInfos); //Dynamic element text item @@ -339,27 +335,7 @@ void GeneralConfigurationPage::on_m_dyn_text_font_pb_clicked() } -/** - * @brief GeneralConfigurationPage::on_m_folio_list_pb_clicked - * Apply font to summary pages - */ -void GeneralConfigurationPage::on_m_folio_list_pb_clicked() -{ - bool ok; - QSettings settings; - QFont font = QFontDialog::getFont(&ok, QFont("Sans Serif", 9), this); - if (ok) - { - settings.setValue("foliolistfont", font.family()); - settings.setValue("foliolistsize", font.pointSize()); - settings.setValue("foliolistweight", font.weight()); - settings.setValue("folioliststyle", font.styleName()); - QString fontInfos = settings.value("foliolistfont").toString() + " " + - settings.value("foliolistsize").toString() + " (" + - settings.value("folioliststyle").toString() + ")"; - ui->m_folio_list_pb->setText(fontInfos); - } -} + void GeneralConfigurationPage::on_m_common_elmt_path_cb_currentIndexChanged(int index) { diff --git a/sources/ui/configpage/generalconfigurationpage.h b/sources/ui/configpage/generalconfigurationpage.h index 32ceb7a6b..9d9dd6d18 100644 --- a/sources/ui/configpage/generalconfigurationpage.h +++ b/sources/ui/configpage/generalconfigurationpage.h @@ -40,7 +40,6 @@ class GeneralConfigurationPage : public ConfigPage private slots: void on_m_font_pb_clicked(); void on_m_dyn_text_font_pb_clicked(); - void on_m_folio_list_pb_clicked(); void on_m_common_elmt_path_cb_currentIndexChanged(int index); void on_m_custom_elmt_path_cb_currentIndexChanged(int index); void on_m_custom_tbt_path_cb_currentIndexChanged(int index); diff --git a/sources/ui/configpage/generalconfigurationpage.ui b/sources/ui/configpage/generalconfigurationpage.ui index de0f03148..ecd7e4edf 100644 --- a/sources/ui/configpage/generalconfigurationpage.ui +++ b/sources/ui/configpage/generalconfigurationpage.ui @@ -17,7 +17,7 @@ - 0 + 4 @@ -485,42 +485,6 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments - - - - Pages de sommaire - - - - - - Police : - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - -