kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-23 18:50:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove old summary feature

Browse Source
This commit is contained in:
Laurent Trinques
2020-07-15 15:06:46 +02:00
parent 430bcae946
commit 53663e20e1
8 changed files with 3 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sources/autoNum/ui/folioautonumbering.cpp
View File

@@ -86,20 +86,6 @@ int FolioAutonumberingW::newFoliosNumber(){
return ui->m_new_tabs_sb->value(); 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 * @brief FolioAutonumberingW::on_m_create_new_tabs_rb_clicked
* Enable New Tabs SpinBox * Enable New Tabs SpinBox
@@ -189,7 +175,6 @@ void FolioAutonumberingW::on_buttonBox_clicked(QAbstractButton *button) {
case QDialogButtonBox::ApplyRole: case QDialogButtonBox::ApplyRole:
applyEnable(true); applyEnable(true);
emit applyPressed(); emit applyPressed();
updateFolioList();
break; break;
} }
} }

2
sources/autoNum/ui/folioautonumbering.h
View File

@@ -66,7 +66,7 @@ class FolioAutonumberingW : public QWidget
Ui::FolioAutonumberingW *ui; Ui::FolioAutonumberingW *ui;
QList <NumPartEditorW *> num_part_list_; QList <NumPartEditorW *> num_part_list_;
NumerotationContext m_context; NumerotationContext m_context;
void updateFolioList();
}; };
#endif // FOLIOAUTONUMBERING_H #endif // FOLIOAUTONUMBERING_H

2
sources/diagram.h
View File

@@ -43,7 +43,6 @@ class QETProject;
class Terminal; class Terminal;
class DiagramImageItem; class DiagramImageItem;
class DiagramEventInterface; class DiagramEventInterface;
class DiagramFolioList;
class QETProject; class QETProject;
/** /**
@@ -54,7 +53,6 @@ class QETProject;
*/ */
class Diagram : public QGraphicsScene class Diagram : public QGraphicsScene
{ {
friend DiagramFolioList;
friend QETProject; friend QETProject;
Q_OBJECT Q_OBJECT

23
sources/qetapp.cpp
View File

@@ -988,30 +988,7 @@ QFont QETApp::diagramTextsItemFont(qreal size)
return(font_); 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 * @brief QETApp::indiTextsItemFont

1
sources/qetapp.h
View File

@@ -135,7 +135,6 @@ class QETApp : public QObject
static QFont diagramTextsFont(qreal = -1.0); static QFont diagramTextsFont(qreal = -1.0);
static QFont diagramTextsItemFont(qreal = -1.0); static QFont diagramTextsItemFont(qreal = -1.0);
static QFont dynamicTextsItemFont(qreal = -1.0); static QFont dynamicTextsItemFont(qreal = -1.0);
static QFont foliolistTextsFont(qreal = -1.0);
static QFont indiTextsItemFont (qreal = -1.0); static QFont indiTextsItemFont (qreal = -1.0);
static QETDiagramEditor *diagramEditorForFile(const QString &); static QETDiagramEditor *diagramEditorForFile(const QString &);
static QETDiagramEditor *diagramEditorAncestorOf (const QWidget *child); static QETDiagramEditor *diagramEditorAncestorOf (const QWidget *child);

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

@@ -62,10 +62,6 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) :
ui->m_font_pb->setText(fontInfos); 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 //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) void GeneralConfigurationPage::on_m_common_elmt_path_cb_currentIndexChanged(int index)
{ {

1
sources/ui/configpage/generalconfigurationpage.h
View File

@@ -40,7 +40,6 @@ class GeneralConfigurationPage : public ConfigPage
private slots: private slots:
void on_m_font_pb_clicked(); void on_m_font_pb_clicked();
void on_m_dyn_text_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_common_elmt_path_cb_currentIndexChanged(int index);
void on_m_custom_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); void on_m_custom_tbt_path_cb_currentIndexChanged(int index);

38
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>4</number>
</property> </property>
<widget class="QWidget" name="tab_3"> <widget class="QWidget" name="tab_3">
<attribute name="title"> <attribute name="title">
@@ -485,42 +485,6 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBox_8">
<property name="title">
<string>Pages de sommaire</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_16">
<property name="text">
<string>Police :</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="m_folio_list_pb">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="groupBox_9"> <widget class="QGroupBox" name="groupBox_9">
<property name="title"> <property name="title">