author | zautrix <zautrix> | 2005-07-05 11:01:38 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-05 11:01:38 (UTC) |
commit | 68016257abe13019610cb7bb230f8d754179abfb (patch) (unidiff) | |
tree | eb89374fe7aa4ef591388a49ce6ba7eddd43a10f /korganizer/journalentry.cpp | |
parent | ea75d46072630883fae6ededd4af1d3c427ff59f (diff) | |
download | kdepimpi-68016257abe13019610cb7bb230f8d754179abfb.zip kdepimpi-68016257abe13019610cb7bb230f8d754179abfb.tar.gz kdepimpi-68016257abe13019610cb7bb230f8d754179abfb.tar.bz2 |
nf
-rw-r--r-- | korganizer/journalentry.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 902e96f..b8a4cf2 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp | |||
@@ -101,18 +101,18 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : | |||
101 | if ( QApplication::desktop()->width() < 321 ) | 101 | if ( QApplication::desktop()->width() < 321 ) |
102 | iconp = SmallIcon("fileimport16"); | 102 | iconp = SmallIcon("fileimport16"); |
103 | else | 103 | else |
104 | iconp = SmallIcon("fileimport"); | 104 | iconp = SmallIcon("fileimport"); |
105 | loadTemplate->setPixmap (iconp ) ; | 105 | loadTemplate->setPixmap (iconp ) ; |
106 | loadTemplate->setFixedSize( size, size ); | 106 | loadTemplate->setFixedSize( size, size ); |
107 | saveTemplate->setFixedSize( size, size ); | 107 | saveTemplate->setFixedSize( size, size ); |
108 | toggleJournal->setFixedSize( size , size ); | 108 | toggleJournal->setFixedSize( size , size ); |
109 | mTitle->setMaximumHeight( size+4); | 109 | mTitle->setFixedHeight( size+4); |
110 | mCalendarBox->setMaximumHeight( size+4); | 110 | mCalendarBox->setFixedHeight( size+4); |
111 | mEditor = new KTextEdit(this); | 111 | mEditor = new KTextEdit(this); |
112 | #ifndef DESKTOP_VERSION | 112 | #ifndef DESKTOP_VERSION |
113 | QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold ); | 113 | QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold ); |
114 | #endif | 114 | #endif |
115 | mEditor->setWordWrap( KTextEdit::WidgetWidth ); | 115 | mEditor->setWordWrap( KTextEdit::WidgetWidth ); |
116 | QBoxLayout *topLayout = new QVBoxLayout(this); | 116 | QBoxLayout *topLayout = new QVBoxLayout(this); |
117 | topLayout->addWidget(vb); | 117 | topLayout->addWidget(vb); |
118 | topLayout->addWidget(mEditor); | 118 | topLayout->addWidget(mEditor); |
@@ -204,21 +204,16 @@ void JournalEntry::fillCalendar( int setToID ) | |||
204 | } | 204 | } |
205 | } | 205 | } |
206 | ++count; | 206 | ++count; |
207 | mCalendarBox->insertItem( kkf->mName ); | 207 | mCalendarBox->insertItem( kkf->mName ); |
208 | } | 208 | } |
209 | kkf = KOPrefs::instance()->mCalendars.next(); | 209 | kkf = KOPrefs::instance()->mCalendars.next(); |
210 | } | 210 | } |
211 | mCalendarBox->setCurrentItem( std ); | 211 | mCalendarBox->setCurrentItem( std ); |
212 | if ( KOPrefs::instance()->mCalendars.count() == 1 ) | ||
213 | mCalendarBox->hide(); | ||
214 | else { | ||
215 | mCalendarBox->show(); | ||
216 | } | ||
217 | } | 212 | } |
218 | 213 | ||
219 | void JournalEntry::toggleShowJournal() | 214 | void JournalEntry::toggleShowJournal() |
220 | { | 215 | { |
221 | if (!mEditor->text().isEmpty() || !mTitle->currentText ().isEmpty()) | 216 | if (!mEditor->text().isEmpty() || !mTitle->currentText ().isEmpty()) |
222 | flushEntry(); | 217 | flushEntry(); |
223 | if ( showOnlyMode ) | 218 | if ( showOnlyMode ) |
224 | emit showJournalOnly( 0 ); | 219 | emit showJournalOnly( 0 ); |