author | zautrix <zautrix> | 2005-03-16 20:11:20 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-16 20:11:20 (UTC) |
commit | aae23f2f26ef87a4fe45ea54f1e7fe82e9fd0460 (patch) (unidiff) | |
tree | c90a533233c8a9c4c8a0be69391bae2c8dd52c50 /korganizer | |
parent | 03eea81694e8956a16b71bb3e9647c20383adb71 (diff) | |
download | kdepimpi-aae23f2f26ef87a4fe45ea54f1e7fe82e9fd0460.zip kdepimpi-aae23f2f26ef87a4fe45ea54f1e7fe82e9fd0460.tar.gz kdepimpi-aae23f2f26ef87a4fe45ea54f1e7fe82e9fd0460.tar.bz2 |
fix
-rw-r--r-- | korganizer/kolocationbox.cpp | 2 | ||||
-rw-r--r-- | korganizer/kolocationbox.h | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/korganizer/kolocationbox.cpp b/korganizer/kolocationbox.cpp index f8fee2e..35a8123 100644 --- a/korganizer/kolocationbox.cpp +++ b/korganizer/kolocationbox.cpp | |||
@@ -1,30 +1,30 @@ | |||
1 | /* | 1 | /* |
2 | Copyright (c) 2004 Dirk Loesche <dirk.loesche@bigfoot.de> | 2 | Copyright (c) 2004 Dirk Loesche <dirk.loesche@bigfoot.de> |
3 | 3 | ||
4 | This file is part of KOrganizer/PI | 4 | This file is part of KOrganizer/PI |
5 | KOrganizer Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> | 5 | KOrganizer Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> |
6 | KOrganizer/PI Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.net> | 6 | KOrganizer/PI Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.info> |
7 | 7 | ||
8 | This program is free software; you can redistribute it and/or modify | 8 | This program is free software; you can redistribute it and/or modify |
9 | it under the terms of the GNU General Public License as published by | 9 | it under the terms of the GNU General Public License as published by |
10 | the Free Software Foundation; either version 2 of the License, or | 10 | the Free Software Foundation; either version 2 of the License, or |
11 | (at your option) any later version. | 11 | (at your option) any later version. |
12 | 12 | ||
13 | This program is distributed in the hope that it will be useful, | 13 | This program is distributed in the hope that it will be useful, |
14 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | GNU General Public License for more details. | 16 | GNU General Public License for more details. |
17 | 17 | ||
18 | You should have received a copy of the GNU General Public License | 18 | You should have received a copy of the GNU General Public License |
19 | along with this program; if not, write to the Free Software | 19 | along with this program; if not, write to the Free Software |
20 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 20 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
21 | 21 | ||
22 | As a special exception, permission is given to link this program | 22 | As a special exception, permission is given to link this program |
23 | with any edition of Qt, and distribute the resulting executable, | 23 | with any edition of Qt, and distribute the resulting executable, |
24 | without including the source code for Qt in the source distribution. | 24 | without including the source code for Qt in the source distribution. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "kolocationbox.h" | 27 | #include "kolocationbox.h" |
28 | #include <qstring.h> | 28 | #include <qstring.h> |
29 | #include <qlineedit.h> | 29 | #include <qlineedit.h> |
30 | #include <qapplication.h> | 30 | #include <qapplication.h> |
diff --git a/korganizer/kolocationbox.h b/korganizer/kolocationbox.h index be8ea86..b604d33 100644 --- a/korganizer/kolocationbox.h +++ b/korganizer/kolocationbox.h | |||
@@ -1,30 +1,30 @@ | |||
1 | /* | 1 | /* |
2 | File Copyright (c) 2004 Dirk Loesche <dirk.loesche@bigfoot.de> | 2 | File Copyright (c) 2004 Dirk Loesche <dirk.loesche@bigfoot.de> |
3 | 3 | ||
4 | This file is part of KOrganizer/PI | 4 | This file is part of KOrganizer/PI |
5 | KOrganizer Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> | 5 | KOrganizer Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> |
6 | KOrganizer/PI Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.net> | 6 | KOrganizer/PI Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.info> |
7 | 7 | ||
8 | This program is free software; you can redistribute it and/or modify | 8 | This program is free software; you can redistribute it and/or modify |
9 | it under the terms of the GNU General Public License as published by | 9 | it under the terms of the GNU General Public License as published by |
10 | the Free Software Foundation; either version 2 of the License, or | 10 | the Free Software Foundation; either version 2 of the License, or |
11 | (at your option) any later version. | 11 | (at your option) any later version. |
12 | 12 | ||
13 | This program is distributed in the hope that it will be useful, | 13 | This program is distributed in the hope that it will be useful, |
14 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | GNU General Public License for more details. | 16 | GNU General Public License for more details. |
17 | 17 | ||
18 | You should have received a copy of the GNU General Public License | 18 | You should have received a copy of the GNU General Public License |
19 | along with this program; if not, write to the Free Software | 19 | along with this program; if not, write to the Free Software |
20 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 20 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
21 | 21 | ||
22 | As a special exception, permission is given to link this program | 22 | As a special exception, permission is given to link this program |
23 | with any edition of Qt, and distribute the resulting executable, | 23 | with any edition of Qt, and distribute the resulting executable, |
24 | without including the source code for Qt in the source distribution. | 24 | without including the source code for Qt in the source distribution. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #ifndef KOLOCATIONBOX_H | 27 | #ifndef KOLOCATIONBOX_H |
28 | #define KOLOCATIONBOX_H | 28 | #define KOLOCATIONBOX_H |
29 | 29 | ||
30 | #include <qcombobox.h> | 30 | #include <qcombobox.h> |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 4f71788..bd9efc8 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1254,49 +1254,49 @@ void MainWindow::faq() | |||
1254 | } | 1254 | } |
1255 | void MainWindow::whatsNew() | 1255 | void MainWindow::whatsNew() |
1256 | { | 1256 | { |
1257 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); | 1257 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); |
1258 | 1258 | ||
1259 | } | 1259 | } |
1260 | void MainWindow::licence() | 1260 | void MainWindow::licence() |
1261 | { | 1261 | { |
1262 | KApplication::showLicence(); | 1262 | KApplication::showLicence(); |
1263 | 1263 | ||
1264 | } | 1264 | } |
1265 | void MainWindow::about() | 1265 | void MainWindow::about() |
1266 | { | 1266 | { |
1267 | QString version; | 1267 | QString version; |
1268 | #include <../version> | 1268 | #include <../version> |
1269 | QMessageBox::about( this, i18n("About KOrganizer/Pi"), | 1269 | QMessageBox::about( this, i18n("About KOrganizer/Pi"), |
1270 | i18n("KOrganizer/Platform-independent\n") + | 1270 | i18n("KOrganizer/Platform-independent\n") + |
1271 | "(KO/Pi) " + version + " - " + | 1271 | "(KO/Pi) " + version + " - " + |
1272 | 1272 | ||
1273 | #ifdef DESKTOP_VERSION | 1273 | #ifdef DESKTOP_VERSION |
1274 | i18n("Desktop Edition\n") + | 1274 | i18n("Desktop Edition\n") + |
1275 | #else | 1275 | #else |
1276 | i18n("PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n") + | 1276 | i18n("PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n") + |
1277 | #endif | 1277 | #endif |
1278 | 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.net --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!") ); | 1278 | 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!") ); |
1279 | } | 1279 | } |
1280 | void MainWindow::keyBindings() | 1280 | void MainWindow::keyBindings() |
1281 | { | 1281 | { |
1282 | QString cap = i18n("KO/Pi Keys + Colors"); | 1282 | QString cap = i18n("KO/Pi Keys + Colors"); |
1283 | QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") + | 1283 | QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") + |
1284 | i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+ | 1284 | i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+ |
1285 | i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") + | 1285 | i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") + |
1286 | i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+ | 1286 | i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+ |
1287 | i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+ | 1287 | i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+ |
1288 | i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+ | 1288 | i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+ |
1289 | i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+ | 1289 | i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+ |
1290 | i18n("<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ")+ | 1290 | i18n("<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ")+ |
1291 | i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+ | 1291 | i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+ |
1292 | i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+ | 1292 | i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+ |
1293 | i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+ | 1293 | i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+ |
1294 | i18n("<p><b>K</b>: Week view in Month view syle</p>\n")+ | 1294 | i18n("<p><b>K</b>: Week view in Month view syle</p>\n")+ |
1295 | i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+ | 1295 | i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+ |
1296 | i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+ | 1296 | i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+ |
1297 | i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n")+ | 1297 | i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n")+ |
1298 | i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+ | 1298 | i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+ |
1299 | i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+ | 1299 | i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+ |
1300 | i18n("<p><b>B</b>: Edit description (details) of selected item</p>\n")+ | 1300 | i18n("<p><b>B</b>: Edit description (details) of selected item</p>\n")+ |
1301 | i18n("<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n")+ | 1301 | i18n("<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n")+ |
1302 | i18n("<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n")+ | 1302 | i18n("<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n")+ |
@@ -1326,49 +1326,49 @@ void MainWindow::keyBindings() | |||
1326 | i18n("<p><h2>KO/Pi icon colors:</h2></p>\n") + | 1326 | i18n("<p><h2>KO/Pi icon colors:</h2></p>\n") + |
1327 | i18n("<p><b>(for square icons in agenda and month view)</b></p>\n") + | 1327 | i18n("<p><b>(for square icons in agenda and month view)</b></p>\n") + |
1328 | i18n("<p><b>Cross</b>: Item cancelled.([c] in Whats'Next view)</p>\n")+ | 1328 | i18n("<p><b>Cross</b>: Item cancelled.([c] in Whats'Next view)</p>\n")+ |
1329 | i18n("<p><b>Red</b>: Alarm set.([a] in Whats'Next view)</p>\n")+ | 1329 | i18n("<p><b>Red</b>: Alarm set.([a] in Whats'Next view)</p>\n")+ |
1330 | i18n("<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n")+ | 1330 | i18n("<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n")+ |
1331 | i18n("<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n")+ | 1331 | i18n("<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n")+ |
1332 | i18n("<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n")+ | 1332 | i18n("<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n")+ |
1333 | i18n("<p><b>Dark yellow</b>: Event/todo with attendees.</p>\n") + | 1333 | i18n("<p><b>Dark yellow</b>: Event/todo with attendees.</p>\n") + |
1334 | i18n("<p><b>White</b>: Item readonly</p>\n"); | 1334 | i18n("<p><b>White</b>: Item readonly</p>\n"); |
1335 | displayText( text, cap); | 1335 | displayText( text, cap); |
1336 | } | 1336 | } |
1337 | void MainWindow::aboutAutoSaving() | 1337 | void MainWindow::aboutAutoSaving() |
1338 | { | 1338 | { |
1339 | QString text = i18n("After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configurable) three minutes.\nFor safety reasons there is one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n"); | 1339 | QString text = i18n("After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configurable) three minutes.\nFor safety reasons there is one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n"); |
1340 | 1340 | ||
1341 | KApplication::showText( i18n("Auto Saving in KOrganizer/Pi"), text); | 1341 | KApplication::showText( i18n("Auto Saving in KOrganizer/Pi"), text); |
1342 | 1342 | ||
1343 | } | 1343 | } |
1344 | void MainWindow::aboutKnownBugs() | 1344 | void MainWindow::aboutKnownBugs() |
1345 | { | 1345 | { |
1346 | QMessageBox* msg; | 1346 | QMessageBox* msg; |
1347 | msg = new QMessageBox( i18n("Known Problems in KOrganizer/Pi"), | 1347 | msg = new QMessageBox( i18n("Known Problems in KOrganizer/Pi"), |
1348 | i18n("1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n")+ | 1348 | i18n("1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n")+ |
1349 | i18n("2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n")+ | 1349 | i18n("2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n")+ |
1350 | i18n("\nPlease report unexpected behaviour to\nlutz@pi-sync.net\n") + | 1350 | i18n("\nPlease report unexpected behaviour to\nlutz@pi-sync.info\n") + |
1351 | i18n("\nor report them in the bugtracker on\n") + | 1351 | i18n("\nor report them in the bugtracker on\n") + |
1352 | i18n("\nhttp://sourceforge.net/projects/kdepimpi\n"), | 1352 | i18n("\nhttp://sourceforge.net/projects/kdepimpi\n"), |
1353 | QMessageBox::NoIcon, | 1353 | QMessageBox::NoIcon, |
1354 | QMessageBox::Ok, | 1354 | QMessageBox::Ok, |
1355 | QMessageBox::NoButton, | 1355 | QMessageBox::NoButton, |
1356 | QMessageBox::NoButton); | 1356 | QMessageBox::NoButton); |
1357 | msg->exec(); | 1357 | msg->exec(); |
1358 | delete msg; | 1358 | delete msg; |
1359 | 1359 | ||
1360 | } | 1360 | } |
1361 | 1361 | ||
1362 | QString MainWindow::defaultFileName() | 1362 | QString MainWindow::defaultFileName() |
1363 | { | 1363 | { |
1364 | return locateLocal( "data", "korganizer/mycalendar.ics" ); | 1364 | return locateLocal( "data", "korganizer/mycalendar.ics" ); |
1365 | } | 1365 | } |
1366 | QString MainWindow::syncFileName() | 1366 | QString MainWindow::syncFileName() |
1367 | { | 1367 | { |
1368 | #ifdef DESKTOP_VERSION | 1368 | #ifdef DESKTOP_VERSION |
1369 | return locateLocal( "tmp", "synccalendar.ics" ); | 1369 | return locateLocal( "tmp", "synccalendar.ics" ); |
1370 | #else | 1370 | #else |
1371 | return QString( "/tmp/synccalendar.ics" ); | 1371 | return QString( "/tmp/synccalendar.ics" ); |
1372 | #endif | 1372 | #endif |
1373 | } | 1373 | } |
1374 | void MainWindow::updateWeek(QDate seda) | 1374 | void MainWindow::updateWeek(QDate seda) |