author | zautrix <zautrix> | 2005-07-04 14:29:18 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-04 14:29:18 (UTC) |
commit | 7221ff029af217ae703e8217333bd9b170203181 (patch) (unidiff) | |
tree | f294b7f4c0235858868c2a44f70b3014b7c53aab /korganizer | |
parent | 172078c08cd183e9f7ec913a9bf42426e3585b78 (diff) | |
download | kdepimpi-7221ff029af217ae703e8217333bd9b170203181.zip kdepimpi-7221ff029af217ae703e8217333bd9b170203181.tar.gz kdepimpi-7221ff029af217ae703e8217333bd9b170203181.tar.bz2 |
box
-rw-r--r-- | korganizer/journalentry.cpp | 36 | ||||
-rw-r--r-- | korganizer/journalentry.h | 3 | ||||
-rw-r--r-- | korganizer/koeditorgeneral.cpp | 4 | ||||
-rw-r--r-- | korganizer/kojournalview.cpp | 36 | ||||
-rw-r--r-- | korganizer/kolocationbox.cpp | 8 | ||||
-rw-r--r-- | korganizer/kolocationbox.h | 2 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 2 | ||||
-rw-r--r-- | korganizer/koprefs.h | 1 |
8 files changed, 56 insertions, 36 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 3c38f34..4751d40 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp | |||
@@ -42,8 +42,10 @@ | |||
42 | #include <kfiledialog.h> | 42 | #include <kfiledialog.h> |
43 | #include <kmessagebox.h> | 43 | #include <kmessagebox.h> |
44 | #include "koprefs.h" | 44 | #include "koprefs.h" |
45 | #include <klineedit.h> | 45 | #include <klineedit.h> |
46 | #include <kdialog.h> | ||
47 | #include "kolocationbox.h" | ||
46 | 48 | ||
47 | #include <libkcal/journal.h> | 49 | #include <libkcal/journal.h> |
48 | #include <libkcal/calendarresources.h> | 50 | #include <libkcal/calendarresources.h> |
49 | #include <libkcal/resourcecalendar.h> | 51 | #include <libkcal/resourcecalendar.h> |
@@ -69,14 +71,15 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : | |||
69 | mJournal = 0; | 71 | mJournal = 0; |
70 | visibleMode = true; | 72 | visibleMode = true; |
71 | QHBox * vb = new QHBox ( this ); | 73 | QHBox * vb = new QHBox ( this ); |
72 | QPixmap iconp; | 74 | QPixmap iconp; |
73 | 75 | vb->setMargin ( KDialog::marginHint()-1 ); | |
74 | QPushButton * toggleJournal = new QPushButton( vb ); | 76 | QPushButton * toggleJournal = new QPushButton( vb ); |
75 | iconp = SmallIcon("1updownarrow"); | 77 | iconp = SmallIcon("1updownarrow"); |
76 | toggleJournal->setPixmap (iconp ) ; | 78 | toggleJournal->setPixmap (iconp ) ; |
77 | new QLabel(" "+i18n("Title: "),vb); | 79 | new QLabel(" "+i18n("Title: "),vb); |
78 | mTitle = new KLineEdit ( vb ); | 80 | mTitle = new KOLocationBox(TRUE, vb, 30); |
81 | mTitle->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding ,QSizePolicy::Fixed ,FALSE) ); | ||
79 | mTitleLabel = new QLabel(i18n("Title"),vb); | 82 | mTitleLabel = new QLabel(i18n("Title"),vb); |
80 | mTitleLabel->setMargin(0); | 83 | mTitleLabel->setMargin(0); |
81 | mTitleLabel->setAlignment(AlignCenter); | 84 | mTitleLabel->setAlignment(AlignCenter); |
82 | QPushButton * loadTemplate = new QPushButton( vb ); | 85 | QPushButton * loadTemplate = new QPushButton( vb ); |
@@ -94,8 +97,9 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : | |||
94 | loadTemplate->setPixmap (iconp ) ; | 97 | loadTemplate->setPixmap (iconp ) ; |
95 | loadTemplate->setFixedSize( size, size ); | 98 | loadTemplate->setFixedSize( size, size ); |
96 | saveTemplate->setFixedSize( size, size ); | 99 | saveTemplate->setFixedSize( size, size ); |
97 | toggleJournal->setFixedSize( size , size ); | 100 | toggleJournal->setFixedSize( size , size ); |
101 | mTitle->setMaximumHeight( size+4); | ||
98 | mEditor = new KTextEdit(this); | 102 | mEditor = new KTextEdit(this); |
99 | #ifndef DESKTOP_VERSION | 103 | #ifndef DESKTOP_VERSION |
100 | QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold ); | 104 | QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold ); |
101 | #endif | 105 | #endif |
@@ -106,8 +110,10 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : | |||
106 | mEditor->installEventFilter(this); | 110 | mEditor->installEventFilter(this); |
107 | connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); | 111 | connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); |
108 | connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); | 112 | connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); |
109 | connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) ); | 113 | connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) ); |
114 | mTitle->load( KOLocationBox::SUMMARYJOURNAL ); | ||
115 | mTitle->lineEdit ()->setText(""); | ||
110 | } | 116 | } |
111 | 117 | ||
112 | JournalEntry::~JournalEntry() | 118 | JournalEntry::~JournalEntry() |
113 | { | 119 | { |
@@ -176,9 +182,9 @@ void JournalEntry::setDate(const QDate &date) | |||
176 | } | 182 | } |
177 | 183 | ||
178 | void JournalEntry::toggleShowJournal() | 184 | void JournalEntry::toggleShowJournal() |
179 | { | 185 | { |
180 | if (!mEditor->text().isEmpty() || !mTitle->text().isEmpty()) | 186 | if (!mEditor->text().isEmpty() || !mTitle->currentText ().isEmpty()) |
181 | flushEntry(); | 187 | flushEntry(); |
182 | if ( showOnlyMode ) | 188 | if ( showOnlyMode ) |
183 | emit showJournalOnly( 0 ); | 189 | emit showJournalOnly( 0 ); |
184 | else { | 190 | else { |
@@ -194,30 +200,30 @@ void JournalEntry::setVisibleOn() | |||
194 | } | 200 | } |
195 | void JournalEntry::setShowOnly() | 201 | void JournalEntry::setShowOnly() |
196 | { | 202 | { |
197 | showOnlyMode = true; | 203 | showOnlyMode = true; |
198 | if ( mTitle->text().isEmpty() ) | 204 | if ( mTitle->currentText().isEmpty() ) |
199 | mTitle->setFocus(); | 205 | mTitle->setFocus(); |
200 | else | 206 | else |
201 | mEditor->setFocus(); | 207 | mEditor->setFocus(); |
202 | } | 208 | } |
203 | void JournalEntry::setJournal(Journal *journal) | 209 | void JournalEntry::setJournal(Journal *journal) |
204 | { | 210 | { |
205 | writeJournal(); | 211 | writeJournal(); |
212 | mTitle->load( KOLocationBox::SUMMARYJOURNAL ); | ||
206 | 213 | ||
207 | mJournal = journal; | 214 | mJournal = journal; |
208 | if ( journal->isReadOnly() ) | 215 | if ( journal->isReadOnly() ) |
209 | mTitle->setText(mJournal->summary()+" ("+i18n("readonly")+")"); | 216 | mTitle->lineEdit ()->setText(mJournal->summary()+" ("+i18n("readonly")+")"); |
210 | else | 217 | else |
211 | mTitle->setText(mJournal->summary()); | 218 | mTitle->lineEdit ()->setText(mJournal->summary()); |
212 | mEditor->setText(mJournal->description()); | 219 | mEditor->setText(mJournal->description()); |
213 | mTitle->setReadOnly (journal->isReadOnly() ); | 220 | mTitle->setEnabled (!journal->isReadOnly() ); |
214 | mEditor->setReadOnly ( journal->isReadOnly() ); | 221 | mEditor->setReadOnly ( journal->isReadOnly() ); |
215 | int id = mJournal->calID(); | 222 | int id = mJournal->calID(); |
216 | 223 | ||
217 | QString calname = KOPrefs::instance()->getCalendar( id )->mName; | 224 | QString calname = KOPrefs::instance()->getCalendar( id )->mName; |
218 | mTitleLabel->setText( " (" + calname +")"); | 225 | mTitleLabel->setText( " (" + calname +")"); |
219 | |||
220 | } | 226 | } |
221 | 227 | ||
222 | Journal *JournalEntry::journal() const | 228 | Journal *JournalEntry::journal() const |
223 | { | 229 | { |
@@ -228,9 +234,10 @@ Journal *JournalEntry::journal() const | |||
228 | void JournalEntry::clear() | 234 | void JournalEntry::clear() |
229 | { | 235 | { |
230 | mJournal = 0; | 236 | mJournal = 0; |
231 | mEditor->setText(""); | 237 | mEditor->setText(""); |
232 | mTitle->setText(""); | 238 | mTitle->load( KOLocationBox::SUMMARYJOURNAL ); |
239 | mTitle->lineEdit ()->setText(""); | ||
233 | } | 240 | } |
234 | 241 | ||
235 | bool JournalEntry::eventFilter( QObject *o, QEvent *e ) | 242 | bool JournalEntry::eventFilter( QObject *o, QEvent *e ) |
236 | { | 243 | { |
@@ -252,9 +259,9 @@ bool JournalEntry::eventFilter( QObject *o, QEvent *e ) | |||
252 | 259 | ||
253 | void JournalEntry::writeJournal() | 260 | void JournalEntry::writeJournal() |
254 | { | 261 | { |
255 | if ( !visibleMode ) return; | 262 | if ( !visibleMode ) return; |
256 | if (mEditor->text().isEmpty() && mTitle->text().isEmpty()) { | 263 | if (mEditor->text().isEmpty() && mTitle->currentText().isEmpty()) { |
257 | if ( mJournal ) { | 264 | if ( mJournal ) { |
258 | Journal* j = mJournal; | 265 | Journal* j = mJournal; |
259 | mJournal = 0; | 266 | mJournal = 0; |
260 | bool conf = KOPrefs::instance()->mConfirm; | 267 | bool conf = KOPrefs::instance()->mConfirm; |
@@ -271,12 +278,15 @@ void JournalEntry::writeJournal() | |||
271 | mJournal = new Journal; | 278 | mJournal = new Journal; |
272 | mJournal->setDtStart(QDateTime(mDate,QTime(0,0,0))); | 279 | mJournal->setDtStart(QDateTime(mDate,QTime(0,0,0))); |
273 | mCalendar->addJournal(mJournal); | 280 | mCalendar->addJournal(mJournal); |
274 | } | 281 | } |
275 | if ( mJournal->description() != mEditor->text() ) | 282 | if ( mJournal->description() != mEditor->text() ) { |
276 | mJournal->setDescription(mEditor->text()); | 283 | mJournal->setDescription(mEditor->text()); |
277 | if ( mJournal->summary() != mTitle->text() ) | 284 | } |
278 | mJournal->setSummary(mTitle->text()); | 285 | if ( mJournal->summary() != mTitle->currentText() ) { |
286 | mJournal->setSummary(mTitle->currentText()); | ||
287 | mTitle->save(KOLocationBox::SUMMARYJOURNAL); | ||
288 | } | ||
279 | } | 289 | } |
280 | 290 | ||
281 | void JournalEntry::flushEntry() | 291 | void JournalEntry::flushEntry() |
282 | { | 292 | { |
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h index cc9b5ef..fb19fb1 100644 --- a/korganizer/journalentry.h +++ b/korganizer/journalentry.h | |||
@@ -31,8 +31,9 @@ | |||
31 | 31 | ||
32 | class QLabel; | 32 | class QLabel; |
33 | class KTextEdit; | 33 | class KTextEdit; |
34 | class KLineEdit; | 34 | class KLineEdit; |
35 | class KOLocationBox; | ||
35 | 36 | ||
36 | using namespace KCal; | 37 | using namespace KCal; |
37 | 38 | ||
38 | class JournalEntry : public QFrame { | 39 | class JournalEntry : public QFrame { |
@@ -75,9 +76,9 @@ class JournalEntry : public QFrame { | |||
75 | Journal *mJournal; | 76 | Journal *mJournal; |
76 | QDate mDate; | 77 | QDate mDate; |
77 | void keyPressEvent ( QKeyEvent * ) ; | 78 | void keyPressEvent ( QKeyEvent * ) ; |
78 | QLabel *mTitleLabel; | 79 | QLabel *mTitleLabel; |
79 | KLineEdit * mTitle; | 80 | KOLocationBox * mTitle; |
80 | KTextEdit *mEditor; | 81 | KTextEdit *mEditor; |
81 | int heiHint; | 82 | int heiHint; |
82 | }; | 83 | }; |
83 | 84 | ||
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 407a5d5..fd50b05 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp | |||
@@ -82,9 +82,9 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) | |||
82 | headerLayout->setSpacing( (KDialog::spacingHint()-3)*2+1 ); | 82 | headerLayout->setSpacing( (KDialog::spacingHint()-3)*2+1 ); |
83 | QLabel *summaryLabel = new QLabel(i18n("Summary:"),parent); | 83 | QLabel *summaryLabel = new QLabel(i18n("Summary:"),parent); |
84 | headerLayout->addWidget(summaryLabel,0,0); | 84 | headerLayout->addWidget(summaryLabel,0,0); |
85 | 85 | ||
86 | mSummaryEdit = new KOLocationBox(TRUE,parent, 10); | 86 | mSummaryEdit = new KOLocationBox(TRUE,parent, 50); |
87 | mSummaryEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) ); | 87 | mSummaryEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) ); |
88 | //mSummaryEdit->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5 ,(QSizePolicy::SizeType)3 ,FALSE) ); | 88 | //mSummaryEdit->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5 ,(QSizePolicy::SizeType)3 ,FALSE) ); |
89 | //qDebug("h %d %d ", summaryLabel->sizeHint().height(),mSummaryEdit->sizeHint().height() ); | 89 | //qDebug("h %d %d ", summaryLabel->sizeHint().height(),mSummaryEdit->sizeHint().height() ); |
90 | int hei = (summaryLabel->sizeHint().height() + mSummaryEdit->sizeHint().height())/2; | 90 | int hei = (summaryLabel->sizeHint().height() + mSummaryEdit->sizeHint().height())/2; |
@@ -104,9 +104,9 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) | |||
104 | headerLayout->addWidget(locationLabel,0,2); | 104 | headerLayout->addWidget(locationLabel,0,2); |
105 | else | 105 | else |
106 | headerLayout->addWidget(locationLabel,1,0); | 106 | headerLayout->addWidget(locationLabel,1,0); |
107 | 107 | ||
108 | mLocationEdit = new KOLocationBox(TRUE,parent,10); | 108 | mLocationEdit = new KOLocationBox(TRUE,parent,30); |
109 | mLocationEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) ); | 109 | mLocationEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) ); |
110 | if ( QApplication::desktop()->width() > 320 && QApplication::desktop()->height() > 240 ) | 110 | if ( QApplication::desktop()->width() > 320 && QApplication::desktop()->height() > 240 ) |
111 | mLocationEdit->setMaximumHeight( hei + 6); | 111 | mLocationEdit->setMaximumHeight( hei + 6); |
112 | 112 | ||
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index 6fa9b23..9b0e748 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp | |||
@@ -49,31 +49,31 @@ KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent, | |||
49 | const char *name) | 49 | const char *name) |
50 | : KOrg::BaseView(calendar, parent, name) | 50 | : KOrg::BaseView(calendar, parent, name) |
51 | { | 51 | { |
52 | mCalendar = calendar; | 52 | mCalendar = calendar; |
53 | QHBox * vb = new QHBox ( this ); | ||
54 | QPushButton * newJournal = new QPushButton( vb ); | ||
55 | QPixmap icon; | ||
56 | if ( QApplication::desktop()->width() < 321 ) | ||
57 | icon = SmallIcon("ko16old"); | ||
58 | else | ||
59 | icon = SmallIcon("ko24old"); | ||
60 | newJournal->setPixmap (icon ) ; | ||
61 | int size = newJournal->sizeHint().height(); | ||
62 | newJournal->setFixedSize( size, size ); | ||
63 | mDateLabel = new QLabel ( vb ); | ||
64 | mDateLabel->setMargin(1); | ||
65 | mDateLabel->setAlignment(AlignCenter); | ||
53 | QScrollView * sv = new QScrollView( this ); | 66 | QScrollView * sv = new QScrollView( this ); |
54 | QHBoxLayout * hbl = new QHBoxLayout( this ); | 67 | QVBoxLayout * hbl = new QVBoxLayout( this ); |
68 | hbl->addWidget( vb ); | ||
55 | hbl->addWidget( sv ); | 69 | hbl->addWidget( sv ); |
56 | parWid = new QWidget( sv->viewport() ); | 70 | parWid = new QWidget( sv->viewport() ); |
57 | sv->addChild(parWid); | 71 | sv->addChild(parWid); |
58 | sv->setResizePolicy( QScrollView:: AutoOneFit ); | 72 | sv->setResizePolicy( QScrollView:: AutoOneFit ); |
59 | mTopLayout = new QVBoxLayout(parWid); | 73 | mTopLayout = new QVBoxLayout(parWid); |
60 | QHBox * vb = new QHBox ( parWid ); | 74 | connect( newJournal, SIGNAL( clicked() ), this , SLOT( newJournal() ) ); |
61 | QPushButton * newJournal = new QPushButton( vb ); | 75 | getNewEntry(); |
62 | QPixmap icon; | ||
63 | if ( QApplication::desktop()->width() < 321 ) | ||
64 | icon = SmallIcon("ko16old"); | ||
65 | else | ||
66 | icon = SmallIcon("ko24old"); | ||
67 | newJournal->setPixmap (icon ) ; | ||
68 | int size = newJournal->sizeHint().height(); | ||
69 | newJournal->setFixedSize( size, size ); | ||
70 | mDateLabel = new QLabel ( vb ); | ||
71 | mTopLayout->addWidget( vb ); | ||
72 | mDateLabel->setMargin(1); | ||
73 | mDateLabel->setAlignment(AlignCenter); | ||
74 | connect( newJournal, SIGNAL( clicked() ), this , SLOT( newJournal() ) ); | ||
75 | getNewEntry(); | ||
76 | } | 76 | } |
77 | 77 | ||
78 | KOJournalView::~KOJournalView() | 78 | KOJournalView::~KOJournalView() |
79 | { | 79 | { |
diff --git a/korganizer/kolocationbox.cpp b/korganizer/kolocationbox.cpp index 35a8123..9d5aafc 100644 --- a/korganizer/kolocationbox.cpp +++ b/korganizer/kolocationbox.cpp | |||
@@ -33,9 +33,9 @@ | |||
33 | KOLocationBox::KOLocationBox( bool rw , QWidget *parent , int _maxItems) : | 33 | KOLocationBox::KOLocationBox( bool rw , QWidget *parent , int _maxItems) : |
34 | QComboBox( rw , parent ) | 34 | QComboBox( rw , parent ) |
35 | { | 35 | { |
36 | maxItems = _maxItems; | 36 | maxItems = _maxItems; |
37 | maxItems = 50; // sorry - hack from me to set maxitems globally to 30 | 37 | //maxItems = 50; // sorry - hack from me to set maxitems globally to 30 |
38 | setInsertionPolicy(AtTop); | 38 | setInsertionPolicy(AtTop); |
39 | setDuplicatesEnabled( FALSE ); | 39 | setDuplicatesEnabled( FALSE ); |
40 | setMaxCount( maxItems ); | 40 | setMaxCount( maxItems ); |
41 | setAutoCompletion( TRUE ); | 41 | setAutoCompletion( TRUE ); |
@@ -60,8 +60,11 @@ void KOLocationBox::load(int what) | |||
60 | break; // don't disable | 60 | break; // don't disable |
61 | case SUMMARYTODO: | 61 | case SUMMARYTODO: |
62 | insertStringList( KOPrefs::instance()->mTodoSummaryUser, 0 ); | 62 | insertStringList( KOPrefs::instance()->mTodoSummaryUser, 0 ); |
63 | break; // don't disable | 63 | break; // don't disable |
64 | case SUMMARYJOURNAL: | ||
65 | insertStringList( KOPrefs::instance()->mJournalSummaryUser, 0 ); | ||
66 | break; // don't disable | ||
64 | } | 67 | } |
65 | } | 68 | } |
66 | 69 | ||
67 | void KOLocationBox::save(int what) | 70 | void KOLocationBox::save(int what) |
@@ -85,8 +88,11 @@ void KOLocationBox::save(int what) | |||
85 | break; // don't disable | 88 | break; // don't disable |
86 | case SUMMARYTODO: | 89 | case SUMMARYTODO: |
87 | KOPrefs::instance()->mTodoSummaryUser = strlist; | 90 | KOPrefs::instance()->mTodoSummaryUser = strlist; |
88 | break; // don't disable | 91 | break; // don't disable |
92 | case SUMMARYJOURNAL: | ||
93 | KOPrefs::instance()->mJournalSummaryUser = strlist; | ||
94 | break; // don't disable | ||
89 | } | 95 | } |
90 | } | 96 | } |
91 | 97 | ||
92 | void KOLocationBox::clearItems(int what) | 98 | void KOLocationBox::clearItems(int what) |
diff --git a/korganizer/kolocationbox.h b/korganizer/kolocationbox.h index b604d33..6a42de6 100644 --- a/korganizer/kolocationbox.h +++ b/korganizer/kolocationbox.h | |||
@@ -35,9 +35,9 @@ class KOLocationBox : public QComboBox | |||
35 | public: | 35 | public: |
36 | KOLocationBox( bool rw , QWidget *parent , int _maxItems ); | 36 | KOLocationBox( bool rw , QWidget *parent , int _maxItems ); |
37 | virtual ~KOLocationBox(); | 37 | virtual ~KOLocationBox(); |
38 | 38 | ||
39 | enum {LOCATION, SUMMARYEVENT, SUMMARYTODO}; | 39 | enum {LOCATION, SUMMARYEVENT, SUMMARYTODO,SUMMARYJOURNAL}; |
40 | 40 | ||
41 | public slots: | 41 | public slots: |
42 | void load(int); | 42 | void load(int); |
43 | void save(int); | 43 | void save(int); |
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 6337ca5..bb3d720 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -130,8 +130,9 @@ KOPrefs::KOPrefs() : | |||
130 | 130 | ||
131 | addItemStringList("LocationDefaults",&mLocationDefaults ); | 131 | addItemStringList("LocationDefaults",&mLocationDefaults ); |
132 | addItemStringList("EventSummary User",&mEventSummaryUser); | 132 | addItemStringList("EventSummary User",&mEventSummaryUser); |
133 | addItemStringList("TodoSummary User",&mTodoSummaryUser); | 133 | addItemStringList("TodoSummary User",&mTodoSummaryUser); |
134 | addItemStringList("JournalSummary User",&mJournalSummaryUser); | ||
134 | 135 | ||
135 | addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); | 136 | addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); |
136 | addItemBool("Enable Project View",&mEnableProjectView,false); | 137 | addItemBool("Enable Project View",&mEnableProjectView,false); |
137 | addItemBool("Auto Save",&mAutoSave,false); | 138 | addItemBool("Auto Save",&mAutoSave,false); |
@@ -362,8 +363,9 @@ void KOPrefs::setAllDefaults() | |||
362 | { | 363 | { |
363 | setCategoryDefaults(); | 364 | setCategoryDefaults(); |
364 | mEventSummaryUser = getDefaultList() ; | 365 | mEventSummaryUser = getDefaultList() ; |
365 | mTodoSummaryUser = getDefaultList() ; | 366 | mTodoSummaryUser = getDefaultList() ; |
367 | mJournalSummaryUser = getDefaultList() ; | ||
366 | mLocationDefaults = getLocationDefaultList(); | 368 | mLocationDefaults = getLocationDefaultList(); |
367 | } | 369 | } |
368 | 370 | ||
369 | void KOPrefs::setCategoryDefaults() | 371 | void KOPrefs::setCategoryDefaults() |
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 5cc9bfa..53d193b 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
@@ -314,8 +314,9 @@ class KOPrefs : public KPimPrefs | |||
314 | 314 | ||
315 | QStringList mLocationDefaults; | 315 | QStringList mLocationDefaults; |
316 | QStringList mEventSummaryUser; | 316 | QStringList mEventSummaryUser; |
317 | QStringList mTodoSummaryUser; | 317 | QStringList mTodoSummaryUser; |
318 | QStringList mJournalSummaryUser; | ||
318 | 319 | ||
319 | bool mUseInternalAlarmNotification; | 320 | bool mUseInternalAlarmNotification; |
320 | int mAlarmPlayBeeps; | 321 | int mAlarmPlayBeeps; |
321 | int mAlarmSuspendTime; | 322 | int mAlarmSuspendTime; |