Callback based client implementation is now finished. Testing is up.

1 files changed, 18 insertions, 10 deletions

diff --git a/client/mainwindow.h b/client/mainwindow.h
index 9da8ff2..8449467 100644
--- a/client/mainwindow.h
+++ b/client/mainwindow.h
@@ -32,41 +32,47 @@
 #include <QVector>
 #include <QPushButton>
 #include <QFont>
+#include <QLabel>
+#include <QDomDocument>
+#include <QScrollArea>
 
 #include "netcom.h"
-//#include "sessions.h"
-#include "macro.h"
+#include "entity.h"
 
-class QLabel;
 class MainWindow : public QMainWindow {
 Q_OBJECT
 public:
-  MainWindow(QString cpr, QString templ, QString host, quint16 port,
+  MainWindow(QString patientid, QString templ, QString host, quint16 port,
              QString user);
   ~MainWindow();
 
   void closeEvent(QCloseEvent *event);
 
 public slots:
-  void update();
+  //  void update();
   void closeCommit();
   void closeNoCommit();
   void closeDiscard();
-  //  void showSessions();
+
+  void handle(QDomDocument &doc);
+  void showError(QString title, QString text);
+
+  bool hasOpen(void *me);
 
 private:
-  void updateTemplateHeaders(QDomNode templatenode);
+  void updateMacros(QDomNodeList &nodes);
+  void updateTemplateHeaders(QDomNode &templatenode);
 
   QString templ;
   NetCom netcom;
 
-  QString cpr;
+  QString patientid;
   QString user;
 
-  //  QMap< QString, MacroWindow* > macros;
-  Macros macros;
   QWidget *w;
 
+  Entities entities;
+
   QLabel *header;
 
   bool initialising;
@@ -76,6 +82,8 @@ private:
 
   void init();
 
+  bool closing;
+
   bool isStored;
 };