1 files changed, 2 insertions, 2 deletions

diff --git a/noncore/multimedia/camera/gui/mainwindow.cpp b/noncore/multimedia/camera/gui/mainwindow.cpp
index 2f42049..e4e1b6c 100644
--- a/noncore/multimedia/camera/gui/mainwindow.cpp
+++ b/noncore/multimedia/camera/gui/mainwindow.cpp
@@ -5,194 +5,194 @@
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "mainwindow.h"
 #include "previewwidget.h"
 #include "zcameraio.h"
 #include "imageio.h"
 #include "avi.h"
 
 /* OPIE */
 #include <opie2/ofiledialog.h>
 #include <opie2/odevice.h>
 #include <opie2/oapplication.h>
 #include <opie2/oconfig.h>
 #include <opie2/odebug.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 using namespace Opie;
 
 /* QT */
 #include <qapplication.h>
 #include <qaction.h>
 #include <qvbox.h>
 #include <qcombobox.h>
 #include <qcursor.h>
 #include <qdatastream.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qimage.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qpopupmenu.h>
 #include <qprogressbar.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qlayout.h>
 #include <qdirectpainter_qws.h>
 
 /* STD */
 #include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
 
 #define CAPTUREFILE "/tmp/capture.dat"
 #define OUTPUTFILE  "/tmp/output.avi"
 
 #define OUTPUT_TO_CUSTOM 250
 #define OUTPUT_TO_DOCFOLDER 251
 
 CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags f )
            :QMainWindow( parent, name, f ),
            _rotation( 270 ), // FIXME: get this from current settings (ODevice?)
            _capturing( false ),
            _pics( 1 ), _videos( 1 )
 {
     #ifdef QT_NO_DEBUG
     if ( !ZCameraIO::instance()->isOpen() )
     {
         QVBox* v = new QVBox( this );
         v->setMargin( 10 );
         QLabel* l1 = new QLabel( v );
         l1->setPixmap( Resource::loadPixmap( "camera/error" ) );
         QLabel* l2 = new QLabel( v );
         l2->setText( "<b>Sorry. could not detect your camera :-(</b><p>"
         "* Is the sharpzdc_cs module loaded ?<br>"
         "* Is /dev/sharpzdc read/writable ?<p>" );
         connect( new QPushButton( "Exit", v ), SIGNAL( clicked() ), this, SLOT( close() ) );
         setCentralWidget( v );
         return;
     }
     #endif
 
     init();
 
     _rotation = 270; //TODO: grab these from the actual settings
 
     preview = new PreviewWidget( this, "camera preview widget" );
     //setCentralWidget( preview ); <--- don't do this!
     preview->resize( QSize( 240, 288 ) );
     preview->show();
 
     // construct a System Channel to receive setRotation messages
     _sysChannel = new QCopChannel( "QPE/System", this );
-    connect( _sysChannel, SIGNAL( received( const QCString&, const QByteArray& ) ),
-             this, SLOT( systemMessage( const QCString&, const QByteArray& ) ) );
+    connect( _sysChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
+             this, SLOT( systemMessage(const QCString&,const QByteArray&) ) );
 
     connect( preview, SIGNAL( contextMenuRequested() ), this, SLOT( showContextMenu() ) );
 
     connect( ZCameraIO::instance(), SIGNAL( shutterClicked() ), this, SLOT( shutterClicked() ) );
 
     updateCaption();
 
 };
 
 
 CameraMainWindow::~CameraMainWindow()
 {
     // write back configuration
     OConfigGroupSaver cgs( oApp->config(), "General" );
     cgs.config()->writeEntry( "flip", flip );
     cgs.config()->writeEntry( "quality", quality );
     cgs.config()->writeEntry( "zoom", zoom );
     cgs.config()->writeEntry( "captureX", captureX );
     cgs.config()->writeEntry( "captureY", captureY );
     cgs.config()->writeEntry( "captureFormat", captureFormat );
     cgs.config()->writeEntry( "outputTo", outputTo );
     cgs.config()->writeEntry( "prefix", prefix );
     cgs.config()->writeEntry( "appendSettings", appendSettings );
 }
 
 
 void CameraMainWindow::init()
 {
     // get values from configuration
     OConfigGroupSaver cgs( oApp->config(), "General" );
     flip = cgs.config()->readEntry( "flip", "A" );
     quality = cgs.config()->readNumEntry( "quality", 50 );
     zoom = cgs.config()->readNumEntry( "zoom", 1 );
     captureX = cgs.config()->readNumEntry( "captureX", 480 );
     captureY = cgs.config()->readNumEntry( "captureY", 640 );
     captureFormat = cgs.config()->readEntry( "captureFormat", "JPEG" );
     outputTo = cgs.config()->readEntry( "outputTo", "Documents Folder" );
     prefix = cgs.config()->readEntry( "prefix", "Untitled" );
     appendSettings = cgs.config()->readBoolEntry( "appendSettings", true );
 
     // create action groups
     QAction* a;
     resog = new QActionGroup( 0, "reso", true );
     resog->setToggleAction( true );
     new QAction( " 64 x  48", 0, 0, resog, "64x48", true );
     new QAction( "128 x  96", 0, 0, resog, "128x96", true );
     new QAction( "192 x 144", 0, 0, resog, "192x144", true );
     new QAction( "256 x 192", 0, 0, resog, "256x192", true );
     new QAction( "320 x 240", 0, 0, resog, "320x240", true );
     new QAction( "384 x 288", 0, 0, resog, "384x288", true );
     new QAction( "448 x 336", 0, 0, resog, "448x336", true );
     new QAction( "512 x 384", 0, 0, resog, "512x384", true );
     new QAction( "576 x 432", 0, 0, resog, "576x432", true );
     new QAction( "640 x 480", 0, 0, resog, "640x480", true );
     a = (QAction*) resog->child( QString().sprintf( "%dx%d", captureX>captureY ? captureX:captureY, captureX>captureY ? captureY:captureX ) );
     if ( a ) a->setOn( true );
     else owarn << "can't set resolution" << oendl;
 
     qualityg = new QActionGroup( 0, "quality", true );
     qualityg->setToggleAction( true );
     new QAction( "  0 (&minimal)", 0, 0, qualityg, "0", true );
     new QAction( " 25 (&low)", 0, 0, qualityg, "25", true );
     new QAction( " 50 (&good)", 0, 0, qualityg, "50", true );
     new QAction( " 75 (&better)", 0, 0, qualityg, "75", true );
     new QAction( "100 (bes&t)", 0, 0, qualityg, "100", true );
     a = (QAction*) qualityg->child( QString().sprintf( "%d", quality ) );
     if ( a ) a->setOn( true );
     else owarn << "can't set quality" << oendl;
 
     zoomg = new QActionGroup( 0, "zoom", true );
     zoomg->setToggleAction( true );
     new QAction( "x 1", 0, 0, zoomg, "1", true );
     new QAction( "x 2", 0, 0, zoomg, "2", true );
     a = (QAction*) zoomg->child( QString().sprintf( "%d", zoom ) );
     if ( a ) a->setOn( true );
     else owarn << "can't set zoom" << oendl;
 
     flipg = new QActionGroup( 0, "flip", true );
     flipg->setToggleAction( true );
     new QAction( "Auto (recommended)", 0, 0, flipg, "A", true );
     new QAction( "0 (always off)", 0, 0, flipg, "0", true );
     new QAction( "X (always horizontal)", 0, 0, flipg, "X", true );
     new QAction( "Y (always vertical)", 0, 0, flipg, "Y", true );
     new QAction( "* (always both)", 0, 0, flipg, "*", true );
     a = (QAction*) flipg->child( QString().sprintf( "%s", (const char*) flip ) );
     if ( a ) a->setOn( true );
     else owarn << "can't set flip" << oendl;
 
     outputTog = new QActionGroup( 0, "output", true );
     outputTog->setToggleAction( true );
     new QAction( "/tmp/", 0, 0, outputTog, "/tmp/", true );
     new QAction( "/mnt/card/", 0, 0, outputTog, "/mnt/card/", true );
     new QAction( "/mnt/cf/", 0, 0, outputTog, "/mnt/cf/", true );
     docfolder = new QAction( "Documents Folder", 0, 0, outputTog, "Documents Folder", true );
     custom = new QAction( "&Custom...", 0, 0, outputTog, "custom", true ); //TODO: How to save custom!?
     a = (QAction*) outputTog->child( QString().sprintf( "%s", (const char*) outputTo ) );