From 74c69254be1bf8ac2d3e535efb54d3a62b95145d Mon Sep 17 00:00:00 2001 From: deva Date: Wed, 18 Feb 2009 15:14:50 +0000 Subject: Added title attribute to the courses/templates, and made them show as a header in the client. --- client/mainwindow.cc | 21 +++++++++++++++++++-- server/src/server.cc | 2 ++ server/xml/macros/B.3.1.2.xml | 2 +- server/xml/macros/B.3.1.3.xml | 2 +- server/xml/templates/amd_behandling.xml | 2 +- server/xml/templates/amd_forunders.xml | 2 +- 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.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 @@ - +