author | zautrix <zautrix> | 2005-02-23 14:09:49 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-23 14:09:49 (UTC) |
commit | faedffc5ce8391204e0340a21eaaf582319ac824 (patch) (unidiff) | |
tree | cef25226d049d6a370bce9444edad171f4b24e97 /korganizer/koeventviewerdialog.cpp | |
parent | 36704cb63582c161d2ab5c63e66ee63bbf3b865f (diff) | |
download | kdepimpi-faedffc5ce8391204e0340a21eaaf582319ac824.zip kdepimpi-faedffc5ce8391204e0340a21eaaf582319ac824.tar.gz kdepimpi-faedffc5ce8391204e0340a21eaaf582319ac824.tar.bz2 |
focus fixes
Diffstat (limited to 'korganizer/koeventviewerdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/koeventviewerdialog.cpp | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index f6f7258..23e62d3 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp | |||
@@ -1,260 +1,266 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <klocale.h> | 20 | #include <klocale.h> |
21 | 21 | ||
22 | #include <libkcal/event.h> | 22 | #include <libkcal/event.h> |
23 | #include <qpushbutton.h> | 23 | #include <qpushbutton.h> |
24 | 24 | ||
25 | #include "koeventviewer.h" | 25 | #include "koeventviewer.h" |
26 | #include "koprefs.h" | 26 | #include "koprefs.h" |
27 | #include <libkcal/todo.h> | 27 | #include <libkcal/todo.h> |
28 | #include "qapp.h" | 28 | #include "qapp.h" |
29 | 29 | ||
30 | #include "koeventviewerdialog.h" | 30 | #include "koeventviewerdialog.h" |
31 | extern int globalFlagBlockAgenda; | 31 | extern int globalFlagBlockAgenda; |
32 | 32 | ||
33 | KOEventViewerDialog::KOEventViewerDialog(QWidget *parent,const char *name) | 33 | KOEventViewerDialog::KOEventViewerDialog(QWidget *parent,const char *name) |
34 | : KDialogBase(parent,name, | 34 | : KDialogBase(parent,name, |
35 | #ifndef DESKTOP_VERSION | 35 | #ifndef DESKTOP_VERSION |
36 | true , | 36 | true , |
37 | #else | 37 | #else |
38 | false, | 38 | false, |
39 | #endif | 39 | #endif |
40 | i18n("Event Viewer"),Ok|User1|Close,Close, false, i18n("Agenda")) | 40 | i18n("Event Viewer"),Ok|User1|Close,Close, false, i18n("Agenda")) |
41 | { | 41 | { |
42 | 42 | ||
43 | mEventViewer = new KOEventViewer(this); | 43 | mEventViewer = new KOEventViewer(this); |
44 | mEventViewer->setFont( KOPrefs::instance()->mEventViewFont ); | 44 | mEventViewer->setFont( KOPrefs::instance()->mEventViewFont ); |
45 | setMainWidget(mEventViewer); | 45 | setMainWidget(mEventViewer); |
46 | setButtonText(Ok, i18n("Edit") ); | 46 | setButtonText(Ok, i18n("Edit") ); |
47 | 47 | ||
48 | QObject::connect(findButton( Ok ),SIGNAL(clicked()), | 48 | QObject::connect(findButton( Ok ),SIGNAL(clicked()), |
49 | SLOT(editIncidence())); | 49 | SLOT(editIncidence())); |
50 | QObject::connect(this,SIGNAL(user1Clicked()), | 50 | QObject::connect(this,SIGNAL(user1Clicked()), |
51 | SLOT(showIncidence())); | 51 | SLOT(showIncidence())); |
52 | mIncidence = 0; | 52 | mIncidence = 0; |
53 | // TODO: Set a sensible size (based on the content?). | 53 | // TODO: Set a sensible size (based on the content?). |
54 | //showMaximized(); | 54 | //showMaximized(); |
55 | //qDebug("++++++++++++KOEventViewerDialog() "); | 55 | //qDebug("++++++++++++KOEventViewerDialog() "); |
56 | // if ( KOPrefs::instance()->mCompactDialogs ) { | 56 | // if ( KOPrefs::instance()->mCompactDialogs ) { |
57 | // setFixedSize( 240,284 ); | 57 | // setFixedSize( 240,284 ); |
58 | // move( 0, 15 ); | 58 | // move( 0, 15 ); |
59 | // } else { | 59 | // } else { |
60 | // setMinimumSize(300,200); | 60 | // setMinimumSize(300,200); |
61 | // resize(320,300); | 61 | // resize(320,300); |
62 | // } | 62 | // } |
63 | mSyncMode = false; | 63 | mSyncMode = false; |
64 | mSyncResult = 0; | 64 | mSyncResult = 0; |
65 | 65 | ||
66 | } | 66 | } |
67 | 67 | ||
68 | KOEventViewerDialog::~KOEventViewerDialog() | 68 | KOEventViewerDialog::~KOEventViewerDialog() |
69 | { | 69 | { |
70 | //qDebug("-------~KOEventViewerDialog() "); | 70 | //qDebug("-------~KOEventViewerDialog() "); |
71 | } | 71 | } |
72 | void KOEventViewerDialog::showMe() | 72 | void KOEventViewerDialog::showMe() |
73 | { | 73 | { |
74 | 74 | ||
75 | #ifdef DESKTOP_VERSION | 75 | #ifdef DESKTOP_VERSION |
76 | show(); | 76 | show(); |
77 | #else | 77 | #else |
78 | showMaximized(); | 78 | showMaximized(); |
79 | #endif | 79 | #endif |
80 | setFocus(); | ||
81 | setActiveWindow(); | 80 | setActiveWindow(); |
81 | mEventViewer->setFocus(); | ||
82 | 82 | ||
83 | } | 83 | } |
84 | void KOEventViewerDialog::setSyncMode( bool b ) | 84 | void KOEventViewerDialog::setSyncMode( bool b ) |
85 | { | 85 | { |
86 | mSyncMode = b; | 86 | mSyncMode = b; |
87 | //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode ); | 87 | //qDebug("KOEventViewerDialog::setSyncMode %d ",mSyncMode ); |
88 | if ( mSyncMode ) { | 88 | if ( mSyncMode ) { |
89 | findButton( Close )->setText( i18n("Cancel Sync")); | 89 | findButton( Close )->setText( i18n("Cancel Sync")); |
90 | findButton( Ok )->setText( i18n("Remote")); | 90 | findButton( Ok )->setText( i18n("Remote")); |
91 | findButton( User1 )->setText( i18n("Local")); | 91 | findButton( User1 )->setText( i18n("Local")); |
92 | } else { | 92 | } else { |
93 | findButton( Close )->setText( i18n("Close")); | 93 | findButton( Close )->setText( i18n("Close")); |
94 | findButton( Ok )->setText( i18n("Edit")); | 94 | findButton( Ok )->setText( i18n("Edit")); |
95 | findButton( User1 )->setText( i18n("Agenda")); | 95 | findButton( User1 )->setText( i18n("Agenda")); |
96 | } | 96 | } |
97 | mEventViewer->setSyncMode( b ); | 97 | mEventViewer->setSyncMode( b ); |
98 | } | 98 | } |
99 | void KOEventViewerDialog::setColorMode( int m ) | 99 | void KOEventViewerDialog::setColorMode( int m ) |
100 | { | 100 | { |
101 | mEventViewer->setColorMode( m ); | 101 | mEventViewer->setColorMode( m ); |
102 | } | 102 | } |
103 | int KOEventViewerDialog::executeS( bool local ) | 103 | int KOEventViewerDialog::executeS( bool local ) |
104 | { | 104 | { |
105 | mSyncResult = 3; | 105 | mSyncResult = 3; |
106 | if ( local ) | 106 | if ( local ) |
107 | findButton( User1 )->setFocus(); | 107 | findButton( User1 )->setFocus(); |
108 | else | 108 | else |
109 | findButton( Ok )->setFocus(); | 109 | findButton( Ok )->setFocus(); |
110 | exec(); | 110 | exec(); |
111 | return mSyncResult; | 111 | return mSyncResult; |
112 | } | 112 | } |
113 | 113 | ||
114 | void KOEventViewerDialog::updateConfig() | 114 | void KOEventViewerDialog::updateConfig() |
115 | { | 115 | { |
116 | mEventViewer->setFont( KOPrefs::instance()->mEventViewFont ); | 116 | mEventViewer->setFont( KOPrefs::instance()->mEventViewFont ); |
117 | 117 | ||
118 | } | 118 | } |
119 | void KOEventViewerDialog::setEvent(Event *event) | 119 | void KOEventViewerDialog::setEvent(Event *event) |
120 | { | 120 | { |
121 | mEventViewer->setEvent(event); | 121 | mEventViewer->setEvent(event); |
122 | mIncidence = event; | 122 | mIncidence = event; |
123 | findButton( Close )->setFocus(); | 123 | mEventViewer->setFocus(); |
124 | //findButton( Close )->setFocus(); | ||
124 | if ( !mSyncMode ) { | 125 | if ( !mSyncMode ) { |
125 | findButton( User1 )->setText( i18n("Agenda")); | 126 | findButton( User1 )->setText( i18n("Agenda")); |
126 | } | 127 | } |
127 | } | 128 | } |
128 | void KOEventViewerDialog::setIncidence(Incidence *in ) | 129 | void KOEventViewerDialog::setIncidence(Incidence *in ) |
129 | { | 130 | { |
130 | if ( in->type() == "Event" ) | 131 | if ( in->type() == "Event" ) |
131 | setEvent( (Event*) in ); | 132 | setEvent( (Event*) in ); |
132 | else if ( in->type() =="Todo" ) | 133 | else if ( in->type() =="Todo" ) |
133 | setTodo( (Todo*) in ); | 134 | setTodo( (Todo*) in ); |
134 | else if ( in->type() =="Journal" ) | 135 | else if ( in->type() =="Journal" ) |
135 | setJournal( (Journal*) in ); | 136 | setJournal( (Journal*) in ); |
136 | } | 137 | } |
137 | void KOEventViewerDialog::addIncidence(Incidence *in) | 138 | void KOEventViewerDialog::addIncidence(Incidence *in) |
138 | { | 139 | { |
139 | if ( in->type() == "Event" ) | 140 | if ( in->type() == "Event" ) |
140 | addEvent( (Event*) in ); | 141 | addEvent( (Event*) in ); |
141 | else if ( in->type() =="Todo" ) | 142 | else if ( in->type() =="Todo" ) |
142 | mEventViewer->setTodo( (Todo*) in, false ); | 143 | mEventViewer->setTodo( (Todo*) in, false ); |
143 | else if ( in->type() =="Journal" ) | 144 | else if ( in->type() =="Journal" ) |
144 | mEventViewer->setJournal( (Journal*) in, false ); | 145 | mEventViewer->setJournal( (Journal*) in, false ); |
145 | if ( mSyncMode ) { | 146 | if ( mSyncMode ) { |
146 | findButton( User1 )->setFocus(); | 147 | findButton( User1 )->setFocus(); |
147 | setCaption(i18n("Conflict! Please choose entry")); | 148 | setCaption(i18n("Conflict! Please choose entry")); |
148 | } | 149 | } |
149 | } | 150 | } |
150 | 151 | ||
151 | void KOEventViewerDialog::addEvent(Event *event) | 152 | void KOEventViewerDialog::addEvent(Event *event) |
152 | { | 153 | { |
153 | mEventViewer->addEvent(event); | 154 | mEventViewer->addEvent(event); |
154 | mIncidence = event; | 155 | mIncidence = event; |
155 | findButton( Close )->setFocus(); | 156 | mEventViewer->setFocus(); |
157 | //findButton( Close )->setFocus(); | ||
156 | if ( !mSyncMode ) { | 158 | if ( !mSyncMode ) { |
157 | findButton( User1 )->setText( i18n("Agenda")); | 159 | findButton( User1 )->setText( i18n("Agenda")); |
158 | } | 160 | } |
159 | } | 161 | } |
160 | 162 | ||
161 | void KOEventViewerDialog::setTodo(Todo *event) | 163 | void KOEventViewerDialog::setTodo(Todo *event) |
162 | { | 164 | { |
163 | mEventViewer->setTodo(event); | 165 | mEventViewer->setTodo(event); |
164 | mIncidence = (Incidence*)event; | 166 | mIncidence = (Incidence*)event; |
165 | findButton( Close )->setFocus(); | 167 | mEventViewer->setFocus(); |
168 | //findButton( Close )->setFocus(); | ||
166 | if ( !mSyncMode ) { | 169 | if ( !mSyncMode ) { |
167 | findButton( User1 )->setText( i18n("Set complete")); | 170 | findButton( User1 )->setText( i18n("Set complete")); |
168 | } | 171 | } |
169 | } | 172 | } |
170 | void KOEventViewerDialog::setJournal(Journal *j) | 173 | void KOEventViewerDialog::setJournal(Journal *j) |
171 | { | 174 | { |
172 | mEventViewer->setJournal(j); | 175 | mEventViewer->setJournal(j); |
173 | mIncidence = (Incidence*)j; | 176 | mIncidence = (Incidence*)j; |
174 | findButton( Close )->setFocus(); | 177 | mEventViewer->setFocus(); |
178 | //findButton( Close )->setFocus(); | ||
175 | if ( !mSyncMode ) { | 179 | if ( !mSyncMode ) { |
176 | findButton( User1 )->setText( i18n("Agenda")); | 180 | findButton( User1 )->setText( i18n("Agenda")); |
177 | } | 181 | } |
178 | } | 182 | } |
179 | 183 | ||
180 | void KOEventViewerDialog::addText(QString text) | 184 | void KOEventViewerDialog::addText(QString text) |
181 | { | 185 | { |
182 | mEventViewer->addText(text); | 186 | mEventViewer->addText(text); |
183 | findButton( Close )->setFocus(); | 187 | mEventViewer->setFocus(); |
188 | //findButton( Close )->setFocus(); | ||
184 | } | 189 | } |
185 | void KOEventViewerDialog::editIncidence() | 190 | void KOEventViewerDialog::editIncidence() |
186 | { | 191 | { |
187 | if ( mSyncMode ) { | 192 | if ( mSyncMode ) { |
188 | mSyncResult = 2; | 193 | mSyncResult = 2; |
189 | accept(); | 194 | accept(); |
190 | return; | 195 | return; |
191 | } | 196 | } |
192 | if ( mIncidence ){ | 197 | if ( mIncidence ){ |
193 | #ifndef DESKTOP_VERSION | 198 | #ifndef DESKTOP_VERSION |
194 | hide(); | 199 | hide(); |
195 | #endif | 200 | #endif |
196 | emit editIncidence( mIncidence ); | 201 | emit editIncidence( mIncidence ); |
197 | } | 202 | } |
198 | } | 203 | } |
199 | void KOEventViewerDialog::showIncidence() | 204 | void KOEventViewerDialog::showIncidence() |
200 | { | 205 | { |
201 | 206 | ||
202 | if ( mSyncMode ) { | 207 | if ( mSyncMode ) { |
203 | mSyncResult = 1; | 208 | mSyncResult = 1; |
204 | accept(); | 209 | accept(); |
205 | return; | 210 | return; |
206 | } | 211 | } |
207 | 212 | ||
208 | if ( mIncidence ){ | 213 | if ( mIncidence ){ |
209 | #ifndef DESKTOP_VERSION | 214 | #ifndef DESKTOP_VERSION |
210 | hide(); | 215 | hide(); |
211 | #endif | 216 | #endif |
212 | QDate date; | 217 | QDate date; |
213 | if ( mIncidence->type() == "Todo" ) { | 218 | if ( mIncidence->type() == "Todo" ) { |
214 | /* | 219 | /* |
215 | if ( ((Todo*)mIncidence)->hasDueDate() ) | 220 | if ( ((Todo*)mIncidence)->hasDueDate() ) |
216 | date = ((Todo*)mIncidence)->dtDue().date(); | 221 | date = ((Todo*)mIncidence)->dtDue().date(); |
217 | else { | 222 | else { |
218 | globalFlagBlockAgenda = 2; | 223 | globalFlagBlockAgenda = 2; |
219 | emit showAgendaView( false ); | 224 | emit showAgendaView( false ); |
220 | return; | 225 | return; |
221 | } | 226 | } |
222 | */ | 227 | */ |
223 | ((Todo*)mIncidence)->setCompleted( true ); | 228 | ((Todo*)mIncidence)->setCompleted( true ); |
224 | ((Todo*)mIncidence)->setCompleted(QDateTime::currentDateTime() ); | 229 | ((Todo*)mIncidence)->setCompleted(QDateTime::currentDateTime() ); |
225 | hide(); | 230 | hide(); |
226 | emit todoCompleted(((Todo*)mIncidence)); | 231 | emit todoCompleted(((Todo*)mIncidence)); |
227 | return; | 232 | return; |
228 | 233 | ||
229 | } else | 234 | } else |
230 | date = mIncidence->dtStart().date(); | 235 | date = mIncidence->dtStart().date(); |
231 | globalFlagBlockAgenda = 1; | 236 | globalFlagBlockAgenda = 1; |
232 | emit showAgendaView( false ); | 237 | emit showAgendaView( false ); |
233 | globalFlagBlockAgenda = 2; | 238 | globalFlagBlockAgenda = 2; |
234 | emit jumpToTime( date ); | 239 | emit jumpToTime( date ); |
235 | } | 240 | } |
236 | } | 241 | } |
237 | void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) | 242 | void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) |
238 | { | 243 | { |
239 | switch ( e->key() ) { | 244 | switch ( e->key() ) { |
240 | 245 | ||
241 | case Qt::Key_A : | 246 | case Qt::Key_A : |
242 | case Qt::Key_L : | 247 | case Qt::Key_L : |
243 | showIncidence(); | 248 | showIncidence(); |
244 | break; | 249 | break; |
245 | case Qt::Key_E : | 250 | case Qt::Key_E : |
246 | case Qt::Key_R : | 251 | case Qt::Key_R : |
247 | editIncidence(); | 252 | editIncidence(); |
248 | break; | 253 | break; |
249 | case Qt::Key_C: | 254 | case Qt::Key_C: |
250 | case Qt::Key_Escape: | 255 | case Qt::Key_Escape: |
251 | close(); | 256 | close(); |
252 | break; | 257 | break; |
253 | case Qt::Key_I: | 258 | case Qt::Key_I: |
254 | accept(); | 259 | accept(); |
255 | break; | 260 | break; |
256 | default: | 261 | default: |
262 | KDialogBase::keyPressEvent ( e ); | ||
257 | break; | 263 | break; |
258 | } | 264 | } |
259 | 265 | ||
260 | } | 266 | } |