-rw-r--r-- | noncore/multimedia/showimg/main.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/showimg/showimg.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/noncore/multimedia/showimg/main.cpp b/noncore/multimedia/showimg/main.cpp index b61cffb..b7ea071 100644 --- a/noncore/multimedia/showimg/main.cpp +++ b/noncore/multimedia/showimg/main.cpp | |||
@@ -14,13 +14,15 @@ | |||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "showimg.h" | 21 | #include "showimg.h" |
22 | 22 | ||
23 | 23 | ||
24 | #include <opie2/oapplicationfactory.h> | 24 | #include <opie2/oapplicationfactory.h> |
25 | 25 | ||
26 | using namespace Opie::Core; | ||
27 | using namespace Opie::Core; | ||
26 | OPIE_EXPORT_APP( OApplicationFactory<ImageViewer> ) | 28 | OPIE_EXPORT_APP( OApplicationFactory<ImageViewer> ) |
diff --git a/noncore/multimedia/showimg/showimg.cpp b/noncore/multimedia/showimg/showimg.cpp index 6c0c4db..696a57b 100644 --- a/noncore/multimedia/showimg/showimg.cpp +++ b/noncore/multimedia/showimg/showimg.cpp | |||
@@ -23,34 +23,35 @@ | |||
23 | // | 23 | // |
24 | 24 | ||
25 | #include "showimg.h" | 25 | #include "showimg.h" |
26 | #include "ImageFileSelector.h" | 26 | #include "ImageFileSelector.h" |
27 | #include "settingsdialog.h" | 27 | #include "settingsdialog.h" |
28 | 28 | ||
29 | 29 | ||
30 | #include <opie2/ofiledialog.h> | 30 | #include <opie2/ofiledialog.h> |
31 | 31 | ||
32 | #include <qpe/qpeapplication.h> | 32 | #include <qpe/qpeapplication.h> |
33 | #include <qpe/config.h> | 33 | #include <qpe/config.h> |
34 | #include <qpe/resource.h> | 34 | #include <qpe/resource.h> |
35 | #include <qpe/qpetoolbar.h> | 35 | #include <qtoolbar.h> |
36 | 36 | ||
37 | #include <qaction.h> | 37 | #include <qaction.h> |
38 | #include <qfiledialog.h> | 38 | #include <qfiledialog.h> |
39 | #include <qmenubar.h> | 39 | #include <qmenubar.h> |
40 | #include <qspinbox.h> | 40 | #include <qspinbox.h> |
41 | 41 | ||
42 | #include <math.h> | 42 | #include <math.h> |
43 | 43 | ||
44 | 44 | ||
45 | using namespace Opie::Ui; | ||
45 | ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent) | 46 | ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent) |
46 | : QDialog(parent,0,true) | 47 | : QDialog(parent,0,true) |
47 | { | 48 | { |
48 | setCaption(caption); | 49 | setCaption(caption); |
49 | 50 | ||
50 | if ( parent ) { | 51 | if ( parent ) { |
51 | setPalette(parent->palette()); | 52 | setPalette(parent->palette()); |
52 | } | 53 | } |
53 | 54 | ||
54 | b=brightness; | 55 | b=brightness; |
55 | img=image; | 56 | img=image; |
56 | 57 | ||
@@ -514,25 +515,25 @@ void ImageViewer::show(const QString& fileref) | |||
514 | filename = fileref; | 515 | filename = fileref; |
515 | updateCaption( fileref ); | 516 | updateCaption( fileref ); |
516 | loadImage( fileref ); | 517 | loadImage( fileref ); |
517 | } | 518 | } |
518 | } | 519 | } |
519 | 520 | ||
520 | void ImageViewer::openFile() { | 521 | void ImageViewer::openFile() { |
521 | MimeTypes types; | 522 | MimeTypes types; |
522 | QStringList image; | 523 | QStringList image; |
523 | image << "image/*"; | 524 | image << "image/*"; |
524 | types.insert("Images", image); | 525 | types.insert("Images", image); |
525 | 526 | ||
526 | QString str = Opie::OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 ); | 527 | QString str = OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 ); |
527 | DocLnk link(str); | 528 | DocLnk link(str); |
528 | // if ( link.isValid() ) | 529 | // if ( link.isValid() ) |
529 | openFile(link); | 530 | openFile(link); |
530 | 531 | ||
531 | } | 532 | } |
532 | 533 | ||
533 | void ImageViewer::openFile( const DocLnk &link ) | 534 | void ImageViewer::openFile( const DocLnk &link ) |
534 | { | 535 | { |
535 | closeFileSelector(); | 536 | closeFileSelector(); |
536 | // DocLnk link(file); | 537 | // DocLnk link(file); |
537 | qDebug("open "+link.name()); | 538 | qDebug("open "+link.name()); |
538 | updateCaption( link.name() ); | 539 | updateCaption( link.name() ); |