summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/camera/cmd/.cvsignore4
-rw-r--r--noncore/multimedia/camera/gui/.cvsignore4
-rw-r--r--noncore/multimedia/camera/gui/mainwindow.cpp8
-rw-r--r--noncore/multimedia/camera/lib/.cvsignore4
4 files changed, 10 insertions, 10 deletions
diff --git a/noncore/multimedia/camera/cmd/.cvsignore b/noncore/multimedia/camera/cmd/.cvsignore
index 737c5b2..e5aacf6 100644
--- a/noncore/multimedia/camera/cmd/.cvsignore
+++ b/noncore/multimedia/camera/cmd/.cvsignore
@@ -1,5 +1,5 @@
1moc 1*moc
2obj 2*obj
3config.in 3config.in
4Makefile 4Makefile
5 5
diff --git a/noncore/multimedia/camera/gui/.cvsignore b/noncore/multimedia/camera/gui/.cvsignore
index 2a3a7a8..8e95df7 100644
--- a/noncore/multimedia/camera/gui/.cvsignore
+++ b/noncore/multimedia/camera/gui/.cvsignore
@@ -1,6 +1,6 @@
1*.pro 1*.pro
2moc 2*moc
3obj 3*obj
4config.in 4config.in
5Makefile 5Makefile
6 6
diff --git a/noncore/multimedia/camera/gui/mainwindow.cpp b/noncore/multimedia/camera/gui/mainwindow.cpp
index bde448d..b2fcc6c 100644
--- a/noncore/multimedia/camera/gui/mainwindow.cpp
+++ b/noncore/multimedia/camera/gui/mainwindow.cpp
@@ -16,26 +16,26 @@
16#include "mainwindow.h" 16#include "mainwindow.h"
17#include "previewwidget.h" 17#include "previewwidget.h"
18#include "zcameraio.h" 18#include "zcameraio.h"
19#include "imageio.h" 19#include "imageio.h"
20#include "avi.h" 20#include "avi.h"
21 21
22/* OPIE */ 22/* OPIE */
23#include <opie2/ofiledialog.h> 23#include <opie2/ofiledialog.h>
24#include <opie2/odevice.h> 24#include <opie2/odevice.h>
25#include <opie2/oapplication.h> 25#include <opie2/oapplication.h>
26#include <opie2/oconfig.h> 26#include <opie2/oconfig.h>
27#include <opie2/odebug.h> 27#include <opie2/odebug.h>
28#include <opie2/oresource.h>
28#include <qpe/global.h> 29#include <qpe/global.h>
29#include <qpe/resource.h>
30#include <qpe/qcopenvelope_qws.h> 30#include <qpe/qcopenvelope_qws.h>
31 31
32/* QT */ 32/* QT */
33#include <qapplication.h> 33#include <qapplication.h>
34#include <qaction.h> 34#include <qaction.h>
35#include <qvbox.h> 35#include <qvbox.h>
36#include <qcombobox.h> 36#include <qcombobox.h>
37#include <qcursor.h> 37#include <qcursor.h>
38#include <qdatastream.h> 38#include <qdatastream.h>
39#include <qdir.h> 39#include <qdir.h>
40#include <qfile.h> 40#include <qfile.h>
41#include <qimage.h> 41#include <qimage.h>
@@ -70,25 +70,25 @@ using namespace Opie::Core;
70CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags f ) 70CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags f )
71 :QMainWindow( parent, name, f ), 71 :QMainWindow( parent, name, f ),
72 _rotation( 270 ), // FIXME: get this from current settings (ODevice?) 72 _rotation( 270 ), // FIXME: get this from current settings (ODevice?)
73 _capturing( false ), 73 _capturing( false ),
74 _pics( 1 ), _videos( 1 ) 74 _pics( 1 ), _videos( 1 )
75{ 75{
76 #ifdef QT_NO_DEBUG 76 #ifdef QT_NO_DEBUG
77 if ( !ZCameraIO::instance()->isOpen() ) 77 if ( !ZCameraIO::instance()->isOpen() )
78 { 78 {
79 QVBox* v = new QVBox( this ); 79 QVBox* v = new QVBox( this );
80 v->setMargin( 10 ); 80 v->setMargin( 10 );
81 QLabel* l1 = new QLabel( v ); 81 QLabel* l1 = new QLabel( v );
82 l1->setPixmap( Resource::loadPixmap( "camera/error" ) ); 82 l1->setPixmap( Opie::Core::OResource::loadPixmap( "camera/error", Opie::Core::OResource::SmallIcon ) );
83 QLabel* l2 = new QLabel( v ); 83 QLabel* l2 = new QLabel( v );
84 l2->setText( "<b>Sorry. could not detect your camera :-(</b><p>" 84 l2->setText( "<b>Sorry. could not detect your camera :-(</b><p>"
85 "* Is the sharpzdc_cs module loaded ?<br>" 85 "* Is the sharpzdc_cs module loaded ?<br>"
86 "* Is /dev/sharpzdc read/writable ?<p>" ); 86 "* Is /dev/sharpzdc read/writable ?<p>" );
87 connect( new QPushButton( "Exit", v ), SIGNAL( clicked() ), this, SLOT( close() ) ); 87 connect( new QPushButton( "Exit", v ), SIGNAL( clicked() ), this, SLOT( close() ) );
88 setCentralWidget( v ); 88 setCentralWidget( v );
89 return; 89 return;
90 } 90 }
91 #endif 91 #endif
92 92
93 init(); 93 init();
94 94
@@ -229,25 +229,25 @@ void CameraMainWindow::systemMessage( const QCString& msg, const QByteArray& dat
229 odebug << "received system message: " << msg << oendl; 229 odebug << "received system message: " << msg << oendl;
230 if ( msg == "setCurrentRotation(int)" ) 230 if ( msg == "setCurrentRotation(int)" )
231 { 231 {
232 stream >> _newrotation; 232 stream >> _newrotation;
233 odebug << "received setCurrentRotation(" << _newrotation << ")" << oendl; 233 odebug << "received setCurrentRotation(" << _newrotation << ")" << oendl;
234 234
235 switch ( _newrotation ) 235 switch ( _newrotation )
236 { 236 {
237 case 270: preview->resize( QSize( 240, 288 ) ); break; 237 case 270: preview->resize( QSize( 240, 288 ) ); break;
238 case 180: preview->resize( QSize( 320, 208 ) ); break; 238 case 180: preview->resize( QSize( 320, 208 ) ); break;
239 default: QMessageBox::warning( this, "opie-camera", 239 default: QMessageBox::warning( this, "opie-camera",
240 "This rotation is not supported.\n" 240 "This rotation is not supported.\n"
241 "Supported are 180° and 270°" ); 241 "Supported are 180 and 270" );
242 } 242 }
243 243
244 if ( _newrotation != _rotation ) 244 if ( _newrotation != _rotation )
245 { 245 {
246 int tmp = captureX; 246 int tmp = captureX;
247 captureX = captureY; 247 captureX = captureY;
248 captureY = tmp; 248 captureY = tmp;
249 _rotation = _newrotation; 249 _rotation = _newrotation;
250 } 250 }
251 251
252 updateCaption(); 252 updateCaption();
253 253
@@ -324,25 +324,25 @@ void CameraMainWindow::resoMenuItemClicked( QAction* a )
324 switch ( _rotation ) 324 switch ( _rotation )
325 { 325 {
326 case 270: 326 case 270:
327 captureY = a->text().left(3).toInt(); 327 captureY = a->text().left(3).toInt();
328 captureX = a->text().right(3).toInt(); 328 captureX = a->text().right(3).toInt();
329 break; 329 break;
330 case 180: 330 case 180:
331 captureX = a->text().left(3).toInt(); 331 captureX = a->text().left(3).toInt();
332 captureY = a->text().right(3).toInt(); 332 captureY = a->text().right(3).toInt();
333 break; 333 break;
334 default: QMessageBox::warning( this, "opie-camera", 334 default: QMessageBox::warning( this, "opie-camera",
335 "This rotation is not supported.\n" 335 "This rotation is not supported.\n"
336 "Supported are 180° and 270°" ); 336 "Supported are 180 and 270" );
337 } 337 }
338 odebug << "Capture Resolution now: " << captureX << ", " << captureY << oendl; 338 odebug << "Capture Resolution now: " << captureX << ", " << captureY << oendl;
339 updateCaption(); 339 updateCaption();
340} 340}
341 341
342 342
343void CameraMainWindow::qualityMenuItemClicked( QAction* a ) 343void CameraMainWindow::qualityMenuItemClicked( QAction* a )
344{ 344{
345 quality = a->text().left(3).toInt(); 345 quality = a->text().left(3).toInt();
346 odebug << "Quality now: " << quality << oendl; 346 odebug << "Quality now: " << quality << oendl;
347 updateCaption(); 347 updateCaption();
348} 348}
diff --git a/noncore/multimedia/camera/lib/.cvsignore b/noncore/multimedia/camera/lib/.cvsignore
index 2a3a7a8..8e95df7 100644
--- a/noncore/multimedia/camera/lib/.cvsignore
+++ b/noncore/multimedia/camera/lib/.cvsignore
@@ -1,6 +1,6 @@
1*.pro 1*.pro
2moc 2*moc
3obj 3*obj
4config.in 4config.in
5Makefile 5Makefile
6 6