author | zautrix <zautrix> | 2005-07-04 16:25:06 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-04 16:25:06 (UTC) |
commit | b0ed0793fa5d27475d8954a683ea68ca9ac0017f (patch) (unidiff) | |
tree | 9d89c4a3bd9b9a87c9e600524adf54c11330f47c | |
parent | 226171366bc79927988eac10e0bf7fc3f7faea69 (diff) | |
download | kdepimpi-b0ed0793fa5d27475d8954a683ea68ca9ac0017f.zip kdepimpi-b0ed0793fa5d27475d8954a683ea68ca9ac0017f.tar.gz kdepimpi-b0ed0793fa5d27475d8954a683ea68ca9ac0017f.tar.bz2 |
fixxx
-rw-r--r-- | korganizer/journalentry.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 56221dc..902e96f 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp | |||
@@ -75,12 +75,20 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : | |||
75 | vb->setMargin ( KDialog::marginHint()-1 ); | 75 | vb->setMargin ( KDialog::marginHint()-1 ); |
76 | QPushButton * toggleJournal = new QPushButton( vb ); | 76 | QPushButton * toggleJournal = new QPushButton( vb ); |
77 | iconp = SmallIcon("1updownarrow"); | 77 | iconp = SmallIcon("1updownarrow"); |
78 | toggleJournal->setPixmap (iconp ) ; | 78 | toggleJournal->setPixmap (iconp ) ; |
79 | new QLabel(" "+i18n("Title: "),vb); | 79 | vb->setStretchFactor (new QLabel(" "+i18n("Title: "),vb),1); |
80 | vb->setStretchFactor( toggleJournal, 1 ); | ||
80 | mTitle = new KOLocationBox(TRUE, vb, 30); | 81 | mTitle = new KOLocationBox(TRUE, vb, 30); |
81 | mTitle->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding ,QSizePolicy::Fixed ,FALSE) ); | 82 | mTitle->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding ,QSizePolicy::Fixed ,FALSE) ); |
82 | mCalendarBox = new QComboBox(vb); | 83 | mCalendarBox = new QComboBox(vb); |
84 | mCalendarBox->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding ,QSizePolicy::Fixed ,FALSE) ); | ||
85 | #ifndef DESKTOP_VERSION | ||
86 | mTitle->setSizeLimit( 8 ); | ||
87 | mCalendarBox->setSizeLimit( 8 ); | ||
88 | #endif | ||
89 | vb->setStretchFactor ( mTitle, 8 ); | ||
90 | vb->setStretchFactor ( mCalendarBox, 3 ); | ||
83 | //mTitleLabel->setMargin(0); | 91 | //mTitleLabel->setMargin(0); |
84 | //mTitleLabel->setAlignment(AlignCenter); | 92 | //mTitleLabel->setAlignment(AlignCenter); |
85 | QPushButton * loadTemplate = new QPushButton( vb ); | 93 | QPushButton * loadTemplate = new QPushButton( vb ); |
86 | QPushButton * saveTemplate = new QPushButton( vb ); | 94 | QPushButton * saveTemplate = new QPushButton( vb ); |
@@ -202,10 +210,11 @@ void JournalEntry::fillCalendar( int setToID ) | |||
202 | } | 210 | } |
203 | mCalendarBox->setCurrentItem( std ); | 211 | mCalendarBox->setCurrentItem( std ); |
204 | if ( KOPrefs::instance()->mCalendars.count() == 1 ) | 212 | if ( KOPrefs::instance()->mCalendars.count() == 1 ) |
205 | mCalendarBox->hide(); | 213 | mCalendarBox->hide(); |
206 | else | 214 | else { |
207 | mCalendarBox->show(); | 215 | mCalendarBox->show(); |
216 | } | ||
208 | } | 217 | } |
209 | 218 | ||
210 | void JournalEntry::toggleShowJournal() | 219 | void JournalEntry::toggleShowJournal() |
211 | { | 220 | { |
@@ -245,8 +254,9 @@ void JournalEntry::setJournal(Journal *journal, bool saveJournal ) | |||
245 | mTitle->lineEdit ()->setText(mJournal->summary()); | 254 | mTitle->lineEdit ()->setText(mJournal->summary()); |
246 | mEditor->setText(mJournal->description()); | 255 | mEditor->setText(mJournal->description()); |
247 | mTitle->setEnabled (!journal->isReadOnly() ); | 256 | mTitle->setEnabled (!journal->isReadOnly() ); |
248 | mEditor->setReadOnly ( journal->isReadOnly() ); | 257 | mEditor->setReadOnly ( journal->isReadOnly() ); |
258 | mCalendarBox->setEnabled (!journal->isReadOnly() ); | ||
249 | fillCalendar( mJournal->calID() ); | 259 | fillCalendar( mJournal->calID() ); |
250 | } | 260 | } |
251 | 261 | ||
252 | Journal *JournalEntry::journal() const | 262 | Journal *JournalEntry::journal() const |