summaryrefslogtreecommitdiff
path: root/noncore/multimedia/camera/gui
Unidiff
Diffstat (limited to 'noncore/multimedia/camera/gui') (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/camera/gui/main.cpp2
-rw-r--r--noncore/multimedia/camera/gui/mainwindow.cpp5
2 files changed, 6 insertions, 1 deletions
diff --git a/noncore/multimedia/camera/gui/main.cpp b/noncore/multimedia/camera/gui/main.cpp
index f25475c..7d6b3bb 100644
--- a/noncore/multimedia/camera/gui/main.cpp
+++ b/noncore/multimedia/camera/gui/main.cpp
@@ -10,15 +10,17 @@
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16
16#include "mainwindow.h" 17#include "mainwindow.h"
17#include <opie2/oapplication.h> 18#include <opie2/oapplication.h>
18 19
20using namespace Opie::Core;
19int main( int argc, char **argv ) 21int main( int argc, char **argv )
20{ 22{
21 OApplication a( argc, argv, "Opie-Camera" ); 23 OApplication a( argc, argv, "Opie-Camera" );
22 CameraMainWindow* w = new CameraMainWindow(); 24 CameraMainWindow* w = new CameraMainWindow();
23 a.showMainWidget( w ); 25 a.showMainWidget( w );
24 a.exec(); 26 a.exec();
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
@@ -25,13 +25,12 @@
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>
31using 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>
@@ -61,12 +60,16 @@ using namespace Opie;
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
67using namespace Opie::Ui;
68using namespace Opie::Core;
69
67CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags f ) 70CameraMainWindow::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{