First working version of the collapser-pracro view.

1 files changed, 20 insertions, 2 deletions

diff --git a/client/macrowindow.h b/client/macrowindow.h
index f1388b2..4e040da 100644
--- a/client/macrowindow.h
+++ b/client/macrowindow.h
@@ -33,15 +33,20 @@
 #include <QObject>
 #include <QVector>
 #include <QMap>
+#include <QLabel>
 
+#include "collapser.h"
+#include "netcom.h"
+
+class NetCom;
 class LUA;
 class Widget;
 
-class MacroWindow : public QObject
+class MacroWindow : public Collapser
 {
 Q_OBJECT
 public:
-  MacroWindow(QDomNode &xml_doc);
+  MacroWindow(NetCom &netcom, QDomNode &xml_doc, QString course);
   ~MacroWindow();
 
   bool isClosed();
@@ -53,6 +58,10 @@ public:
   Widget *getWidget(QString name);
   void addAuxWidgets(QVector< Widget* >);
 
+  void update(QDomNode &xml_doc);
+
+  QString macrotitle;
+
 public slots:
   void commit();
   void reset();
@@ -60,6 +69,11 @@ public slots:
   void cont(QString name);
   void cont_nocommit(QString name);
 
+  void toggleMacro();
+
+signals:
+  void updateOnCommit();
+
 private:
   void initMacro(QDomNode &node);
 
@@ -67,11 +81,15 @@ private:
   QVector< Widget* > widgets;
   QVector< Widget* > auxwidgets;
   QString macro;
+  QString course;
   QString version;
   QWidget *mainwidget;
+  QLabel *resumewidget;
 
   bool isclosed;
   void close();
+
+  NetCom &netcom;
 };
 
 #endif/*__PRACRO_MACROWINDOW_H__*/