Diffstat (limited to 'core/pim/datebook/datebook.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/pim/datebook/datebook.cpp | 46 |
1 files changed, 42 insertions, 4 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 6dd8918..cf1eeca 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -244,2 +244,16 @@ void DateBook::slotSettings() | |||
244 | 244 | ||
245 | bool found=false; | ||
246 | for (int i=0; i<(frmSettings.comboLocation->count()); i++) { | ||
247 | if ( frmSettings.comboLocation->text(i) == defaultLocation ) { | ||
248 | frmSettings.comboLocation->setCurrentItem(i); | ||
249 | found=true; | ||
250 | break; | ||
251 | } | ||
252 | } | ||
253 | if(!found) { | ||
254 | frmSettings.comboLocation->insertItem(defaultLocation); | ||
255 | frmSettings.comboLocation->setCurrentItem(frmSettings.comboLocation->count()-1); | ||
256 | } | ||
257 | frmSettings.comboCategory->setCategories(defaultCategories,"Calendar", tr("Calendar")); | ||
258 | |||
245 | #if defined (Q_WS_QWS) || defined(_WS_QWS_) | 259 | #if defined (Q_WS_QWS) || defined(_WS_QWS_) |
@@ -257,2 +271,4 @@ void DateBook::slotSettings() | |||
257 | weeklistviewconfig=frmSettings.comboWeekListView->currentItem(); | 271 | weeklistviewconfig=frmSettings.comboWeekListView->currentItem(); |
272 | defaultLocation=frmSettings.comboLocation->currentText(); | ||
273 | defaultCategories=frmSettings.comboCategory->currentCategories(); | ||
258 | 274 | ||
@@ -387,4 +403,6 @@ void DateBook::insertEvent( const Event &e ) | |||
387 | { | 403 | { |
388 | qWarning("Adding Event!"); | 404 | Event dupEvent=e; |
389 | db->addEvent(e); | 405 | dupEvent.setLocation(defaultLocation); |
406 | dupEvent.setCategories(defaultCategories); | ||
407 | db->addEvent(dupEvent); | ||
390 | emit newEvent(); | 408 | emit newEvent(); |
@@ -608,2 +626,11 @@ void DateBook::loadSettings() | |||
608 | weeklistviewconfig = config.readNumEntry("weeklistviewconfig",NORMAL); | 626 | weeklistviewconfig = config.readNumEntry("weeklistviewconfig",NORMAL); |
627 | |||
628 | defaultLocation=config.readEntry("defaultLocation"); | ||
629 | QString tmpString=config.readEntry("defaultCategories"); | ||
630 | QStringList tmpStringList=QStringList::split(",",tmpString); | ||
631 | defaultCategories.truncate(0); | ||
632 | for( QStringList::Iterator i=tmpStringList.begin(); i!=tmpStringList.end(); i++) { | ||
633 | defaultCategories.resize(defaultCategories.count()+1); | ||
634 | defaultCategories[defaultCategories.count()-1]=(*i).toInt(); | ||
635 | } | ||
609 | } | 636 | } |
@@ -622,2 +649,9 @@ void DateBook::saveSettings() | |||
622 | configDB.writeEntry("weeklistviewconfig",weeklistviewconfig); | 649 | configDB.writeEntry("weeklistviewconfig",weeklistviewconfig); |
650 | |||
651 | configDB.writeEntry("defaultLocation",defaultLocation); | ||
652 | QStringList tmpStringList; | ||
653 | for( uint i=0; i<defaultCategories.count(); i++) { | ||
654 | tmpStringList << QString::number(defaultCategories[i]); | ||
655 | } | ||
656 | configDB.writeEntry("defaultCategories",tmpStringList.join(",")); | ||
623 | } | 657 | } |
@@ -843,6 +877,11 @@ void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const | |||
843 | if(location==0) { | 877 | if(location==0) { |
878 | if(defaultLocation.isEmpty()) { | ||
844 | ev.setLocation( tr("(Unknown)") ); | 879 | ev.setLocation( tr("(Unknown)") ); |
845 | } else { | 880 | } else { |
881 | ev.setLocation( defaultLocation ); | ||
882 | } | ||
883 | } else { | ||
846 | ev.setLocation(location); | 884 | ev.setLocation(location); |
847 | } | 885 | } |
886 | ev.setCategories(defaultCategories); | ||
848 | ev.setStart( start ); | 887 | ev.setStart( start ); |
@@ -861,4 +900,3 @@ void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const | |||
861 | if ( !error.isNull() ) { | 900 | if ( !error.isNull() ) { |
862 | if ( QMessageBox::warning( this, tr("Error!"), | 901 | if ( QMessageBox::warning( this, tr("Error!"), error, tr("Fix it"), tr("Continue"), 0, 0, 1 ) == 0 ) |
863 | error, tr("Fix it"), tr("Continue"), 0, 0, 1 ) == 0 ) | ||
864 | continue; | 902 | continue; |