fixxhhh

3 files changed, 12 insertions, 7 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 58be545..f71401e 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1022,11 +1022,11 @@
 { "<p><b>C</b>: Show current time in agenda view</p>\n","<p><b>C</b>: Zeige aktuelle Zeit in Agenda Ansicht</p>\n" },
 { "<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n","<p><b>+,-</b> : Zoom rein/raus Agenda | <b>A</b>: Wechsle Ganztag Agenda Höhe</p>\n" },
-{ "<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n","<p><b>S+ctrl</b>: Füge Sub-Todo hinzu | <b>X</b>: Zeige/verstecke Datenavigator</p>\n" },
+{ "<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n","<p><b>S+ctrl</b>: Füge Sub-Todo hinzu | <b>X</b>: Zeige/verstecke Datumsnavigator</p>\n" },
 { "<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n","<p><b>T</b>: Gehe zu Heute | <b>T+ctrl</b>: Neues Todo</p>\n" },
 { "<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n","<p><b>E</b>: Editiere selektiertes Item |<b> E+ctrl</b>: Neuer Termin</p>\n" },
-{ "<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n","<p><b>D</b>: Ein-Tages Ansicht | <b>M</b>: Monats Ansicht</p>\n" },
-{ "<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n","<p><b>Z,Y</b>: Arbeitswochen Ansicht | <b>U</b>: Wochen Ansicht</p>\n" },
+{ "<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n","<p><b>D</b>: Ein-Tages Ansicht | <b>M</b>: Monatsansicht</p>\n" },
+{ "<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n","<p><b>Z,Y</b>: Arbeitswochenansicht | <b>U</b>: Wochenansicht</p>\n" },
 { "<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n","<p><b>V</b>: Todo Ansicht | <b>L</b>: Termin Listen Ansicht</p>\n" },
-{ "<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ","<p><b>N</b>: Nächste-Tage Ansicht days view| <b>W</b>: What's next Ansicht\n " },
+{ "<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ","<p><b>N</b>: Nächste-Tage Ansicht | <b>W</b>: What's Next Ansicht\n " },
 { "<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n","<p><b>1-0</b> (+<b>ctrl</b>): Selektiere Filter 1-10 (11-20)</p>\n" },
 { "<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n","<p><b>O</b>: Filter An/Aus | <b>J</b>: Journal Ansicht</p>\n" },
@@ -1288,5 +1288,5 @@
 { "yearly","jährlich" },
 { "(%1) ","%1-" },
-{ "","" },
+{ "<p><b>K</b>: Week view in Month view syle</p>\n","<p><b>K</b>: Wochenansicht in Art der Monatsansicht</p>\n" },
 { "","" },
 { "","" },
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 7b29ce7..d0a7b07 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -408,7 +408,7 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint )
             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
@@ -288,4 +288,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     mBRdisabled = false;
     //toggleBeamReceive();
+    setFocusPolicy ( WheelFocus  ); 
 }
 MainWindow::~MainWindow()
@@ -1279,4 +1280,5 @@ void MainWindow::keyBindings()
         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")+
@@ -1627,4 +1629,7 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
         mView->viewManager()->agendaView()->scrollOneHourUp();
         break;
+    case Qt::Key_K:
+        mView->viewManager()->showMonthViewWeek();
+        break;
     case Qt::Key_I:
         mView->showIncidence();