summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
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
@@ -406,11 +406,11 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint )
x = 3;
if ( w > parentWidget()->width() ){
w = parentWidget()->width() - 6;
#ifndef DESKTOP_VERSION
- align = ( AlignCenter|WordBreak);
+ align = ( AlignHCenter|WordBreak|AlignTop);
#else
- align = ( AlignCenter|BreakAnywhere|WordBreak);
+ align = ( AlignHCenter|BreakAnywhere|WordBreak|AlignTop);
#endif
}
}
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 16031b8..a164fa4 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -286,8 +286,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
SLOT( updateWeekNum( const KCal::DateList & ) ) );
mBRdisabled = false;
//toggleBeamReceive();
+ setFocusPolicy ( WheelFocus );
}
MainWindow::~MainWindow()
{
//qDebug("MainWindow::~MainWindow() ");
@@ -1277,8 +1278,9 @@ void MainWindow::keyBindings()
i18n("<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ")+
i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+
i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+
i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+
+ i18n("<p><b>K</b>: Week view in Month view syle</p>\n")+
i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+
i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+
i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n")+
i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+
@@ -1625,8 +1627,11 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
break;
case Qt::Key_Up:
mView->viewManager()->agendaView()->scrollOneHourUp();
break;
+ case Qt::Key_K:
+ mView->viewManager()->showMonthViewWeek();
+ break;
case Qt::Key_I:
mView->showIncidence();
break;
case Qt::Key_Delete: