summaryrefslogtreecommitdiffabout
path: root/korganizer
Unidiff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koeditorgeneraltodo.cpp21
-rw-r--r--korganizer/kolistview.cpp71
-rw-r--r--korganizer/mainwindow.cpp5
3 files changed, 47 insertions, 50 deletions
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index 965cf47..10d9a8c 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -94,12 +94,22 @@ void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout)
94 QFrame *timeBoxFrame = new QFrame(timeGroupBox); 94 QFrame *timeBoxFrame = new QFrame(timeGroupBox);
95 95
96 QGridLayout *layoutTimeBox = new QGridLayout(timeBoxFrame,3,3); 96 QGridLayout *layoutTimeBox = new QGridLayout(timeBoxFrame,3,3);
97 layoutTimeBox->setSpacing(KDialog::spacingHintSmall()); 97 layoutTimeBox->setSpacing(KDialog::spacingHintSmall());
98 layoutTimeBox->setColStretch( 1, 1 ); 98 layoutTimeBox->setColStretch( 1, 1 );
99 99
100 mStartCheck = new QCheckBox(i18n("Start:"),timeBoxFrame);
101 layoutTimeBox->addWidget(mStartCheck,0,0);
102 connect(mStartCheck,SIGNAL(toggled(bool)),SLOT(enableStartEdit(bool)));
103
104 mStartDateEdit = new KDateEdit(timeBoxFrame);
105 layoutTimeBox->addWidget(mStartDateEdit,0,1);
106
107 mStartTimeEdit = new KOTimeEdit(timeBoxFrame);
108 layoutTimeBox->addWidget(mStartTimeEdit,0,2);
109
100 mDueCheck = new QCheckBox(i18n("Due:"),timeBoxFrame); 110 mDueCheck = new QCheckBox(i18n("Due:"),timeBoxFrame);
101 layoutTimeBox->addWidget(mDueCheck,1,0); 111 layoutTimeBox->addWidget(mDueCheck,1,0);
102 connect(mDueCheck,SIGNAL(toggled(bool)),SLOT(enableDueEdit(bool))); 112 connect(mDueCheck,SIGNAL(toggled(bool)),SLOT(enableDueEdit(bool)));
103 connect(mDueCheck,SIGNAL(toggled(bool)),SLOT(showAlarm())); 113 connect(mDueCheck,SIGNAL(toggled(bool)),SLOT(showAlarm()));
104 114
105 115
@@ -107,23 +117,12 @@ void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout)
107 layoutTimeBox->addWidget(mDueDateEdit,1,1); 117 layoutTimeBox->addWidget(mDueDateEdit,1,1);
108 118
109 mDueTimeEdit = new KOTimeEdit(timeBoxFrame); 119 mDueTimeEdit = new KOTimeEdit(timeBoxFrame);
110 layoutTimeBox->addWidget(mDueTimeEdit,1,2); 120 layoutTimeBox->addWidget(mDueTimeEdit,1,2);
111 121
112 122
113 mStartCheck = new QCheckBox(i18n("Start:"),timeBoxFrame);
114 layoutTimeBox->addWidget(mStartCheck,0,0);
115 connect(mStartCheck,SIGNAL(toggled(bool)),SLOT(enableStartEdit(bool)));
116
117 mStartDateEdit = new KDateEdit(timeBoxFrame);
118 layoutTimeBox->addWidget(mStartDateEdit,0,1);
119
120 mStartTimeEdit = new KOTimeEdit(timeBoxFrame);
121 layoutTimeBox->addWidget(mStartTimeEdit,0,2);
122
123
124 mTimeButton = new QCheckBox(i18n("Time associated"),timeBoxFrame); 123 mTimeButton = new QCheckBox(i18n("Time associated"),timeBoxFrame);
125 layoutTimeBox->addMultiCellWidget(mTimeButton,2,2,0,1); 124 layoutTimeBox->addMultiCellWidget(mTimeButton,2,2,0,1);
126 125
127 connect(mTimeButton,SIGNAL(toggled(bool)),SLOT(enableTimeEdits(bool))); 126 connect(mTimeButton,SIGNAL(toggled(bool)),SLOT(enableTimeEdits(bool)));
128 connect(mDueDateEdit,SIGNAL(setTimeTo(QTime)),mDueTimeEdit,SLOT(setTime(QTime))); 127 connect(mDueDateEdit,SIGNAL(setTimeTo(QTime)),mDueTimeEdit,SLOT(setTime(QTime)));
129 connect(mStartDateEdit,SIGNAL(setTimeTo(QTime)),mStartTimeEdit,SLOT(setTime(QTime))); 128 connect(mStartDateEdit,SIGNAL(setTimeTo(QTime)),mStartTimeEdit,SLOT(setTime(QTime)));
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index e7a5e0e..e560ce4 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -125,26 +125,25 @@ bool ListItemVisitor::visit(Event *e)
125 mItem->setText(2,e->dtStartTimeStr()); 125 mItem->setText(2,e->dtStartTimeStr());
126 mItem->setText(3,end); 126 mItem->setText(3,end);
127 if ( e->doesFloat() ) 127 if ( e->doesFloat() )
128 mItem->setText(4,"---"); 128 mItem->setText(4,"---");
129 else 129 else
130 mItem->setText(4,e->dtEndTimeStr()); 130 mItem->setText(4,e->dtEndTimeStr());
131 mItem->setText(5, e->durationText());
131 if ( e->isAlarmEnabled() ) { 132 if ( e->isAlarmEnabled() ) {
132 mItem->setText(5,e->alarms().first()->offsetText() ); 133 mItem->setText(6,e->alarms().first()->offsetText() );
133 } else { 134 } else {
134 mItem->setText(5, i18n("No")); 135 mItem->setText(6, i18n("No"));
135 } 136 }
136 mItem->setText(6, e->recurrenceText()); 137 mItem->setText(7, e->recurrenceText());
137 if( ! e->doesRecur() ) 138 if( ! e->doesRecur() )
138 mItem->setSortKey( 6, "-" ); 139 mItem->setSortKey( 7, "-" );
139 mItem->setText(7,"---"); 140 mItem->setText(8, e->cancelled() ? i18n("Yes") : i18n("No"));
140 mItem->setText(8,"---"); 141 mItem->setText(9,e->categoriesStr());
141 mItem->setText(9, e->cancelled() ? i18n("Yes") : i18n("No")); 142 mItem->setText(10, KOPrefs::instance()->calName( e->calID() ));
142 mItem->setText(10,e->categoriesStr()); 143 mItem->setText(11, KGlobal::locale()->formatDateTime( e->lastModified(), true, true ));
143 mItem->setText(11, KOPrefs::instance()->calName( e->calID() ));
144 mItem->setText(12, KGlobal::locale()->formatDateTime( e->lastModified(), true, true ));
145 144
146 QString key; 145 QString key;
147 QDate d = e->lastModified().date(); 146 QDate d = e->lastModified().date();
148 QTime t = e->lastModified().time(); 147 QTime t = e->lastModified().time();
149 key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() ); 148 key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() );
150 mItem->setSortKey(12,key); 149 mItem->setSortKey(12,key);
@@ -174,47 +173,46 @@ bool ListItemVisitor::visit(Todo *t)
174 mItem->setText(2,t->dtStartTimeStr()); 173 mItem->setText(2,t->dtStartTimeStr());
175 } 174 }
176 } else { 175 } else {
177 mItem->setText(1,"---"); 176 mItem->setText(1,"---");
178 mItem->setText(2,"---"); 177 mItem->setText(2,"---");
179 } 178 }
180 mItem->setText(3,"---");
181 mItem->setText(4,"---");
182 if ( t->isAlarmEnabled() ) { 179 if ( t->isAlarmEnabled() ) {
183 mItem->setText(5,t->alarms().first()->offsetText() ); 180 mItem->setText(6,t->alarms().first()->offsetText() );
184 } else { 181 } else {
185 mItem->setText(5, i18n("No")); 182 mItem->setText(6, i18n("No"));
186 } 183 }
187 mItem->setText(6, t->recurrenceText()); 184 mItem->setText(7, t->recurrenceText());
188 if( ! t->doesRecur() ) 185 if( ! t->doesRecur() )
189 mItem->setSortKey( 6, "-" ); 186 mItem->setSortKey( 7, "-" );
190 if (t->hasDueDate()) { 187 if (t->hasDueDate()) {
191 mItem->setText(7,t->dtDueDateStr()); 188 mItem->setText(3,t->dtDueDateStr());
192 if (t->doesFloat()) { 189 if (t->doesFloat()) {
193 mItem->setText(8,"---"); 190 mItem->setText(4,"---");
194 } else { 191 } else {
195 mItem->setText(8,t->dtDueTimeStr()); 192 mItem->setText(4,t->dtDueTimeStr());
196 } 193 }
197 } else { 194 } else {
198 mItem->setText(7,"---"); 195 mItem->setText(3,"---");
199 mItem->setText(8,"---"); 196 mItem->setText(4,"---");
200 } 197 }
201 mItem->setText(9, t->cancelled() ? i18n("Yes") : i18n("No")); 198 mItem->setText(5, t->durationText());
202 mItem->setText(10,t->categoriesStr()); 199 mItem->setText(8, t->cancelled() ? i18n("Yes") : i18n("No"));
203 mItem->setText(11, KOPrefs::instance()->calName( t->calID() )); 200 mItem->setText(9,t->categoriesStr());
204 mItem->setText(12, KGlobal::locale()->formatDateTime( t->lastModified(), true, true )); 201 mItem->setText(10, KOPrefs::instance()->calName( t->calID() ));
202 mItem->setText(11, KGlobal::locale()->formatDateTime( t->lastModified(), true, true ));
205 QString key; 203 QString key;
206 QDate d = t->lastModified().date(); 204 QDate d = t->lastModified().date();
207 QTime tm = t->lastModified().time(); 205 QTime tm = t->lastModified().time();
208 key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute(),tm.second() ); 206 key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute(),tm.second() );
209 mItem->setSortKey(12,key); 207 mItem->setSortKey(11,key);
210 if (t->hasDueDate()) { 208 if (t->hasDueDate()) {
211 d = t->dtDue().date(); 209 d = t->dtDue().date();
212 tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time(); 210 tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time();
213 key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute()); 211 key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
214 mItem->setSortKey(7,key); 212 mItem->setSortKey(3,key);
215 } 213 }
216 if ( t->hasStartDate() ) { 214 if ( t->hasStartDate() ) {
217 d = t->dtStart().date(); 215 d = t->dtStart().date();
218 tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time(); 216 tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time();
219 key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute()); 217 key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
220 mItem->setSortKey(1,key); 218 mItem->setSortKey(1,key);
@@ -240,18 +238,17 @@ bool ListItemVisitor::visit(Journal * j)
240 mItem->setText(1,j->dtStartDateStr()); 238 mItem->setText(1,j->dtStartDateStr());
241 mItem->setText(2,"---"); 239 mItem->setText(2,"---");
242 mItem->setText(3,"---"); 240 mItem->setText(3,"---");
243 mItem->setText(4,"---"); 241 mItem->setText(4,"---");
244 mItem->setText(5,"---"); 242 mItem->setText(5,"---");
245 mItem->setText(6,"---"); 243 mItem->setText(6,"---");
246 mItem->setText(7,j->dtStartDateStr()); 244 mItem->setText(7,"---");
247 mItem->setText(8,"---"); 245 mItem->setText(8,"---");
248 mItem->setText(9,"---"); 246 mItem->setText(9,j->categoriesStr());
249 mItem->setText(10,j->categoriesStr()); 247 mItem->setText(10, KOPrefs::instance()->calName( j->calID() ));
250 mItem->setText(11, KOPrefs::instance()->calName( j->calID() )); 248 mItem->setText(11, KGlobal::locale()->formatDateTime( j->lastModified(), true, true ));
251 mItem->setText(12, KGlobal::locale()->formatDateTime( j->lastModified(), true, true ));
252 249
253 QString key; 250 QString key;
254 QDate d = j->lastModified().date(); 251 QDate d = j->lastModified().date();
255 QTime tm = j->lastModified().time(); 252 QTime tm = j->lastModified().time();
256 key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute(),tm.second() ); 253 key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute(),tm.second() );
257 mItem->setSortKey(12,key); 254 mItem->setSortKey(12,key);
@@ -271,18 +268,17 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
271 mActiveItem = 0; 268 mActiveItem = 0;
272 mForceShowCompletedTodos = false; 269 mForceShowCompletedTodos = false;
273 mListView = new KOListViewListView(this); 270 mListView = new KOListViewListView(this);
274 mListView->addColumn(i18n("Summary")); 271 mListView->addColumn(i18n("Summary"));
275 mListView->addColumn(i18n("Start Date")); 272 mListView->addColumn(i18n("Start Date"));
276 mListView->addColumn(i18n("Start Time")); 273 mListView->addColumn(i18n("Start Time"));
277 mListView->addColumn(i18n("End Date")); 274 mListView->addColumn(i18n("End/Due Date"));
278 mListView->addColumn(i18n("End Time")); 275 mListView->addColumn(i18n("End/Due Time"));
276 mListView->addColumn(i18n("Duration"));
279 mListView->addColumn(i18n("Alarm")); // alarm set? 277 mListView->addColumn(i18n("Alarm")); // alarm set?
280 mListView->addColumn(i18n("Recurs")); // recurs? 278 mListView->addColumn(i18n("Recurs")); // recurs?
281 mListView->addColumn(i18n("Due Date"));
282 mListView->addColumn(i18n("Due Time"));
283 mListView->addColumn(i18n("Cancelled")); 279 mListView->addColumn(i18n("Cancelled"));
284 mListView->addColumn(i18n("Categories")); 280 mListView->addColumn(i18n("Categories"));
285 mListView->addColumn(i18n("Calendar")); 281 mListView->addColumn(i18n("Calendar"));
286 mListView->addColumn(i18n("Last Modified")); 282 mListView->addColumn(i18n("Last Modified"));
287 283
288 mListView->setColumnAlignment(0,AlignLeft); 284 mListView->setColumnAlignment(0,AlignLeft);
@@ -294,17 +290,16 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
294 mListView->setColumnAlignment(6,AlignLeft); 290 mListView->setColumnAlignment(6,AlignLeft);
295 mListView->setColumnAlignment(7,AlignLeft); 291 mListView->setColumnAlignment(7,AlignLeft);
296 mListView->setColumnAlignment(8,AlignLeft); 292 mListView->setColumnAlignment(8,AlignLeft);
297 mListView->setColumnAlignment(9,AlignLeft); 293 mListView->setColumnAlignment(9,AlignLeft);
298 mListView->setColumnAlignment(10,AlignLeft); 294 mListView->setColumnAlignment(10,AlignLeft);
299 mListView->setColumnAlignment(11,AlignLeft); 295 mListView->setColumnAlignment(11,AlignLeft);
300 mListView->setColumnAlignment(12,AlignLeft);
301 mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this); 296 mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this);
302 297
303 int iii = 0; 298 int iii = 0;
304 for ( iii = 0; iii< 13 ; ++iii ) 299 for ( iii = 0; iii< 12 ; ++iii )
305 mListView->setColumnWidthMode( iii, QListView::Manual ); 300 mListView->setColumnWidthMode( iii, QListView::Manual );
306 301
307 QBoxLayout *layoutTop = new QVBoxLayout(this); 302 QBoxLayout *layoutTop = new QVBoxLayout(this);
308 layoutTop->addWidget(mListView); 303 layoutTop->addWidget(mListView);
309 mListView->setFont ( KOPrefs::instance()->mListViewFont ); 304 mListView->setFont ( KOPrefs::instance()->mListViewFont );
310 mPopupMenu = eventPopup(); 305 mPopupMenu = eventPopup();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 77d0ac8..98a820d 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -222,13 +222,16 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
222 else 222 else
223 tbd = Left; 223 tbd = Left;
224 } 224 }
225 filterToolBar = new QPEToolBar ( this ); 225 filterToolBar = new QPEToolBar ( this );
226 filterMenubar = new KMenuBar( 0 ); 226 filterMenubar = new KMenuBar( 0 );
227 QFontMetrics fm ( filterMenubar->font() ); 227 QFontMetrics fm ( filterMenubar->font() );
228 228#ifndef DESKTOP_VERSION
229 filterToolBar->setFocusPolicy( NoFocus );
230 filterMenubar->setFocusPolicy( NoFocus );
231#endif
229 filterPopupMenu = new QPopupMenu( this ); 232 filterPopupMenu = new QPopupMenu( this );
230 filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); 233 filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 );
231 QString addTest = "A"; 234 QString addTest = "A";
232 filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) ); 235 filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) );
233#ifdef DESKTOP_VERSION 236#ifdef DESKTOP_VERSION
234 addTest = "AAABBBCCCx"; 237 addTest = "AAABBBCCCx";