summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-07-04 16:25:06 (UTC)
committer zautrix <zautrix>2005-07-04 16:25:06 (UTC)
commitb0ed0793fa5d27475d8954a683ea68ca9ac0017f (patch) (side-by-side diff)
tree9d89c4a3bd9b9a87c9e600524adf54c11330f47c
parent226171366bc79927988eac10e0bf7fc3f7faea69 (diff)
downloadkdepimpi-b0ed0793fa5d27475d8954a683ea68ca9ac0017f.zip
kdepimpi-b0ed0793fa5d27475d8954a683ea68ca9ac0017f.tar.gz
kdepimpi-b0ed0793fa5d27475d8954a683ea68ca9ac0017f.tar.bz2
fixxx
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/journalentry.cpp14
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
@@ -67,28 +67,36 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
heiHint = heiHint / fac;
showOnlyMode = false;
mCalendar = calendar;
mJournal = 0;
visibleMode = true;
QHBox * vb = new QHBox ( this );
QPixmap iconp;
vb->setMargin ( KDialog::marginHint()-1 );
QPushButton * toggleJournal = new QPushButton( vb );
iconp = SmallIcon("1updownarrow");
toggleJournal->setPixmap (iconp ) ;
- new QLabel(" "+i18n("Title: "),vb);
+ vb->setStretchFactor (new QLabel(" "+i18n("Title: "),vb),1);
+ vb->setStretchFactor( toggleJournal, 1 );
mTitle = new KOLocationBox(TRUE, vb, 30);
mTitle->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding ,QSizePolicy::Fixed ,FALSE) );
mCalendarBox = new QComboBox(vb);
+ mCalendarBox->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding ,QSizePolicy::Fixed ,FALSE) );
+#ifndef DESKTOP_VERSION
+ mTitle->setSizeLimit( 8 );
+ mCalendarBox->setSizeLimit( 8 );
+#endif
+ vb->setStretchFactor ( mTitle, 8 );
+ vb->setStretchFactor ( mCalendarBox, 3 );
//mTitleLabel->setMargin(0);
//mTitleLabel->setAlignment(AlignCenter);
QPushButton * loadTemplate = new QPushButton( vb );
QPushButton * saveTemplate = new QPushButton( vb );
if ( QApplication::desktop()->width() < 321 )
iconp = SmallIcon("fileexport16");
else
iconp = SmallIcon("fileexport");
saveTemplate->setPixmap (iconp ) ;
int size = saveTemplate->sizeHint().height();
if ( QApplication::desktop()->width() < 321 )
iconp = SmallIcon("fileimport16");
@@ -194,26 +202,27 @@ void JournalEntry::fillCalendar( int setToID )
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
+ else {
mCalendarBox->show();
+ }
}
void JournalEntry::toggleShowJournal()
{
if (!mEditor->text().isEmpty() || !mTitle->currentText ().isEmpty())
flushEntry();
if ( showOnlyMode )
emit showJournalOnly( 0 );
else {
// we have to protect mJournal from deleting if mJournal has empty text
visibleMode = false; // set to true via :setShowOnly()
emit showJournalOnly( mJournal );
@@ -237,24 +246,25 @@ void JournalEntry::setJournal(Journal *journal, bool saveJournal )
if ( saveJournal )
writeJournal();
mTitle->load( KOLocationBox::SUMMARYJOURNAL );
mJournal = journal;
if ( journal->isReadOnly() )
mTitle->lineEdit ()->setText(mJournal->summary()+" ("+i18n("readonly")+")");
else
mTitle->lineEdit ()->setText(mJournal->summary());
mEditor->setText(mJournal->description());
mTitle->setEnabled (!journal->isReadOnly() );
mEditor->setReadOnly ( journal->isReadOnly() );
+ mCalendarBox->setEnabled (!journal->isReadOnly() );
fillCalendar( mJournal->calID() );
}
Journal *JournalEntry::journal() const
{
return mJournal;
}
void JournalEntry::clear()
{
mJournal = 0;