author | mickeyl <mickeyl> | 2004-03-02 15:53:21 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-03-02 15:53:21 (UTC) |
commit | 5a384bdb8bec87955ee18c08463abb386f3755fd (patch) (unidiff) | |
tree | e500ddde1e5f31ee1c52e67309f82b1d97ca5c76 | |
parent | 1e88bf8b55fa51d9b7989930f29f404e5ec50bc1 (diff) | |
download | opie-5a384bdb8bec87955ee18c08463abb386f3755fd.zip opie-5a384bdb8bec87955ee18c08463abb386f3755fd.tar.gz opie-5a384bdb8bec87955ee18c08463abb386f3755fd.tar.bz2 |
revert effects of fixincludes
-rw-r--r-- | noncore/multimedia/camera/gui/mainwindow.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/noncore/multimedia/camera/gui/mainwindow.h b/noncore/multimedia/camera/gui/mainwindow.h index d93cca1..b82c2ca 100644 --- a/noncore/multimedia/camera/gui/mainwindow.h +++ b/noncore/multimedia/camera/gui/mainwindow.h | |||
@@ -1,105 +1,106 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2003 Michael 'Mickey' Lauer. All rights reserved. | 2 | ** Copyright (C) 2003 Michael 'Mickey' Lauer. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Opie Environment. | 4 | ** This file is part of Opie Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
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 | #ifndef MAINWINDOW_H | 16 | #ifndef MAINWINDOW_H |
17 | #define MAINWINDOW_H | 17 | #define MAINWINDOW_H |
18 | 18 | ||
19 | #include <qmainwindow.h> | 19 | #include <qmainwindow.h> |
20 | #include <qimage.h> | 20 | #include <qimage.h> |
21 | #include <qpixmap.h> | 21 | #include <qpixmap.h> |
22 | #include <qdatetime.h> | ||
22 | 23 | ||
23 | class QAction; | 24 | class QAction; |
24 | class QActionGroup; | 25 | class QActionGroup; |
25 | class QIconSet; | 26 | class QIconSet; |
26 | class QTimerEvent; | 27 | class QTimerEvent; |
27 | class QToolButton; | 28 | class QToolButton; |
28 | class QLabel; | 29 | class QLabel; |
29 | class MainWindowBase; | 30 | class MainWindowBase; |
30 | class QCopChannel; | 31 | class QCopChannel; |
31 | class PreviewWidget; | 32 | class PreviewWidget; |
32 | 33 | ||
33 | class CameraMainWindow: public QMainWindow | 34 | class CameraMainWindow: public QMainWindow |
34 | { | 35 | { |
35 | Q_OBJECT | 36 | Q_OBJECT |
36 | 37 | ||
37 | public: | 38 | public: |
38 | CameraMainWindow( QWidget * parent = 0, const char * name = "mainwindow", WFlags f = 0 ); | 39 | CameraMainWindow( QWidget * parent = 0, const char * name = "mainwindow", WFlags f = 0 ); |
39 | virtual ~CameraMainWindow(); | 40 | virtual ~CameraMainWindow(); |
40 | 41 | ||
41 | public slots: | 42 | public slots: |
42 | void changeZoom( int ); | 43 | void changeZoom( int ); |
43 | void systemMessage( const QCString&, const QByteArray& ); | 44 | void systemMessage( const QCString&, const QByteArray& ); |
44 | void showContextMenu(); | 45 | void showContextMenu(); |
45 | void resoMenuItemClicked( QAction* ); | 46 | void resoMenuItemClicked( QAction* ); |
46 | void qualityMenuItemClicked( QAction* ); | 47 | void qualityMenuItemClicked( QAction* ); |
47 | void zoomMenuItemClicked( QAction* ); | 48 | void zoomMenuItemClicked( QAction* ); |
48 | void flipMenuItemClicked( QAction* ); | 49 | void flipMenuItemClicked( QAction* ); |
49 | void outputToMenuItemClicked( QAction* ); | 50 | void outputToMenuItemClicked( QAction* ); |
50 | void outputMenuItemClicked( QAction* ); | 51 | void outputMenuItemClicked( QAction* ); |
51 | void prefixItemChoosen(); | 52 | void prefixItemChoosen(); |
52 | void appendSettingsChoosen(); | 53 | void appendSettingsChoosen(); |
53 | void shutterClicked(); | 54 | void shutterClicked(); |
54 | 55 | ||
55 | void updateCaption(); | 56 | void updateCaption(); |
56 | 57 | ||
57 | protected: | 58 | protected: |
58 | void init(); | 59 | void init(); |
59 | void startVideoCapture(); | 60 | void startVideoCapture(); |
60 | void stopVideoCapture(); | 61 | void stopVideoCapture(); |
61 | void postProcessVideo( const QString&, const QString& ); | 62 | void postProcessVideo( const QString&, const QString& ); |
62 | void performCapture( const QString& ); | 63 | void performCapture( const QString& ); |
63 | 64 | ||
64 | virtual void timerEvent( QTimerEvent* ); | 65 | virtual void timerEvent( QTimerEvent* ); |
65 | 66 | ||
66 | protected slots: | 67 | protected slots: |
67 | void doSomething(); // solely for debugging purposes | 68 | void doSomething(); // solely for debugging purposes |
68 | 69 | ||
69 | private: | 70 | private: |
70 | PreviewWidget* preview; | 71 | PreviewWidget* preview; |
71 | int _rotation; | 72 | int _rotation; |
72 | QCopChannel* _sysChannel; | 73 | QCopChannel* _sysChannel; |
73 | 74 | ||
74 | QActionGroup* resog; | 75 | QActionGroup* resog; |
75 | QActionGroup* qualityg; | 76 | QActionGroup* qualityg; |
76 | QActionGroup* zoomg; | 77 | QActionGroup* zoomg; |
77 | QActionGroup* flipg; | 78 | QActionGroup* flipg; |
78 | QActionGroup* outputTog; | 79 | QActionGroup* outputTog; |
79 | QAction* custom; | 80 | QAction* custom; |
80 | QAction* docfolder; | 81 | QAction* docfolder; |
81 | QActionGroup* outputg; | 82 | QActionGroup* outputg; |
82 | 83 | ||
83 | QString flip; | 84 | QString flip; |
84 | int quality; | 85 | int quality; |
85 | int zoom; | 86 | int zoom; |
86 | int captureX; | 87 | int captureX; |
87 | int captureY; | 88 | int captureY; |
88 | QString captureFormat; | 89 | QString captureFormat; |
89 | 90 | ||
90 | QString outputTo; | 91 | QString outputTo; |
91 | QString prefix; | 92 | QString prefix; |
92 | bool appendSettings; | 93 | bool appendSettings; |
93 | 94 | ||
94 | bool _capturing; | 95 | bool _capturing; |
95 | int _pics; | 96 | int _pics; |
96 | int _videos; | 97 | int _videos; |
97 | 98 | ||
98 | QTime _time; | 99 | QTime _time; |
99 | int _videopics; | 100 | int _videopics; |
100 | int _capturefd; | 101 | int _capturefd; |
101 | int _framerate; | 102 | int _framerate; |
102 | unsigned char* _capturebuf; | 103 | unsigned char* _capturebuf; |
103 | }; | 104 | }; |
104 | 105 | ||
105 | #endif | 106 | #endif |