summaryrefslogtreecommitdiffabout
path: root/korganizer
Unidiff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaitem.cpp4
-rw-r--r--korganizer/mainwindow.cpp5
2 files changed, 7 insertions, 2 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 7b29ce7..d0a7b07 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -404,15 +404,15 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint )
404 if ( x < 0 ) { 404 if ( x < 0 ) {
405 w = w+x-3; 405 w = w+x-3;
406 x = 3; 406 x = 3;
407 if ( w > parentWidget()->width() ){ 407 if ( w > parentWidget()->width() ){
408 w = parentWidget()->width() - 6; 408 w = parentWidget()->width() - 6;
409#ifndef DESKTOP_VERSION 409#ifndef DESKTOP_VERSION
410 align = ( AlignCenter|WordBreak); 410 align = ( AlignHCenter|WordBreak|AlignTop);
411#else 411#else
412 align = ( AlignCenter|BreakAnywhere|WordBreak); 412 align = ( AlignHCenter|BreakAnywhere|WordBreak|AlignTop);
413#endif 413#endif
414 414
415 } 415 }
416 } 416 }
417 QRect dr; 417 QRect dr;
418 if ( w + x > parentWidget()->width() ) 418 if ( w + x > parentWidget()->width() )
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 16031b8..a164fa4 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -284,12 +284,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
284#endif 284#endif
285 updateWeek( mView->startDate() ); 285 updateWeek( mView->startDate() );
286 connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), 286 connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
287 SLOT( updateWeekNum( const KCal::DateList & ) ) ); 287 SLOT( updateWeekNum( const KCal::DateList & ) ) );
288 mBRdisabled = false; 288 mBRdisabled = false;
289 //toggleBeamReceive(); 289 //toggleBeamReceive();
290 setFocusPolicy ( WheelFocus );
290} 291}
291MainWindow::~MainWindow() 292MainWindow::~MainWindow()
292{ 293{
293 //qDebug("MainWindow::~MainWindow() "); 294 //qDebug("MainWindow::~MainWindow() ");
294 //save toolbar location 295 //save toolbar location
295 delete mCalendar; 296 delete mCalendar;
@@ -1275,12 +1276,13 @@ void MainWindow::keyBindings()
1275 i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+ 1276 i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+
1276 i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+ 1277 i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+
1277 i18n("<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ")+ 1278 i18n("<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ")+
1278 i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+ 1279 i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+
1279 i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+ 1280 i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+
1280 i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+ 1281 i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+
1282 i18n("<p><b>K</b>: Week view in Month view syle</p>\n")+
1281 i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+ 1283 i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+
1282 i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+ 1284 i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+
1283 i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n")+ 1285 i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n")+
1284 i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+ 1286 i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+
1285 i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+ 1287 i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+
1286 i18n("<p><b>B</b>: Edit description (details) of selected item</p>\n")+ 1288 i18n("<p><b>B</b>: Edit description (details) of selected item</p>\n")+
@@ -1623,12 +1625,15 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
1623 case Qt::Key_Down: 1625 case Qt::Key_Down:
1624 mView->viewManager()->agendaView()->scrollOneHourDown(); 1626 mView->viewManager()->agendaView()->scrollOneHourDown();
1625 break; 1627 break;
1626 case Qt::Key_Up: 1628 case Qt::Key_Up:
1627 mView->viewManager()->agendaView()->scrollOneHourUp(); 1629 mView->viewManager()->agendaView()->scrollOneHourUp();
1628 break; 1630 break;
1631 case Qt::Key_K:
1632 mView->viewManager()->showMonthViewWeek();
1633 break;
1629 case Qt::Key_I: 1634 case Qt::Key_I:
1630 mView->showIncidence(); 1635 mView->showIncidence();
1631 break; 1636 break;
1632 case Qt::Key_Delete: 1637 case Qt::Key_Delete:
1633 case Qt::Key_Backspace: 1638 case Qt::Key_Backspace:
1634 mView->deleteIncidence(); 1639 mView->deleteIncidence();