Diffstat (limited to 'noncore/graphics/opie-eye/gui/imageinfoui.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageinfoui.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageinfoui.cpp b/noncore/graphics/opie-eye/gui/imageinfoui.cpp index 7afb62d..8f70602 100644 --- a/noncore/graphics/opie-eye/gui/imageinfoui.cpp +++ b/noncore/graphics/opie-eye/gui/imageinfoui.cpp | |||
@@ -16,15 +16,15 @@ | |||
16 | #include "lib/slavemaster.h" | 16 | #include "lib/slavemaster.h" |
17 | #include "lib/imagecache.h" | 17 | #include "lib/imagecache.h" |
18 | 18 | ||
19 | #include <opie2/oconfig.h> | 19 | #include <opie2/oconfig.h> |
20 | #include <opie2/okeyconfigwidget.h> | 20 | #include <opie2/okeyconfigwidget.h> |
21 | #include <opie2/odebug.h> | 21 | #include <opie2/odebug.h> |
22 | #include <opie2/oresource.h> | ||
22 | 23 | ||
23 | #include <qpe/qcopenvelope_qws.h> | 24 | #include <qpe/qcopenvelope_qws.h> |
24 | #include <qpe/resource.h> | ||
25 | 25 | ||
26 | static const int THUMBSIZE = 128; | 26 | static const int THUMBSIZE = 128; |
27 | 27 | ||
28 | using namespace Opie::Core; | 28 | using namespace Opie::Core; |
29 | 29 | ||
30 | imageinfo::imageinfo(Opie::Core::OConfig *cfg,QWidget* parent, const char* name, WFlags fl ) | 30 | imageinfo::imageinfo(Opie::Core::OConfig *cfg,QWidget* parent, const char* name, WFlags fl ) |
@@ -69,14 +69,14 @@ void imageinfo::initKeys() | |||
69 | lst.append( Opie::Core::OKeyPair::rightArrowKey() ); | 69 | lst.append( Opie::Core::OKeyPair::rightArrowKey() ); |
70 | lst.append( Opie::Core::OKeyPair::returnKey() ); | 70 | lst.append( Opie::Core::OKeyPair::returnKey() ); |
71 | 71 | ||
72 | m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "imageinfo_keys", | 72 | m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "imageinfo_keys", |
73 | lst, false,this, "keyconfig name" ); | 73 | lst, false,this, "keyconfig name" ); |
74 | m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Full Image"), "infoview", | 74 | m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Full Image"), "infoview", |
75 | Resource::loadPixmap("1to1"), ViewItem, | 75 | Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon), |
76 | Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton), | 76 | ViewItem, Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton), |
77 | this, SLOT(slotShowImage()))); | 77 | this, SLOT(slotShowImage()))); |
78 | m_viewManager->load(); | 78 | m_viewManager->load(); |
79 | m_viewManager->handleWidget( this ); | 79 | m_viewManager->handleWidget( this ); |
80 | m_viewManager->handleWidget( TextView1 ); | 80 | m_viewManager->handleWidget( TextView1 ); |
81 | } | 81 | } |
82 | 82 | ||
@@ -132,13 +132,13 @@ void imageinfo::slotChangeName(const QString&_path) | |||
132 | QFileInfo fi(_path); | 132 | QFileInfo fi(_path); |
133 | fnameLabel->setText("<qt><center><b>"+fi.fileName()+"</b></center></qt>"); | 133 | fnameLabel->setText("<qt><center><b>"+fi.fileName()+"</b></center></qt>"); |
134 | SlaveMaster::self()->imageInfo( currentFile ); | 134 | SlaveMaster::self()->imageInfo( currentFile ); |
135 | 135 | ||
136 | QPixmap*m_pix = PPixmapCache::self()->cachedImage( _path, THUMBSIZE,THUMBSIZE ); | 136 | QPixmap*m_pix = PPixmapCache::self()->cachedImage( _path, THUMBSIZE,THUMBSIZE ); |
137 | if (!m_pix) { | 137 | if (!m_pix) { |
138 | PixmapLabel1->setPixmap(QPixmap( Resource::loadPixmap( "UnknownDocument" ))); | 138 | PixmapLabel1->setPixmap(QPixmap( Opie::Core::OResource::loadPixmap( "UnknownDocument", Opie::Core::OResource::SmallIcon ))); |
139 | SlaveMaster::self()->thumbNail(currentFile,THUMBSIZE,THUMBSIZE); | 139 | SlaveMaster::self()->thumbNail(currentFile,THUMBSIZE,THUMBSIZE); |
140 | } else { | 140 | } else { |
141 | PixmapLabel1->setPixmap(*m_pix); | 141 | PixmapLabel1->setPixmap(*m_pix); |
142 | } | 142 | } |
143 | } | 143 | } |
144 | 144 | ||