author | zecke <zecke> | 2004-04-02 19:28:09 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-04-02 19:28:09 (UTC) |
commit | 97bdc55663590ba430a4f322ad97aab9f4c02bf3 (patch) (unidiff) | |
tree | 8d340684ac97907b73d6b8abf995116f58680cdd /noncore/graphics/opie-eye/gui | |
parent | 09d1ebb55ab44ebd129ff44b83b6b20054df77aa (diff) | |
download | opie-97bdc55663590ba430a4f322ad97aab9f4c02bf3.zip opie-97bdc55663590ba430a4f322ad97aab9f4c02bf3.tar.gz opie-97bdc55663590ba430a4f322ad97aab9f4c02bf3.tar.bz2 |
-Fix realignment of the items but now it updates too often
-Fix slave not to include <qt></qt> for iconViewName
Diffstat (limited to 'noncore/graphics/opie-eye/gui') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 29 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 2 |
2 files changed, 14 insertions, 17 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index b3f0006..ed9fc9c 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp | |||
@@ -12,6 +12,7 @@ | |||
12 | 12 | ||
13 | #include <opie2/oconfig.h> | 13 | #include <opie2/oconfig.h> |
14 | #include <opie2/okeyconfigwidget.h> | 14 | #include <opie2/okeyconfigwidget.h> |
15 | #include <opie2/odebug.h> | ||
15 | 16 | ||
16 | #include <qpe/resource.h> | 17 | #include <qpe/resource.h> |
17 | #include <qpe/qpemessagebox.h> | 18 | #include <qpe/qpemessagebox.h> |
@@ -42,7 +43,8 @@ namespace { | |||
42 | QString path()const { return m_path; } | 43 | QString path()const { return m_path; } |
43 | bool isDir()const { return m_isDir; } | 44 | bool isDir()const { return m_isDir; } |
44 | void setText( const QString& ); | 45 | void setText( const QString& ); |
45 | void reCalc(); | 46 | |
47 | |||
46 | private: | 48 | private: |
47 | mutable QPixmap* m_pix; | 49 | mutable QPixmap* m_pix; |
48 | QString m_path; | 50 | QString m_path; |
@@ -70,6 +72,10 @@ namespace { | |||
70 | _unkPix = new QPixmap( Resource::loadPixmap( "UnknownDocument" ) ); | 72 | _unkPix = new QPixmap( Resource::loadPixmap( "UnknownDocument" ) ); |
71 | } | 73 | } |
72 | inline QPixmap* IconViewItem::pixmap()const { | 74 | inline QPixmap* IconViewItem::pixmap()const { |
75 | qWarning( "Name is " + m_path.right( 15 ) + " rect is %d %d %d %d | %d %d", | ||
76 | rect().x(),rect().y(),rect().width(),rect().height(), | ||
77 | iconView()->contentsX(), iconView()->contentsY()); | ||
78 | |||
73 | if ( m_isDir ) | 79 | if ( m_isDir ) |
74 | return _dirPix; | 80 | return _dirPix; |
75 | else{ | 81 | else{ |
@@ -90,12 +96,6 @@ namespace { | |||
90 | QString text = QIconViewItem::text()+"\n"+str; | 96 | QString text = QIconViewItem::text()+"\n"+str; |
91 | m_noInfo = true; | 97 | m_noInfo = true; |
92 | QIconViewItem::setText( text ); | 98 | QIconViewItem::setText( text ); |
93 | reCalc(); | ||
94 | } | ||
95 | |||
96 | inline void IconViewItem::reCalc() | ||
97 | { | ||
98 | calcRect(); | ||
99 | } | 99 | } |
100 | } | 100 | } |
101 | 101 | ||
@@ -122,11 +122,10 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg ) | |||
122 | 122 | ||
123 | m_view->setArrangement( QIconView::LeftToRight ); | 123 | m_view->setArrangement( QIconView::LeftToRight ); |
124 | m_view->setItemTextPos( QIconView::Right ); | 124 | m_view->setItemTextPos( QIconView::Right ); |
125 | m_view->setResizeMode(QIconView::Adjust); | ||
126 | 125 | ||
127 | int dw = QApplication::desktop()->width(); | 126 | int dw = QApplication::desktop()->width(); |
128 | int viewerWidth = dw-style().scrollBarExtent().width(); | 127 | int viewerWidth = dw-style().scrollBarExtent().width(); |
129 | m_view->setGridX( viewerWidth-2*m_view->spacing() ); | 128 | m_view->setGridX( viewerWidth-3*m_view->spacing()); |
130 | m_view->setGridY( fontMetrics().height()*2+40 ); | 129 | m_view->setGridY( fontMetrics().height()*2+40 ); |
131 | 130 | ||
132 | 131 | ||
@@ -196,11 +195,11 @@ void PIconView::slotChangeDir(const QString& path) { | |||
196 | lister->setStartPath( path ); | 195 | lister->setStartPath( path ); |
197 | m_path = lister->currentPath(); | 196 | m_path = lister->currentPath(); |
198 | 197 | ||
199 | m_view->setUpdatesEnabled( false ); | 198 | m_view->viewport()->setUpdatesEnabled( false ); |
200 | m_view->clear(); | 199 | m_view->clear(); |
201 | addFolders( lister->folders() ); | 200 | addFolders( lister->folders() ); |
202 | addFiles( lister->files() ); | 201 | addFiles( lister->files() ); |
203 | m_view->setUpdatesEnabled( true ); | 202 | m_view->viewport()->setUpdatesEnabled( true ); |
204 | 203 | ||
205 | // Also invalidate the cache. We can't cancel the operations anyway | 204 | // Also invalidate the cache. We can't cancel the operations anyway |
206 | g_stringPix.clear(); | 205 | g_stringPix.clear(); |
@@ -314,7 +313,6 @@ void PIconView::slotThumbInfo( const QString& _path, const QString& str ) { | |||
314 | /* if set the view shows nonsens! | 313 | /* if set the view shows nonsens! |
315 | I dont know how to fix the format of displayed text :(*/ | 314 | I dont know how to fix the format of displayed text :(*/ |
316 | item->setText( str ); | 315 | item->setText( str ); |
317 | item->repaint(); | ||
318 | g_stringInf.remove( _path ); | 316 | g_stringInf.remove( _path ); |
319 | } | 317 | } |
320 | } | 318 | } |
@@ -325,11 +323,9 @@ void PIconView::slotThumbNail(const QString& _path, const QPixmap &pix) { | |||
325 | if (pix.width()>0) { | 323 | if (pix.width()>0) { |
326 | PPixmapCache::self()->insertImage( _path, pix, 64, 64 ); | 324 | PPixmapCache::self()->insertImage( _path, pix, 64, 64 ); |
327 | /* required for a recalculated rectangle. otherwise the view show nonsense! */ | 325 | /* required for a recalculated rectangle. otherwise the view show nonsense! */ |
328 | item->reCalc(); | ||
329 | } else { | 326 | } else { |
330 | PPixmapCache::self()->insertImage(_path,Resource::loadPixmap( "UnknownDocument" ),64,64 ); | 327 | PPixmapCache::self()->insertImage(_path,Resource::loadPixmap( "UnknownDocument" ),64,64 ); |
331 | } | 328 | } |
332 | item->repaint(); | ||
333 | g_stringPix.remove( _path ); | 329 | g_stringPix.remove( _path ); |
334 | } | 330 | } |
335 | } | 331 | } |
@@ -357,11 +353,12 @@ void PIconView::slotBeamDone( Ir* ir) { | |||
357 | } | 353 | } |
358 | 354 | ||
359 | void PIconView::slotStart() { | 355 | void PIconView::slotStart() { |
360 | m_view->setUpdatesEnabled( false ); | 356 | m_view->viewport()->setUpdatesEnabled( false ); |
361 | } | 357 | } |
362 | 358 | ||
363 | void PIconView::slotEnd() { | 359 | void PIconView::slotEnd() { |
364 | m_view->setUpdatesEnabled( true ); | 360 | m_view->arrangeItemsInGrid( ); |
361 | m_view->viewport()->setUpdatesEnabled( true ); | ||
365 | } | 362 | } |
366 | 363 | ||
367 | void PIconView::slotShowImage() { | 364 | void PIconView::slotShowImage() { |
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index 0314659..83ff4f1 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp | |||
@@ -109,7 +109,7 @@ void PMainWindow::slotConfig() { | |||
109 | QWidget *_wid = inf->configWidget( *m_cfg ); | 109 | QWidget *_wid = inf->configWidget( *m_cfg ); |
110 | _wid->reparent(wid, QPoint() ); | 110 | _wid->reparent(wid, QPoint() ); |
111 | lst.insert( view, _wid ); | 111 | lst.insert( view, _wid ); |
112 | wid->addTab( _wid, QString::null, inf->name() ); | 112 | wid->addTab( _wid, "fileopen", inf->name() ); |
113 | } | 113 | } |
114 | 114 | ||
115 | /* | 115 | /* |