Add new summary table (WIP)

This commit is contained in:
Claveau Joshua
2020-06-18 18:52:29 +02:00
parent 80b5029cd1
commit ec5f537da4
21 changed files with 1079 additions and 524 deletions

View File

@@ -24,17 +24,21 @@
#include <QFontDialog>
/**
* @brief AddTableDialog::AddNomenclatureDialog
* @param parent
* @brief AddTableDialog::AddTableDialog
* @param content_widget : the widget to display in the "content" tab.
* This dialog take ownership of @content_widget.
* @param parent : parent widget.
*/
AddTableDialog::AddTableDialog(QWidget *parent) :
AddTableDialog::AddTableDialog(QWidget *content_widget, QWidget *parent) :
QDialog(parent),
ui(new Ui::AddTableDialog)
{
ui->setupUi(this);
ui->m_header_font_pb->setText(m_header_font.family());
ui->m_table_font_pb->setText(m_table_font.family());
ui->m_tab->addTab(m_query_widget, tr("Contenu"));
m_content_widget = content_widget;
content_widget->setParent(this);
ui->m_tab->addTab(content_widget, tr("Contenu"));
fillSavedQuery();
connect(ui->m_config_gb, &ConfigSaveLoaderWidget::saveClicked, this, &AddTableDialog::saveConfig);
@@ -58,14 +62,6 @@ void AddTableDialog::setQueryWidget(QWidget *widget) {
Q_UNUSED(widget)
}
/**
* @brief AddTableDialog::queryStr
* @return
*/
QString AddTableDialog::queryStr() {
return m_query_widget->queryStr();
}
/**
* @brief AddTableDialog::adjustTableToFolio
* @return
@@ -154,6 +150,10 @@ QFont AddTableDialog::tableFont() const {
return m_table_font;
}
QWidget *AddTableDialog::contentWidget() const {
return m_content_widget;
}
void AddTableDialog::on_m_header_font_pb_clicked()
{
bool b;

View File

@@ -20,7 +20,6 @@
#include <QDialog>
#include "elementquerywidget.h"
#include "qetapp.h"
namespace Ui {
@@ -40,11 +39,10 @@ class AddTableDialog : public QDialog
Q_OBJECT
public:
explicit AddTableDialog(QWidget *parent = nullptr);
explicit AddTableDialog(QWidget *content_widget, QWidget *parent = nullptr);
~AddTableDialog();
void setQueryWidget(QWidget *widget);
QString queryStr();
bool adjustTableToFolio() const;
bool addNewTableToNewDiagram() const;
@@ -57,6 +55,7 @@ class AddTableDialog : public QDialog
QMargins tableMargins() const;
Qt::Alignment tableAlignment() const;
QFont tableFont() const;
QWidget *contentWidget() const;
private slots:
void on_m_header_font_pb_clicked();
@@ -69,7 +68,8 @@ class AddTableDialog : public QDialog
private:
Ui::AddTableDialog *ui;
ElementQueryWidget *m_query_widget = new ElementQueryWidget();
QWidget *m_content_widget = nullptr;
QMargins m_header_margins = QMargins(5,5,10,5),
m_table_margins = QMargins(5,5,10,5);
@@ -77,6 +77,8 @@ class AddTableDialog : public QDialog
QFont m_header_font = QETApp::diagramTextsFont();
QFont m_table_font = QETApp::diagramTextsFont();
QString m_identifier;
};
#endif // ADDTABLEDIALOG_H