diff options
author | deva <deva> | 2009-02-18 15:14:50 +0000 |
---|---|---|
committer | deva <deva> | 2009-02-18 15:14:50 +0000 |
commit | 74c69254be1bf8ac2d3e535efb54d3a62b95145d (patch) | |
tree | f5603b26b043fdef074a5cb9d8a5b19e97f49a05 | |
parent | 41df494d727810c49c1f0f3e4ffb494f9b1b9a10 (diff) |
Added title attribute to the courses/templates, and made them show as a header in the client.
-rw-r--r-- | client/mainwindow.cc | 21 | ||||
-rw-r--r-- | server/src/server.cc | 2 | ||||
-rw-r--r-- | server/xml/macros/B.3.1.2.xml | 2 | ||||
-rw-r--r-- | server/xml/macros/B.3.1.3.xml | 2 | ||||
-rw-r--r-- | server/xml/templates/amd_behandling.xml | 2 | ||||
-rw-r--r-- | server/xml/templates/amd_forunders.xml | 2 | ||||
-rw-r--r-- | server/xml/templates/amd_kontrolunders.xml | 5 |
7 files changed, 28 insertions, 8 deletions
diff --git a/client/mainwindow.cc b/client/mainwindow.cc index 639c9d0..884ecf2 100644 --- a/client/mainwindow.cc +++ b/client/mainwindow.cc @@ -58,9 +58,10 @@ MainWindow::MainWindow(QString cpr, QString course, QString host, quint16 port, w->setLayout(new QVBoxLayout()); this->course = course; + // status->showMessage("Makroen blev succesfuldt indlæst."); + setStatusBar(status); + init(); - - status->showMessage("Makroen blev succesfuldt indlæst."); } MainWindow::~MainWindow() @@ -97,6 +98,22 @@ void MainWindow::update() QDomNodeList courses = xml_doc.documentElement().childNodes(); QDomNode coursenode = courses.at(0); // There can be only one! (Swush, flomp) + + QDomElement course_elem = coursenode.toElement(); + QString course_title = course_elem.attribute("title"); + QString course_name = course_elem.attribute("name"); + + QLabel *header = new QLabel(); + header->setText(course_title); + QFont headerfont = header->font(); + headerfont.setBold(true); + headerfont.setPointSize(headerfont.pointSize() + 4); + header->setFont(headerfont); + header->setAlignment(Qt::AlignHCenter); + w->layout()->addWidget(header); + + statusBar()->showMessage(course_title + " (" + course_name + ")"); + QDomNodeList macronodes = coursenode.childNodes(); for(int j = 0; j < macronodes.count(); j++) { QDomNode macronode = macronodes.at(j); diff --git a/server/src/server.cc b/server/src/server.cc index 1ea2020..24d1eb1 100644 --- a/server/src/server.cc +++ b/server/src/server.cc @@ -135,6 +135,8 @@ static std::string handleTransaction(Transaction *transaction, answer += " <course name=\""; answer += templ->course.attributes["name"]; + answer += "\" title=\""; + answer += templ->course.attributes["title"]; answer += "\">\n"; bool foundmacro = false; diff --git a/server/xml/macros/B.3.1.2.xml b/server/xml/macros/B.3.1.2.xml index d21ba92..2391b0e 100644 --- a/server/xml/macros/B.3.1.2.xml +++ b/server/xml/macros/B.3.1.2.xml @@ -7,7 +7,7 @@ </maps> <scripts> </scripts> - <window caption="GennemgÃ¥else af de 5 trin (B.3.1.2)" layout="vbox"> + <window caption="Gennemgang af de 5 trin (B.3.1.2)" layout="vbox"> <frame layout="vbox"> <frame layout="hbox"> <label caption="De 5 trin til forebyggelse af forveksling af øjnene er gennemgÃ¥et:"/> diff --git a/server/xml/macros/B.3.1.3.xml b/server/xml/macros/B.3.1.3.xml index 8faa31e..3562523 100644 --- a/server/xml/macros/B.3.1.3.xml +++ b/server/xml/macros/B.3.1.3.xml @@ -7,7 +7,7 @@ </maps> <scripts> </scripts> - <window caption="(B.3.1.3)" layout="vbox"> + <window caption="Procedure (B.3.1.3)" layout="vbox"> <frame layout="vbox"> <label height="80" caption="Der afvaskes periorbitalt med povidoniodid og efterfølgende dryppes der med povidoniodid. Efter 5 min bedøves med spongostan vædet i Lidocain 20 mg/ml tilsat adrenalin. Injektionsstedet nedadtil temporalt i konjunktiva afmærkes med passer 3,5 mm fra limbus."/> diff --git a/server/xml/templates/amd_behandling.xml b/server/xml/templates/amd_behandling.xml index fa3bc92..2d0f4dd 100644 --- a/server/xml/templates/amd_behandling.xml +++ b/server/xml/templates/amd_behandling.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<course name="amd_kontrolunders" version="1.0"> +<course name="amd_kontrolunders" version="1.0" title="AMD behandling"> <macro name="B.0" static="true"/> <macro header="Behandling"/> diff --git a/server/xml/templates/amd_forunders.xml b/server/xml/templates/amd_forunders.xml index 90c35bf..07f4b6c 100644 --- a/server/xml/templates/amd_forunders.xml +++ b/server/xml/templates/amd_forunders.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<course name="amd_forunders" version="1.0"> +<course name="amd_forunders" version="1.0" title="AMD forundersøgelse"> <macro name="B.0" static="true"/> <macro header="Anamnese"/> diff --git a/server/xml/templates/amd_kontrolunders.xml b/server/xml/templates/amd_kontrolunders.xml index 10c39fb..cadac75 100644 --- a/server/xml/templates/amd_kontrolunders.xml +++ b/server/xml/templates/amd_kontrolunders.xml @@ -1,12 +1,13 @@ <?xml version='1.0' encoding='UTF-8'?> -<course name="amd_kontrolunders" version="1.0"> +<course name="amd_kontrolunders" version="1.0" title="AMD kontrolundersøgelse"> <macro name="B.0" static="true"/> <macro header="Anamnese"/> <macro name="B.1.1"/> <macro name="B.1.2" compact="true"/> - <macro name="B.1.3"/> + <macro name="B.2.1.2"/> <!-- + <macro name="B.1.3"/> <macro name="B.2.1.1"/> <macro name="B.2.1.2"/> <macro name="B.2.1.3"/> |