-rw-r--r-- | korganizer/journalentry.cpp | 53 |
1 files changed, 41 insertions, 12 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 4751d40..56221dc 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -80,7 +80,7 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : mTitle = new KOLocationBox(TRUE, vb, 30); mTitle->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding ,QSizePolicy::Fixed ,FALSE) ); - mTitleLabel = new QLabel(i18n("Title"),vb); - mTitleLabel->setMargin(0); - mTitleLabel->setAlignment(AlignCenter); + mCalendarBox = new QComboBox(vb); + //mTitleLabel->setMargin(0); + //mTitleLabel->setAlignment(AlignCenter); QPushButton * loadTemplate = new QPushButton( vb ); QPushButton * saveTemplate = new QPushButton( vb ); @@ -100,4 +100,5 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : toggleJournal->setFixedSize( size , size ); mTitle->setMaximumHeight( size+4); + mCalendarBox->setMaximumHeight( size+4); mEditor = new KTextEdit(this); #ifndef DESKTOP_VERSION @@ -177,7 +178,32 @@ void JournalEntry::setDate(const QDate &date) writeJournal(); mDate = date; - int id = mCalendar->defaultCalendar(); - QString calname = KOPrefs::instance()->getCalendar( id )->mName; - mTitleLabel->setText( " (" + calname +")"); + fillCalendar( mCalendar->defaultCalendar() ); +} +void JournalEntry::fillCalendar( int setToID ) +{ + mCalendarBox->clear(); + KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); + int std = 0; + int count = 0; + while ( kkf ) { + if ( (!kkf->mErrorOnLoad &&! kkf->isReadOnly) || setToID == kkf->mCalNumber ) { + if ( setToID ) { + if ( kkf->mCalNumber == setToID ) + std = count; + } else { + if ( kkf->isStandard ) { + std = count; + } + } + ++count; + mCalendarBox->insertItem( kkf->mName ); + } + kkf = KOPrefs::instance()->mCalendars.next(); + } + mCalendarBox->setCurrentItem( std ); + if ( KOPrefs::instance()->mCalendars.count() == 1 ) + mCalendarBox->hide(); + else + mCalendarBox->show(); } @@ -207,7 +233,8 @@ void JournalEntry::setShowOnly() mEditor->setFocus(); } -void JournalEntry::setJournal(Journal *journal) +void JournalEntry::setJournal(Journal *journal, bool saveJournal ) { - writeJournal(); + if ( saveJournal ) + writeJournal(); mTitle->load( KOLocationBox::SUMMARYJOURNAL ); @@ -220,8 +247,5 @@ void JournalEntry::setJournal(Journal *journal) mTitle->setEnabled (!journal->isReadOnly() ); mEditor->setReadOnly ( journal->isReadOnly() ); - int id = mJournal->calID(); - - QString calname = KOPrefs::instance()->getCalendar( id )->mName; - mTitleLabel->setText( " (" + calname +")"); + fillCalendar( mJournal->calID() ); } @@ -261,4 +285,5 @@ void JournalEntry::writeJournal() { if ( !visibleMode ) return; + if ( !mTitle->isEnabled() ) return; if (mEditor->text().isEmpty() && mTitle->currentText().isEmpty()) { if ( mJournal ) { @@ -287,4 +312,8 @@ void JournalEntry::writeJournal() mTitle->save(KOLocationBox::SUMMARYJOURNAL); } + int id = KOPrefs::instance()->getCalendarID( mCalendarBox->currentText() ); + if ( mJournal->calID() != id ) { + mJournal->setCalID( id ); + } } |