-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 3 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/phunk_view.pro | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index aeaa3c6..74a8d0f 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp | |||
@@ -57,64 +57,65 @@ namespace { | |||
57 | IconViewItem::IconViewItem( QIconView* view,const QString& path, | 57 | IconViewItem::IconViewItem( QIconView* view,const QString& path, |
58 | const QString& name, bool isDir ) | 58 | const QString& name, bool isDir ) |
59 | : QIconViewItem( view ), m_path( path ), m_isDir( isDir ), | 59 | : QIconViewItem( view ), m_path( path ), m_isDir( isDir ), |
60 | m_noInfo( false ) | 60 | m_noInfo( false ) |
61 | { | 61 | { |
62 | QIconViewItem::setText( name ); | 62 | QIconViewItem::setText( name ); |
63 | if ( isDir && !_dirPix ) | 63 | if ( isDir && !_dirPix ) |
64 | _dirPix = new QPixmap( Resource::loadPixmap("advancedfm/FileBrowser")); | 64 | _dirPix = new QPixmap( Resource::loadPixmap("advancedfm/FileBrowser")); |
65 | else if ( !isDir && !_unkPix ) | 65 | else if ( !isDir && !_unkPix ) |
66 | _unkPix = new QPixmap( Resource::loadPixmap( "UnknownDocument" ) ); | 66 | _unkPix = new QPixmap( Resource::loadPixmap( "UnknownDocument" ) ); |
67 | } | 67 | } |
68 | inline QPixmap* IconViewItem::pixmap()const { | 68 | inline QPixmap* IconViewItem::pixmap()const { |
69 | if ( m_isDir ) | 69 | if ( m_isDir ) |
70 | return _dirPix; | 70 | return _dirPix; |
71 | else{ | 71 | else{ |
72 | if (!m_noInfo && !g_stringInf.contains( m_path ) ) { | 72 | if (!m_noInfo && !g_stringInf.contains( m_path ) ) { |
73 | currentView()->dirLister()->imageInfo( m_path ); | 73 | currentView()->dirLister()->imageInfo( m_path ); |
74 | g_stringInf.insert( m_path, const_cast<IconViewItem*>(this)); | 74 | g_stringInf.insert( m_path, const_cast<IconViewItem*>(this)); |
75 | } | 75 | } |
76 | 76 | ||
77 | m_pix = PPixmapCache::self()->cachedImage( m_path, 64, 64 ); | 77 | m_pix = PPixmapCache::self()->cachedImage( m_path, 64, 64 ); |
78 | if ( !m_pix && !g_stringPix.contains( m_path )) { | 78 | if ( !m_pix && !g_stringPix.contains( m_path )) { |
79 | currentView()->dirLister()->thumbNail( m_path, 64, 64 ); | 79 | currentView()->dirLister()->thumbNail( m_path, 64, 64 ); |
80 | g_stringPix.insert( m_path, const_cast<IconViewItem*>(this)); | 80 | g_stringPix.insert( m_path, const_cast<IconViewItem*>(this)); |
81 | } | 81 | } |
82 | return m_pix ? m_pix : _unkPix; | 82 | return m_pix ? m_pix : _unkPix; |
83 | } | 83 | } |
84 | } | 84 | } |
85 | inline void IconViewItem::setText( const QString& str ) { | 85 | inline void IconViewItem::setText( const QString& str ) { |
86 | QString text = QIconViewItem::text()+"\n"+str; | 86 | QString text = QIconViewItem::text()+"\n"+str; |
87 | m_noInfo = true; | 87 | m_noInfo = true; |
88 | QIconViewItem::setText( text ); | 88 | QIconViewItem::setText( text ); |
89 | reCalc(); | ||
89 | } | 90 | } |
90 | 91 | ||
91 | inline void IconViewItem::reCalc() | 92 | inline void IconViewItem::reCalc() |
92 | { | 93 | { |
93 | calcRect(); | 94 | calcRect(); |
94 | } | 95 | } |
95 | } | 96 | } |
96 | 97 | ||
97 | 98 | ||
98 | PIconView::PIconView( QWidget* wid, Config* cfg ) | 99 | PIconView::PIconView( QWidget* wid, Config* cfg ) |
99 | : QVBox( wid ), m_cfg( cfg ) | 100 | : QVBox( wid ), m_cfg( cfg ) |
100 | { | 101 | { |
101 | { | 102 | { |
102 | QCopEnvelope( "QPE/Application/opie-eye_slave", "refUp()" ); | 103 | QCopEnvelope( "QPE/Application/opie-eye_slave", "refUp()" ); |
103 | } | 104 | } |
104 | m_path = QDir::homeDirPath(); | 105 | m_path = QDir::homeDirPath(); |
105 | 106 | ||
106 | QHBox *hbox = new QHBox( this ); | 107 | QHBox *hbox = new QHBox( this ); |
107 | QLabel* lbl = new QLabel( hbox ); | 108 | QLabel* lbl = new QLabel( hbox ); |
108 | lbl->setText( tr("View as" ) ); | 109 | lbl->setText( tr("View as" ) ); |
109 | 110 | ||
110 | m_views = new QComboBox( hbox, "View As" ); | 111 | m_views = new QComboBox( hbox, "View As" ); |
111 | connect( m_views, SIGNAL(activated(int)), | 112 | connect( m_views, SIGNAL(activated(int)), |
112 | this, SLOT(slotViewChanged(int)) ); | 113 | this, SLOT(slotViewChanged(int)) ); |
113 | 114 | ||
114 | m_view= new QIconView( this ); | 115 | m_view= new QIconView( this ); |
115 | connect(m_view, SIGNAL(clicked(QIconViewItem*) ), | 116 | connect(m_view, SIGNAL(clicked(QIconViewItem*) ), |
116 | this, SLOT(slotClicked(QIconViewItem*)) ); | 117 | this, SLOT(slotClicked(QIconViewItem*)) ); |
117 | 118 | ||
118 | m_view->setArrangement( QIconView::LeftToRight ); | 119 | m_view->setArrangement( QIconView::LeftToRight ); |
119 | m_view->setItemTextPos( QIconView::Right ); | 120 | m_view->setItemTextPos( QIconView::Right ); |
120 | m_view->setResizeMode(QIconView::Adjust); | 121 | m_view->setResizeMode(QIconView::Adjust); |
@@ -237,65 +238,65 @@ void PIconView::slotReloadDir() { | |||
237 | void PIconView::addFolders( const QStringList& lst) { | 238 | void PIconView::addFolders( const QStringList& lst) { |
238 | QStringList::ConstIterator it; | 239 | QStringList::ConstIterator it; |
239 | 240 | ||
240 | for(it=lst.begin(); it != lst.end(); ++it ) { | 241 | for(it=lst.begin(); it != lst.end(); ++it ) { |
241 | (void)new IconViewItem( m_view, m_path+"/"+(*it), (*it), true ); | 242 | (void)new IconViewItem( m_view, m_path+"/"+(*it), (*it), true ); |
242 | } | 243 | } |
243 | 244 | ||
244 | } | 245 | } |
245 | 246 | ||
246 | void PIconView::addFiles( const QStringList& lst) { | 247 | void PIconView::addFiles( const QStringList& lst) { |
247 | QStringList::ConstIterator it; | 248 | QStringList::ConstIterator it; |
248 | for (it=lst.begin(); it!= lst.end(); ++it ) | 249 | for (it=lst.begin(); it!= lst.end(); ++it ) |
249 | (void)new IconViewItem( m_view, m_path+"/"+(*it), (*it) ); | 250 | (void)new IconViewItem( m_view, m_path+"/"+(*it), (*it) ); |
250 | 251 | ||
251 | } | 252 | } |
252 | 253 | ||
253 | void PIconView::slotClicked(QIconViewItem* _it) { | 254 | void PIconView::slotClicked(QIconViewItem* _it) { |
254 | if(!_it ) | 255 | if(!_it ) |
255 | return; | 256 | return; |
256 | 257 | ||
257 | IconViewItem* it = static_cast<IconViewItem*>(_it); | 258 | IconViewItem* it = static_cast<IconViewItem*>(_it); |
258 | if( it->isDir() ) | 259 | if( it->isDir() ) |
259 | slotChangeDir( it->path() ); | 260 | slotChangeDir( it->path() ); |
260 | else // view image | 261 | else // view image |
261 | ; | 262 | ; |
262 | } | 263 | } |
263 | 264 | ||
264 | void PIconView::slotThumbInfo( const QString& _path, const QString& str ) { | 265 | void PIconView::slotThumbInfo( const QString& _path, const QString& str ) { |
265 | if ( g_stringInf.contains( _path ) ) { | 266 | if ( g_stringInf.contains( _path ) ) { |
266 | IconViewItem* item = g_stringInf[_path]; | 267 | IconViewItem* item = g_stringInf[_path]; |
267 | /* if set the view shows nonsens! | 268 | /* if set the view shows nonsens! |
268 | I dont know how to fix the format of displayed text :(*/ | 269 | I dont know how to fix the format of displayed text :(*/ |
269 | //item->setText( str ); | 270 | item->setText( str ); |
270 | item->repaint(); | 271 | item->repaint(); |
271 | g_stringInf.remove( _path ); | 272 | g_stringInf.remove( _path ); |
272 | } | 273 | } |
273 | } | 274 | } |
274 | void PIconView::slotThumbNail(const QString& _path, const QPixmap &pix) { | 275 | void PIconView::slotThumbNail(const QString& _path, const QPixmap &pix) { |
275 | if ( g_stringPix.contains( _path ) ) { | 276 | if ( g_stringPix.contains( _path ) ) { |
276 | IconViewItem* item = g_stringPix[_path]; | 277 | IconViewItem* item = g_stringPix[_path]; |
277 | 278 | ||
278 | if (pix.width()>0) { | 279 | if (pix.width()>0) { |
279 | PPixmapCache::self()->insertImage( _path, pix, 64, 64 ); | 280 | PPixmapCache::self()->insertImage( _path, pix, 64, 64 ); |
280 | /* required for a recalculated rectangle. otherwise the view show nonsense! */ | 281 | /* required for a recalculated rectangle. otherwise the view show nonsense! */ |
281 | item->reCalc(); | 282 | item->reCalc(); |
282 | } else { | 283 | } else { |
283 | PPixmapCache::self()->insertImage(_path,Resource::loadPixmap( "UnknownDocument" ),64,64 ); | 284 | PPixmapCache::self()->insertImage(_path,Resource::loadPixmap( "UnknownDocument" ),64,64 ); |
284 | } | 285 | } |
285 | item->repaint(); | 286 | item->repaint(); |
286 | g_stringPix.remove( _path ); | 287 | g_stringPix.remove( _path ); |
287 | } | 288 | } |
288 | } | 289 | } |
289 | 290 | ||
290 | 291 | ||
291 | void PIconView::slotRename() { | 292 | void PIconView::slotRename() { |
292 | 293 | ||
293 | } | 294 | } |
294 | 295 | ||
295 | void PIconView::slotBeam() { | 296 | void PIconView::slotBeam() { |
296 | bool isDir; | 297 | bool isDir; |
297 | QString pa = currentFileName( isDir ); | 298 | QString pa = currentFileName( isDir ); |
298 | if ( isDir && pa.isEmpty() ) | 299 | if ( isDir && pa.isEmpty() ) |
299 | return; | 300 | return; |
300 | 301 | ||
301 | Ir* ir = new Ir( this ); | 302 | Ir* ir = new Ir( this ); |
diff --git a/noncore/graphics/opie-eye/phunk_view.pro b/noncore/graphics/opie-eye/phunk_view.pro index 0bb5679..3547af0 100644 --- a/noncore/graphics/opie-eye/phunk_view.pro +++ b/noncore/graphics/opie-eye/phunk_view.pro | |||
@@ -1,33 +1,33 @@ | |||
1 | CONFIG += qt warn_on #quick-app | 1 | CONFIG += qt warn_on quick-app |
2 | DESTDIR = $(OPIEDIR)/bin | 2 | DESTDIR = $(OPIEDIR)/bin |
3 | TEMPLATE = app | 3 | TEMPLATE = app |
4 | TARGET = opie-eye | 4 | TARGET = opie-eye |
5 | # the name of the resulting object | 5 | # the name of the resulting object |
6 | 6 | ||
7 | HEADERS = gui/iconview.h gui/filesystem.h gui/mainwindow.h \ | 7 | HEADERS = gui/iconview.h gui/filesystem.h gui/mainwindow.h \ |
8 | lib/imagecache.h impl/dir/dir_dirview.h \ | 8 | lib/imagecache.h impl/dir/dir_dirview.h \ |
9 | iface/dirview.h iface/dirlister.h iface/ifaceinfo.h \ | 9 | iface/dirview.h iface/dirlister.h iface/ifaceinfo.h \ |
10 | impl/dir/dir_lister.h impl/dir/dir_ifaceinfo.h \ | 10 | impl/dir/dir_lister.h impl/dir/dir_ifaceinfo.h \ |
11 | lib/slavemaster.h \ | 11 | lib/slavemaster.h \ |
12 | iface/slaveiface.h | 12 | iface/slaveiface.h |
13 | 13 | ||
14 | # A list header files | 14 | # A list header files |
15 | 15 | ||
16 | 16 | ||
17 | SOURCES = gui/iconview.cpp gui/filesystem.cpp gui/mainwindow.cpp \ | 17 | SOURCES = gui/iconview.cpp gui/filesystem.cpp gui/mainwindow.cpp \ |
18 | lib/imagecache.cpp lib/viewmap.cpp \ | 18 | lib/imagecache.cpp lib/viewmap.cpp \ |
19 | impl/dir/dir_dirview.cpp iface/dirlister.cpp \ | 19 | impl/dir/dir_dirview.cpp iface/dirlister.cpp \ |
20 | iface/dirview.cpp impl/dir/dir_lister.cpp \ | 20 | iface/dirview.cpp impl/dir/dir_lister.cpp \ |
21 | impl/dir/dir_ifaceinfo.cpp lib/slavemaster.cpp | 21 | impl/dir/dir_ifaceinfo.cpp lib/slavemaster.cpp |
22 | # A list of source files | 22 | # A list of source files |
23 | 23 | ||
24 | INTERFACES = | 24 | INTERFACES = |
25 | # list of ui files | 25 | # list of ui files |
26 | 26 | ||
27 | INCLUDEPATH += . $(OPIEDIR)/include | 27 | INCLUDEPATH += . $(OPIEDIR)/include |
28 | DEPENDPATH += $(OPIEDIR)/include | 28 | DEPENDPATH += $(OPIEDIR)/include |
29 | 29 | ||
30 | 30 | ||
31 | 31 | ||
32 | LIBS += -lqpe -lopieui2 | 32 | LIBS += -lqpe -lopieui2 |
33 | 33 | ||