author | drw <drw> | 2005-05-24 21:07:23 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-24 21:07:23 (UTC) |
commit | 7b809e61a3ec2afe898dd9d721efb981abffb0ca (patch) (unidiff) | |
tree | 780a542f961fb3b7e743b3c9593b1839f0e6ddb7 | |
parent | 82a7658f6ff0c82cdba2088b70bd2a05aeb85fd6 (diff) | |
download | opie-7b809e61a3ec2afe898dd9d721efb981abffb0ca.zip opie-7b809e61a3ec2afe898dd9d721efb981abffb0ca.tar.gz opie-7b809e61a3ec2afe898dd9d721efb981abffb0ca.tar.bz2 |
Resource -> OResource and .cvsignore updates
-rw-r--r-- | noncore/multimedia/camera/cmd/.cvsignore | 4 | ||||
-rw-r--r-- | noncore/multimedia/camera/gui/.cvsignore | 4 | ||||
-rw-r--r-- | noncore/multimedia/camera/gui/mainwindow.cpp | 8 | ||||
-rw-r--r-- | noncore/multimedia/camera/lib/.cvsignore | 4 |
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 @@ | |||
1 | moc | 1 | *moc |
2 | obj | 2 | *obj |
3 | config.in | 3 | config.in |
4 | Makefile | 4 | Makefile |
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 |
2 | moc | 2 | *moc |
3 | obj | 3 | *obj |
4 | config.in | 4 | config.in |
5 | Makefile | 5 | Makefile |
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 | |||
@@ -22,14 +22,14 @@ | |||
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> |
@@ -76,13 +76,13 @@ CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags | |||
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 ); |
@@ -235,13 +235,13 @@ void CameraMainWindow::systemMessage( const QCString& msg, const QByteArray& dat | |||
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; |
@@ -330,13 +330,13 @@ void CameraMainWindow::resoMenuItemClicked( QAction* a ) | |||
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 | ||
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 |
2 | moc | 2 | *moc |
3 | obj | 3 | *obj |
4 | config.in | 4 | config.in |
5 | Makefile | 5 | Makefile |
6 | 6 | ||