WebSVN - OpenInventory - Различия - Редакция 63 и 65


#ifndef CLASSEDITOR_H
#define CLASSEDITOR_H

#include <QMainWindow>
#include "mysql.h"
#include "mymodel.h"
#include "modelfordescriptiontable.h"
#include "delegateforclassestable.h"

#include <QTreeView>


namespace Ui {
    class ClassEditor;
}

class ClassEditor : public QMainWindow {
    Q_OBJECT
public:
    ClassEditor(QWidget *parent = 0);
    ~ClassEditor();

protected:
    void changeEvent(QEvent *e);

private:
    Ui::ClassEditor *ui;
    MySql sql;
    SettingsDialog settdialog;
    TableField *field;
    SqlTable *table;
    QModelIndex currIndexOfClassesTable; // ïåðåìåííàÿ õðàíèò òåêóùèé èíäåêñ òàáëèöû êëàññîâ
    QString currClassID; // òåêóùèé èäåíòèôèêàòîð êëàññà

    QSqlTableModel* model;
   // QSqlTableModel* modelForDescription;
    ModelForDescriptionTable* modelForDescription;

    QTableView* tableForDescription;
    MyModel* mymodel;

    DelegateForClassesTable classTableDelegate;

    void addNewClass(); // äîáàâèì íîâûé êëàññ
    void addNewClass_new();
    void addNewField(); // äîáàâëÿåì íîâîå ïîëå ê êëàññó

private slots:

    void on_pushButton_clicked();           // îáðàáîò÷èê íàæàòèÿ êíîïêè "Íîâûé êëàññ"
    void on_pushButton_2_clicked();         // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü êëàññ"
    void on_pushButton_3_clicked();         // îáðàáîò÷èê íàæàòèÿ êíîïêè "Íîâîå ïîëå"
    void on_pushButton_4_clicked();         // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü ïîëå"
    void on_pushButton_5_clicked();         // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü âñå ïîëÿ"
    void on_action_ID_triggered(bool is_checked);          // îáðàáàòûâàåì âûáîð â ìåíþ "Ïîêàçûâàòü ID"
    void on_action_showAlias_triggered(bool is_checked);     // îáðàáàòûâàåì âûáîð â ìåíþ "Ïîêàçûâàòü ïñåâäîíèì"
    void on_action_showInstance_triggered(bool is_checked); // ... ïîêàçûâàòü õðàíèëèùà îáúåêòîâ
    void on_tableView_clicked(const QModelIndex & index );
    void on_myModel_dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight );
    void on_modelForDescription_dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight );

};

#endif // CLASSEDITOR_H
 

Редакция 63	Редакция 65
1	#ifndef CLASSEDITOR_H	1	#ifndef CLASSEDITOR_H
2	#define CLASSEDITOR_H	2	#define CLASSEDITOR_H
3		3
4	#include <QMainWindow>	4	#include <QMainWindow>
5	#include "mysql.h"	5	#include "mysql.h"
6	#include "mymodel.h"	6	#include "mymodel.h"
7	#include "modelfordescriptiontable.h"	7	#include "modelfordescriptiontable.h"
-		8	#include "delegateforclassestable.h"
8		9
9	#include <QTreeView>	10	#include <QTreeView>
10		11
11		12
12	namespace Ui {	13	namespace Ui {
13	class ClassEditor;	14	class ClassEditor;
14	}	15	}
15		16
16	class ClassEditor : public QMainWindow {	17	class ClassEditor : public QMainWindow {
17	Q_OBJECT	18	Q_OBJECT
18	public:	19	public:
19	ClassEditor(QWidget *parent = 0);	20	ClassEditor(QWidget *parent = 0);
20	~ClassEditor();	21	~ClassEditor();
21		22
22	protected:	23	protected:
23	void changeEvent(QEvent *e);	24	void changeEvent(QEvent *e);
24		25
25	private:	26	private:
26	Ui::ClassEditor *ui;	27	Ui::ClassEditor *ui;
27	MySql sql;	28	MySql sql;
28	SettingsDialog settdialog;	29	SettingsDialog settdialog;
29	TableField *field;	30	TableField *field;
30	SqlTable *table;	31	SqlTable *table;
31	QModelIndex currIndexOfClassesTable; // ïåðåìåííàÿ õðàíèò òåêóùèé èíäåêñ òàáëèöû êëàññîâ	32	QModelIndex currIndexOfClassesTable; // ïåðåìåííàÿ õðàíèò òåêóùèé èíäåêñ òàáëèöû êëàññîâ
32	QString currClassID; // òåêóùèé èäåíòèôèêàòîð êëàññà	33	QString currClassID; // òåêóùèé èäåíòèôèêàòîð êëàññà
33		34
34	QSqlTableModel* model;	35	QSqlTableModel* model;
35	// QSqlTableModel* modelForDescription;	36	// QSqlTableModel* modelForDescription;
36	ModelForDescriptionTable* modelForDescription;	37	ModelForDescriptionTable* modelForDescription;
37		38
38	QTableView* tableForDescription;	39	QTableView* tableForDescription;
39	MyModel* mymodel;	40	MyModel* mymodel;
40		41
-		42	DelegateForClassesTable classTableDelegate;
-		43
41	void addNewClass(); // äîáàâèì íîâûé êëàññ	44	void addNewClass(); // äîáàâèì íîâûé êëàññ
42	void addNewClass_new();	45	void addNewClass_new();
43	void addNewField(); // äîáàâëÿåì íîâîå ïîëå ê êëàññó	46	void addNewField(); // äîáàâëÿåì íîâîå ïîëå ê êëàññó
44		47
45	private slots:	48	private slots:
46		49
47	void on_pushButton_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Íîâûé êëàññ"	50	void on_pushButton_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Íîâûé êëàññ"
48	void on_pushButton_2_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü êëàññ"	51	void on_pushButton_2_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü êëàññ"
49	void on_pushButton_3_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Íîâîå ïîëå"	52	void on_pushButton_3_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Íîâîå ïîëå"
50	void on_pushButton_4_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü ïîëå"	53	void on_pushButton_4_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü ïîëå"
51	void on_pushButton_5_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü âñå ïîëÿ"	54	void on_pushButton_5_clicked(); // îáðàáîò÷èê íàæàòèÿ êíîïêè "Óäàëèòü âñå ïîëÿ"
-		55	void on_action_ID_triggered(bool is_checked); // îáðàáàòûâàåì âûáîð â ìåíþ "Ïîêàçûâàòü ID"
-		56	void on_action_showAlias_triggered(bool is_checked); // îáðàáàòûâàåì âûáîð â ìåíþ "Ïîêàçûâàòü ïñåâäîíèì"
-		57	void on_action_showInstance_triggered(bool is_checked); // ... ïîêàçûâàòü õðàíèëèùà îáúåêòîâ
52	void on_tableView_clicked(const QModelIndex & index );	58	void on_tableView_clicked(const QModelIndex & index );
53	void on_myModel_dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight );	59	void on_myModel_dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight );
54	void on_modelForDescription_dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight );	60	void on_modelForDescription_dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight );
55		61
56	};	62	};
57		63
58	#endif // CLASSEDITOR_H	64	#endif // CLASSEDITOR_H
59		65

Хранилища Subversion OpenInventory

(root)/trunk/ClassEditor/classeditor.h - Редакция 63 → 65