author | alwin <alwin> | 2004-11-14 17:56:36 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-11-14 17:56:36 (UTC) |
commit | 4763ca7911e452b6e36b00999eb243e6549e5cb5 (patch) (unidiff) | |
tree | d947ad65bd55933df22cf5454d02110abbc9157c | |
parent | efd57e13cd3114ab7419ff34c2496cd8289ed5fe (diff) | |
download | opie-4763ca7911e452b6e36b00999eb243e6549e5cb5.zip opie-4763ca7911e452b6e36b00999eb243e6549e5cb5.tar.gz opie-4763ca7911e452b6e36b00999eb243e6549e5cb5.tar.bz2 |
disabled code which makes problems on Z
-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 | |||
@@ -62,48 +62,49 @@ bool Doc_DirLister::matchCat(const AppLnk* app)const | |||
62 | 62 | ||
63 | QString Doc_DirLister::setStartPath(const QString&) { | 63 | QString Doc_DirLister::setStartPath(const QString&) { |
64 | static const QString Mtype_str("image/jpeg;image/gif;image/bmp;image/png"); | 64 | static const QString Mtype_str("image/jpeg;image/gif;image/bmp;image/png"); |
65 | if (!m_docreads) { | 65 | if (!m_docreads) { |
66 | Global::findDocuments(&m_ds,Mtype_str); | 66 | Global::findDocuments(&m_ds,Mtype_str); |
67 | m_docreads = true; | 67 | m_docreads = true; |
68 | } | 68 | } |
69 | return QString::null; | 69 | return QString::null; |
70 | } | 70 | } |
71 | 71 | ||
72 | QString Doc_DirLister::currentPath()const | 72 | QString Doc_DirLister::currentPath()const |
73 | { | 73 | { |
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 | } |
98 | 99 | ||
99 | void Doc_DirLister::thumbNail( const QString& str, int w, int h) | 100 | void Doc_DirLister::thumbNail( const QString& str, int w, int h) |
100 | { | 101 | { |
101 | SlaveMaster::self()->thumbNail( str, w, h ); | 102 | SlaveMaster::self()->thumbNail( str, w, h ); |
102 | } | 103 | } |
103 | 104 | ||
104 | QImage Doc_DirLister::image( const QString& str, Factor f, int m) | 105 | QImage Doc_DirLister::image( const QString& str, Factor f, int m) |
105 | { | 106 | { |
106 | return SlaveMaster::self()->image(str, f, m ); | 107 | return SlaveMaster::self()->image(str, f, m ); |
107 | } | 108 | } |
108 | 109 | ||
109 | void Doc_DirLister::imageInfo( const QString& str) { | 110 | void Doc_DirLister::imageInfo( const QString& str) { |
@@ -134,68 +135,74 @@ QString Doc_DirLister::nameToFname(const QString&name)const | |||
134 | return name; | 135 | return name; |
135 | } | 136 | } |
136 | 137 | ||
137 | QString Doc_DirLister::dirUp( const QString& p ) const{ | 138 | QString Doc_DirLister::dirUp( const QString& p ) const{ |
138 | return p; | 139 | return p; |
139 | } | 140 | } |
140 | 141 | ||
141 | QWidget* Doc_DirLister::widget(QWidget*parent) | 142 | QWidget* Doc_DirLister::widget(QWidget*parent) |
142 | { | 143 | { |
143 | CategorySelect * catmb = new CategorySelect(parent); | 144 | CategorySelect * catmb = new CategorySelect(parent); |
144 | Categories cats( 0 ); | 145 | Categories cats( 0 ); |
145 | cats.load( categoryFileName() ); | 146 | cats.load( categoryFileName() ); |
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(); |
180 | ++dit; | 186 | ++dit; |
181 | if (doc->linkFile() == link) { | 187 | if (doc->linkFile() == link) { |
182 | found = true; | 188 | found = true; |
183 | DocLnk* dl = new DocLnk(link); | 189 | DocLnk* dl = new DocLnk(link); |
184 | if (dl->fileKnown()) { | 190 | if (dl->fileKnown()) { |
185 | // changing | 191 | // changing |
186 | m_ds.add(dl); | 192 | m_ds.add(dl); |
187 | } else { | 193 | } else { |
188 | delete dl; | 194 | delete dl; |
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 | } |