author | zautrix <zautrix> | 2005-06-30 05:32:10 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-30 05:32:10 (UTC) |
commit | da264cf19c0183d6ea4e8dab6eabd40994e351c8 (patch) (unidiff) | |
tree | 061026fe6869c365641853b1ebba542b852046bc /korganizer/kojournalview.cpp | |
parent | 4e850fa7aa99f92676e49466cfccaa5d5e0ec24c (diff) | |
download | kdepimpi-da264cf19c0183d6ea4e8dab6eabd40994e351c8.zip kdepimpi-da264cf19c0183d6ea4e8dab6eabd40994e351c8.tar.gz kdepimpi-da264cf19c0183d6ea4e8dab6eabd40994e351c8.tar.bz2 |
fixxx
Diffstat (limited to 'korganizer/kojournalview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/kojournalview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index ff87ef4..cb9a2c0 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp | |||
@@ -56,18 +56,18 @@ KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent, | |||
56 | parWid = new QWidget( sv->viewport() ); | 56 | parWid = new QWidget( sv->viewport() ); |
57 | sv->addChild(parWid); | 57 | sv->addChild(parWid); |
58 | sv->setResizePolicy( QScrollView:: AutoOneFit ); | 58 | sv->setResizePolicy( QScrollView:: AutoOneFit ); |
59 | mTopLayout = new QVBoxLayout(parWid); | 59 | mTopLayout = new QVBoxLayout(parWid); |
60 | QHBox * vb = new QHBox ( parWid ); | 60 | QHBox * vb = new QHBox ( parWid ); |
61 | QPushButton * newJournal = new QPushButton( vb ); | 61 | QPushButton * newJournal = new QPushButton( vb ); |
62 | QIconSet icon; | 62 | QPixmap icon; |
63 | if ( QApplication::desktop()->width() < 321 ) | 63 | if ( QApplication::desktop()->width() < 321 ) |
64 | icon = SmallIcon("ko16old"); | 64 | icon = SmallIcon("ko16old"); |
65 | else | 65 | else |
66 | icon = SmallIcon("ko24old"); | 66 | icon = SmallIcon("ko24old"); |
67 | newJournal->setIconSet (icon ) ; | 67 | newJournal->setPixmap (icon ) ; |
68 | int size = newJournal->sizeHint().height(); | 68 | int size = newJournal->sizeHint().height(); |
69 | newJournal->setFixedSize( size, size ); | 69 | newJournal->setFixedSize( size, size ); |
70 | mDateLabel = new QLabel ( vb ); | 70 | mDateLabel = new QLabel ( vb ); |
71 | mTopLayout->addWidget( vb ); | 71 | mTopLayout->addWidget( vb ); |
72 | mDateLabel->setMargin(1); | 72 | mDateLabel->setMargin(1); |
73 | mDateLabel->setAlignment(AlignCenter); | 73 | mDateLabel->setAlignment(AlignCenter); |
@@ -135,20 +135,22 @@ void KOJournalView::clearList() | |||
135 | mEntry->clear(); | 135 | mEntry->clear(); |
136 | mEntry = jEntries.next(); | 136 | mEntry = jEntries.next(); |
137 | } | 137 | } |
138 | } | 138 | } |
139 | void KOJournalView::newJournal() | 139 | void KOJournalView::newJournal() |
140 | { | 140 | { |
141 | flushView(); | ||
141 | Journal* mJournal = new Journal; | 142 | Journal* mJournal = new Journal; |
142 | mJournal->setDtStart(QDateTime(mDate,QTime(0,0,0))); | 143 | mJournal->setDtStart(QDateTime(mDate,QTime(0,0,0))); |
143 | mCalendar->addJournal(mJournal); | 144 | mCalendar->addJournal(mJournal); |
144 | showDates( mDate, QDate() ); | 145 | showDates( mDate, QDate() ); |
145 | } | 146 | } |
146 | 147 | ||
147 | void KOJournalView::showOnly ( Journal* j ) | 148 | void KOJournalView::showOnly ( Journal* j ) |
148 | { | 149 | { |
150 | flushView(); | ||
149 | if ( j == 0 ) { | 151 | if ( j == 0 ) { |
150 | showDates( mDate, QDate() ); | 152 | showDates( mDate, QDate() ); |
151 | return; | 153 | return; |
152 | } | 154 | } |
153 | QPtrList<Journal> jl; | 155 | QPtrList<Journal> jl; |
154 | jl.append ( j ); | 156 | jl.append ( j ); |