summaryrefslogtreecommitdiff
path: root/client/macrowindow.h
diff options
context:
space:
mode:
Diffstat (limited to 'client/macrowindow.h')
-rw-r--r--client/macrowindow.h33
1 files changed, 8 insertions, 25 deletions
diff --git a/client/macrowindow.h b/client/macrowindow.h
index 279394f..803bf62 100644
--- a/client/macrowindow.h
+++ b/client/macrowindow.h
@@ -27,22 +27,15 @@
#ifndef __PRACRO_MACROWINDOW_H__
#define __PRACRO_MACROWINDOW_H__
-#include <QDomDocument>
-#include <QWidget>
#include <QDomNode>
-#include <QObject>
#include <QVector>
-#include <QMap>
-#include <QLabel>
#include "collapser.h"
#include "netcom.h"
-#include "resumewidget.h"
-class NetCom;
class LUA;
class Widget;
-
+class ResumeWidget;
class MacroWindow : public Collapser
{
Q_OBJECT
@@ -51,19 +44,11 @@ public:
bool collapsed = true, bool compact = false);
~MacroWindow();
- bool isClosed();
-
QVector< QString > luaprograms;
LUA *lua;
- Widget *getWidget(QString name);
-
- // Add a widget that can be seen from script, and will be committed, and validated.
- void addWidgets(QVector< Widget* >);
-
- // Add a widget that can only be seen from scripts, but will not be committed or validated.
- void addAuxWidgets(QVector< Widget* >);
+ // Widget *getWidget(QString name);
void update(QDomNode &xml_doc);
@@ -73,10 +58,7 @@ public:
public slots:
void commit();
- void reset();
void cancel();
- void cont(QString name);
- void cont_nocommit(QString name);
void toggleMacro();
@@ -85,6 +67,9 @@ public slots:
void collapseWrapper();
void expandWrapper();
+ void collapsed();
+ void expanded();
+
signals:
void updateOnCommit();
void macroHasChanged();
@@ -94,16 +79,14 @@ private:
void initMacro(QDomNode &node);
bool doCommit();
- QVector< Widget* > widgets;
- QVector< Widget* > auxwidgets;
+
QString macro;
QString templ;
QString version;
- QWidget *mainwidget;
+ Widget *mainwidget;
ResumeWidget *resumewidget;
- bool isclosed;
- void close();
+ void clear();
NetCom &netcom;