author | simon <simon> | 2002-12-04 11:40:01 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-04 11:40:01 (UTC) |
commit | 6a11cf48019e28006172cfb9a61e865816c3657e (patch) (unidiff) | |
tree | 45634eded135f17fcdba8e4cb706e87f47f6d5f0 /noncore/multimedia/opieplayer2/playlistfileview.cpp | |
parent | 84d5ca934e9cb8950d1efdb90ac3b00ce6d44e95 (diff) | |
download | opie-6a11cf48019e28006172cfb9a61e865816c3657e.zip opie-6a11cf48019e28006172cfb9a61e865816c3657e.tar.gz opie-6a11cf48019e28006172cfb9a61e865816c3657e.tar.bz2 |
- move more view population logic into PlayListFileView
Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistfileview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistfileview.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.cpp b/noncore/multimedia/opieplayer2/playlistfileview.cpp index 0ed1061..cb16415 100644 --- a/noncore/multimedia/opieplayer2/playlistfileview.cpp +++ b/noncore/multimedia/opieplayer2/playlistfileview.cpp | |||
@@ -3,13 +3,14 @@ | |||
3 | 3 | ||
4 | #include <qfile.h> | 4 | #include <qfile.h> |
5 | #include <qpe/global.h> | 5 | #include <qpe/global.h> |
6 | #include <qpe/resource.h> | 6 | #include <qpe/resource.h> |
7 | 7 | ||
8 | PlayListFileView::PlayListFileView( const QString &mimeTypePattern, const QString &itemPixmapName, QWidget *parent, const char *name ) | 8 | PlayListFileView::PlayListFileView( const QString &mimeTypePattern, const QString &itemPixmapName, QWidget *parent, const char *name ) |
9 | : PlayListView( parent, name ), m_mimeTypePattern( mimeTypePattern ), m_itemPixmapName( itemPixmapName ), m_scannedFiles( false ) | 9 | : PlayListView( parent, name ), m_mimeTypePattern( mimeTypePattern ), m_itemPixmapName( itemPixmapName ), m_scannedFiles( false ), |
10 | m_viewPopulated( false ) | ||
10 | { | 11 | { |
11 | addColumn( tr( "Title" ), 140); | 12 | addColumn( tr( "Title" ), 140); |
12 | addColumn( tr( "Size" ), -1 ); | 13 | addColumn( tr( "Size" ), -1 ); |
13 | addColumn(tr( "Media" ), 0 ); | 14 | addColumn(tr( "Media" ), 0 ); |
14 | addColumn(tr( "Path" ), -1 ); | 15 | addColumn(tr( "Path" ), -1 ); |
15 | setColumnAlignment( 1, Qt::AlignRight ); | 16 | setColumnAlignment( 1, Qt::AlignRight ); |
@@ -29,23 +30,34 @@ void PlayListFileView::scanFiles() | |||
29 | m_files.detachChildren(); | 30 | m_files.detachChildren(); |
30 | QListIterator<DocLnk> sdit( m_files.children() ); | 31 | QListIterator<DocLnk> sdit( m_files.children() ); |
31 | for ( ; sdit.current(); ++sdit ) | 32 | for ( ; sdit.current(); ++sdit ) |
32 | delete sdit.current(); | 33 | delete sdit.current(); |
33 | 34 | ||
34 | Global::findDocuments( &m_files, m_mimeTypePattern ); | 35 | Global::findDocuments( &m_files, m_mimeTypePattern ); |
36 | |||
37 | if ( m_viewPopulated ) { | ||
38 | m_viewPopulated = false; | ||
39 | populateView(); | ||
40 | } | ||
35 | } | 41 | } |
36 | 42 | ||
37 | void PlayListFileView::populateView() | 43 | void PlayListFileView::populateView() |
38 | { | 44 | { |
45 | if ( m_viewPopulated ) | ||
46 | return; | ||
47 | |||
39 | clear(); | 48 | clear(); |
40 | 49 | ||
41 | if( !m_scannedFiles ) { | 50 | if( !m_scannedFiles ) { |
51 | m_viewPopulated = false; // avoid a recursion :) | ||
42 | scanFiles(); | 52 | scanFiles(); |
43 | m_scannedFiles = true; | 53 | m_scannedFiles = true; |
44 | } | 54 | } |
45 | 55 | ||
56 | m_viewPopulated = true; | ||
57 | |||
46 | QString storage; | 58 | QString storage; |
47 | QListIterator<DocLnk> dit( m_files.children() ); | 59 | QListIterator<DocLnk> dit( m_files.children() ); |
48 | for ( ; dit.current(); ++dit ) { | 60 | for ( ; dit.current(); ++dit ) { |
49 | 61 | ||
50 | QListViewItem *newItem; | 62 | QListViewItem *newItem; |
51 | 63 | ||