summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2011-11-04 09:27:44 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2011-11-04 09:27:44 +0100
commitdb2851d0d8ad618e36eca9a61b02bdb999dca7b2 (patch)
treec7574d979bdcb292ec8bf73b38badc7ecb46377f /client
parent59e00220f562b3840295d9f2dc1eb6038a7c09c2 (diff)
parent95ca5d5e396bfaad076324d225b5a15cfc9fcb29 (diff)
Merge branch 'master' of http://git.aasimon.org/public/pracro
Diffstat (limited to 'client')
-rw-r--r--client/aboutbox.cc12
-rw-r--r--client/macrodrawer.cc3
-rw-r--r--client/mainwindow.cc1
3 files changed, 9 insertions, 7 deletions
diff --git a/client/aboutbox.cc b/client/aboutbox.cc
index 47cc9e3..e90efa1 100644
--- a/client/aboutbox.cc
+++ b/client/aboutbox.cc
@@ -67,9 +67,15 @@ AboutBox::AboutBox(QWidget *parent, Qt::WindowFlags f): QDialog(parent, f)
QHBoxLayout *topLayout = new QHBoxLayout();
QLabel *logo = new QLabel();
logo->setPixmap(QPixmap(":icons/icon.png"));
- QLabel *title = new QLabel(tr("<h1>Pracro Client</h1>"
- "<h2>v."VERSION"</h2>"
- "Developed at Aarhus University Hospital"));
+ QLabel *title = new QLabel;
+ title->setWordWrap(true);
+ title->setText(tr("<h1>Pracro Client</h1>"
+ "<h2>v."VERSION"</h2>"
+ "Copyright (C) 2007-2011 Aasimon.org<br />"
+ "This is free software. You may redistribute copies of it "
+ "under the terms of the GNU General Public License "
+ "(http://www.gnu.org/licenses/gpl.html). There is NO "
+ "WARRANTY, to the extent permitted by law."));
topLayout->addWidget(logo);
topLayout->addWidget(title);
diff --git a/client/macrodrawer.cc b/client/macrodrawer.cc
index 343d5d1..2ddc0c0 100644
--- a/client/macrodrawer.cc
+++ b/client/macrodrawer.cc
@@ -105,15 +105,12 @@ void MacroDrawer::activationChange(bool active)
// Set padlock icon on button.
if(button) {
button->setIcon(QPixmap(":icons/padlock.png"));
- //button->setText("");
}
} else {
// Clear padlock icon on button
if(button) {
button->setIcon(QPixmap());
- //button->setText("");
}
}
-
}
diff --git a/client/mainwindow.cc b/client/mainwindow.cc
index 9aa6241..f415dcb 100644
--- a/client/mainwindow.cc
+++ b/client/mainwindow.cc
@@ -103,7 +103,6 @@ MainWindow::MainWindow(QString patientid, QString title, QString course,
setWindowIcon(QIcon(":/icons/icon.png"));
QStatusBar *status = statusBar();
- //status->addPermanentWidget(new QLabel("Pracro v."VERSION));
aboutButton = new QPushButton("Pracro v."VERSION, status);
aboutButton->setIcon(QIcon(":icons/icon.png"));