-rw-r--r-- | bin/kdepim/WhatsNew.txt | 6 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 4 | ||||
-rw-r--r-- | desktop/rpm/kdepim_rpm | 2 | ||||
-rw-r--r-- | korganizer/kolistview.cpp | 82 | ||||
-rw-r--r-- | korganizer/kolistview.h | 3 | ||||
-rw-r--r-- | version | 2 |
6 files changed, 95 insertions, 4 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 6e3b886..719f120 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,5 +1,11 @@ | |||
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 ************ | ||
4 | |||
5 | KO/Pi: | ||
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. | ||
8 | |||
3 | ********** VERSION 2.1.5 ************ | 9 | ********** VERSION 2.1.5 ************ |
4 | 10 | ||
5 | This is the new stable version. | 11 | This is the new stable version. |
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 5a27a10..8f28234 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1372,8 +1372,8 @@ | |||
1372 | { "Agenda view shows completed todos","Agenda Ansicht zeigt erledigte Todos" }, | 1372 | { "Agenda view shows completed todos","Agenda Ansicht zeigt erledigte Todos" }, |
1373 | { "KO/Pi: Missing alarms!","KO/Pi: Verpasste Alarme!" }, | 1373 | { "KO/Pi: Missing alarms!","KO/Pi: Verpasste Alarme!" }, |
1374 | { "You missed the alarms for the following events or todos:","Sie verpassten die Alarme für folgende Termine oder Todos:" }, | 1374 | { "You missed the alarms for the following events or todos:","Sie verpassten die Alarme für folgende Termine oder Todos:" }, |
1375 | { "","" }, | 1375 | { "Print complete list","Drucke komplette Liste" }, |
1376 | { "","" }, | 1376 | { "Hide all selected","Verstecke Selektierte" }, |
1377 | { "","" }, | 1377 | { "","" }, |
1378 | { "","" }, | 1378 | { "","" }, |
1379 | { "","" }, | 1379 | { "","" }, |
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm index cf68670..ee00372 100644 --- a/desktop/rpm/kdepim_rpm +++ b/desktop/rpm/kdepim_rpm | |||
@@ -1,6 +1,6 @@ | |||
1 | Summary: A collection of PIM programs | 1 | Summary: A collection of PIM programs |
2 | Name: KDE-Pim-Pi | 2 | Name: KDE-Pim-Pi |
3 | Version: 2.1.5 | 3 | Version: 2.1.6 |
4 | Release: SuSE_9.2 | 4 | Release: SuSE_9.2 |
5 | Copyright:GPL | 5 | Copyright:GPL |
6 | Group: Productivity/Pim | 6 | Group: Productivity/Pim |
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index bc52281..7022e02 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -34,6 +34,8 @@ | |||
34 | #include <qdir.h> | 34 | #include <qdir.h> |
35 | #include <qwhatsthis.h> | 35 | #include <qwhatsthis.h> |
36 | #include <qregexp.h> | 36 | #include <qregexp.h> |
37 | #include <qpainter.h> | ||
38 | #include <qpaintdevicemetrics.h> | ||
37 | 39 | ||
38 | #include <klocale.h> | 40 | #include <klocale.h> |
39 | #include <kdebug.h> | 41 | #include <kdebug.h> |
@@ -63,6 +65,7 @@ | |||
63 | #include "kfiledialog.h" | 65 | #include "kfiledialog.h" |
64 | 66 | ||
65 | #include "kolistview.h" | 67 | #include "kolistview.h" |
68 | #include "koeventviewer.h" | ||
66 | 69 | ||
67 | 70 | ||
68 | 71 | ||
@@ -280,7 +283,18 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, | |||
280 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | 283 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), |
281 | i18n("Delete all selected"),this, | 284 | i18n("Delete all selected"),this, |
282 | SLOT(deleteAll()),true); | 285 | SLOT(deleteAll()),true); |
286 | #ifdef DESKTOP_VERSION | ||
287 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | ||
288 | i18n("Hide all selected"),this, | ||
289 | SLOT(hideAll()),true); | ||
290 | #endif | ||
291 | mPopupMenu->insertSeparator(); | ||
292 | #ifdef DESKTOP_VERSION | ||
293 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | ||
294 | i18n("Print complete list"),this, | ||
295 | SLOT(printList()),true); | ||
283 | mPopupMenu->insertSeparator(); | 296 | mPopupMenu->insertSeparator(); |
297 | #endif | ||
284 | QPopupMenu * exportPO = new QPopupMenu ( this ); | 298 | QPopupMenu * exportPO = new QPopupMenu ( this ); |
285 | mPopupMenu->insertItem( i18n("Export selected"), exportPO ); | 299 | mPopupMenu->insertItem( i18n("Export selected"), exportPO ); |
286 | exportPO->insertItem( i18n("As iCal (ics) file..."),this, | 300 | exportPO->insertItem( i18n("As iCal (ics) file..."),this, |
@@ -722,6 +736,27 @@ void KOListView::writeToFile( bool iCal ) | |||
722 | } | 736 | } |
723 | QTimer::singleShot( 1, this, SLOT ( resetFocus() ) ); | 737 | QTimer::singleShot( 1, this, SLOT ( resetFocus() ) ); |
724 | } | 738 | } |
739 | void KOListView::hideAll() | ||
740 | { | ||
741 | QPtrList<QListViewItem> delSel ; | ||
742 | QListViewItem *item = mListView->firstChild (); | ||
743 | while ( item ) { | ||
744 | if ( item->isSelected() ) { | ||
745 | delSel.append(item); | ||
746 | } | ||
747 | item = item->nextSibling(); | ||
748 | } | ||
749 | item = delSel.first() ; | ||
750 | while ( item ) { | ||
751 | QListViewItem * del = item; | ||
752 | item = delSel.next(); | ||
753 | delete del; | ||
754 | } | ||
755 | } | ||
756 | void KOListView::printList() | ||
757 | { | ||
758 | mListView->printList(); | ||
759 | } | ||
725 | void KOListView::deleteAll() | 760 | void KOListView::deleteAll() |
726 | { | 761 | { |
727 | int icount = 0; | 762 | int icount = 0; |
@@ -1287,3 +1322,50 @@ void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e) | |||
1287 | KListView::contentsMouseMoveEvent(e); | 1322 | KListView::contentsMouseMoveEvent(e); |
1288 | } | 1323 | } |
1289 | 1324 | ||
1325 | #define protected public | ||
1326 | #include <qheader.h> | ||
1327 | #undef protected | ||
1328 | void KOListViewListView::printList() | ||
1329 | { | ||
1330 | #ifdef DESKTOP_VERSION | ||
1331 | KOPrintPrefs pp ( this ); | ||
1332 | if (!pp.exec() ) | ||
1333 | return; | ||
1334 | int scaleval = pp.printMode() ; | ||
1335 | |||
1336 | QPrinter printer; | ||
1337 | if (!printer.setup() ) | ||
1338 | return; | ||
1339 | clearSelection (); | ||
1340 | QPainter p; | ||
1341 | p.begin ( &printer ); | ||
1342 | QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer ); | ||
1343 | float dx, dy; | ||
1344 | int wid = (m.width() * 9)/10; | ||
1345 | dx = (float) wid/(float)contentsWidth (); | ||
1346 | dy = (float)(m.height()) / (float)contentsHeight (); | ||
1347 | float scale; | ||
1348 | // scale to fit the width or height of the paper | ||
1349 | if ( dx < dy ) | ||
1350 | scale = dx; | ||
1351 | else | ||
1352 | scale = dy; | ||
1353 | |||
1354 | p.translate( m.width()/10,m.width()/10 ); | ||
1355 | if ( scaleval == 2 || scaleval == 1 && scale < 1.0 ) { | ||
1356 | p.scale( scale, scale ); | ||
1357 | } | ||
1358 | |||
1359 | int cou = header()->count(); | ||
1360 | int iii; | ||
1361 | QRect rect ( 0,0,0, header()->height()); | ||
1362 | for ( iii = 0; iii < cou; ++iii ) { | ||
1363 | rect.setLeft ( header()->sectionPos( iii ) ); | ||
1364 | rect.setRight ( header()->sectionPos( iii ) + header()->sectionSize (iii)); | ||
1365 | header()->paintSection ( & p, header()->mapToIndex (iii), rect ); | ||
1366 | } | ||
1367 | p.translate( 0, header()->height()); | ||
1368 | drawContentsOffset ( &p, 0,0, 0,0, contentsWidth (), contentsHeight () ); | ||
1369 | p.end(); | ||
1370 | #endif | ||
1371 | } | ||
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h index f4d6879..c25592d 100644 --- a/korganizer/kolistview.h +++ b/korganizer/kolistview.h | |||
@@ -216,6 +216,7 @@ class KOListViewListView : public KListView | |||
216 | public: | 216 | public: |
217 | KOListViewListView(KOListView * lv ); | 217 | KOListViewListView(KOListView * lv ); |
218 | bool hasMultiSelection(QListViewItem*); | 218 | bool hasMultiSelection(QListViewItem*); |
219 | void printList(); | ||
219 | signals: | 220 | signals: |
220 | void newEvent(); | 221 | void newEvent(); |
221 | void showIncidence( Incidence* ); | 222 | void showIncidence( Incidence* ); |
@@ -266,6 +267,8 @@ class KOListView : public KOEventView | |||
266 | void beamIncidenceList(QPtrList<Incidence>); | 267 | void beamIncidenceList(QPtrList<Incidence>); |
267 | 268 | ||
268 | public slots: | 269 | public slots: |
270 | void hideAll(); | ||
271 | void printList(); | ||
269 | void resetFocus(); | 272 | void resetFocus(); |
270 | virtual void updateView(); | 273 | virtual void updateView(); |
271 | virtual void showDates(const QDate &start, const QDate &end); | 274 | virtual void showDates(const QDate &start, const QDate &end); |
@@ -1 +1 @@ | |||
version = "2.1.5"; | version = "2.1.6"; | ||