-rw-r--r-- | noncore/graphics/opie-eye/impl/doc/doc_lister.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp index 8bcf01d..4a491e2 100644 --- a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp +++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp | |||
@@ -74,24 +74,25 @@ QString Doc_DirLister::currentPath()const | |||
74 | return QString::null; | 74 | return QString::null; |
75 | } | 75 | } |
76 | 76 | ||
77 | 77 | ||
78 | QStringList Doc_DirLister::folders()const { | 78 | QStringList Doc_DirLister::folders()const { |
79 | return QStringList(); | 79 | return QStringList(); |
80 | } | 80 | } |
81 | 81 | ||
82 | QStringList Doc_DirLister::files()const { | 82 | QStringList Doc_DirLister::files()const { |
83 | QStringList out; | 83 | QStringList out; |
84 | QListIterator<DocLnk> dit(m_ds.children()); | 84 | QListIterator<DocLnk> dit(m_ds.children()); |
85 | for( ; dit.current(); ++dit) { | 85 | for( ; dit.current(); ++dit) { |
86 | if (!(*dit)->isValid()) continue; | ||
86 | if (!matchCat((*dit))) continue; | 87 | if (!matchCat((*dit))) continue; |
87 | QString s = (*dit)->name(); | 88 | QString s = (*dit)->name(); |
88 | s+=char(0); | 89 | s+=char(0); |
89 | s+=(*dit)->file(); | 90 | s+=(*dit)->file(); |
90 | out.append(s); | 91 | out.append(s); |
91 | } | 92 | } |
92 | return out; | 93 | return out; |
93 | } | 94 | } |
94 | 95 | ||
95 | void Doc_DirLister::deleteImage( const QString& ) | 96 | void Doc_DirLister::deleteImage( const QString& ) |
96 | { | 97 | { |
97 | } | 98 | } |
@@ -146,34 +147,39 @@ QWidget* Doc_DirLister::widget(QWidget*parent) | |||
146 | QArray<int> vl( 0 ); | 147 | QArray<int> vl( 0 ); |
147 | catmb->setCategories( vl, "Document View", // No tr | 148 | catmb->setCategories( vl, "Document View", // No tr |
148 | "Document View" ); | 149 | "Document View" ); |
149 | catmb->setRemoveCategoryEdit( TRUE ); | 150 | catmb->setRemoveCategoryEdit( TRUE ); |
150 | catmb->setAllCategories( TRUE ); | 151 | catmb->setAllCategories( TRUE ); |
151 | connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int))); | 152 | connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int))); |
152 | catmb->setCurrentCategory(-2); | 153 | catmb->setCurrentCategory(-2); |
153 | return catmb; | 154 | return catmb; |
154 | } | 155 | } |
155 | 156 | ||
156 | void Doc_DirLister::showCategory(int which) | 157 | void Doc_DirLister::showCategory(int which) |
157 | { | 158 | { |
159 | odebug<<"Show cat " << which << oendl; | ||
158 | m_catFilter = which==-2?0:which; | 160 | m_catFilter = which==-2?0:which; |
159 | setStartPath(""); | 161 | setStartPath(""); |
162 | odebug<<"Show cat before emit" << oendl; | ||
160 | emit sig_reloadDir(); | 163 | emit sig_reloadDir(); |
164 | odebug<<"Show cat - emit signal finished" << oendl; | ||
161 | } | 165 | } |
162 | 166 | ||
163 | void Doc_DirLister::systemMsg(const QCString &msg, const QByteArray &data) | 167 | void Doc_DirLister::systemMsg(const QCString &msg, const QByteArray &data) |
164 | { | 168 | { |
165 | if ( msg != "linkChanged(QString)"||!m_docreads) { | 169 | if ( msg != "linkChanged(QString)"||!m_docreads) { |
166 | return; | 170 | return; |
167 | } | 171 | } |
172 | #if 0 | ||
173 | // makes big problems on zaurus! | ||
168 | QString link; | 174 | QString link; |
169 | QDataStream stream( data, IO_ReadOnly ); | 175 | QDataStream stream( data, IO_ReadOnly ); |
170 | stream >> link; | 176 | stream >> link; |
171 | odebug << "Doc_DirLister systemMsg -> linkchanged( " << link << " )" << oendl; | 177 | odebug << "Doc_DirLister systemMsg -> linkchanged( " << link << " )" << oendl; |
172 | if ( link.isNull() || OGlobal::isAppLnkFileName(link) ) { | 178 | if ( link.isNull() || OGlobal::isAppLnkFileName(link) ) { |
173 | return; | 179 | return; |
174 | } | 180 | } |
175 | QListIterator<DocLnk> dit(m_ds.children()); | 181 | QListIterator<DocLnk> dit(m_ds.children()); |
176 | bool must_reload = false; | 182 | bool must_reload = false; |
177 | bool found = false; | 183 | bool found = false; |
178 | while ( dit.current() ) { | 184 | while ( dit.current() ) { |
179 | DocLnk *doc = dit.current(); | 185 | DocLnk *doc = dit.current(); |
@@ -189,13 +195,14 @@ void Doc_DirLister::systemMsg(const QCString &msg, const QByteArray &data) | |||
189 | } | 195 | } |
190 | if (matchCat(doc) || matchCat(dl)) { | 196 | if (matchCat(doc) || matchCat(dl)) { |
191 | must_reload = true; | 197 | must_reload = true; |
192 | } | 198 | } |
193 | m_ds.remove( doc ); // remove old link from docLnkSet | 199 | m_ds.remove( doc ); // remove old link from docLnkSet |
194 | delete doc; | 200 | delete doc; |
195 | } | 201 | } |
196 | } | 202 | } |
197 | if (must_reload) { | 203 | if (must_reload) { |
198 | setStartPath(""); | 204 | setStartPath(""); |
199 | emit sig_reloadDir(); | 205 | emit sig_reloadDir(); |
200 | } | 206 | } |
207 | #endif | ||
201 | } | 208 | } |