Diffstat (limited to 'noncore/graphics/opie-eye/gui/iconview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index 0b80012..38a621e 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp | |||
@@ -72,49 +72,49 @@ namespace { | |||
72 | currentView()->dirLister()->imageInfo( m_path ); | 72 | currentView()->dirLister()->imageInfo( m_path ); |
73 | g_stringInf.insert( m_path, const_cast<IconViewItem*>(this)); | 73 | g_stringInf.insert( m_path, const_cast<IconViewItem*>(this)); |
74 | } | 74 | } |
75 | 75 | ||
76 | m_pix = PPixmapCache::self()->cachedImage( m_path, 64, 64 ); | 76 | m_pix = PPixmapCache::self()->cachedImage( m_path, 64, 64 ); |
77 | if ( !m_pix && !g_stringPix.contains( m_path )) { | 77 | if ( !m_pix && !g_stringPix.contains( m_path )) { |
78 | currentView()->dirLister()->thumbNail( m_path, 64, 64 ); | 78 | currentView()->dirLister()->thumbNail( m_path, 64, 64 ); |
79 | g_stringPix.insert( m_path, const_cast<IconViewItem*>(this)); | 79 | g_stringPix.insert( m_path, const_cast<IconViewItem*>(this)); |
80 | } | 80 | } |
81 | return m_pix ? m_pix : _unkPix; | 81 | return m_pix ? m_pix : _unkPix; |
82 | } | 82 | } |
83 | } | 83 | } |
84 | inline void IconViewItem::setText( const QString& str ) { | 84 | inline void IconViewItem::setText( const QString& str ) { |
85 | QString text = QIconViewItem::text()+"\n"+str; | 85 | QString text = QIconViewItem::text()+"\n"+str; |
86 | m_noInfo = true; | 86 | m_noInfo = true; |
87 | QIconViewItem::setText( text ); | 87 | QIconViewItem::setText( text ); |
88 | } | 88 | } |
89 | } | 89 | } |
90 | 90 | ||
91 | 91 | ||
92 | PIconView::PIconView( QWidget* wid, Config* cfg ) | 92 | PIconView::PIconView( QWidget* wid, Config* cfg ) |
93 | : QVBox( wid ), m_cfg( cfg ) | 93 | : QVBox( wid ), m_cfg( cfg ) |
94 | { | 94 | { |
95 | { | 95 | { |
96 | QCopEnvelope( "QPE/Application/opie-eye_slave", "foo()" ); | 96 | // QCopEnvelope( "QPE/Application/opie-eye_slave", "foo()" ); |
97 | } | 97 | } |
98 | m_path = QDir::homeDirPath(); | 98 | m_path = QDir::homeDirPath(); |
99 | 99 | ||
100 | QHBox *hbox = new QHBox( this ); | 100 | QHBox *hbox = new QHBox( this ); |
101 | QLabel* lbl = new QLabel( hbox ); | 101 | QLabel* lbl = new QLabel( hbox ); |
102 | lbl->setText( tr("View as" ) ); | 102 | lbl->setText( tr("View as" ) ); |
103 | 103 | ||
104 | m_views = new QComboBox( hbox, "View As" ); | 104 | m_views = new QComboBox( hbox, "View As" ); |
105 | connect( m_views, SIGNAL(activated(int)), | 105 | connect( m_views, SIGNAL(activated(int)), |
106 | this, SLOT(slotViewChanged(int)) ); | 106 | this, SLOT(slotViewChanged(int)) ); |
107 | 107 | ||
108 | m_view= new QIconView( this ); | 108 | m_view= new QIconView( this ); |
109 | connect(m_view, SIGNAL(clicked(QIconViewItem*) ), | 109 | connect(m_view, SIGNAL(clicked(QIconViewItem*) ), |
110 | this, SLOT(slotClicked(QIconViewItem*)) ); | 110 | this, SLOT(slotClicked(QIconViewItem*)) ); |
111 | 111 | ||
112 | m_view->setArrangement( QIconView::LeftToRight ); | 112 | m_view->setArrangement( QIconView::LeftToRight ); |
113 | m_view->setItemTextPos( QIconView::Right ); | 113 | m_view->setItemTextPos( QIconView::Right ); |
114 | 114 | ||
115 | 115 | ||
116 | int dw = QApplication::desktop()->width(); | 116 | int dw = QApplication::desktop()->width(); |
117 | int viewerWidth = dw-style().scrollBarExtent().width(); | 117 | int viewerWidth = dw-style().scrollBarExtent().width(); |
118 | m_view->setGridX( viewerWidth-2*m_view->spacing() ); | 118 | m_view->setGridX( viewerWidth-2*m_view->spacing() ); |
119 | m_view->setGridY( fontMetrics().height()*2+40 ); | 119 | m_view->setGridY( fontMetrics().height()*2+40 ); |
120 | loadViews(); | 120 | loadViews(); |
@@ -125,48 +125,52 @@ PIconView::~PIconView() { | |||
125 | } | 125 | } |
126 | 126 | ||
127 | void PIconView::slotDirUp() { | 127 | void PIconView::slotDirUp() { |
128 | QDir dir( m_path ); | 128 | QDir dir( m_path ); |
129 | dir.cdUp(); | 129 | dir.cdUp(); |
130 | slotChangeDir( dir.absPath() ); | 130 | slotChangeDir( dir.absPath() ); |
131 | 131 | ||
132 | } | 132 | } |
133 | 133 | ||
134 | void PIconView::slotChangeDir(const QString& path) { | 134 | void PIconView::slotChangeDir(const QString& path) { |
135 | if ( !currentView() ) | 135 | if ( !currentView() ) |
136 | return; | 136 | return; |
137 | 137 | ||
138 | PDirLister *lister = currentView()->dirLister(); | 138 | PDirLister *lister = currentView()->dirLister(); |
139 | if (!lister ) | 139 | if (!lister ) |
140 | return; | 140 | return; |
141 | 141 | ||
142 | lister->setStartPath( path ); | 142 | lister->setStartPath( path ); |
143 | m_path = lister->currentPath(); | 143 | m_path = lister->currentPath(); |
144 | 144 | ||
145 | m_view->clear(); | 145 | m_view->clear(); |
146 | addFolders( lister->folders() ); | 146 | addFolders( lister->folders() ); |
147 | addFiles( lister->files() ); | 147 | addFiles( lister->files() ); |
148 | 148 | ||
149 | // Also invalidate the cache. We can't cancel the operations anyway | ||
150 | g_stringPix.clear(); | ||
151 | g_stringInf.clear(); | ||
152 | |||
149 | // looks ugly | 153 | // looks ugly |
150 | static_cast<QMainWindow*>(parent())->setCaption( QObject::tr("%1 - O View", "Name of the dir").arg( m_path ) ); | 154 | static_cast<QMainWindow*>(parent())->setCaption( QObject::tr("%1 - O View", "Name of the dir").arg( m_path ) ); |
151 | } | 155 | } |
152 | 156 | ||
153 | QString PIconView::currentFileName(bool &isDir)const { | 157 | QString PIconView::currentFileName(bool &isDir)const { |
154 | isDir = false; | 158 | isDir = false; |
155 | QIconViewItem* _it = m_view->currentItem(); | 159 | QIconViewItem* _it = m_view->currentItem(); |
156 | if ( !_it ) | 160 | if ( !_it ) |
157 | return QString::null; | 161 | return QString::null; |
158 | 162 | ||
159 | IconViewItem* it = static_cast<IconViewItem*>( _it ); | 163 | IconViewItem* it = static_cast<IconViewItem*>( _it ); |
160 | isDir = it->isDir(); | 164 | isDir = it->isDir(); |
161 | return it->path(); | 165 | return it->path(); |
162 | } | 166 | } |
163 | 167 | ||
164 | void PIconView::slotTrash() { | 168 | void PIconView::slotTrash() { |
165 | bool isDir; | 169 | bool isDir; |
166 | QString pa = currentFileName( isDir ); | 170 | QString pa = currentFileName( isDir ); |
167 | if ( isDir && pa.isEmpty() ) | 171 | if ( isDir && pa.isEmpty() ) |
168 | return; | 172 | return; |
169 | 173 | ||
170 | if (!QPEMessageBox::confirmDelete( this, | 174 | if (!QPEMessageBox::confirmDelete( this, |
171 | tr("Delete Image" ), | 175 | tr("Delete Image" ), |
172 | tr("the Image %1" ).arg(pa))) | 176 | tr("the Image %1" ).arg(pa))) |