-rw-r--r-- | korganizer/kodaymatrix.cpp | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 4366265..30efbf6 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -194,40 +194,40 @@ QString KODayMatrix::getWhatsThisText( QPoint p ) | |||
194 | } | 194 | } |
195 | else { | 195 | else { |
196 | text = KGlobal::locale()->formatTime(event->dtStart().time()); | 196 | text = KGlobal::locale()->formatTime(event->dtStart().time()); |
197 | text += " " + event->summary(); | 197 | text += " " + event->summary(); |
198 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); | 198 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); |
199 | } | 199 | } |
200 | } | 200 | } |
201 | if ( !event->location().isEmpty() ) | 201 | if ( !event->location().isEmpty() ) |
202 | mToolTipText += " (" + event->location() + ")"; | 202 | mToolTipText += " (" + event->location() + ")"; |
203 | //qDebug("TTT: %s ", mToolTipText.latin1()); | 203 | //qDebug("TTT: %s ", mToolTipText.latin1()); |
204 | mToolTip.append( deTag( mToolTipText ) ); | 204 | mToolTip.append( deTag( mToolTipText ) ); |
205 | } | 205 | } |
206 | mToolTip.sort(); | ||
206 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { | 207 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { |
207 | QPtrList<Todo> todolist = mCalendar->todos(mDate); | 208 | QPtrList<Todo> todolist = mCalendar->todos(mDate); |
208 | Todo *todo; | 209 | Todo *todo; |
209 | for(todo=todolist.first();todo != 0;todo=todolist.next()) { | 210 | for(todo=todolist.first();todo != 0;todo=todolist.next()) { |
210 | QString mToolTipText; | 211 | QString mToolTipText; |
211 | if ( !todo->doesFloat() ) | 212 | if ( !todo->doesFloat() ) |
212 | mToolTipText += KGlobal::locale()->formatTime(todo->dtDue().time())+" "; | 213 | mToolTipText += KGlobal::locale()->formatTime(todo->dtDue().time())+" "; |
213 | mToolTipText += todo->summary(); | 214 | mToolTipText += todo->summary(); |
214 | if ( !todo->location().isEmpty() ) | 215 | if ( !todo->location().isEmpty() ) |
215 | mToolTipText += " (" + todo->location() + ")"; | 216 | mToolTipText += " (" + todo->location() + ")"; |
216 | mToolTipText = deTag( mToolTipText); | 217 | mToolTipText = deTag( mToolTipText); |
217 | mToolTipText = "<b>" + i18n("Todo: ") + "</b>"+ mToolTipText; | 218 | mToolTipText = "<b>" + i18n("Todo: ") + "</b>"+ mToolTipText; |
218 | mToolTip.append( mToolTipText ); | 219 | mToolTip.append( mToolTipText ); |
219 | } | 220 | } |
220 | } | 221 | } |
221 | mToolTip.sort(); | ||
222 | if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { | 222 | if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { |
223 | Journal *j = mCalendar->journal( mDate ); | 223 | Journal *j = mCalendar->journal( mDate ); |
224 | if ( j ) { | 224 | if ( j ) { |
225 | QString mToolTipText = j->description().left(100); | 225 | QString mToolTipText = j->description().left(100); |
226 | if ( j->description().length() > 100 ) | 226 | if ( j->description().length() > 100 ) |
227 | mToolTipText += " ..."; | 227 | mToolTipText += " ..."; |
228 | mToolTipText = deTag( mToolTipText); | 228 | mToolTipText = deTag( mToolTipText); |
229 | mToolTipText = "<b>" + i18n("Journal: ") + "</b>"+ mToolTipText; | 229 | mToolTipText = "<b>" + i18n("Journal: ") + "</b>"+ mToolTipText; |
230 | mToolTip.append( mToolTipText ); | 230 | mToolTip.append( mToolTipText ); |
231 | } | 231 | } |
232 | } | 232 | } |
233 | return "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>"); | 233 | return "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>"); |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index eed023c..3c0259f 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -178,25 +178,25 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
178 | if ( p->mToolBarUpF ) | 178 | if ( p->mToolBarUpF ) |
179 | tbd = Bottom; | 179 | tbd = Bottom; |
180 | else | 180 | else |
181 | tbd = Top; | 181 | tbd = Top; |
182 | } | 182 | } |
183 | else { | 183 | else { |
184 | if ( p->mToolBarUpF ) | 184 | if ( p->mToolBarUpF ) |
185 | tbd = Right; | 185 | tbd = Right; |
186 | else | 186 | else |
187 | tbd = Left; | 187 | tbd = Left; |
188 | } | 188 | } |
189 | filterToolBar = new QPEToolBar ( this ); | 189 | filterToolBar = new QPEToolBar ( this ); |
190 | filterMenubar = new QMenuBar( filterToolBar ); | 190 | filterMenubar = new QMenuBar( 0 ); |
191 | QFontMetrics fm ( filterMenubar->font() ); | 191 | QFontMetrics fm ( filterMenubar->font() ); |
192 | 192 | ||
193 | filterPopupMenu = new QPopupMenu( this ); | 193 | filterPopupMenu = new QPopupMenu( this ); |
194 | filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); | 194 | filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); |
195 | QString addTest = "A"; | 195 | QString addTest = "A"; |
196 | filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) ); | 196 | filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) ); |
197 | #ifdef DESKTOP_VERSION | 197 | #ifdef DESKTOP_VERSION |
198 | addTest = "AAABBBCCCx"; | 198 | addTest = "AAABBBCCCx"; |
199 | #else | 199 | #else |
200 | addTest = "AAx"; | 200 | addTest = "AAx"; |
201 | #endif | 201 | #endif |
202 | filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) ); | 202 | filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) ); |
@@ -1271,26 +1271,28 @@ void MainWindow::initActions() | |||
1271 | navigatorToolBar->setHorizontalStretchable (true ); | 1271 | navigatorToolBar->setHorizontalStretchable (true ); |
1272 | iconToolBar->setVerticalStretchable (true ); | 1272 | iconToolBar->setVerticalStretchable (true ); |
1273 | viewToolBar->setVerticalStretchable (true ); | 1273 | viewToolBar->setVerticalStretchable (true ); |
1274 | navigatorToolBar->setVerticalStretchable (true ); | 1274 | navigatorToolBar->setVerticalStretchable (true ); |
1275 | configureToolBarMenu->setItemChecked( 5, true ); | 1275 | configureToolBarMenu->setItemChecked( 5, true ); |
1276 | } | 1276 | } |
1277 | if (p-> mShowIconFilter) | 1277 | if (p-> mShowIconFilter) |
1278 | configureToolBarMenu->setItemChecked( 7, true ); | 1278 | configureToolBarMenu->setItemChecked( 7, true ); |
1279 | if (p-> mShowIconOnetoolbar) | 1279 | if (p-> mShowIconOnetoolbar) |
1280 | configureToolBarMenu->setItemChecked( 6, true ); | 1280 | configureToolBarMenu->setItemChecked( 6, true ); |
1281 | 1281 | ||
1282 | 1282 | ||
1283 | if ( filterMenubar ) | 1283 | if ( filterMenubar ) { |
1284 | filterMenubar->reparent(filterToolBar,0,QPoint(0,0) ); | ||
1284 | connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) ); | 1285 | connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) ); |
1286 | } | ||
1285 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); | 1287 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); |
1286 | configureAgenda( p->mHourSize ); | 1288 | configureAgenda( p->mHourSize ); |
1287 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); | 1289 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); |
1288 | } | 1290 | } |
1289 | 1291 | ||
1290 | void MainWindow::exportToPhone( int mode ) | 1292 | void MainWindow::exportToPhone( int mode ) |
1291 | { | 1293 | { |
1292 | 1294 | ||
1293 | //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); | 1295 | //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); |
1294 | //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); | 1296 | //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); |
1295 | KOex2phonePrefs ex2phone; | 1297 | KOex2phonePrefs ex2phone; |
1296 | 1298 | ||