-rw-r--r-- | bin/kdepim/WhatsNew.txt | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 12 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 1 |
3 files changed, 12 insertions, 3 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index af994ae..ec6a4ec 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,24 +1,24 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.1.6 ************ | 3 | ********** VERSION 2.1.6 ************ |
4 | 4 | ||
5 | KO/Pi: | 5 | KO/Pi: |
6 | Added to the list view (the list view is used in search dialog as well) the possibility to print it. | 6 | Added to the list view (the list view is used in search dialog as well) the possibility to print it. |
7 | Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view. | 7 | Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view. |
8 | Added to the list view the possibility to add all subtodos of selected todos to an export. | 8 | Added to the list view the possibility to add all subtodos of selected todos to an export/beam. |
9 | Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout. | 9 | Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout. |
10 | 10 | ||
11 | ********** VERSION 2.1.5 ************ | 11 | ********** VERSION 2.1.5 ************ |
12 | 12 | ||
13 | This is the new stable version. | 13 | This is the new stable version. |
14 | Bugfix: | 14 | Bugfix: |
15 | Fixed a problem with agenda popup on the desktop in KO/Pi. | 15 | Fixed a problem with agenda popup on the desktop in KO/Pi. |
16 | Fixed a crash when reloading file, e.g. after a passive pi-sync synchronization. | 16 | Fixed a crash when reloading file, e.g. after a passive pi-sync synchronization. |
17 | Added config option to not display completed todos in agenda view. | 17 | Added config option to not display completed todos in agenda view. |
18 | Addressee view is now using the formatted name, if defined. | 18 | Addressee view is now using the formatted name, if defined. |
19 | That makes it possible to display "lastname, firstname" in that view now. | 19 | That makes it possible to display "lastname, firstname" in that view now. |
20 | To set the formatted name for all contacts, please use menu: | 20 | To set the formatted name for all contacts, please use menu: |
21 | Edit->Change->Set formatted name. | 21 | Edit->Change->Set formatted name. |
22 | Fixed the bug in KA/Pi that is was not possible to add images to a contact on Windows. | 22 | Fixed the bug in KA/Pi that is was not possible to add images to a contact on Windows. |
23 | 23 | ||
24 | ********** VERSION 2.1.4 ************ | 24 | ********** VERSION 2.1.4 ************ |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 481eab4..20f8b57 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1030,53 +1030,58 @@ void MainWindow::initActions() | |||
1030 | brAction->addTo( beamMenu_X ); | 1030 | brAction->addTo( beamMenu_X ); |
1031 | brAction->setToggleAction (true ) ; | 1031 | brAction->setToggleAction (true ) ; |
1032 | connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); | 1032 | connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); |
1033 | 1033 | ||
1034 | action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, | 1034 | action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, |
1035 | this ); | 1035 | this ); |
1036 | action->addTo( beamMenu_X ); | 1036 | action->addTo( beamMenu_X ); |
1037 | connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); | 1037 | connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); |
1038 | 1038 | ||
1039 | action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, | 1039 | action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, |
1040 | this ); | 1040 | this ); |
1041 | action->addTo( beamMenu_X ); | 1041 | action->addTo( beamMenu_X ); |
1042 | connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); | 1042 | connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); |
1043 | importMenu->insertItem( i18n("Beam"), beamMenu_X ); | 1043 | importMenu->insertItem( i18n("Beam"), beamMenu_X ); |
1044 | #else | 1044 | #else |
1045 | //importMenu->insertSeparator(); | 1045 | //importMenu->insertSeparator(); |
1046 | icon = loadPixmap( pathString + "print" ); | 1046 | icon = loadPixmap( pathString + "print" ); |
1047 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); | 1047 | action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); |
1048 | action->addTo( beamMenu_X ); | 1048 | action->addTo( beamMenu_X ); |
1049 | connect( action, SIGNAL( activated() ), | 1049 | connect( action, SIGNAL( activated() ), |
1050 | this, SLOT( printCal() ) ); | 1050 | this, SLOT( printCal() ) ); |
1051 | 1051 | ||
1052 | icon = loadPixmap( pathString + "print" ); | 1052 | icon = loadPixmap( pathString + "print" ); |
1053 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); | 1053 | action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); |
1054 | action->addTo( beamMenu_X ); | 1054 | action->addTo( beamMenu_X ); |
1055 | connect( action, SIGNAL( activated() ), | 1055 | connect( action, SIGNAL( activated() ), |
1056 | this, SLOT( printSel() ) ); | 1056 | this, SLOT( printSel() ) ); |
1057 | action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); | 1057 | action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); |
1058 | action->addTo( beamMenu_X ); | 1058 | action->addTo( beamMenu_X ); |
1059 | connect( action, SIGNAL( activated() ), | 1059 | connect( action, SIGNAL( activated() ), |
1060 | mView->viewManager(), SLOT( slotprintWNV() ) ); | 1060 | mView->viewManager(), SLOT( slotprintWNV() ) ); |
1061 | 1061 | ||
1062 | action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); | 1062 | action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); |
1063 | action->addTo( beamMenu_X ); | 1063 | action->addTo( beamMenu_X ); |
1064 | connect( action, SIGNAL( activated() ), | 1064 | connect( action, SIGNAL( activated() ), |
1065 | mView, SLOT( slotprintSelInc() ) ); | 1065 | mView, SLOT( slotprintSelInc() ) ); |
1066 | 1066 | ||
1067 | icon = loadPixmap( pathString + "print" ); | ||
1068 | action = new QAction( i18n("Print list view..."),icon,i18n("Print list view..."), 0, this ); | ||
1069 | action->addTo( beamMenu_X ); | ||
1070 | connect( action, SIGNAL( activated() ), | ||
1071 | this, SLOT( printListView() ) ); | ||
1067 | 1072 | ||
1068 | importMenu->insertItem( i18n("Print"), beamMenu_X ); | 1073 | importMenu->insertItem( i18n("Print"), beamMenu_X ); |
1069 | #endif | 1074 | #endif |
1070 | importMenu->insertSeparator(); | 1075 | importMenu->insertSeparator(); |
1071 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, | 1076 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, |
1072 | this ); | 1077 | this ); |
1073 | action->addTo( importMenu ); | 1078 | action->addTo( importMenu ); |
1074 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); | 1079 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); |
1075 | importMenu->insertSeparator(); | 1080 | importMenu->insertSeparator(); |
1076 | action = new QAction( "beam all", i18n("Save"), 0, | 1081 | action = new QAction( "beam all", i18n("Save"), 0, |
1077 | this ); | 1082 | this ); |
1078 | action->addTo( importMenu ); | 1083 | action->addTo( importMenu ); |
1079 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); | 1084 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); |
1080 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, | 1085 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, |
1081 | this ); | 1086 | this ); |
1082 | action->addTo( importMenu ); | 1087 | action->addTo( importMenu ); |
@@ -2407,33 +2412,36 @@ void MainWindow::syncFileRequest() | |||
2407 | mView->saveCalendar( sentSyncFile() ); | 2412 | mView->saveCalendar( sentSyncFile() ); |
2408 | setCaption(i18n("Data saved to temp file!" )); | 2413 | setCaption(i18n("Data saved to temp file!" )); |
2409 | 2414 | ||
2410 | } | 2415 | } |
2411 | void MainWindow::getFile( bool success ) | 2416 | void MainWindow::getFile( bool success ) |
2412 | { | 2417 | { |
2413 | if ( ! success ) { | 2418 | if ( ! success ) { |
2414 | setCaption( i18n("Error receiving file. Nothing changed!") ); | 2419 | setCaption( i18n("Error receiving file. Nothing changed!") ); |
2415 | return; | 2420 | return; |
2416 | } | 2421 | } |
2417 | mView->openCalendar( sentSyncFile() ); | 2422 | mView->openCalendar( sentSyncFile() ); |
2418 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { | 2423 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { |
2419 | mSyncManager->slotSyncMenu( 999 ); | 2424 | mSyncManager->slotSyncMenu( 999 ); |
2420 | } | 2425 | } |
2421 | setCaption( i18n("Pi-Sync successful!") ); | 2426 | setCaption( i18n("Pi-Sync successful!") ); |
2422 | } | 2427 | } |
2423 | 2428 | void MainWindow::printListView() | |
2429 | { | ||
2430 | qDebug("MainWindow::printListView() "); | ||
2431 | } | ||
2424 | void MainWindow::printSel( ) | 2432 | void MainWindow::printSel( ) |
2425 | { | 2433 | { |
2426 | mView->viewManager()->agendaView()->agenda()->printSelection(); | 2434 | mView->viewManager()->agendaView()->agenda()->printSelection(); |
2427 | } | 2435 | } |
2428 | 2436 | ||
2429 | void MainWindow::printCal() | 2437 | void MainWindow::printCal() |
2430 | { | 2438 | { |
2431 | mView->print();//mCp->showDialog(); | 2439 | mView->print();//mCp->showDialog(); |
2432 | } | 2440 | } |
2433 | 2441 | ||
2434 | 2442 | ||
2435 | #include "libkdepim/kdatepicker.h" | 2443 | #include "libkdepim/kdatepicker.h" |
2436 | #include <kdatetbl.h> | 2444 | #include <kdatetbl.h> |
2437 | 2445 | ||
2438 | void MainWindow::weekAction() | 2446 | void MainWindow::weekAction() |
2439 | { | 2447 | { |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 6895e36..1105783 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -72,32 +72,33 @@ class MainWindow : public QMainWindow | |||
72 | void processIncidenceSelection( Incidence * ); | 72 | void processIncidenceSelection( Incidence * ); |
73 | 73 | ||
74 | void importQtopia(); | 74 | void importQtopia(); |
75 | void importBday(); | 75 | void importBday(); |
76 | void importOL(); | 76 | void importOL(); |
77 | void importIcal(); | 77 | void importIcal(); |
78 | void importFile( QString, bool ); | 78 | void importFile( QString, bool ); |
79 | void quickImportIcal(); | 79 | void quickImportIcal(); |
80 | 80 | ||
81 | void slotModifiedChanged( bool ); | 81 | void slotModifiedChanged( bool ); |
82 | 82 | ||
83 | void save(); | 83 | void save(); |
84 | void saveStopTimer(); | 84 | void saveStopTimer(); |
85 | void configureToolBar( int ); | 85 | void configureToolBar( int ); |
86 | void printSel(); | 86 | void printSel(); |
87 | void printCal(); | 87 | void printCal(); |
88 | void printListView(); | ||
88 | void saveCalendar(); | 89 | void saveCalendar(); |
89 | void loadCalendar(); | 90 | void loadCalendar(); |
90 | void exportVCalendar(); | 91 | void exportVCalendar(); |
91 | void fillFilterMenu(); | 92 | void fillFilterMenu(); |
92 | void fillFilterMenuTB(); | 93 | void fillFilterMenuTB(); |
93 | void selectFilter( int ); | 94 | void selectFilter( int ); |
94 | void fillFilterMenuPopup(); | 95 | void fillFilterMenuPopup(); |
95 | void selectFilterPopup( int ); | 96 | void selectFilterPopup( int ); |
96 | void exportToPhone( int ); | 97 | void exportToPhone( int ); |
97 | void toggleBeamReceive(); | 98 | void toggleBeamReceive(); |
98 | void disableBR(bool); | 99 | void disableBR(bool); |
99 | signals: | 100 | signals: |
100 | void selectWeek ( int ); | 101 | void selectWeek ( int ); |
101 | private slots: | 102 | private slots: |
102 | void showConfigureAgenda(); | 103 | void showConfigureAgenda(); |
103 | void getFile( bool ); | 104 | void getFile( bool ); |