summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-07-26 13:41:20 (UTC)
committer zautrix <zautrix>2005-07-26 13:41:20 (UTC)
commit08f8edb64a919e51ad6e1a62031569a629cffa0f (patch) (unidiff)
treea41d7cc8b5c5208056e1cee9b2a221349484f52c
parentb37d71f782540851846613a70a60daf86816f7ec (diff)
downloadkdepimpi-08f8edb64a919e51ad6e1a62031569a629cffa0f.zip
kdepimpi-08f8edb64a919e51ad6e1a62031569a629cffa0f.tar.gz
kdepimpi-08f8edb64a919e51ad6e1a62031569a629cffa0f.tar.bz2
fixx
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt1
-rw-r--r--korganizer/koeventviewer.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 2032420..06d630a 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,30 +1,31 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 2.1.17 ************ 3********** VERSION 2.1.17 ************
4 4
5KO/Pi: 5KO/Pi:
6Added option to display times in What's Next View on two lines. 6Added option to display times in What's Next View on two lines.
7(Useful for display on the Zaurus with 240x320 screen)
7Removed "Allday" for allday events of one day duration in What's Next View. 8Removed "Allday" for allday events of one day duration in What's Next View.
8Added date range for allday events of more than one day duration in What's Next View. 9Added date range for allday events of more than one day duration in What's Next View.
9 10
10********** VERSION 2.1.16 ************ 11********** VERSION 2.1.16 ************
11 12
12Fixed a problem with the menu bar in KO/Pi and using the "Menu" hardware key on the Zaurus. 13Fixed a problem with the menu bar in KO/Pi and using the "Menu" hardware key on the Zaurus.
13Added columns for datetime in todo view: Last modified, created and last modified subtodo 14Added columns for datetime in todo view: Last modified, created and last modified subtodo
14Fixed a bug in agenda view displaying recurring multiday events which are longer than two days. 15Fixed a bug in agenda view displaying recurring multiday events which are longer than two days.
15Made conflict detection up to 4 times faster. 16Made conflict detection up to 4 times faster.
16 17
17********** VERSION 2.1.15 ************ 18********** VERSION 2.1.15 ************
18 19
19Fixed two layout problems on the Z: 20Fixed two layout problems on the Z:
20Made the with of the newly added buttons on the Quick-Todo smaller. 21Made the with of the newly added buttons on the Quick-Todo smaller.
21Made listweek layout in 2 columns on the Z760 in portait screen and full menubar visible. 22Made listweek layout in 2 columns on the Z760 in portait screen and full menubar visible.
22 23
23 24
24********** VERSION 2.1.14 ************ 25********** VERSION 2.1.14 ************
25 26
26Added some buttons to the KO/Pi Quick-todo line to make it possible to quickly access some todo view layout settings like display all flat/open/close and hide/show running/done. 27Added some buttons to the KO/Pi Quick-todo line to make it possible to quickly access some todo view layout settings like display all flat/open/close and hide/show running/done.
27Added a button to add a subtodo quickly. 28Added a button to add a subtodo quickly.
28 29
29Added a possibility to search for conflicting events. (In the Action menu. Keyboard shortcut "q", shift+q or ctrl +q ). 30Added a possibility to search for conflicting events. (In the Action menu. Keyboard shortcut "q", shift+q or ctrl +q ).
30Added an option to change the layout of the list week to column mode. 31Added an option to change the layout of the list week to column mode.
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 2d0bfff..a690ab1 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -94,49 +94,49 @@ void KOEventViewer::printMe()
94 float scale; 94 float scale;
95 // scale to fit the width or height of the paper 95 // scale to fit the width or height of the paper
96 if ( dx < dy ) 96 if ( dx < dy )
97 scale = dx; 97 scale = dx;
98 else 98 else
99 scale = dy; 99 scale = dy;
100 100
101 p.translate( m.width()/10,0 ); 101 p.translate( m.width()/10,0 );
102 if ( scaleval == 2 || scaleval == 1 && scale < 1.0 ) { 102 if ( scaleval == 2 || scaleval == 1 && scale < 1.0 ) {
103 p.scale( scale, scale ); 103 p.scale( scale, scale );
104 } 104 }
105 drawContents ( &p, 0,0, contentsWidth (), contentsHeight () ); 105 drawContents ( &p, 0,0, contentsWidth (), contentsHeight () );
106 p.end(); 106 p.end();
107#endif 107#endif
108 108
109} 109}
110void KOEventViewer::setSource(const QString& n) 110void KOEventViewer::setSource(const QString& n)
111{ 111{
112 112
113 if ( n.left(8) == "todo_uid" ) { 113 if ( n.left(8) == "todo_uid" ) {
114 int midstr = 9; 114 int midstr = 9;
115#ifdef DESKTOP_VERSION 115#ifdef DESKTOP_VERSION
116 midstr = 11; 116 midstr = 11;
117#endif 117#endif
118 qDebug("-%s- ", n.mid(midstr).latin1()); 118 //qDebug("-%s- ", n.mid(midstr).latin1());
119 emit showIncidence( n.mid(midstr) ); 119 emit showIncidence( n.mid(midstr) );
120 return; 120 return;
121 } 121 }
122 122
123 if ( n.left(3) == "uid" ) 123 if ( n.left(3) == "uid" )
124#ifdef DESKTOP_VERSION 124#ifdef DESKTOP_VERSION
125 { 125 {
126 KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); 126 KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true );
127 KABC::AddressBook::Iterator it; 127 KABC::AddressBook::Iterator it;
128 for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { 128 for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) {
129 // LR I do not understand, why the uid string is different on zaurus and desktop 129 // LR I do not understand, why the uid string is different on zaurus and desktop
130 QString uid = "uid://"+(*it).uid(); 130 QString uid = "uid://"+(*it).uid();
131 131
132 //qDebug("for *%s* +%s+ ", n.latin1(), uid.latin1()); 132 //qDebug("for *%s* +%s+ ", n.latin1(), uid.latin1());
133 if (n == uid ) { 133 if (n == uid ) {
134 //qDebug("found %s ",(*it).mobileHomePhone().latin1() ); 134 //qDebug("found %s ",(*it).mobileHomePhone().latin1() );
135 QDialog dia( this,"dia123", true ); 135 QDialog dia( this,"dia123", true );
136 dia.setCaption( i18n("Details of attendee") ); 136 dia.setCaption( i18n("Details of attendee") );
137 QVBoxLayout lay ( &dia ); 137 QVBoxLayout lay ( &dia );
138 KABC::AddresseeView av ( &dia ); 138 KABC::AddresseeView av ( &dia );
139 av.setAddressee( (*it) ); 139 av.setAddressee( (*it) );
140 lay.addWidget( &av ); 140 lay.addWidget( &av );
141 if ( QApplication::desktop()->width() < 480 ) 141 if ( QApplication::desktop()->width() < 480 )
142 dia.resize( 220, 240); 142 dia.resize( 220, 240);