-rw-r--r-- | noncore/multimedia/camera/mainwindow.cpp | 36 | ||||
-rw-r--r-- | noncore/multimedia/camera/mainwindow.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/camera/zcameraio.cpp | 10 | ||||
-rw-r--r-- | noncore/multimedia/camera/zcameraio.h | 2 |
4 files changed, 42 insertions, 8 deletions
diff --git a/noncore/multimedia/camera/mainwindow.cpp b/noncore/multimedia/camera/mainwindow.cpp index 7080e63..34ebe9e 100644 --- a/noncore/multimedia/camera/mainwindow.cpp +++ b/noncore/multimedia/camera/mainwindow.cpp | |||
@@ -21,5 +21,8 @@ | |||
21 | #include <qcombobox.h> | 21 | #include <qcombobox.h> |
22 | #include <qcursor.h> | ||
22 | #include <qdatastream.h> | 23 | #include <qdatastream.h> |
23 | #include <qpushbutton.h> | ||
24 | #include <qlabel.h> | 24 | #include <qlabel.h> |
25 | #include <qpopupmenu.h> | ||
26 | #include <qpushbutton.h> | ||
27 | #include <qmessagebox.h> | ||
25 | #include <qdirectpainter_qws.h> | 28 | #include <qdirectpainter_qws.h> |
@@ -36,2 +39,17 @@ CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags | |||
36 | { | 39 | { |
40 | if ( !ZCameraIO::instance()->isOpen() ) | ||
41 | { | ||
42 | QVBox* v = new QVBox( this ); | ||
43 | v->setMargin( 10 ); | ||
44 | QLabel* l1 = new QLabel( v ); | ||
45 | l1->setPixmap( Resource::loadPixmap( "camera/error" ) ); | ||
46 | QLabel* l2 = new QLabel( v ); | ||
47 | l2->setText( "<b>Sorry. could not detect your camera :-(</b><p>" | ||
48 | "* Is the sharpzdc_cs module loaded ?<br>" | ||
49 | "* Is /dev/sharpzdc read/writable ?<p>" ); | ||
50 | connect( new QPushButton( "Exit", v ), SIGNAL( clicked() ), this, SLOT( close() ) ); | ||
51 | setCentralWidget( v ); | ||
52 | return; | ||
53 | } | ||
54 | |||
37 | _rotation = 270; //TODO: grab these from the actual settings | 55 | _rotation = 270; //TODO: grab these from the actual settings |
@@ -48,2 +66,3 @@ CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags | |||
48 | 66 | ||
67 | connect( preview, SIGNAL( contextMenuRequested() ), this, SLOT( showContextMenu() ) ); | ||
49 | }; | 68 | }; |
@@ -69,3 +88,5 @@ void CameraMainWindow::systemMessage( const QCString& msg, const QByteArray& dat | |||
69 | case 180: preview->resize( QSize( 320, 208 ) ); break; | 88 | case 180: preview->resize( QSize( 320, 208 ) ); break; |
70 | default: assert( 0 ); // not yet handled | 89 | default: QMessageBox::warning( this, "opie-camera", |
90 | "This rotation is not supported.\n" | ||
91 | "Supported are 180° and 270°" ); | ||
71 | } | 92 | } |
@@ -89 +110,12 @@ void CameraMainWindow::changeZoom( int zoom ) | |||
89 | 110 | ||
111 | |||
112 | void CameraMainWindow::showContextMenu() | ||
113 | { | ||
114 | QPopupMenu m( this ); | ||
115 | m.insertItem( "Item 1" ); | ||
116 | m.insertItem( "Item 1" ); | ||
117 | m.insertItem( "Item 1" ); | ||
118 | m.insertItem( "Item 1" ); | ||
119 | m.exec( QCursor::pos() ); | ||
120 | } | ||
121 | |||
diff --git a/noncore/multimedia/camera/mainwindow.h b/noncore/multimedia/camera/mainwindow.h index cc12840..df66204 100644 --- a/noncore/multimedia/camera/mainwindow.h +++ b/noncore/multimedia/camera/mainwindow.h | |||
@@ -42,2 +42,4 @@ class CameraMainWindow: public QMainWindow | |||
42 | 42 | ||
43 | void showContextMenu(); | ||
44 | |||
43 | protected: | 45 | protected: |
diff --git a/noncore/multimedia/camera/zcameraio.cpp b/noncore/multimedia/camera/zcameraio.cpp index 51771a5..b37ae8c 100644 --- a/noncore/multimedia/camera/zcameraio.cpp +++ b/noncore/multimedia/camera/zcameraio.cpp | |||
@@ -77,3 +77,3 @@ ZCameraIO::~ZCameraIO() | |||
77 | 77 | ||
78 | inline bool ZCameraIO::isOpen() const | 78 | bool ZCameraIO::isOpen() const |
79 | { | 79 | { |
@@ -83,3 +83,3 @@ inline bool ZCameraIO::isOpen() const | |||
83 | 83 | ||
84 | inline bool ZCameraIO::isShutterPressed() | 84 | bool ZCameraIO::isShutterPressed() |
85 | { | 85 | { |
@@ -90,3 +90,3 @@ inline bool ZCameraIO::isShutterPressed() | |||
90 | 90 | ||
91 | inline bool ZCameraIO::isFinderReversed() const | 91 | bool ZCameraIO::isFinderReversed() const |
92 | { | 92 | { |
@@ -96,3 +96,3 @@ inline bool ZCameraIO::isFinderReversed() const | |||
96 | 96 | ||
97 | inline bool ZCameraIO::isCapturing() const | 97 | bool ZCameraIO::isCapturing() const |
98 | { | 98 | { |
@@ -102,3 +102,3 @@ inline bool ZCameraIO::isCapturing() const | |||
102 | 102 | ||
103 | inline bool ZCameraIO::isAvailable() const | 103 | bool ZCameraIO::isAvailable() const |
104 | { | 104 | { |
diff --git a/noncore/multimedia/camera/zcameraio.h b/noncore/multimedia/camera/zcameraio.h index bc4926b..9d4b1d7 100644 --- a/noncore/multimedia/camera/zcameraio.h +++ b/noncore/multimedia/camera/zcameraio.h | |||
@@ -40,4 +40,4 @@ class ZCameraIO | |||
40 | bool isFinderReversed() const; | 40 | bool isFinderReversed() const; |
41 | |||
42 | bool isOpen() const; | 41 | bool isOpen() const; |
42 | |||
43 | bool snapshot( QImage* ); | 43 | bool snapshot( QImage* ); |