author | zecke <zecke> | 2002-06-25 18:18:59 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-06-25 18:18:59 (UTC) |
commit | bb392a72fd6071e76ca0c103637d6bb9eed59d3a (patch) (unidiff) | |
tree | 8ed133ad55a7809873b5136ca97063be5fc85d8d | |
parent | 6812da2105ea8cc3e78b4fb54601e3fd12413ccc (diff) | |
download | opie-bb392a72fd6071e76ca0c103637d6bb9eed59d3a.zip opie-bb392a72fd6071e76ca0c103637d6bb9eed59d3a.tar.gz opie-bb392a72fd6071e76ca0c103637d6bb9eed59d3a.tar.bz2 |
Fixing QPE bugs isn't good for my health.... But I guess
judging of the amount already fixed bugs that there isn't
much to come
-rw-r--r-- | core/pim/datebook/datebook.cpp | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 7dd93a6..e10842a 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -49,24 +49,25 @@ | |||
49 | #include <qcopchannel_qws.h> | 49 | #include <qcopchannel_qws.h> |
50 | #include <qdatetime.h> | 50 | #include <qdatetime.h> |
51 | #include <qdialog.h> | 51 | #include <qdialog.h> |
52 | #include <qfile.h> | 52 | #include <qfile.h> |
53 | #include <qlabel.h> | 53 | #include <qlabel.h> |
54 | #include <qlayout.h> | 54 | #include <qlayout.h> |
55 | #include <qmessagebox.h> | 55 | #include <qmessagebox.h> |
56 | #include <qpopupmenu.h> | 56 | #include <qpopupmenu.h> |
57 | #include <qpushbutton.h> | 57 | #include <qpushbutton.h> |
58 | #include <qregexp.h> | 58 | #include <qregexp.h> |
59 | #include <qtextcodec.h> | 59 | #include <qtextcodec.h> |
60 | #include <qtextstream.h> | 60 | #include <qtextstream.h> |
61 | #include <qtimer.h> | ||
61 | #include <qtl.h> | 62 | #include <qtl.h> |
62 | #include <qwidgetstack.h> | 63 | #include <qwidgetstack.h> |
63 | #include <qwindowsystem_qws.h> | 64 | #include <qwindowsystem_qws.h> |
64 | 65 | ||
65 | #include <sys/stat.h> | 66 | #include <sys/stat.h> |
66 | #include <sys/types.h> | 67 | #include <sys/types.h> |
67 | #include <fcntl.h> | 68 | #include <fcntl.h> |
68 | #include <unistd.h> | 69 | #include <unistd.h> |
69 | 70 | ||
70 | #include <stdlib.h> | 71 | #include <stdlib.h> |
71 | 72 | ||
72 | #define DAY 1 | 73 | #define DAY 1 |
@@ -77,24 +78,25 @@ | |||
77 | 78 | ||
78 | DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | 79 | DateBook::DateBook( QWidget *parent, const char *, WFlags f ) |
79 | : QMainWindow( parent, "datebook", f ), | 80 | : QMainWindow( parent, "datebook", f ), |
80 | aPreset( FALSE ), | 81 | aPreset( FALSE ), |
81 | presetTime( -1 ), | 82 | presetTime( -1 ), |
82 | startTime( 8 ), // an acceptable default | 83 | startTime( 8 ), // an acceptable default |
83 | rowStyle( 0 ), | 84 | rowStyle( 0 ), |
84 | bJumpToCurTime(FALSE), | 85 | bJumpToCurTime(FALSE), |
85 | syncing(FALSE), | 86 | syncing(FALSE), |
86 | inSearch(FALSE), | 87 | inSearch(FALSE), |
87 | alarmCounter(0) | 88 | alarmCounter(0) |
88 | { | 89 | { |
90 | bool needEvilHack= false; // if we need an Evil Hack | ||
89 | QTime t; | 91 | QTime t; |
90 | t.start(); | 92 | t.start(); |
91 | db = new DateBookDBHack; | 93 | db = new DateBookDBHack; |
92 | qDebug("loading db t=%d", t.elapsed() ); | 94 | qDebug("loading db t=%d", t.elapsed() ); |
93 | loadSettings(); | 95 | loadSettings(); |
94 | setCaption( tr("Calendar") ); | 96 | setCaption( tr("Calendar") ); |
95 | setIcon( Resource::loadPixmap( "datebook_icon" ) ); | 97 | setIcon( Resource::loadPixmap( "datebook_icon" ) ); |
96 | 98 | ||
97 | setToolBarsMovable( FALSE ); | 99 | setToolBarsMovable( FALSE ); |
98 | 100 | ||
99 | views = new QWidgetStack( this ); | 101 | views = new QWidgetStack( this ); |
100 | setCentralWidget( views ); | 102 | setCentralWidget( views ); |
@@ -172,25 +174,25 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
172 | settings->insertItem( tr( "Default View" ),default_view ); | 174 | settings->insertItem( tr( "Default View" ),default_view ); |
173 | default_view->setCheckable(TRUE); | 175 | default_view->setCheckable(TRUE); |
174 | 176 | ||
175 | Config config("DateBook"); | 177 | Config config("DateBook"); |
176 | config.setGroup("Main"); | 178 | config.setGroup("Main"); |
177 | int current=config.readNumEntry("defaultview", DAY); | 179 | int current=config.readNumEntry("defaultview", DAY); |
178 | 180 | ||
179 | QActionGroup *ag = new QActionGroup(this); | 181 | QActionGroup *ag = new QActionGroup(this); |
180 | a = new QAction( tr( "Day" ), QString::null, 0, 0, 0, true ); | 182 | a = new QAction( tr( "Day" ), QString::null, 0, 0, 0, true ); |
181 | if (current==DAY) a->setOn(true), viewDay(); | 183 | if (current==DAY) a->setOn(true), viewDay(); |
182 | ag->insert(a); | 184 | ag->insert(a); |
183 | a = new QAction( tr( "Week" ), QString::null, 0, 0, 0, true ); | 185 | a = new QAction( tr( "Week" ), QString::null, 0, 0, 0, true ); |
184 | if (current==WEEK) a->setOn(true), viewWeek(); | 186 | if (current==WEEK) a->setOn(true), /*viewWeek(),*/ needEvilHack = true; |
185 | ag->insert(a); | 187 | ag->insert(a); |
186 | a = new QAction( tr( "WeekLst" ), QString::null, 0, 0, 0, true ); | 188 | a = new QAction( tr( "WeekLst" ), QString::null, 0, 0, 0, true ); |
187 | if (current==WEEKLST) a->setOn(true), viewWeekLst(); | 189 | if (current==WEEKLST) a->setOn(true), viewWeekLst(); |
188 | ag->insert(a); | 190 | ag->insert(a); |
189 | a = new QAction( tr( "Month" ), QString::null, 0, 0, 0, true ); | 191 | a = new QAction( tr( "Month" ), QString::null, 0, 0, 0, true ); |
190 | if (current==MONTH) a->setOn(true), viewMonth(); | 192 | if (current==MONTH) a->setOn(true), viewMonth(); |
191 | ag->insert(a); | 193 | ag->insert(a); |
192 | 194 | ||
193 | ag->addTo(default_view); | 195 | ag->addTo(default_view); |
194 | connect(ag, SIGNAL( selected ( QAction * ) ), | 196 | connect(ag, SIGNAL( selected ( QAction * ) ), |
195 | this, SLOT( newDefaultView(QAction *) ) | 197 | this, SLOT( newDefaultView(QAction *) ) |
196 | ); | 198 | ); |
@@ -210,25 +212,42 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
210 | #if !defined(QT_NO_COP) | 212 | #if !defined(QT_NO_COP) |
211 | QCopChannel *channel = new QCopChannel( "QPE/System", this ); | 213 | QCopChannel *channel = new QCopChannel( "QPE/System", this ); |
212 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), | 214 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), |
213 | this, SLOT(receive(const QCString&, const QByteArray&)) ); | 215 | this, SLOT(receive(const QCString&, const QByteArray&)) ); |
214 | channel = new QCopChannel( "QPE/Datebook", this ); | 216 | channel = new QCopChannel( "QPE/Datebook", this ); |
215 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), | 217 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), |
216 | this, SLOT(receive(const QCString&, const QByteArray&)) ); | 218 | this, SLOT(receive(const QCString&, const QByteArray&)) ); |
217 | qDebug("olle\n"); | 219 | qDebug("olle\n"); |
218 | #endif | 220 | #endif |
219 | #endif | 221 | #endif |
220 | 222 | ||
221 | qDebug("done t=%d", t.elapsed() ); | 223 | qDebug("done t=%d", t.elapsed() ); |
222 | 224 | ||
225 | /* | ||
226 | * Here is a problem description: | ||
227 | * When Weekview is the default view | ||
228 | * a DateBookWeekView get's created | ||
229 | * redraw() get's called. So what? | ||
230 | * Remember that we're still in the c'tor | ||
231 | * and no final layout has happened? Ok | ||
232 | * now all Events get arranged. Their x | ||
233 | * position get's determined by a QHeader | ||
234 | * position. But the QHeader isn't layouted or | ||
235 | * at the right position. redraw() is a slot | ||
236 | * so we'll call it then via a singleShot | ||
237 | * from view() | ||
238 | */ | ||
239 | if( needEvilHack ){ | ||
240 | QTimer::singleShot( 500, this, SLOT(viewWeek()) ); | ||
241 | } | ||
223 | } | 242 | } |
224 | 243 | ||
225 | void DateBook::receive( const QCString &msg, const QByteArray &data ) | 244 | void DateBook::receive( const QCString &msg, const QByteArray &data ) |
226 | { | 245 | { |
227 | QDataStream stream( data, IO_ReadOnly ); | 246 | QDataStream stream( data, IO_ReadOnly ); |
228 | if ( msg == "timeChange(QString)" ) { | 247 | if ( msg == "timeChange(QString)" ) { |
229 | // update active view! | 248 | // update active view! |
230 | if ( dayAction->isOn() ) | 249 | if ( dayAction->isOn() ) |
231 | viewDay(); | 250 | viewDay(); |
232 | else if ( weekAction->isOn() ) | 251 | else if ( weekAction->isOn() ) |
233 | viewWeek(); | 252 | viewWeek(); |
234 | else if ( monthAction->isOn() ) | 253 | else if ( monthAction->isOn() ) |