summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/showimg/main.cpp10
-rw-r--r--noncore/multimedia/showimg/showimg.cpp90
-rw-r--r--noncore/multimedia/showimg/showimg.h1
-rw-r--r--noncore/multimedia/showimg/showimg.pro4
4 files changed, 50 insertions, 55 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
@@ -23,11 +23,5 @@
#include <qpe/qpeapplication.h>
-int main( int argc, char **argv )
-{
- QPEApplication a( argc, argv );
-
- ImageViewer w(0, "new window", Qt::WResizeNoErase );
- a.showMainDocumentWidget(&w);
+#include <opie/oapplicationfactory.h>
- return a.exec();
-}
+OPIE_EXPORT_APP( OApplicationFactory<ImageViewer> ) \ No newline at end of file
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
@@ -27,5 +27,5 @@
#include "settingsdialog.h"
-
+
#include <opie/ofiledialog.h>
@@ -76,9 +76,9 @@ ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightne
pixmap->setPixmap(pm);
pixmap->setMinimumSize(pm.width(),pm.height());
- gl->addMultiCellWidget(pixmap,0,0,0,2,AlignCenter);
+ gl->addMultiCellWidget(pixmap,0,0,0,2,AlignCenter);
QLabel *l=new QLabel(tr("Brightness")+":",this);
- gl->addWidget(l,1,0,AlignLeft);
- spb=new QSpinBox(-100,100,2,this);
- gl->addWidget(spb,1,1,AlignRight);
+ gl->addWidget(l,1,0,AlignLeft);
+ spb=new QSpinBox(-100,100,2,this);
+ gl->addWidget(spb,1,1,AlignRight);
spb->setValue(0);
@@ -103,5 +103,5 @@ void ControlsDialog::bValueChanged(int value)
void ControlsDialog::accept()
{
- *b=spb->value();
+ *b=spb->value();
done(1);
}
@@ -119,5 +119,7 @@ InfoDialog::InfoDialog(const QString &caption, const QStringList text,QWidget *p
}
- const char *labels[]={"File Name","Format","File Size","Size","Colors","Alpha"};
+
+
+ QString labels[]={ tr("File Name"),tr("Format"),tr("File Size"),tr("Size"),tr("Colors"),tr("Alpha") };
setMinimumSize(180,80);
@@ -134,10 +136,10 @@ InfoDialog::InfoDialog(const QString &caption, const QStringList text,QWidget *p
QFrame *frm=new QFrame(this);
frm->setFrameStyle(QFrame::HLine|QFrame::Sunken);
- gl->addMultiCellWidget(frm,i,i,0,1);
+ gl->addMultiCellWidget(frm,i,i,0,1);
}
else
{
- l=new QLabel(tr(labels[count])+":",this);
- gl->addWidget(l,i,0,AlignLeft);
+ l=new QLabel( tr( labels[count] )+":",this);
+ gl->addWidget(l,i,0,AlignLeft);
l=new QLabel(text[count],this);
gl->addWidget(l,i,1,AlignRight);
@@ -145,5 +147,5 @@ InfoDialog::InfoDialog(const QString &caption, const QStringList text,QWidget *p
}
- }
+ }
}
@@ -154,5 +156,5 @@ void InfoDialog::displayInfo(const QString &caption, const QStringList text, QWi
dlg->exec();
delete dlg;
-}
+}
//===========================================================================
@@ -211,5 +213,5 @@ void ImageWidget::mouseReleaseEvent(QMouseEvent *)
ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
-: QMainWindow( parent, name, wFlags ), filename( 0 ), bFromDocView( FALSE )
+: QMainWindow( parent, name, WResizeNoErase ), filename( 0 ), bFromDocView( FALSE )
{
setCaption( tr("Image Viewer") );
@@ -242,9 +244,9 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
viewMenuFile = new QPopupMenu( this );
- //menubarFile->insertItem( tr("View"), viewMenu );
+ //menubarFile->insertItem( tr("View"), viewMenu );
viewMenuFile->insertItem( tr("Thumbnail View"),
this, SLOT(switchThumbView()), 0, SHOW_THUMBNAILS );
-
- viewMenuFile->setItemChecked ( SHOW_THUMBNAILS, showThumbView );
+
+ viewMenuFile->setItemChecked ( SHOW_THUMBNAILS, showThumbView );
@@ -270,12 +272,12 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
fileMenuView = new QPopupMenu( this );
- //menubarView->insertItem( tr("File"),fileMenu );
+ //menubarView->insertItem( tr("File"),fileMenu );
fileMenuView->insertItem( tr("Image Info ..."),this, SLOT(displayInfoDialog()),0 );
- fileMenuView->insertSeparator();
+ fileMenuView->insertSeparator();
viewMenuView = new QPopupMenu(this );
- viewMenuView->setCheckable ( true );
+ viewMenuView->setCheckable ( true );
- //menubarView->insertItem( tr("View"),viewMenu );
+ //menubarView->insertItem( tr("View"),viewMenu );
viewMenuView->insertItem(tr("Horizontal flip"), this, SLOT(hFlip()), 0);
viewMenuView->insertItem(tr("Vertical flip"), this, SLOT(vFlip()), 0);
@@ -286,5 +288,5 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
- imagePanel = new ImagePane( stack );
+ imagePanel = new ImagePane( stack );
connect(imagePanel, SIGNAL(clicked()), this, SLOT(normalView()));
@@ -298,8 +300,8 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
qDebug("cv = %d",cv);
- fileSelector = new ImageFileSelector( cv,stack, "fs");
-
+ fileSelector = new ImageFileSelector( cv,stack, "fs");
+
//switchThumbView();
-
+
//fileSelector = new ImageFileSelector("image/*", stack, "fs");
@@ -320,5 +322,5 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
connect( a, SIGNAL( activated() ), this, SLOT( open() ) );
a->addTo( fileMenuView);
- a->addTo( iconToolBar );
+ a->addTo( iconToolBar );
@@ -352,5 +354,5 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
sss->addTo( viewMenuView );
- sss->setOn(isSized);
+ sss->setOn(isSized);
viewMenuView->insertSeparator();
@@ -383,7 +385,7 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
switchToFileSelector();
- setMouseTracking( TRUE );
+ setMouseTracking( TRUE );
+
-
}
@@ -392,5 +394,5 @@ ImageViewer::~ImageViewer()
Config cfg("Image Viewer");
cfg.setGroup("Image Viewer");
-
+
cfg.writeEntry("ShowThumbnails",(int)showThumbView);
cfg.writeEntry("SizeToScreen",(int)isSized);
@@ -464,5 +466,5 @@ void ImageViewer::switchThumbView()
viewMenuFile->setItemChecked ( SHOW_THUMBNAILS, showThumbView );
fileSelector->switchView();
-
+
}
@@ -498,5 +500,5 @@ void ImageViewer::setDocument(const QString& fileref)
{
delayLoad = fileref;
- switchToImageView();
+ switchToImageView();
QTimer::singleShot( 0, this, SLOT(doDelayedLoad()) );
}
@@ -533,5 +535,5 @@ void ImageViewer::openFile() {
image << "image/*";
types.insert("Images", image);
-
+
QString str = OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 );
DocLnk link(str);
@@ -551,5 +553,5 @@ void ImageViewer::openFile( const DocLnk &link )
slideTimer->start(slideDelay * 1000, FALSE);
}
-
+
}
@@ -561,5 +563,5 @@ void ImageViewer::open()
void ImageViewer::closeFileSelector()
{
- switchToImageView();
+ switchToImageView();
}
@@ -583,5 +585,5 @@ void ImageViewer::loadImage( const char *fileName )
//imagePanel->statusLabel()->setText( tr("Loading image...") );
qApp->processEvents();
- bool ok = image.load(filename, 0);
+ bool ok = image.load(filename, 0);
if ( ok ) {
ok = reconvertImage();
@@ -598,5 +600,5 @@ void ImageViewer::loadImage( const char *fileName )
// fastLoad ? QMAX(imagewidth/maxsize, imageheight/maxsize) : 1);
-
+
// matrix.reset();
rotated90 = FALSE;
@@ -604,8 +606,8 @@ void ImageViewer::loadImage( const char *fileName )
if (rotateOnLoad) {
rotated90 = TRUE;
- rot90();
+ rot90();
// matrix.rotate( -90.0 );
}
-
+
switchToImageView();
updateImage();
@@ -626,8 +628,8 @@ bool ImageViewer::loadSelected()
filename = link->file();
qApp->processEvents();
- ok = image.load(filename, 0);
+ ok = image.load(filename, 0);
if ( ok )
{
- updateImageInfo(filename);
+ updateImageInfo(filename);
ok = reconvertImage();
}
@@ -728,5 +730,5 @@ void ImageViewer::hFlip()
{
// matrix.scale( -1.0, 1.0 );
-
+
setImage(image.mirror(TRUE,FALSE));
}
@@ -808,5 +810,5 @@ void ImageViewer::normalView()
isFullScreen = FALSE;
stack->addWidget( imagePanel, 1 );
- switchToImageView();
+ switchToImageView();
if ( isSized )
scale();
@@ -843,5 +845,5 @@ void ImageViewer::setImage(const QImage& newimage)
image = newimage;
reconvertImage();
- updateImage();
+ updateImage();
}
@@ -856,5 +858,5 @@ void ImageViewer::updateImageInfo(QString &filePath)
imageInfo[FORMAT]=QImage::imageFormat (filePath );
QFileInfo fi(filePath);
- imageInfo[PATH]=fi.fileName();
+ imageInfo[PATH]=fi.fileName();
imageInfo[FILE_SIZE]=QString::number(fi.size())+" (bytes)";
QString message("%1x%2");
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
@@ -159,4 +159,5 @@ class ImageViewer : public QMainWindow
Q_OBJECT
public:
+ static QString appName() { return QString::fromLatin1("showimg"); }
ImageViewer( QWidget *parent=0, const char *name=0, int wFlags=0 );
~ImageViewer();
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,5 +1,3 @@
-TEMPLATE = app
-CONFIG += qt warn_on release
-DESTDIR = $(OPIEDIR)/bin
+CONFIG += qt warn_on release quick-app
HEADERS = showimg.h ImageFileSelector.h settingsdialog.h settingsdialogbase.h
SOURCES = main.cpp showimg.cpp ImageFileSelector.cpp settingsdialog.cpp settingsdialogbase.cpp