realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-13 20:23:04 +02:00
Code Packages Releases 1 Activity

Merge pull request #316 from plc-user/master

Browse Source 
Fix typo and some whitespace
This commit is contained in:
Laurent Trinques 2024-12-19 16:22:45 +01:00 committed by GitHub
commit ba14c6112e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sources/ui/configpage/configpages.h
View File

@ -66,9 +66,9 @@ public slots:
QETProject *m_project; ///< Project to edit properties
BorderPropertiesWidget *bpw; ///< Widget to edit default diagram dimensions
TitleBlockPropertiesWidget *ipw; ///< Widget to edit default title block properties
ConductorPropertiesWidget *m_cpw; ///< Widget to edit default conductor properties
ConductorPropertiesWidget *m_cpw; ///< Widget to edit default conductor properties
ReportPropertieWidget *rpw; ///< Widget to edit default report label
XRefPropertiesWidget *xrefpw; ///< Widget to edit default xref properties
XRefPropertiesWidget *xrefpw; ///< Widget to edit default xref properties
TitleBlockProperties savedTbp; ///< Used to save current TBP and retrieve later
};

2
sources/ui/diagrampropertiesdialog.cpp
View File

@ -57,7 +57,7 @@ DiagramPropertiesDialog::DiagramPropertiesDialog(Diagram *diagram, QWidget *pare
TitleBlockPropertiesWidget *titleblock_infos;
if (QETProject *parent_project = diagram -> project())
titleblock_infos = new TitleBlockPropertiesWidget(parent_project -> embeddedTitleBlockTemplatesCollection(), titleblock, false, diagram->project(), this);
titleblock_infos = new TitleBlockPropertiesWidget(parent_project -> embeddedTitleBlockTemplatesCollection(), titleblock, false, diagram->project(), this);
else
titleblock_infos = new TitleBlockPropertiesWidget(titleblock, false, diagram->project(), this);

34
sources/ui/titleblockpropertieswidget.cpp
View File

@ -49,7 +49,7 @@ TitleBlockPropertiesWidget::TitleBlockPropertiesWidget(
/**
@brief TitleBlockPropertiesWidget::TitleBlockPropertiesWidget
default constructor with tempalte list
default constructor with template list
@param tbt_collection template list
@param titleblock properties to edit
@param current_date if true, display the radio button "current date"
@ -113,17 +113,17 @@ TitleBlockPropertiesWidget::~TitleBlockPropertiesWidget()
*/
void TitleBlockPropertiesWidget::setProperties(
const TitleBlockProperties &properties) {
ui -> m_title_le -> setText (properties.title);
ui -> m_author_le -> setText (properties.author);
ui -> m_file_le -> setText (properties.filename);
ui -> m_plant -> setText (properties.plant);
ui -> m_loc -> setText (properties.locmach);
ui -> m_indice -> setText (properties.indexrev);
ui -> m_folio_le -> setText (properties.folio);
ui -> m_title_le -> setText (properties.title);
ui -> m_author_le -> setText (properties.author);
ui -> m_file_le -> setText (properties.filename);
ui -> m_plant -> setText (properties.plant);
ui -> m_loc -> setText (properties.locmach);
ui -> m_indice -> setText (properties.indexrev);
ui -> m_folio_le -> setText (properties.folio);
ui -> m_display_at_cb -> setCurrentIndex(properties.display_at == Qt::BottomEdge ? 0 : 1);
ui->auto_page_cb->setCurrentText(properties.auto_page_num);
//About date
//About date
ui -> m_date_now_pb -> setDisabled(true);
ui -> m_date_edit -> setDisabled(true);
ui -> m_date_edit -> setDate(QDate::currentDate());
@ -172,13 +172,13 @@ void TitleBlockPropertiesWidget::setProperties(
TitleBlockProperties TitleBlockPropertiesWidget::properties() const
{
TitleBlockProperties prop;
prop.title = ui -> m_title_le -> text();
prop.author = ui -> m_author_le -> text();
prop.filename = ui -> m_file_le -> text();
prop.plant = ui -> m_plant -> text();
prop.locmach = ui -> m_loc -> text();
prop.indexrev = ui -> m_indice -> text();
prop.folio = ui -> m_folio_le -> text();
prop.title = ui -> m_title_le -> text();
prop.author = ui -> m_author_le -> text();
prop.filename = ui -> m_file_le -> text();
prop.plant = ui -> m_plant -> text();
prop.locmach = ui -> m_loc -> text();
prop.indexrev = ui -> m_indice -> text();
prop.folio = ui -> m_folio_le -> text();
prop.display_at = ui -> m_display_at_cb -> currentIndex() == 0 ? Qt::BottomEdge : Qt::RightEdge;
if (ui->m_no_date_rb->isChecked()) {
@ -218,7 +218,7 @@ TitleBlockProperties TitleBlockPropertiesWidget::propertiesAutoNum(
prop.title = ui -> m_title_le -> text();
prop.author = ui -> m_author_le -> text();
prop.filename = ui -> m_file_le -> text();
prop.plant = ui -> m_plant -> text();
prop.plant = ui -> m_plant -> text();
prop.locmach = ui -> m_loc -> text();
prop.indexrev = ui -> m_indice -> text();
prop.folio = "%autonum";