-rw-r--r-- | microkde/ofileselector_p.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/microkde/ofileselector_p.cpp b/microkde/ofileselector_p.cpp index e2af32b..488dee2 100644 --- a/microkde/ofileselector_p.cpp +++ b/microkde/ofileselector_p.cpp | |||
@@ -148,34 +148,35 @@ QWidget* ODocumentFileView::widget( QWidget* parent ) { | |||
148 | /* | 148 | /* |
149 | * This is the file system view used | 149 | * This is the file system view used |
150 | * we use a QListView + QListViewItems for it | 150 | * we use a QListView + QListViewItems for it |
151 | */ | 151 | */ |
152 | 152 | ||
153 | OFileSelectorItem::OFileSelectorItem( QListView* view, const QPixmap& pixmap, | 153 | OFileSelectorItem::OFileSelectorItem( QListView* view, const QPixmap& pixmap, |
154 | const QString& path, const QString& date, | 154 | const QString& path, const QString& date, |
155 | const QString& size, const QString& dir, | 155 | const QString& size, const QString& dir, |
156 | bool isLocked, bool isDir ) | 156 | bool isLocked, bool isDir ) |
157 | : QListViewItem( view ) | 157 | : QListViewItem( view ) |
158 | { | 158 | { |
159 | 159 | ||
160 | QString kind; | 160 | QString kind = "dir";; |
161 | QString _path = path; | 161 | QString _path = path; |
162 | if ( isDir ) | 162 | if ( !isDir ){ |
163 | kind = "dir"; | 163 | int arrow = path.findRev( "." ,-1); |
164 | else | 164 | if (arrow > 0 ) { |
165 | kind = "file"; | 165 | kind = path.mid(arrow+1); |
166 | } | ||
167 | } | ||
166 | setPixmap(0, pixmap ); | 168 | setPixmap(0, pixmap ); |
167 | int arrow = path.find( "->" ); | 169 | int arrow = path.find( "->" ); |
168 | if (arrow > 0 ) { | 170 | if (arrow > 0 ) { |
169 | kind += path.mid( arrow ); | ||
170 | _path = path.left(arrow); | 171 | _path = path.left(arrow); |
171 | } | 172 | } |
172 | setText(1, _path ); | 173 | setText(1, _path ); |
173 | setText(2, size ); | 174 | setText(2, size ); |
174 | setText(3, date ); | 175 | setText(3, date ); |
175 | setText(4, kind ); | 176 | setText(4, kind ); |
176 | m_isDir = isDir; | 177 | m_isDir = isDir; |
177 | m_dir = dir; | 178 | m_dir = dir; |
178 | m_locked = isLocked; | 179 | m_locked = isLocked; |
179 | } | 180 | } |
180 | OFileSelectorItem::~OFileSelectorItem() { | 181 | OFileSelectorItem::~OFileSelectorItem() { |
181 | 182 | ||
@@ -282,27 +283,27 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st | |||
282 | 283 | ||
283 | btn->setPopup( pop ); | 284 | btn->setPopup( pop ); |
284 | btn->setPopupDelay ( 0 ); | 285 | btn->setPopupDelay ( 0 ); |
285 | lay->addWidget( box ); | 286 | lay->addWidget( box ); |
286 | 287 | ||
287 | m_view = new QListView( this ); | 288 | m_view = new QListView( this ); |
288 | 289 | ||
289 | m_view->installEventFilter(this); | 290 | m_view->installEventFilter(this); |
290 | 291 | ||
291 | QPEApplication::setStylusOperation( m_view->viewport(), | 292 | QPEApplication::setStylusOperation( m_view->viewport(), |
292 | QPEApplication::RightOnHold); | 293 | QPEApplication::RightOnHold); |
293 | m_view->addColumn(" " ); | 294 | m_view->addColumn(" " ); |
294 | m_view->addColumn(i18n("Name"), 135 ); | 295 | m_view->addColumn(i18n("Name"), 150 ); |
295 | m_view->addColumn(i18n("Size"), -1 ); | 296 | m_view->addColumn(i18n("Size"), -1 ); |
296 | m_view->addColumn(i18n("Date"), 60 ); | 297 | m_view->addColumn(i18n("Date"), -1 ); |
297 | m_view->addColumn(i18n("Mime Type"), -1 ); | 298 | m_view->addColumn(i18n("Mime Type"), -1 ); |
298 | 299 | ||
299 | 300 | ||
300 | m_view->setSorting( 1 ); | 301 | m_view->setSorting( 1 ); |
301 | m_view->setAllColumnsShowFocus( TRUE ); | 302 | m_view->setAllColumnsShowFocus( TRUE ); |
302 | 303 | ||
303 | lay->addWidget( m_view, 1000 ); | 304 | lay->addWidget( m_view, 1000 ); |
304 | connectSlots(); | 305 | connectSlots(); |
305 | } | 306 | } |
306 | OFileViewFileListView::~OFileViewFileListView() { | 307 | OFileViewFileListView::~OFileViewFileListView() { |
307 | } | 308 | } |
308 | void OFileViewFileListView::slotNew() { | 309 | void OFileViewFileListView::slotNew() { |