1 files changed, 23 insertions, 53 deletions

diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index 80b99b6..eda7dc9 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -8,25 +8,32 @@
  ****************************************************************************/
 
 /*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *    This file is part of MIaV.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
+ *    MIaV is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *    MIaV is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with MIaV; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
+
 /*
  * $Id$
  */
+
 /*
  * $Log$
+ * Revision 1.24  2005/05/03 08:31:59  deva
+ * Removed the error object, and replaced it with a more generic info object.
+ *
  * Revision 1.23  2005/05/02 20:34:38  deva
  *
  * Some hacked borky ugly scumm code to check for errors! :(
@@ -41,9 +48,6 @@
  * Cpr now sent to decoder. And saved prioer to editing, in order to be able
  * to disable editing session and revert to old cpr.
  *
- * Revision 1.20  2005/05/01 12:17:41  deva
- * *** empty log message ***
- *
  * Revision 1.19  2005/05/01 12:13:50  deva
  * Removed bitmap readin.
  *
@@ -56,6 +60,7 @@
  * Revision 1.16  2005/05/01 09:56:26  deva
  * Added Id and Log tags to all files
  */
+
 #include <config.h>
 #ifdef USE_GUI
 
@@ -89,17 +94,14 @@
 MainWindow::MainWindow( QWidget* parent, const char* name )
 	: QWidget( parent, name, WStyle_Customize | WStyle_NoBorder )
 {
-  Error *error = config->getErrorObj();
+  info = new InfoGui();
+
   video_width = config->readInt("video_width");
   video_height = config->readInt("video_height");
 
   int resolution_w = config->readInt("pixel_width");
   int resolution_h = config->readInt("pixel_height");
-  while(error->hasError()) {
-    show();
-    MessageBox(this, TXT_ERROR_TITLE, error->popErrorString().c_str(), 
-               TYPE_OK, ICON_ERROR).exec();
-  }
+
   unit = ((float)resolution_w / (float)(config->readFloat("screensize") * 3.1f));
 
   move(0,0);
@@ -137,25 +139,16 @@ MainWindow::MainWindow( QWidget* parent, const char* name )
   createGui();
   show();
 
-  camera = new Camera();
+  camera = new Camera(info);
   camera->connect(config->readString("server_addr")->c_str(), 
                   config->readInt("server_port"));
 
-  cam_error = camera->errorObject();
-  while(cam_error->hasError()) {
-    MessageBox(this, TXT_ERROR_TITLE, cam_error->popErrorString().c_str(), 
-               TYPE_OK, ICON_ERROR).exec();
-  }
-
   recording = false;
   frozen = false;
 
   // Open the CPR Dialog
   cpr_clicked();
 
-  errtimer = new QTimer(this);
-  connect(errtimer, SIGNAL(timeout()), SLOT(check_errors()));
-  errtimer->start(2000);
 }
 
 MainWindow::~MainWindow()
@@ -331,14 +324,6 @@ void MainWindow::cpr_clicked()
   }
 }
 
-void MainWindow::checkErrors()
-{
-  while(cam_error->hasError()) {
-    MessageBox(this, TXT_ERROR_TITLE, cam_error->popErrorString().c_str(), 
-               TYPE_OK, ICON_ERROR).exec();
-  }
-}
-
 void MainWindow::rec_clicked()
 {
   if(!recording) {
@@ -348,7 +333,6 @@ void MainWindow::rec_clicked()
     timer->start(100);
     btn_rec->setPixmap(*pix_stop);
     camera->start();
-    checkErrors();
   } else {
     switch(MessageBox(this, 
                       TXT_ASK_SAVE_TITLE, 
@@ -382,7 +366,6 @@ void MainWindow::rec_clicked()
     case MSG_CANCEL:
       break;
     }
-    checkErrors();
   }
 }
 
@@ -393,7 +376,6 @@ void MainWindow::shoot_clicked()
   QImage image(720, 576, 32);
 
   camera->snapshot(image.bits());
-  checkErrors();
 
   image = image.smoothScale(img_history[0]->width(), img_history[0]->height());
 
@@ -407,7 +389,6 @@ void MainWindow::shoot_clicked()
   if(frozen) {
     camera->unfreeze();
     btn_freeze->setPixmap(*pix_freeze);
-    checkErrors();
     btn_freeze->setOn(false);
     frozen = false;
   }
@@ -418,25 +399,14 @@ void MainWindow::freeze_clicked()
   if(frozen) {
     camera->unfreeze();
     btn_freeze->setPixmap(*pix_freeze);
-    checkErrors();
     btn_freeze->setOn(false);
     frozen = false;
   } else {
     camera->freeze();
     btn_freeze->setPixmap(*pix_unfreeze);
-    checkErrors();
     btn_freeze->setOn(true);
     frozen = true;
   }
 }
 
-void MainWindow::check_errors()
-{
-  while(cam_error->hasError()) {
-    MessageBox(this, TXT_ERROR_TITLE, cam_error->popErrorString().c_str(), 
-               TYPE_OK, ICON_ERROR).exec();
-  }
-}
-
-
 #endif /*USE_GUI*/