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

Improve some code and gui

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5643 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2018-12-09 18:37:09 +00:00
parent d0f3825bfc
commit 835ff082bf
5 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/SearchAndReplace/searchandreplaceworker.cpp
View File

@@ -236,7 +236,7 @@ void SearchAndReplaceWorker::replaceConductor(Conductor *conductor)
* With search and replace, when the variable to edit is a text, * With search and replace, when the variable to edit is a text,
* the editor is always the same no matter if it is for a folio, element or conductor. * the editor is always the same no matter if it is for a folio, element or conductor.
* The editor is a QLineEdit to edit the text and checkbox to erase the text if checked. * The editor is a QLineEdit to edit the text and checkbox to erase the text if checked.
* This function fill the editor * This function fill the editor, from the current string
* @param l * @param l
* @param cb * @param cb
* @param str * @param str
@@ -245,6 +245,7 @@ void SearchAndReplaceWorker::setupLineEdit(QLineEdit *l, QCheckBox *cb, QString
{ {
l->setText(str); l->setText(str);
cb->setChecked(str == eraseText() ? true : false); cb->setChecked(str == eraseText() ? true : false);
l->setDisabled(str == eraseText() ? true : false);
} }
ConductorProperties SearchAndReplaceWorker::invalidConductorProperties() ConductorProperties SearchAndReplaceWorker::invalidConductorProperties()

4
sources/SearchAndReplace/ui/replaceelementdialog.cpp
View File

@@ -47,10 +47,8 @@ void ReplaceElementDialog::setContext(DiagramContext context)
{ {
m_context = context; m_context = context;
for (ElementInfoPartWidget *eipw : m_eipw_list) for (ElementInfoPartWidget *eipw : m_eipw_list) {
{
eipw->setText(m_context[eipw->key()].toString()); eipw->setText(m_context[eipw->key()].toString());
eipw->setEraseTextChecked(false);
} }
} }

16
sources/SearchAndReplace/ui/replacefoliowidget.cpp
View File

@@ -22,6 +22,8 @@
#include <QDialogButtonBox> #include <QDialogButtonBox>
typedef SearchAndReplaceWorker sarw;
ReplaceFolioWidget::ReplaceFolioWidget(QWidget *parent) : ReplaceFolioWidget::ReplaceFolioWidget(QWidget *parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::ReplaceFolioWidget) ui(new Ui::ReplaceFolioWidget)
@@ -75,13 +77,13 @@ TitleBlockProperties ReplaceFolioWidget::titleBlockProperties() const
*/ */
void ReplaceFolioWidget::setTitleBlockProperties(const TitleBlockProperties &properties) void ReplaceFolioWidget::setTitleBlockProperties(const TitleBlockProperties &properties)
{ {
ui->m_title_le ->setText (properties.title); sarw::setupLineEdit(ui->m_title_le, ui->m_title_cb, properties.title);
ui->m_author_le->setText (properties.author); sarw::setupLineEdit(ui->m_author_le, ui->m_author_cb, properties.author);
ui->m_file_le ->setText (properties.filename); sarw::setupLineEdit(ui->m_file_le, ui->m_file_cb, properties.filename);
ui->m_plant ->setText (properties.plant); sarw::setupLineEdit(ui->m_plant, ui->m_plant_cb, properties.plant);
ui->m_loc ->setText (properties.locmach); sarw::setupLineEdit(ui->m_loc, ui->m_loc_cb, properties.locmach);
ui->m_indice ->setText (properties.indexrev); sarw::setupLineEdit(ui->m_indice, ui->m_indice_cb, properties.indexrev);
ui->m_folio_le ->setText (properties.folio); sarw::setupLineEdit(ui->m_folio_le, ui->m_folio_cb, properties.folio);
//About date //About date
ui->m_date_now_pb->setDisabled(true); ui->m_date_now_pb->setDisabled(true);

6
sources/ui/elementinfopartwidget.cpp
View File

@@ -21,6 +21,7 @@
#include "ui_elementinfopartwidget.h" #include "ui_elementinfopartwidget.h"
#include "searchandreplaceworker.h" #include "searchandreplaceworker.h"
typedef SearchAndReplaceWorker sarw;
/** /**
* @brief ElementInfoPartWidget::ElementInfoPartWidget * @brief ElementInfoPartWidget::ElementInfoPartWidget
@@ -58,8 +59,8 @@ ElementInfoPartWidget::~ElementInfoPartWidget()
*/ */
void ElementInfoPartWidget::setText(const QString &txt) void ElementInfoPartWidget::setText(const QString &txt)
{ {
if (txt == SearchAndReplaceWorker::eraseText()) { if (m_show_erase) {
ui->m_erase_text->setChecked(true); sarw::setupLineEdit(ui->line_edit, ui->m_erase_text, txt);
} else { } else {
ui->line_edit->setText(txt); ui->line_edit->setText(txt);
} }
@@ -113,6 +114,7 @@ void ElementInfoPartWidget::setDisabled(bool d) {
*/ */
void ElementInfoPartWidget::setEraseTextVisible(bool visible) { void ElementInfoPartWidget::setEraseTextVisible(bool visible) {
ui->m_erase_text->setVisible(visible); ui->m_erase_text->setVisible(visible);
m_show_erase = visible;
} }
/** /**

1
sources/ui/elementinfopartwidget.h
View File

@@ -55,6 +55,7 @@ class ElementInfoPartWidget : public QWidget
private: private:
Ui::ElementInfoPartWidget *ui; Ui::ElementInfoPartWidget *ui;
QString key_; QString key_;
bool m_show_erase = false;
}; };
#endif // ELEMENTINFOPARTWIDGET_H #endif // ELEMENTINFOPARTWIDGET_H