author | mickeyl <mickeyl> | 2003-10-27 20:26:56 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-27 20:26:56 (UTC) |
commit | 1fed961e25a6afd4070d8873b431aba8342406c3 (patch) (unidiff) | |
tree | 8ef9a1b3ad5cf50406ac500ccfb77cff60b77796 /noncore | |
parent | 651d29249946e7221fc85580453750d9e4be4fb0 (diff) | |
download | opie-1fed961e25a6afd4070d8873b431aba8342406c3.zip opie-1fed961e25a6afd4070d8873b431aba8342406c3.tar.gz opie-1fed961e25a6afd4070d8873b431aba8342406c3.tar.bz2 |
merge noncore/multimedia/showimg
- opieplayer2 and opierec generate lots of conflicts in merge
I'll gladly leave that to the experts ljp and Harlekin ;)
-rw-r--r-- | noncore/multimedia/showimg/main.cpp | 10 | ||||
-rw-r--r-- | noncore/multimedia/showimg/showimg.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/showimg/showimg.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/showimg/showimg.pro | 4 |
4 files changed, 8 insertions, 13 deletions
diff --git a/noncore/multimedia/showimg/main.cpp b/noncore/multimedia/showimg/main.cpp index c28cc85..efb1c68 100644 --- a/noncore/multimedia/showimg/main.cpp +++ b/noncore/multimedia/showimg/main.cpp | |||
@@ -22,12 +22,6 @@ | |||
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | 24 | ||
25 | int main( int argc, char **argv ) | 25 | #include <opie/oapplicationfactory.h> |
26 | { | ||
27 | QPEApplication a( argc, argv ); | ||
28 | 26 | ||
29 | ImageViewer w(0, "new window", Qt::WResizeNoErase ); | 27 | OPIE_EXPORT_APP( OApplicationFactory<ImageViewer> ) \ No newline at end of file |
30 | a.showMainDocumentWidget(&w); | ||
31 | |||
32 | return a.exec(); | ||
33 | } | ||
diff --git a/noncore/multimedia/showimg/showimg.cpp b/noncore/multimedia/showimg/showimg.cpp index d6f0733..56bdecf 100644 --- a/noncore/multimedia/showimg/showimg.cpp +++ b/noncore/multimedia/showimg/showimg.cpp | |||
@@ -118,7 +118,9 @@ InfoDialog::InfoDialog(const QString &caption, const QStringList text,QWidget *p | |||
118 | setPalette(parent->palette()); | 118 | setPalette(parent->palette()); |
119 | } | 119 | } |
120 | 120 | ||
121 | const char *labels[]={"File Name","Format","File Size","Size","Colors","Alpha"}; | 121 | |
122 | |||
123 | QString labels[]={ tr("File Name"),tr("Format"),tr("File Size"),tr("Size"),tr("Colors"),tr("Alpha") }; | ||
122 | 124 | ||
123 | setMinimumSize(180,80); | 125 | setMinimumSize(180,80); |
124 | int num=ImageViewer::LAST+1; | 126 | int num=ImageViewer::LAST+1; |
@@ -210,7 +212,7 @@ void ImageWidget::mouseReleaseEvent(QMouseEvent *) | |||
210 | //=========================================================================== | 212 | //=========================================================================== |
211 | 213 | ||
212 | ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags ) | 214 | ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags ) |
213 | : QMainWindow( parent, name, wFlags ), filename( 0 ), bFromDocView( FALSE ) | 215 | : QMainWindow( parent, name, WResizeNoErase ), filename( 0 ), bFromDocView( FALSE ) |
214 | { | 216 | { |
215 | setCaption( tr("Image Viewer") ); | 217 | setCaption( tr("Image Viewer") ); |
216 | setIcon( Resource::loadPixmap( "ImageViewer" ) ); | 218 | setIcon( Resource::loadPixmap( "ImageViewer" ) ); |
diff --git a/noncore/multimedia/showimg/showimg.h b/noncore/multimedia/showimg/showimg.h index 8555ff0..abbd976 100644 --- a/noncore/multimedia/showimg/showimg.h +++ b/noncore/multimedia/showimg/showimg.h | |||
@@ -158,6 +158,7 @@ class ImageViewer : public QMainWindow | |||
158 | { | 158 | { |
159 | Q_OBJECT | 159 | Q_OBJECT |
160 | public: | 160 | public: |
161 | static QString appName() { return QString::fromLatin1("showimg"); } | ||
161 | ImageViewer( QWidget *parent=0, const char *name=0, int wFlags=0 ); | 162 | ImageViewer( QWidget *parent=0, const char *name=0, int wFlags=0 ); |
162 | ~ImageViewer(); | 163 | ~ImageViewer(); |
163 | 164 | ||
diff --git a/noncore/multimedia/showimg/showimg.pro b/noncore/multimedia/showimg/showimg.pro index d369e62..e8d753b 100644 --- a/noncore/multimedia/showimg/showimg.pro +++ b/noncore/multimedia/showimg/showimg.pro | |||
@@ -1,6 +1,4 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on release | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = showimg.h ImageFileSelector.h settingsdialog.h settingsdialogbase.h | 2 | HEADERS = showimg.h ImageFileSelector.h settingsdialog.h settingsdialogbase.h |
5 | SOURCES = main.cpp showimg.cpp ImageFileSelector.cpp settingsdialog.cpp settingsdialogbase.cpp | 3 | SOURCES = main.cpp showimg.cpp ImageFileSelector.cpp settingsdialog.cpp settingsdialogbase.cpp |
6 | TARGET = showimg | 4 | TARGET = showimg |