*** empty log message ***

1 files changed, 30 insertions, 10 deletions

diff --git a/client/mainwindow.cc b/client/mainwindow.cc
index 3a0eeab..9970568 100644
--- a/client/mainwindow.cc
+++ b/client/mainwindow.cc
@@ -35,7 +35,6 @@
 #include <QGridLayout>
 
 #include "videowidget.h"
-#include "historyframe.h"
 #include "historywidget.h"
 
 // Macro for creating buttons
@@ -54,12 +53,20 @@ static QPushButton *createButton(char* icon)
   return btn;
 }
 
+#include <QApplication>
 MainWindow::MainWindow(): QWidget()
 {
   MIaV::info->log("Starting MIaV v. %s.", VERSION);
 
   // Create the overlaying splashscreen
-  //  SplashScreen splash;
+  SplashScreen splash(this);
+  /*
+  sleep(3);
+  splash.setProgress("Loading some items", 10);
+  sleep(3);
+  splash.setProgress("Established connections",50);
+  sleep(3);
+  */
 
   // Create layout
   QGridLayout *layout = new QGridLayout(this);
@@ -92,16 +99,27 @@ MainWindow::MainWindow(): QWidget()
   layout->addWidget(button, 2,3, 1,1);
   connect(button, SIGNAL(clicked()), this, SLOT(mute_clicked()));
 
+  button = createButton(PIXMAP_CLEAR);
+  layout->addWidget(button, 2,4, 1,1);
+  connect(button, SIGNAL(clicked()), this, SLOT(clear_clicked()));
+
   // Create history bar
-  HistoryFrame *frame = new HistoryFrame();
-  layout->addWidget(frame, 0,4, 3,1);
-  frame->addHistoryItem(new HistoryWidget());
-  frame->addHistoryItem(new HistoryWidget());
-  frame->addHistoryItem(new HistoryWidget());
+  history = new HistoryFrame();
+  layout->addWidget(history, 0,4, 2,1);
+  history->addHistoryItem(new HistoryWidget(new QPixmap(PIXMAP_MUTE)));
+  history->addHistoryItem(new HistoryWidget(new QPixmap(PIXMAP_UNMUTE)));
+  history->addHistoryItem(new HistoryWidget(new QPixmap(PIXMAP_STOP)));
+  history->addHistoryItem(new HistoryWidget(new QPixmap(PIXMAP_RECORD)));
+  history->addHistoryItem(new HistoryWidget(new QPixmap(PIXMAP_FREEZE)));
+  history->addHistoryItem(new HistoryWidget(new QPixmap(PIXMAP_UNFREEZE)));
+  history->addHistoryItem(new HistoryWidget(new QPixmap(PIXMAP_CPR)));
+  history->addHistoryItem(new HistoryWidget(new QPixmap(PIXMAP_CLEAR)));
+  history->addHistoryItem(new HistoryWidget(new QPixmap(PIXMAP_DUMMY)));
+  history->addHistoryItem(new HistoryWidget(new QPixmap(PIXMAP_LOGO_SMALL)));
 
 
   // Create statusbar
-
+  
   show();
   //  setWindowState(Qt::WindowFullScreen);
 
@@ -123,18 +141,20 @@ void MainWindow::about_clicked()
 
 void MainWindow::clear_clicked()
 {
+  printf("clear\n");
 }
 
 void MainWindow::cpr_clicked()
 {
 }
 
-void MainWindow::rec_clicked()
+void MainWindow::record_clicked()
 {
 }
 
-void MainWindow::shoot_clicked()
+void MainWindow::snapshot_clicked()
 {
+  history->addHistoryItem(new HistoryWidget(new QPixmap(PIXMAP_LOGO_SMALL)));
 }
 
 void MainWindow::freeze_clicked()