From dd8e7832c69a5ef484a2f3b6054a482d29275f85 Mon Sep 17 00:00:00 2001 From: deva Date: Sat, 20 May 2006 14:35:59 +0000 Subject: *** empty log message *** --- client/mainwindow.cc | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) (limited to 'client/mainwindow.cc') diff --git a/client/mainwindow.cc b/client/mainwindow.cc index 3680afc..da2785b 100644 --- a/client/mainwindow.cc +++ b/client/mainwindow.cc @@ -34,15 +34,12 @@ #include "historywidget.h" -#include - #include "control.h" #include "icons.h" QPushButton *MainWindow::createButton(QPixmap *pixmap) { - // QPixmap p = loadIcon(icon); QPushButton *btn = new QPushButton(); btn->setIconSize(QSize(pixmap->width(), pixmap->height())); btn->setIcon(*pixmap); @@ -83,35 +80,58 @@ MainWindow::MainWindow(Decoder *d) // Create the control buttons btn_cpr = createButton(Icons::cpr); - layout->addWidget(btn_cpr, 1,3, 1,1); + layout->addWidget(btn_cpr, 1,3, 2,1); connect(btn_cpr, SIGNAL(clicked()), this, SLOT(cpr_clicked())); btn_record = createButton(Icons::record); - layout->addWidget(btn_record, 2,0, 1,1); + layout->addWidget(btn_record, 3,0, 1,1); connect(btn_record, SIGNAL(clicked()), this, SLOT(record_clicked())); btn_snapshot = createButton(Icons::snapshot); - layout->addWidget(btn_snapshot, 2,1, 1,1); + layout->addWidget(btn_snapshot, 3,1, 1,1); connect(btn_snapshot, SIGNAL(clicked()), this, SLOT(snapshot_clicked())); btn_freeze = createButton(Icons::freeze); - layout->addWidget(btn_freeze, 2,2, 1,1); + layout->addWidget(btn_freeze, 3,2, 1,1); connect(btn_freeze, SIGNAL(clicked()), this, SLOT(freeze_clicked())); btn_mute = createButton(Icons::mute); - layout->addWidget(btn_mute, 2,3, 1,1); + layout->addWidget(btn_mute, 3,3, 1,1); connect(btn_mute, SIGNAL(clicked()), this, SLOT(mute_clicked())); btn_clear = createButton(Icons::clear); - layout->addWidget(btn_clear, 2,4, 1,1); + layout->addWidget(btn_clear, 3,4, 1,1); connect(btn_clear, SIGNAL(clicked()), this, SLOT(clear_clicked())); + // Create the labels + lbl_cpr = new QLabel(); + QFont font = lbl_cpr->font(); + font.setPointSize(font.pointSize() * 2); + font.setBold(true); + lbl_cpr->setFont(font); + lbl_cpr->setText("CPR"); + layout->addWidget(lbl_cpr, 1,0, 1,3); + + lbl_name = new QLabel(); + font = lbl_name->font(); + font.setPointSize(font.pointSize() * 3); + font.setBold(true); + lbl_name->setFont(font); + lbl_name->setText("Name"); + layout->addWidget(lbl_name, 2,0, 1,3); + + // Stretch the layout + layout->setRowStretch(0, 100); + layout->setRowStretch(1, 1); + layout->setRowStretch(2, 1); + layout->setRowStretch(3, 1); + // Create history bar history = new HistoryFrame(); - layout->addWidget(history, 0,4, 2,1); + layout->addWidget(history, 0,4, 3,1); // Create statusbar - QStatusBar *statusbar = new QStatusBar(this); + statusbar = new QStatusBar(this); outerlayout->addWidget(statusbar, 1,0, 1,1); statusbar->showMessage("Ready!"); -- cgit v1.2.3