author | alwin <alwin> | 2003-12-17 22:14:05 (UTC) |
---|---|---|
committer | alwin <alwin> | 2003-12-17 22:14:05 (UTC) |
commit | eccc6a6362ab655b14c91a65a1cd4c89f39bd1e6 (patch) (unidiff) | |
tree | 30bef45970fea14e13d46a7fd026ef80c4a9b7d0 /noncore/net/mail/accountview.cpp | |
parent | 0b9db8cd39412de3bdc26e8f451b0475a149c903 (diff) | |
download | opie-eccc6a6362ab655b14c91a65a1cd4c89f39bd1e6.zip opie-eccc6a6362ab655b14c91a65a1cd4c89f39bd1e6.tar.gz opie-eccc6a6362ab655b14c91a65a1cd4c89f39bd1e6.tar.bz2 |
folder tree will generate better and real.
Diffstat (limited to 'noncore/net/mail/accountview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/accountview.cpp | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp index bc13336..71a0d74 100644 --- a/noncore/net/mail/accountview.cpp +++ b/noncore/net/mail/accountview.cpp | |||
@@ -105,6 +105,27 @@ AbstractMail *IMAPviewItem::getWrapper() | |||
105 | return wrapper; | 105 | return wrapper; |
106 | } | 106 | } |
107 | 107 | ||
108 | IMAPfolderItem*IMAPviewItem::findSubItem(const QString&path,IMAPfolderItem*start) | ||
109 | { | ||
110 | IMAPfolderItem*pitem,*sitem; | ||
111 | if (!start) pitem = (IMAPfolderItem*)firstChild(); | ||
112 | else pitem = (IMAPfolderItem*)start->firstChild(); | ||
113 | while (pitem) { | ||
114 | if (pitem->matchName(path)) { | ||
115 | break; | ||
116 | } | ||
117 | if (pitem->childCount()>0) { | ||
118 | sitem = findSubItem(path,pitem); | ||
119 | if (sitem) { | ||
120 | pitem = sitem; | ||
121 | break; | ||
122 | } | ||
123 | } | ||
124 | pitem=(IMAPfolderItem*)pitem->nextSibling(); | ||
125 | } | ||
126 | return pitem; | ||
127 | } | ||
128 | |||
108 | void IMAPviewItem::refresh(QList<RecMail>&) | 129 | void IMAPviewItem::refresh(QList<RecMail>&) |
109 | { | 130 | { |
110 | if (childCount()>0) return; | 131 | if (childCount()>0) return; |
@@ -120,7 +141,6 @@ void IMAPviewItem::refresh(QList<RecMail>&) | |||
120 | Folder *it; | 141 | Folder *it; |
121 | QListViewItem*item = 0; | 142 | QListViewItem*item = 0; |
122 | QListViewItem*titem = 0; | 143 | QListViewItem*titem = 0; |
123 | QListViewItem*inboxitem = 0; | ||
124 | QString fname,del,search; | 144 | QString fname,del,search; |
125 | int pos; | 145 | int pos; |
126 | // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 146 | // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
@@ -128,36 +148,28 @@ void IMAPviewItem::refresh(QList<RecMail>&) | |||
128 | 148 | ||
129 | for ( it = folders->first(); it; it = folders->next() ) { | 149 | for ( it = folders->first(); it; it = folders->next() ) { |
130 | if (it->getDisplayName().lower()=="inbox") { | 150 | if (it->getDisplayName().lower()=="inbox") { |
131 | inboxitem = new IMAPfolderItem( it, this , item ); | 151 | item = new IMAPfolderItem( it, this , item ); |
132 | folders->remove(it); | 152 | folders->remove(it); |
133 | qDebug("inbox found"); | 153 | qDebug("inbox found"); |
134 | break; | 154 | break; |
135 | } | 155 | } |
136 | } | 156 | } |
137 | |||
138 | for ( it = folders->first(); it; it = folders->next() ) { | 157 | for ( it = folders->first(); it; it = folders->next() ) { |
139 | fname = it->getDisplayName(); | 158 | fname = it->getDisplayName(); |
140 | pos = fname.findRev(it->Separator()); | 159 | pos = fname.findRev(it->Separator()); |
141 | if (pos != -1) { | 160 | if (pos != -1) { |
142 | fname = fname.left(pos); | 161 | fname = fname.left(pos); |
143 | qDebug(fname); | ||
144 | } | ||
145 | IMAPfolderItem*pitem = (IMAPfolderItem*)firstChild(); | ||
146 | while (pitem) { | ||
147 | if (pitem->matchName(fname)) { | ||
148 | break; | ||
149 | } | ||
150 | pitem=(IMAPfolderItem*)pitem->nextSibling(); | ||
151 | } | 162 | } |
163 | IMAPfolderItem*pitem = findSubItem(fname); | ||
152 | if (pitem) { | 164 | if (pitem) { |
153 | titem = item; | 165 | titem = item; |
154 | item = new IMAPfolderItem(it,pitem,item,this); | 166 | item = new IMAPfolderItem(it,pitem,pitem->firstChild(),this); |
155 | item->setSelectable(it->may_select()); | 167 | item->setSelectable(it->may_select()); |
156 | /* setup the short name */ | 168 | /* setup the short name */ |
157 | item->setText(0,it->getDisplayName().right(it->getDisplayName().length()-pos-1)); | 169 | item->setText(0,it->getDisplayName().right(it->getDisplayName().length()-pos-1)); |
158 | item = titem; | 170 | item = titem; |
159 | } else { | 171 | } else { |
160 | item = new IMAPfolderItem( it, this , (inboxitem?inboxitem:item) ); | 172 | item = new IMAPfolderItem( it, this , item ); |
161 | item->setSelectable(it->may_select()); | 173 | item->setSelectable(it->may_select()); |
162 | } | 174 | } |
163 | } | 175 | } |
@@ -175,7 +187,7 @@ IMAPfolderItem::~IMAPfolderItem() | |||
175 | } | 187 | } |
176 | 188 | ||
177 | IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent , QListViewItem*after ) | 189 | IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent , QListViewItem*after ) |
178 | : AccountViewItem( parent ) | 190 | : AccountViewItem( parent , after ) |
179 | { | 191 | { |
180 | folder = folderInit; | 192 | folder = folderInit; |
181 | imap = parent; | 193 | imap = parent; |