-rw-r--r-- | korganizer/kojournalview.cpp | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index 406df5a..51594ff 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp | |||
@@ -22,19 +22,25 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | // | 24 | // |
25 | // View of Journal entries | 25 | // View of Journal entries |
26 | 26 | ||
27 | #include <qlayout.h> | 27 | #include <qlayout.h> |
28 | #include <qscrollview.h> | 28 | #include <q3scrollview.h> |
29 | #include <qpopupmenu.h> | 29 | #include <q3popupmenu.h> |
30 | #include <qhbox.h> | 30 | #include <q3hbox.h> |
31 | #include <qpushbutton.h> | 31 | #include <qpushbutton.h> |
32 | #include <qlabel.h> | 32 | #include <qlabel.h> |
33 | #include <qpushbutton.h> | 33 | #include <qpushbutton.h> |
34 | #include <qapplication.h> | 34 | #include <qapplication.h> |
35 | #include <QDesktopWidget> | ||
36 | //Added by qt3to4: | ||
37 | #include <QPixmap> | ||
38 | #include <Q3PtrList> | ||
39 | #include <QKeyEvent> | ||
40 | #include <Q3VBoxLayout> | ||
35 | 41 | ||
36 | #include <klocale.h> | 42 | #include <klocale.h> |
37 | #include <kdebug.h> | 43 | #include <kdebug.h> |
38 | #include "koprefs.h" | 44 | #include "koprefs.h" |
39 | #include <kglobal.h> | 45 | #include <kglobal.h> |
40 | #include <ktextedit.h> | 46 | #include <ktextedit.h> |
@@ -48,33 +54,33 @@ using namespace KOrg; | |||
48 | 54 | ||
49 | KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent, | 55 | KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent, |
50 | const char *name) | 56 | const char *name) |
51 | : KOrg::BaseView(calendar, parent, name) | 57 | : KOrg::BaseView(calendar, parent, name) |
52 | { | 58 | { |
53 | mCalendar = calendar; | 59 | mCalendar = calendar; |
54 | QHBox * vb = new QHBox ( this ); | 60 | Q3HBox * vb = new Q3HBox ( this ); |
55 | QPushButton * newJournal = new QPushButton( vb ); | 61 | QPushButton * newJournal = new QPushButton( vb ); |
56 | QPixmap icon; | 62 | QPixmap icon; |
57 | if ( QApplication::desktop()->width() < 321 ) | 63 | if ( QApplication::desktop()->width() < 321 ) |
58 | icon = SmallIcon("ko16old"); | 64 | icon = SmallIcon("ko16old"); |
59 | else | 65 | else |
60 | icon = SmallIcon("ko24old"); | 66 | icon = SmallIcon("ko24old"); |
61 | newJournal->setPixmap (icon ) ; | 67 | newJournal->setPixmap (icon ) ; |
62 | int size = newJournal->sizeHint().height(); | 68 | int size = newJournal->sizeHint().height(); |
63 | newJournal->setFixedSize( size, size ); | 69 | newJournal->setFixedSize( size, size ); |
64 | mDateLabel = new QLabel ( vb ); | 70 | mDateLabel = new QLabel ( vb ); |
65 | mDateLabel->setMargin(1); | 71 | mDateLabel->setMargin(1); |
66 | mDateLabel->setAlignment(AlignCenter); | 72 | mDateLabel->setAlignment(Qt::AlignCenter); |
67 | QScrollView * sv = new QScrollView( this ); | 73 | Q3ScrollView * sv = new Q3ScrollView( this ); |
68 | QVBoxLayout * hbl = new QVBoxLayout( this ); | 74 | Q3VBoxLayout * hbl = new Q3VBoxLayout( this ); |
69 | hbl->addWidget( vb ); | 75 | hbl->addWidget( vb ); |
70 | hbl->addWidget( sv ); | 76 | hbl->addWidget( sv ); |
71 | parWid = new QWidget( sv->viewport() ); | 77 | parWid = new QWidget( sv->viewport() ); |
72 | sv->addChild(parWid); | 78 | sv->addChild(parWid); |
73 | sv->setResizePolicy( QScrollView:: AutoOneFit ); | 79 | sv->setResizePolicy( Q3ScrollView:: AutoOneFit ); |
74 | mTopLayout = new QVBoxLayout(parWid); | 80 | mTopLayout = new Q3VBoxLayout(parWid); |
75 | connect( newJournal, SIGNAL( clicked() ), this , SLOT( newJournal() ) ); | 81 | connect( newJournal, SIGNAL( clicked() ), this , SLOT( newJournal() ) ); |
76 | getNewEntry(); | 82 | getNewEntry(); |
77 | } | 83 | } |
78 | 84 | ||
79 | KOJournalView::~KOJournalView() | 85 | KOJournalView::~KOJournalView() |
80 | { | 86 | { |
@@ -93,15 +99,15 @@ JournalEntry* KOJournalView::getNewEntry() | |||
93 | connect ( Entry,SIGNAL(deleteJournal(Journal *) ),this ,SIGNAL(deleteJournal(Journal *) ) ) ; | 99 | connect ( Entry,SIGNAL(deleteJournal(Journal *) ),this ,SIGNAL(deleteJournal(Journal *) ) ) ; |
94 | connect ( Entry,SIGNAL(newJournal() ),this ,SLOT(newJournal() ) ) ; | 100 | connect ( Entry,SIGNAL(newJournal() ),this ,SLOT(newJournal() ) ) ; |
95 | connect ( Entry,SIGNAL(showJournalOnly( Journal * ) ),this ,SLOT(showOnly ( Journal* ) ) ) ; | 101 | connect ( Entry,SIGNAL(showJournalOnly( Journal * ) ),this ,SLOT(showOnly ( Journal* ) ) ) ; |
96 | return Entry; | 102 | return Entry; |
97 | } | 103 | } |
98 | 104 | ||
99 | QPtrList<Incidence> KOJournalView::selectedIncidences() | 105 | Q3PtrList<Incidence> KOJournalView::selectedIncidences() |
100 | { | 106 | { |
101 | QPtrList<Incidence> eventList; | 107 | Q3PtrList<Incidence> eventList; |
102 | 108 | ||
103 | return eventList; | 109 | return eventList; |
104 | } | 110 | } |
105 | void KOJournalView::updateConfig() | 111 | void KOJournalView::updateConfig() |
106 | { | 112 | { |
107 | JournalEntry* mEntry = jEntries.first(); | 113 | JournalEntry* mEntry = jEntries.first(); |
@@ -159,19 +165,19 @@ void KOJournalView::showOnly ( Journal* j ) | |||
159 | //qDebug("showOnly %x ", j); | 165 | //qDebug("showOnly %x ", j); |
160 | flushView(); | 166 | flushView(); |
161 | if ( j == 0 ) { | 167 | if ( j == 0 ) { |
162 | showDates( mDate, QDate() ); | 168 | showDates( mDate, QDate() ); |
163 | return; | 169 | return; |
164 | } | 170 | } |
165 | QPtrList<Journal> jl; | 171 | Q3PtrList<Journal> jl; |
166 | jl.append ( j ); | 172 | jl.append ( j ); |
167 | showList( jl ); | 173 | showList( jl ); |
168 | JournalEntry* mEntry = jEntries.first(); | 174 | JournalEntry* mEntry = jEntries.first(); |
169 | mEntry->setShowOnly(); | 175 | mEntry->setShowOnly(); |
170 | } | 176 | } |
171 | void KOJournalView::showList(QPtrList<Journal> jl) | 177 | void KOJournalView::showList(Q3PtrList<Journal> jl) |
172 | { | 178 | { |
173 | static bool ff = false; | 179 | static bool ff = false; |
174 | if ( ff ) return; | 180 | if ( ff ) return; |
175 | ff = true; | 181 | ff = true; |
176 | //qDebug("KOJournalView::showList %d",jl.count() ); | 182 | //qDebug("KOJournalView::showList %d",jl.count() ); |
177 | JournalEntry* mEntry = jEntries.first(); | 183 | JournalEntry* mEntry = jEntries.first(); |
@@ -222,17 +228,17 @@ void KOJournalView::showList(QPtrList<Journal> jl) | |||
222 | } | 228 | } |
223 | 229 | ||
224 | void KOJournalView::showDates(const QDate &start, const QDate &) | 230 | void KOJournalView::showDates(const QDate &start, const QDate &) |
225 | { | 231 | { |
226 | mDate = start; | 232 | mDate = start; |
227 | mDateLabel->setText(KGlobal::locale()->formatDate(mDate)); | 233 | mDateLabel->setText(KGlobal::locale()->formatDate(mDate)); |
228 | QPtrList<Journal> jl = calendar()->journals4Date( start ); | 234 | Q3PtrList<Journal> jl = calendar()->journals4Date( start ); |
229 | showList( jl ); | 235 | showList( jl ); |
230 | } | 236 | } |
231 | 237 | ||
232 | void KOJournalView::showEvents(QPtrList<Event>) | 238 | void KOJournalView::showEvents(Q3PtrList<Event>) |
233 | { | 239 | { |
234 | // After new creation of list view no events are selected. | 240 | // After new creation of list view no events are selected. |
235 | // emit incidenceSelected( 0 ); | 241 | // emit incidenceSelected( 0 ); |
236 | } | 242 | } |
237 | 243 | ||
238 | void KOJournalView::changeEventDisplay(Event *, int /*action*/) | 244 | void KOJournalView::changeEventDisplay(Event *, int /*action*/) |