author | zautrix <zautrix> | 2005-03-31 11:26:51 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-31 11:26:51 (UTC) |
commit | c0fa26aa3b33c293853bdd7d028ddb0545e33c85 (patch) (unidiff) | |
tree | 12bbb65fb6d235415bd7a7007c1e019ccfcf97ac /korganizer | |
parent | f39d5000ed2f9a436ee94cbd42f840651afa89d6 (diff) | |
download | kdepimpi-c0fa26aa3b33c293853bdd7d028ddb0545e33c85.zip kdepimpi-c0fa26aa3b33c293853bdd7d028ddb0545e33c85.tar.gz kdepimpi-c0fa26aa3b33c293853bdd7d028ddb0545e33c85.tar.bz2 |
many fixes
-rw-r--r-- | korganizer/mainwindow.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 09a0880..d98915b 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1430,37 +1430,39 @@ void MainWindow::about() | |||
1430 | #ifdef DESKTOP_VERSION | 1430 | #ifdef DESKTOP_VERSION |
1431 | i18n("Desktop Edition\n") + | 1431 | i18n("Desktop Edition\n") + |
1432 | #else | 1432 | #else |
1433 | i18n("PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n") + | 1433 | i18n("PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n") + |
1434 | #endif | 1434 | #endif |
1435 | i18n("(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.info --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!") ); | 1435 | i18n("(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.info --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!") ); |
1436 | } | 1436 | } |
1437 | void MainWindow::keyBindings() | 1437 | void MainWindow::keyBindings() |
1438 | { | 1438 | { |
1439 | QString cap = i18n("KO/Pi Keys + Colors"); | 1439 | QString cap = i18n("KO/Pi Keys + Colors"); |
1440 | QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") + | 1440 | QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") + |
1441 | i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+ | 1441 | i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+ |
1442 | i18n("<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n") + | ||
1443 | i18n("<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n") + | ||
1442 | i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") + | 1444 | i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") + |
1443 | i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+ | 1445 | i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+ |
1444 | i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+ | 1446 | i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+ |
1445 | i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+ | 1447 | i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+ |
1446 | i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+ | 1448 | i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+ |
1447 | i18n("<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ")+ | 1449 | i18n("<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ")+ |
1448 | i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+ | 1450 | i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+ |
1449 | i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+ | 1451 | i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+ |
1450 | i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+ | 1452 | i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+ |
1451 | i18n("<p><b>K</b>: Week view in Month view syle</p>\n")+ | 1453 | i18n("<p><b>K</b>: Week view in Month view syle</p>\n")+ |
1452 | i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+ | 1454 | i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+ |
1453 | i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+ | 1455 | i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+ |
1454 | i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n")+ | 1456 | i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X+ctrl</b>: Toggle datenavigator</p>\n")+ |
1455 | i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+ | 1457 | i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+ |
1456 | i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+ | 1458 | i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+ |
1457 | i18n("<p><b>B</b>: Edit description (details) of selected item</p>\n")+ | 1459 | i18n("<p><b>B</b>: Edit description (details) of selected item</p>\n")+ |
1458 | i18n("<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n")+ | 1460 | i18n("<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n")+ |
1459 | i18n("<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n")+ | 1461 | i18n("<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n")+ |
1460 | i18n("<p><b>del,backspace</b>: Delete selected item</p>\n")+ | 1462 | i18n("<p><b>del,backspace</b>: Delete selected item</p>\n")+ |
1461 | i18n("<p><h3>In agenda view:</h3></p>\n") + | 1463 | i18n("<p><h3>In agenda view:</h3></p>\n") + |
1462 | i18n("<p><b>up/down</b>: Scroll agenda view</p>\n")+ | 1464 | i18n("<p><b>up/down</b>: Scroll agenda view</p>\n")+ |
1463 | i18n("<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n")+ | 1465 | i18n("<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n")+ |
1464 | i18n("<p><h3>In todo view:</h3></p>\n") + | 1466 | i18n("<p><h3>In todo view:</h3></p>\n") + |
1465 | i18n("<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n")+ | 1467 | i18n("<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n")+ |
1466 | i18n("<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n")+ | 1468 | i18n("<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n")+ |
@@ -1891,48 +1893,48 @@ void MainWindow::keyPressEvent ( QKeyEvent * e ) | |||
1891 | showSelectedDates = true; | 1893 | showSelectedDates = true; |
1892 | break; | 1894 | break; |
1893 | case Qt::Key_H : | 1895 | case Qt::Key_H : |
1894 | keyBindings(); | 1896 | keyBindings(); |
1895 | break; | 1897 | break; |
1896 | case Qt::Key_W: | 1898 | case Qt::Key_W: |
1897 | mView->viewManager()->showWhatsNextView(); | 1899 | mView->viewManager()->showWhatsNextView(); |
1898 | break; | 1900 | break; |
1899 | case Qt::Key_L: | 1901 | case Qt::Key_L: |
1900 | mView->viewManager()->showListView(); | 1902 | mView->viewManager()->showListView(); |
1901 | break; | 1903 | break; |
1902 | case Qt::Key_N: | 1904 | case Qt::Key_N: |
1903 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton) | ||
1904 | mView->viewManager()->showNextView(); | 1905 | mView->viewManager()->showNextView(); |
1905 | else { | ||
1906 | mView->viewManager()->showNextXView(); | ||
1907 | showSelectedDates = true; | ||
1908 | } | ||
1909 | break; | 1906 | break; |
1910 | case Qt::Key_V: | 1907 | case Qt::Key_V: |
1911 | mView->viewManager()->showTodoView(); | 1908 | mView->viewManager()->showTodoView(); |
1912 | break; | 1909 | break; |
1913 | case Qt::Key_C: | 1910 | case Qt::Key_C: |
1914 | mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() ); | 1911 | mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() ); |
1915 | break; | 1912 | break; |
1916 | case Qt::Key_P: | 1913 | case Qt::Key_P: |
1917 | mView->showDatePicker( ); | 1914 | mView->showDatePicker( ); |
1918 | break; | 1915 | break; |
1919 | case Qt::Key_F: | 1916 | case Qt::Key_F: |
1920 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) | 1917 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) |
1921 | mView->editFilters(); | 1918 | mView->editFilters(); |
1922 | else | 1919 | else |
1923 | mView->toggleFilter(); | 1920 | mView->toggleFilter(); |
1924 | break; | 1921 | break; |
1925 | case Qt::Key_X: | 1922 | case Qt::Key_X: |
1923 | if ( e->state() == Qt::ControlButton ) | ||
1926 | mView->toggleDateNavigatorWidget(); | 1924 | mView->toggleDateNavigatorWidget(); |
1925 | else { | ||
1926 | mView->viewManager()->showNextXView(); | ||
1927 | showSelectedDates = true; | ||
1928 | } | ||
1927 | break; | 1929 | break; |
1928 | case Qt::Key_Space: | 1930 | case Qt::Key_Space: |
1929 | mView->toggleExpand(); | 1931 | mView->toggleExpand(); |
1930 | break; | 1932 | break; |
1931 | case Qt::Key_A: | 1933 | case Qt::Key_A: |
1932 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) | 1934 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) |
1933 | mView->showNextAlarms(); | 1935 | mView->showNextAlarms(); |
1934 | else | 1936 | else |
1935 | mView->toggleAllDaySize(); | 1937 | mView->toggleAllDaySize(); |
1936 | break; | 1938 | break; |
1937 | case Qt::Key_T: | 1939 | case Qt::Key_T: |
1938 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) | 1940 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) |