author | zautrix <zautrix> | 2005-04-05 23:31:44 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-05 23:31:44 (UTC) |
commit | cf4848d972efe96640f2d5f5d52704306d0cbe4c (patch) (unidiff) | |
tree | 123a2075927def5f7f59a20949d6b59174ae79b6 /korganizer/koeventviewerdialog.cpp | |
parent | 6add774cf9841377f32613c7aa23161a823aa1da (diff) | |
download | kdepimpi-cf4848d972efe96640f2d5f5d52704306d0cbe4c.zip kdepimpi-cf4848d972efe96640f2d5f5d52704306d0cbe4c.tar.gz kdepimpi-cf4848d972efe96640f2d5f5d52704306d0cbe4c.tar.bz2 |
fixes
Diffstat (limited to 'korganizer/koeventviewerdialog.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | korganizer/koeventviewerdialog.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index 35d084d..1dce841 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp | |||
@@ -61,55 +61,60 @@ KOEventViewerDialog::KOEventViewerDialog(QWidget *parent,const char *name) | |||
61 | // } else { | 61 | // } else { |
62 | // setMinimumSize(300,200); | 62 | // setMinimumSize(300,200); |
63 | // resize(320,300); | 63 | // resize(320,300); |
64 | // } | 64 | // } |
65 | mSyncMode = false; | 65 | mSyncMode = false; |
66 | mSyncResult = 0; | 66 | mSyncResult = 0; |
67 | 67 | ||
68 | } | 68 | } |
69 | 69 | ||
70 | KOEventViewerDialog::~KOEventViewerDialog() | 70 | KOEventViewerDialog::~KOEventViewerDialog() |
71 | { | 71 | { |
72 | //qDebug("-------~KOEventViewerDialog() "); | 72 | //qDebug("-------~KOEventViewerDialog() "); |
73 | } | 73 | } |
74 | void KOEventViewerDialog::showMe() | 74 | void KOEventViewerDialog::showMe() |
75 | { | 75 | { |
76 | 76 | ||
77 | #ifdef DESKTOP_VERSION | 77 | #ifdef DESKTOP_VERSION |
78 | int x,y,w,h; | 78 | int x,y,w,h; |
79 | x = geometry().x(); | 79 | x = geometry().x(); |
80 | y = geometry().y(); | 80 | y = geometry().y(); |
81 | w = width(); | 81 | w = width(); |
82 | h = height(); | 82 | h = height(); |
83 | show(); | 83 | show(); |
84 | setGeometry(x,y,w,h); | 84 | setGeometry(x,y,w,h); |
85 | raise(); | ||
85 | #else | 86 | #else |
86 | showMaximized(); | 87 | showMaximized(); |
87 | #endif | 88 | #endif |
88 | raise(); | 89 | QTimer::singleShot( 1, this, SLOT ( setMyFocus() ) ); |
90 | |||
91 | } | ||
92 | void KOEventViewerDialog::setMyFocus() | ||
93 | { | ||
94 | |||
89 | setActiveWindow(); | 95 | setActiveWindow(); |
90 | mEventViewer->setFocus(); | 96 | mEventViewer->setFocus(); |
91 | //raise(); | ||
92 | 97 | ||
93 | } | 98 | } |
94 | void KOEventViewerDialog::print() | 99 | void KOEventViewerDialog::print() |
95 | { | 100 | { |
96 | mEventViewer->printMe(); | 101 | mEventViewer->printMe(); |
97 | 102 | ||
98 | } | 103 | } |
99 | void KOEventViewerDialog::setSyncMode( bool b ) | 104 | void KOEventViewerDialog::setSyncMode( bool b ) |
100 | { | 105 | { |
101 | mSyncMode = b; | 106 | mSyncMode = b; |
102 | //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode ); | 107 | //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode ); |
103 | if ( mSyncMode ) { | 108 | if ( mSyncMode ) { |
104 | findButton( Close )->setText( i18n("Cancel Sync")); | 109 | findButton( Close )->setText( i18n("Cancel Sync")); |
105 | findButton( Ok )->setText( i18n("Remote")); | 110 | findButton( Ok )->setText( i18n("Remote")); |
106 | findButton( User1 )->setText( i18n("Local")); | 111 | findButton( User1 )->setText( i18n("Local")); |
107 | } else { | 112 | } else { |
108 | findButton( Close )->setText( i18n("Close")); | 113 | findButton( Close )->setText( i18n("Close")); |
109 | findButton( Ok )->setText( i18n("Edit")); | 114 | findButton( Ok )->setText( i18n("Edit")); |
110 | findButton( User1 )->setText( i18n("Agenda")); | 115 | findButton( User1 )->setText( i18n("Agenda")); |
111 | } | 116 | } |
112 | mEventViewer->setSyncMode( b ); | 117 | mEventViewer->setSyncMode( b ); |
113 | } | 118 | } |
114 | void KOEventViewerDialog::setColorMode( int m ) | 119 | void KOEventViewerDialog::setColorMode( int m ) |
115 | { | 120 | { |
@@ -191,49 +196,50 @@ void KOEventViewerDialog::setJournal(Journal *j) | |||
191 | mIncidence = (Incidence*)j; | 196 | mIncidence = (Incidence*)j; |
192 | mEventViewer->setFocus(); | 197 | mEventViewer->setFocus(); |
193 | //findButton( Close )->setFocus(); | 198 | //findButton( Close )->setFocus(); |
194 | if ( !mSyncMode ) { | 199 | if ( !mSyncMode ) { |
195 | findButton( User1 )->setText( i18n("Agenda")); | 200 | findButton( User1 )->setText( i18n("Agenda")); |
196 | } | 201 | } |
197 | } | 202 | } |
198 | 203 | ||
199 | void KOEventViewerDialog::addText(QString text) | 204 | void KOEventViewerDialog::addText(QString text) |
200 | { | 205 | { |
201 | mEventViewer->addText(text); | 206 | mEventViewer->addText(text); |
202 | mEventViewer->setFocus(); | 207 | mEventViewer->setFocus(); |
203 | //findButton( Close )->setFocus(); | 208 | //findButton( Close )->setFocus(); |
204 | } | 209 | } |
205 | void KOEventViewerDialog::editIncidence() | 210 | void KOEventViewerDialog::editIncidence() |
206 | { | 211 | { |
207 | sendSignalViewerClosed = false; | 212 | sendSignalViewerClosed = false; |
208 | if ( mSyncMode ) { | 213 | if ( mSyncMode ) { |
209 | mSyncResult = 2; | 214 | mSyncResult = 2; |
210 | accept(); | 215 | accept(); |
211 | return; | 216 | return; |
212 | } | 217 | } |
213 | if ( mIncidence ){ | 218 | if ( mIncidence ){ |
214 | #ifndef DESKTOP_VERSION | 219 | #ifndef DESKTOP_VERSION |
215 | hide(); | 220 | //hide(); |
221 | close(); | ||
216 | #endif | 222 | #endif |
217 | emit editIncidence( mIncidence ); | 223 | emit editIncidence( mIncidence ); |
218 | } | 224 | } |
219 | } | 225 | } |
220 | void KOEventViewerDialog::showIncidence() | 226 | void KOEventViewerDialog::showIncidence() |
221 | { | 227 | { |
222 | sendSignalViewerClosed = false; | 228 | sendSignalViewerClosed = false; |
223 | if ( mSyncMode ) { | 229 | if ( mSyncMode ) { |
224 | mSyncResult = 1; | 230 | mSyncResult = 1; |
225 | accept(); | 231 | accept(); |
226 | return; | 232 | return; |
227 | } | 233 | } |
228 | 234 | ||
229 | if ( mIncidence ){ | 235 | if ( mIncidence ){ |
230 | #ifndef DESKTOP_VERSION | 236 | #ifndef DESKTOP_VERSION |
231 | hide(); | 237 | hide(); |
232 | #endif | 238 | #endif |
233 | QDate date; | 239 | QDate date; |
234 | if ( mIncidence->type() == "Todo" ) { | 240 | if ( mIncidence->type() == "Todo" ) { |
235 | /* | 241 | /* |
236 | if ( ((Todo*)mIncidence)->hasDueDate() ) | 242 | if ( ((Todo*)mIncidence)->hasDueDate() ) |
237 | date = ((Todo*)mIncidence)->dtDue().date(); | 243 | date = ((Todo*)mIncidence)->dtDue().date(); |
238 | else { | 244 | else { |
239 | globalFlagBlockAgenda = 2; | 245 | globalFlagBlockAgenda = 2; |