Revert "Revert "Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet into terminal_strip""

This reverts commit bb26954bd4.
This commit is contained in:
joshua
2021-09-10 23:30:20 +02:00
parent 543447aa31
commit 374805d6ab
27 changed files with 2814 additions and 12 deletions

View File

@@ -42,6 +42,8 @@ class NumerotationContext;
class QUndoStack;
class XmlElementCollection;
class QTimer;
class TerminalStrip;
#ifdef BUILD_WITHOUT_KF5
#else
class KAutoSaveFile;
@@ -176,6 +178,11 @@ class QETProject : public QObject
void setProjectProperties(const DiagramContext &);
QUndoStack* undoStack() {return m_undo_stack;}
QVector<TerminalStrip *> terminalStrip() const;
TerminalStrip * newTerminalStrip(QString installation = QString(), QString location = QString(), QString name = QString());
bool addTerminalStrip(TerminalStrip *strip);
bool removeTerminalStrip(TerminalStrip *strip);
public slots:
Diagram *addNewDiagram(int pos = -1);
void removeDiagram(Diagram *);
@@ -218,6 +225,7 @@ class QETProject : public QObject
void readElementsCollectionXml(QDomDocument &xml_project);
void readProjectPropertiesXml(QDomDocument &xml_project);
void readDefaultPropertiesXml(QDomDocument &xml_project);
void readTerminalStripXml(const QDomDocument &xml_project);
void writeProjectPropertiesXml(QDomElement &);
void writeDefaultPropertiesXml(QDomElement &);
@@ -281,6 +289,7 @@ class QETProject : public QObject
#endif
QUuid m_uuid = QUuid::createUuid();
projectDataBase m_data_base;
QVector<TerminalStrip *> m_terminal_strip_vector;
};
Q_DECLARE_METATYPE(QETProject *)