-rw-r--r-- | libopie2/opieui/fileselector/ofileselector.cpp | 15 | ||||
-rw-r--r-- | libopie2/opieui/fileselector/ofileselector_p.h | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp index 01a51a2..718f743 100644 --- a/libopie2/opieui/fileselector/ofileselector.cpp +++ b/libopie2/opieui/fileselector/ofileselector.cpp | |||
@@ -240,21 +240,18 @@ QWidget* ODocumentFileView::widget( QWidget* parent ) | |||
240 | */ | 240 | */ |
241 | 241 | ||
242 | OFileSelectorItem::OFileSelectorItem( QListView* view, const QPixmap& pixmap, | 242 | OFileSelectorItem::OFileSelectorItem( QListView* view, const QPixmap& pixmap, |
243 | const QString& path, const QString& date, | 243 | const QString& path, const QString& date, |
244 | const QString& size, const QString& dir, | 244 | const QString& size, const QString& dir, |
245 | bool isLocked, bool isDir ) | 245 | bool isLocked, bool isDir ) |
246 | : QListViewItem( view ) | 246 | : QListViewItem( view ), m_dir(dir), m_isDir(isDir), m_locked(isLocked) |
247 | { | 247 | { |
248 | setPixmap(0, pixmap ); | 248 | setPixmap(0, pixmap ); |
249 | setText(1, path ); | 249 | setText(1, path ); |
250 | setText(2, size ); | 250 | setText(2, size ); |
251 | setText(3, date ); | 251 | setText(3, date ); |
252 | m_isDir = isDir; | ||
253 | m_dir = dir; | ||
254 | m_locked = isLocked; | ||
255 | } | 252 | } |
256 | 253 | ||
257 | OFileSelectorItem::~OFileSelectorItem() | 254 | OFileSelectorItem::~OFileSelectorItem() |
258 | { | 255 | { |
259 | } | 256 | } |
260 | 257 | ||
@@ -278,12 +275,17 @@ QString OFileSelectorItem::path()const | |||
278 | return text( 1 ); | 275 | return text( 1 ); |
279 | } | 276 | } |
280 | 277 | ||
281 | QString OFileSelectorItem::key( int id, bool )const | 278 | QString OFileSelectorItem::key( int id, bool )const |
282 | { | 279 | { |
283 | QString ke; | 280 | QString ke; |
281 | |||
282 | /* | ||
283 | * id = 0 ||id == 1 : Sort By Name but Directories at Top | ||
284 | * id = 2 : Sort By Size: Prepend '0' to the key | ||
285 | */ | ||
284 | if( id == 0 || id == 1 ) | 286 | if( id == 0 || id == 1 ) |
285 | { // name | 287 | { // name |
286 | if( m_isDir ) | 288 | if( m_isDir ) |
287 | { | 289 | { |
288 | ke.append("0" ); | 290 | ke.append("0" ); |
289 | ke.append( text(1) ); | 291 | ke.append( text(1) ); |
@@ -291,14 +293,15 @@ QString OFileSelectorItem::key( int id, bool )const | |||
291 | else | 293 | else |
292 | { | 294 | { |
293 | ke.append("1" ); | 295 | ke.append("1" ); |
294 | ke.append( text(1) ); | 296 | ke.append( text(1) ); |
295 | } | 297 | } |
296 | return ke; | 298 | return ke; |
297 | } | 299 | }else if(id == 2) { |
298 | else | 300 | return text(2).rightJustify(20, '0'); |
301 | }else | ||
299 | return text( id ); | 302 | return text( id ); |
300 | 303 | ||
301 | } | 304 | } |
302 | 305 | ||
303 | OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& startDir, OFileSelector* sel) | 306 | OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& startDir, OFileSelector* sel) |
304 | :QWidget( parent ), m_sel( sel ) | 307 | :QWidget( parent ), m_sel( sel ) |
diff --git a/libopie2/opieui/fileselector/ofileselector_p.h b/libopie2/opieui/fileselector/ofileselector_p.h index 790d2bd..15db916 100644 --- a/libopie2/opieui/fileselector/ofileselector_p.h +++ b/libopie2/opieui/fileselector/ofileselector_p.h | |||
@@ -134,15 +134,15 @@ public: | |||
134 | bool isDir()const; | 134 | bool isDir()const; |
135 | QString directory()const; | 135 | QString directory()const; |
136 | QString path()const; | 136 | QString path()const; |
137 | QString key(int id, bool )const; | 137 | QString key(int id, bool )const; |
138 | 138 | ||
139 | private: | 139 | private: |
140 | bool m_locked : 1; | ||
141 | bool m_isDir : 1; | ||
142 | QString m_dir; | 140 | QString m_dir; |
141 | bool m_isDir : 1; | ||
142 | bool m_locked : 1; | ||
143 | }; | 143 | }; |
144 | 144 | ||
145 | class OFileViewFileListView : public QWidget | 145 | class OFileViewFileListView : public QWidget |
146 | { | 146 | { |
147 | Q_OBJECT | 147 | Q_OBJECT |
148 | public: | 148 | public: |