SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

refactoring qad widgets part 2

Browse Source 
c++ cast, nullptr, forward declaration, agregate ui, connect to member functions, order and clear includes
This commit is contained in:
Бычков Андрей
2022-12-12 10:18:34 +03:00
parent 728c132f2b
commit 4497123421
23 changed files with 837 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
libs/widgets/qpiconfigwidget.h
View File

@@ -20,26 +20,28 @@
#ifndef QPICONFIGWIDGET_H
#define QPICONFIGWIDGET_H
#include <QTreeWidget>
#include <QComboBox>
#include <QEvent>
#include <QBoxLayout>
#include <QAction>
#include <QMenu>
#include "qad_widgets_export.h"
#include "qpiconfig.h"
#include "qpiconfignewdialog.h"
#include "qpiconfigvaluewidget.h"
#include "qad_widgets_export.h"
#include <QComboBox>
#include <QTreeWidget>
#include <QAction>
#include <QMenu>
class ConfigValueWidget;
class QAD_WIDGETS_EXPORT UComboBox: public QComboBox
{
Q_OBJECT
public:
UComboBox(QWidget * parent = 0): QComboBox(parent) {connect(this, SIGNAL(currentIndexChanged(int)), this, SLOT(indexChange(int)));}
UComboBox(QWidget *parent = nullptr);
private slots:
void indexChange(int i) {emit currentIndexChanged(i, this);}
void indexChange(int i);
signals:
void currentIndexChanged(int, UComboBox * );
};
@@ -56,10 +58,10 @@ class QAD_WIDGETS_EXPORT QPIConfigWidget: public QTreeWidget
Q_PROPERTY(bool columnTypeVisible READ columnTypeVisible WRITE setColumnTypeVisible)
Q_PROPERTY(bool columnCommentVisible READ columnCommentVisible WRITE setColumnCommentVisible)
public:
QPIConfigWidget(QWidget * parent = 0, QPIConfig * c = 0, bool on = true);
~QPIConfigWidget() {clear();}
void setQPIConfig(QPIConfig * c) {conf = c; buildTree();}
QPIConfigWidget(QWidget * parent = nullptr, QPIConfig * c = nullptr, bool on = true);
~QPIConfigWidget() override {clear();}
void setQPIConfig(QPIConfig *c);
bool readOnlyName() {return read_only_name;}
bool readOnlyValue() {return read_only_value;}
bool readOnlyType() {return read_only_type;}
@@ -71,21 +73,48 @@ public:
QString writeToString();
void readFromString(QString str);
public slots:
void parse();
void write();
void clear();
void buildTree();
void filter(const QString &f);
void setReadOnlyName(bool yes);
void setReadOnlyValue(bool yes);
void setReadOnlyType(bool yes);
void setReadOnlyComment(bool yes);
void setColumnNameVisible(bool yes);
void setColumnValueVisible(bool yes);
void setColumnTypeVisible(bool yes);
void setColumnCommentVisible(bool yes);
private slots:
void itemClicked(QTreeWidgetItem * item, int column);
void itemChanged(QTreeWidgetItem * item, int column);
void typeChange(int t, UComboBox * c);
void valueChange(ConfigValueWidget * w, QString v);
void on_actionAddItem_triggered();
void on_actionAddNode_triggered();
void on_actionRemove_triggered();
signals:
void changed();
private:
void changeEvent(QEvent * e);
bool eventFilter(QObject * o, QEvent * e);
void changeEvent(QEvent * e) override;
bool eventFilter(QObject * o, QEvent * e) override;
void buildEntry(QTreeWidgetItem * i, QPIConfig::Entry * e);
void buildFullNames(QTreeWidgetItem * i);
QPIConfig::Entry * itemEntry(QTreeWidgetItem * i);
ConfigValueWidget * itemCWidget(QTreeWidgetItem * i) {return qobject_cast<ConfigValueWidget * >(itemWidget(i, 1));}
UComboBox * itemTWidget(QTreeWidgetItem * i) {return qobject_cast<UComboBox * >(itemWidget(i, 2));}
ConfigValueWidget *itemCWidget(QTreeWidgetItem *i);
UComboBox *itemTWidget(QTreeWidgetItem *i);
QTreeWidgetItem * addEntry(QTreeWidgetItem * i, QPIConfig::Entry * e, bool node = false);
void deleteEntry(QTreeWidgetItem * i);
bool filter(const QString & f, QTreeWidgetItem * i);
bool filterItem(const QString & f, QTreeWidgetItem * i);
void translate();
void addTrEntry(const QString & s, const QString & f) {types.insert(s, f); s_types << f;}
void addTrEntry(const QString &s, const QString &f);
QPIConfig * conf;
QPIConfigNewDialog new_dialog;
QAction actionAddItem, actionAddNode, actionToItem, actionToNode, actionRemove, actionExpandAll, actionCollapseAll;
@@ -98,34 +127,6 @@ private:
QVector<UComboBox * > w_types;
QVector<bool> c_hidden;
bool active, read_only_name, read_only_value, read_only_type, read_only_comment;
public slots:
void parse() {if (conf == 0) clear(); else conf->readAll();}
void write() {if (conf == 0) return; conf->buildFullNames(&(conf->root)); conf->writeAll();}
void clear();
void buildTree();
void filter(const QString & f) {if (!active) return; filter(f, invisibleRootItem());}
void setReadOnlyName(bool yes) {read_only_name = yes;}
void setReadOnlyValue(bool yes);
void setReadOnlyType(bool yes);
void setReadOnlyComment(bool yes) {read_only_comment = yes;}
void setColumnNameVisible(bool yes) {setColumnHidden(0, !yes); c_hidden[0] = !yes;}
void setColumnValueVisible(bool yes) {setColumnHidden(1, !yes); c_hidden[1] = !yes;}
void setColumnTypeVisible(bool yes) {setColumnHidden(2, !yes); c_hidden[2] = !yes;}
void setColumnCommentVisible(bool yes) {setColumnHidden(3, !yes); c_hidden[3] = !yes;}
private slots:
void itemClicked(QTreeWidgetItem * item, int column);
void itemChanged(QTreeWidgetItem * item, int column);
void typeChange(int t, UComboBox * c);
void valueChange(ConfigValueWidget * w, QString v);
void on_actionAddItem_triggered();
void on_actionAddNode_triggered();
void on_actionRemove_triggered();
signals:
void changed();
};
#endif // QPICONFIGWIDGET_H