-rw-r--r-- | libkdepim/categoryselectdialog.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp index 4d80726..974752c 100644 --- a/libkdepim/categoryselectdialog.cpp +++ b/libkdepim/categoryselectdialog.cpp | |||
@@ -59,13 +59,16 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent, | |||
59 | void CategorySelectDialog::editCategoriesDialog() | 59 | void CategorySelectDialog::editCategoriesDialog() |
60 | { | 60 | { |
61 | KPIM::CategoryEditDialog* ced = new KPIM::CategoryEditDialog(mPrefs,this ); | 61 | KPIM::CategoryEditDialog* ced = new KPIM::CategoryEditDialog(mPrefs,this ); |
62 | 62 | ||
63 | ced->exec(); | 63 | ced->exec(); |
64 | delete ced; | 64 | delete ced; |
65 | slotApply(); | ||
66 | QStringList temp = mCategoryList; | ||
65 | setCategories(); | 67 | setCategories(); |
68 | setSelected( temp ); | ||
66 | } | 69 | } |
67 | void CategorySelectDialog::setCategories() | 70 | void CategorySelectDialog::setCategories() |
68 | { | 71 | { |
69 | mColorItem = 0; | 72 | mColorItem = 0; |
70 | mCategories->clear(); | 73 | mCategories->clear(); |
71 | mCategoryList.clear(); | 74 | mCategoryList.clear(); |
@@ -189,27 +192,27 @@ void CategorySelectDialog::slotApply() | |||
189 | } | 192 | } |
190 | item = (QCheckListItem *)item->nextSibling(); | 193 | item = (QCheckListItem *)item->nextSibling(); |
191 | } | 194 | } |
192 | categories.sort(); | 195 | categories.sort(); |
193 | if ( ! colcat.isEmpty() ) | 196 | if ( ! colcat.isEmpty() ) |
194 | categories.prepend( colcat ); | 197 | categories.prepend( colcat ); |
195 | QString categoriesStr = categories.join(","); | 198 | // QString categoriesStr = categories.join(","); |
196 | 199 | ||
197 | mCategoryList = categories; | 200 | mCategoryList = categories; |
198 | 201 | ||
199 | emit categoriesSelected(categories); | ||
200 | emit categoriesSelected(categoriesStr); | ||
201 | } | 202 | } |
202 | void CategorySelectDialog::accept() | 203 | void CategorySelectDialog::accept() |
203 | { | 204 | { |
204 | slotOk(); | 205 | slotOk(); |
205 | } | 206 | } |
206 | 207 | ||
207 | void CategorySelectDialog::slotOk() | 208 | void CategorySelectDialog::slotOk() |
208 | { | 209 | { |
209 | slotApply(); | 210 | slotApply(); |
211 | emit categoriesSelected(mCategoryList); | ||
212 | emit categoriesSelected(mCategoryList.join(",")); | ||
210 | QDialog::accept(); | 213 | QDialog::accept(); |
211 | } | 214 | } |
212 | 215 | ||
213 | void CategorySelectDialog::clear() | 216 | void CategorySelectDialog::clear() |
214 | { | 217 | { |
215 | QCheckListItem *item = (QCheckListItem *)mCategories->firstChild(); | 218 | QCheckListItem *item = (QCheckListItem *)mCategories->firstChild(); |