summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-16 23:29:30 (UTC)
committer zautrix <zautrix>2005-03-16 23:29:30 (UTC)
commite0a510893ffcddb8d58f785832622d030900b2f9 (patch) (unidiff)
treeaa9499e0a81c26a24f832b0dd58bc8943db13e3d
parentd2be5ea1cd22f5222aecb0f70a2fe8657fae9698 (diff)
downloadkdepimpi-e0a510893ffcddb8d58f785832622d030900b2f9.zip
kdepimpi-e0a510893ffcddb8d58f785832622d030900b2f9.tar.gz
kdepimpi-e0a510893ffcddb8d58f785832622d030900b2f9.tar.bz2
fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/categoryselectdialog.cpp9
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
@@ -53,25 +53,28 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent,
53 resize( 300, 360 ); 53 resize( 300, 360 );
54 else 54 else
55 showMaximized(); 55 showMaximized();
56 connect( mSetColorCat, SIGNAL( clicked() ), this, SLOT( setColorCat() ) ); 56 connect( mSetColorCat, SIGNAL( clicked() ), this, SLOT( setColorCat() ) );
57 // connect( mCategories, SIGNAL( clicked(QListViewItem *) ), this, SLOT( clicked(QListViewItem *) ) ); 57 // connect( mCategories, SIGNAL( clicked(QListViewItem *) ), this, SLOT( clicked(QListViewItem *) ) );
58} 58}
59void CategorySelectDialog::editCategoriesDialog() 59void 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}
67void CategorySelectDialog::setCategories() 70void CategorySelectDialog::setCategories()
68{ 71{
69 mColorItem = 0; 72 mColorItem = 0;
70 mCategories->clear(); 73 mCategories->clear();
71 mCategoryList.clear(); 74 mCategoryList.clear();
72 75
73 QStringList::Iterator it; 76 QStringList::Iterator it;
74 for (it = mPrefs->mCustomCategories.begin(); 77 for (it = mPrefs->mCustomCategories.begin();
75 it != mPrefs->mCustomCategories.end(); ++it ) { 78 it != mPrefs->mCustomCategories.end(); ++it ) {
76 CategorySelectItem * item = new CategorySelectItem(mCategories,*it,QCheckListItem::CheckBox); 79 CategorySelectItem * item = new CategorySelectItem(mCategories,*it,QCheckListItem::CheckBox);
77 QObject::connect( item, SIGNAL( stateChanged(QListViewItem *) ), this, SLOT( clicked(QListViewItem *) ) ); 80 QObject::connect( item, SIGNAL( stateChanged(QListViewItem *) ), this, SLOT( clicked(QListViewItem *) ) );
@@ -183,39 +186,39 @@ void CategorySelectDialog::slotApply()
183 while (item) { 186 while (item) {
184 if (item->isOn()) { 187 if (item->isOn()) {
185 if ( item == mColorItem) 188 if ( item == mColorItem)
186 colcat = item->text(); 189 colcat = item->text();
187 else 190 else
188 categories.append(item->text()); 191 categories.append(item->text());
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}
202void CategorySelectDialog::accept() 203void CategorySelectDialog::accept()
203{ 204{
204 slotOk(); 205 slotOk();
205} 206}
206 207
207void CategorySelectDialog::slotOk() 208void 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
213void CategorySelectDialog::clear() 216void CategorySelectDialog::clear()
214{ 217{
215 QCheckListItem *item = (QCheckListItem *)mCategories->firstChild(); 218 QCheckListItem *item = (QCheckListItem *)mCategories->firstChild();
216 while (item) { 219 while (item) {
217 item->setOn(false); 220 item->setOn(false);
218 item = (QCheckListItem *)item->nextSibling(); 221 item = (QCheckListItem *)item->nextSibling();
219 } 222 }
220} 223}
221 224