Diffstat (limited to 'noncore/multimedia/camera/gui/mainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/camera/gui/mainwindow.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/noncore/multimedia/camera/gui/mainwindow.cpp b/noncore/multimedia/camera/gui/mainwindow.cpp index e4e1b6c..7f2a9bd 100644 --- a/noncore/multimedia/camera/gui/mainwindow.cpp +++ b/noncore/multimedia/camera/gui/mainwindow.cpp | |||
@@ -19,25 +19,24 @@ | |||
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 <qpe/global.h> | 28 | #include <qpe/global.h> |
29 | #include <qpe/resource.h> | 29 | #include <qpe/resource.h> |
30 | #include <qpe/qcopenvelope_qws.h> | 30 | #include <qpe/qcopenvelope_qws.h> |
31 | using namespace Opie; | ||
32 | 31 | ||
33 | /* QT */ | 32 | /* QT */ |
34 | #include <qapplication.h> | 33 | #include <qapplication.h> |
35 | #include <qaction.h> | 34 | #include <qaction.h> |
36 | #include <qvbox.h> | 35 | #include <qvbox.h> |
37 | #include <qcombobox.h> | 36 | #include <qcombobox.h> |
38 | #include <qcursor.h> | 37 | #include <qcursor.h> |
39 | #include <qdatastream.h> | 38 | #include <qdatastream.h> |
40 | #include <qdir.h> | 39 | #include <qdir.h> |
41 | #include <qfile.h> | 40 | #include <qfile.h> |
42 | #include <qimage.h> | 41 | #include <qimage.h> |
43 | #include <qlabel.h> | 42 | #include <qlabel.h> |
@@ -55,24 +54,28 @@ using namespace Opie; | |||
55 | #include <sys/stat.h> | 54 | #include <sys/stat.h> |
56 | #include <fcntl.h> | 55 | #include <fcntl.h> |
57 | #include <string.h> | 56 | #include <string.h> |
58 | #include <errno.h> | 57 | #include <errno.h> |
59 | #include <unistd.h> | 58 | #include <unistd.h> |
60 | 59 | ||
61 | #define CAPTUREFILE "/tmp/capture.dat" | 60 | #define CAPTUREFILE "/tmp/capture.dat" |
62 | #define OUTPUTFILE "/tmp/output.avi" | 61 | #define OUTPUTFILE "/tmp/output.avi" |
63 | 62 | ||
64 | #define OUTPUT_TO_CUSTOM 250 | 63 | #define OUTPUT_TO_CUSTOM 250 |
65 | #define OUTPUT_TO_DOCFOLDER 251 | 64 | #define OUTPUT_TO_DOCFOLDER 251 |
66 | 65 | ||
66 | |||
67 | using namespace Opie::Ui; | ||
68 | using namespace Opie::Core; | ||
69 | |||
67 | CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags f ) | 70 | CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags f ) |
68 | :QMainWindow( parent, name, f ), | 71 | :QMainWindow( parent, name, f ), |
69 | _rotation( 270 ), // FIXME: get this from current settings (ODevice?) | 72 | _rotation( 270 ), // FIXME: get this from current settings (ODevice?) |
70 | _capturing( false ), | 73 | _capturing( false ), |
71 | _pics( 1 ), _videos( 1 ) | 74 | _pics( 1 ), _videos( 1 ) |
72 | { | 75 | { |
73 | #ifdef QT_NO_DEBUG | 76 | #ifdef QT_NO_DEBUG |
74 | if ( !ZCameraIO::instance()->isOpen() ) | 77 | if ( !ZCameraIO::instance()->isOpen() ) |
75 | { | 78 | { |
76 | QVBox* v = new QVBox( this ); | 79 | QVBox* v = new QVBox( this ); |
77 | v->setMargin( 10 ); | 80 | v->setMargin( 10 ); |
78 | QLabel* l1 = new QLabel( v ); | 81 | QLabel* l1 = new QLabel( v ); |