-rw-r--r-- | korganizer/kofilterview.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index 9709324..a8a3052 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp | |||
@@ -135,204 +135,197 @@ void KOCalEditView::selectCal(int id ,bool b) | |||
135 | void KOCalEditView::selectStdCal( int id, bool b ) | 135 | void KOCalEditView::selectStdCal( int id, bool b ) |
136 | { | 136 | { |
137 | 137 | ||
138 | if ( !b ) { | 138 | if ( !b ) { |
139 | KOCalCheckButton* it = (KOCalCheckButton*) sender(); | 139 | KOCalCheckButton* it = (KOCalCheckButton*) sender(); |
140 | if ( it ) { | 140 | if ( it ) { |
141 | it->blockSignals( true ); | 141 | it->blockSignals( true ); |
142 | it->setChecked( true ); | 142 | it->setChecked( true ); |
143 | it->blockSignals( false ); | 143 | it->blockSignals( false ); |
144 | return; | 144 | return; |
145 | } | 145 | } |
146 | return; | 146 | return; |
147 | } | 147 | } |
148 | KOCalRadioButton* sen = (KOCalRadioButton*) sender(); | 148 | KOCalRadioButton* sen = (KOCalRadioButton*) sender(); |
149 | KOCalRadioButton* it = mStdandardB.first(); | 149 | KOCalRadioButton* it = mStdandardB.first(); |
150 | while ( it ) { | 150 | while ( it ) { |
151 | if ( it->isChecked() ) { | 151 | if ( it->isChecked() ) { |
152 | if ( it != sen ) { | 152 | if ( it != sen ) { |
153 | it->blockSignals( true ); | 153 | it->blockSignals( true ); |
154 | it->setChecked( false ); | 154 | it->setChecked( false ); |
155 | it->blockSignals( false ); | 155 | it->blockSignals( false ); |
156 | break; | 156 | break; |
157 | } | 157 | } |
158 | } | 158 | } |
159 | it = mStdandardB.next(); | 159 | it = mStdandardB.next(); |
160 | } | 160 | } |
161 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | 161 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); |
162 | while ( kkf ) { | 162 | while ( kkf ) { |
163 | kkf->isStandard = false; | 163 | kkf->isStandard = false; |
164 | kkf = KOPrefs::instance()->mCalendars.next(); | 164 | kkf = KOPrefs::instance()->mCalendars.next(); |
165 | } | 165 | } |
166 | KOPrefs::instance()->getCalendar( id )->isStandard = true; | 166 | KOPrefs::instance()->getCalendar( id )->isStandard = true; |
167 | emit setCalendarDefault ( id ); | 167 | emit setCalendarDefault ( id ); |
168 | } | 168 | } |
169 | 169 | ||
170 | void KOCalEditView::selectCalAlarm(int id ,bool b ) | 170 | void KOCalEditView::selectCalAlarm(int id ,bool b ) |
171 | { | 171 | { |
172 | KOPrefs::instance()->getCalendar( id )->isAlarmEnabled = b; | 172 | KOPrefs::instance()->getCalendar( id )->isAlarmEnabled = b; |
173 | emit alarmEnabled ( id , b ); | 173 | emit alarmEnabled ( id , b ); |
174 | emit needsUpdate(); | 174 | emit needsUpdate(); |
175 | } | 175 | } |
176 | void KOCalEditView::selectReadOnly(int id ,bool b ) | 176 | void KOCalEditView::selectReadOnly(int id ,bool b ) |
177 | { | 177 | { |
178 | KOPrefs::instance()->getCalendar( id )->isReadOnly = b; | 178 | KOPrefs::instance()->getCalendar( id )->isReadOnly = b; |
179 | emit calendarReadonly ( id , b ); | 179 | emit calendarReadonly ( id , b ); |
180 | if ( KOPrefs::instance()->getCalendar( id )->isStandard && b && id > 1 ) { | 180 | if ( KOPrefs::instance()->getCalendar( id )->isStandard && b && id > 1 ) { |
181 | KOPrefs::instance()->getCalendar( id )->isStandard = false; | 181 | KOPrefs::instance()->getCalendar( id )->isStandard = false; |
182 | KOPrefs::instance()->getCalendar( 1 )->isStandard = true; | 182 | KOPrefs::instance()->getCalendar( 1 )->isStandard = true; |
183 | mStdandardB.at(0)->setChecked( true ); | ||
184 | mStdandardB.at(id-1)->setChecked( false ); | ||
183 | emit setCalendarDefault ( 1 ); | 185 | emit setCalendarDefault ( 1 ); |
184 | } | 186 | } |
187 | mStdandardB.at(id-1)->setEnabled( !b ); | ||
185 | emit needsUpdate(); | 188 | emit needsUpdate(); |
186 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | ||
187 | 189 | ||
188 | } | 190 | } |
189 | void KOCalEditView::setColor( const QColor& c, int id ) | 191 | void KOCalEditView::setColor( const QColor& c, int id ) |
190 | { | 192 | { |
191 | KOPrefs::instance()->getCalendar( id )->mDefaultColor = c; | 193 | KOPrefs::instance()->getCalendar( id )->mDefaultColor = c; |
192 | emit needsUpdate(); | 194 | emit needsUpdate(); |
193 | } | 195 | } |
194 | void KOCalEditView::deleteCal( int id ) | 196 | void KOCalEditView::deleteCal( int id ) |
195 | { | 197 | { |
196 | KopiCalendarFile * kkf = KOPrefs::instance()->getCalendar( id ); | 198 | KopiCalendarFile * kkf = KOPrefs::instance()->getCalendar( id ); |
197 | QString name = kkf->mName; | 199 | QString name = kkf->mName; |
198 | QString file = KGlobal::formatMessage ( kkf->mFileName ,0 ); | 200 | QString file = KGlobal::formatMessage ( kkf->mFileName ,0 ); |
199 | if ( KMessageBox::warningContinueCancel( this, i18n("The calendar <b>%1</b> is displaying file <b>%2</b>. Do you want to remove this calendar from KO/Pi? (The file is not removed!)").arg(name).arg(file) ) != KMessageBox::Continue ) return; | 201 | if ( KMessageBox::warningContinueCancel( this, i18n("The calendar <b>%1</b> is displaying file <b>%2</b>. Do you want to remove this calendar from KO/Pi? (The file is not removed!)").arg(name).arg(file) ) != KMessageBox::Continue ) return; |
200 | if ( kkf->isStandard ) | 202 | if ( kkf->isStandard ) |
201 | selectStdCal( 1, true ); | 203 | selectStdCal( 1, true ); |
202 | emit removeCalendar ( id ); | 204 | emit removeCalendar ( id ); |
203 | KOPrefs::instance()->mCalendars.remove ( kkf ); | 205 | KOPrefs::instance()->mCalendars.remove ( kkf ); |
204 | emit needsUpdate(); | 206 | emit needsUpdate(); |
205 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | 207 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); |
206 | } | 208 | } |
207 | void KOCalEditView::infoCal( int id ) | 209 | void KOCalEditView::infoCal( int id ) |
208 | { | 210 | { |
209 | QString name = KOPrefs::instance()->getCalendar( id )->mName; | 211 | QString name = KOPrefs::instance()->getCalendar( id )->mName; |
210 | QString file = KGlobal::formatMessage ( KOPrefs::instance()->getCalendar( id )->mFileName, 0 ); | 212 | QString file = KGlobal::formatMessage ( KOPrefs::instance()->getCalendar( id )->mFileName, 0 ); |
211 | if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) { | 213 | if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) { |
212 | if ( KMessageBox::Yes == KMessageBox::questionYesNo( this, i18n("The calendar <b>%1</b> is not loaded! Loading of file <b>%2</b> failed! <b>Try again to load the calendar?</b>").arg(name).arg(file) ) ) { | 214 | if ( KMessageBox::Yes == KMessageBox::questionYesNo( this, i18n("The calendar <b>%1</b> is not loaded! Loading of file <b>%2</b> failed! <b>Try again to load the calendar?</b>").arg(name).arg(file) ) ) { |
213 | emit calendarAdded( id ); | 215 | emit calendarAdded( id ); |
214 | emit needsUpdate(); | 216 | emit needsUpdate(); |
215 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | 217 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); |
216 | } | 218 | } |
217 | } | 219 | } |
218 | else | 220 | else |
219 | KMessageBox::information( this, i18n("The calendar <b>%1</b> is displaying file <b>%2</b>").arg(name).arg(file) ); | 221 | KMessageBox::information( this, i18n("The calendar <b>%1</b> is displaying file <b>%2</b>").arg(name).arg(file) ); |
220 | } | 222 | } |
221 | void KOCalEditView::readConfig() | 223 | void KOCalEditView::readConfig() |
222 | { | 224 | { |
223 | 225 | ||
224 | mStdandardB.clear(); | 226 | mStdandardB.clear(); |
225 | mEnabledB.clear(); | 227 | mEnabledB.clear(); |
226 | mAlarmB.clear(); | 228 | mAlarmB.clear(); |
227 | mROB.clear(); | 229 | mROB.clear(); |
228 | 230 | ||
229 | if ( mw ) delete mw; | 231 | if ( mw ) delete mw; |
230 | mw = new QWidget ( viewport() ); | 232 | mw = new QWidget ( viewport() ); |
231 | addChild(mw); | 233 | addChild(mw); |
232 | int ii = 0; | 234 | int ii = 0; |
233 | mainLayout = new QGridLayout ( mw , 2, 8 ); | 235 | mainLayout = new QGridLayout ( mw , 2, 8 ); |
234 | mainLayout->setMargin( 2 ); | 236 | mainLayout->setMargin( 2 ); |
235 | mainLayout->setSpacing( 2 ); | 237 | mainLayout->setSpacing( 2 ); |
236 | QPushButton * addBut = new QPushButton ( mw ); | 238 | QPushButton * addBut = new QPushButton ( mw ); |
237 | addBut->setFocusPolicy(NoFocus); | 239 | addBut->setFocusPolicy(NoFocus); |
238 | mainLayout->addWidget( addBut,0,0 ); | 240 | mainLayout->addWidget( addBut,0,0 ); |
239 | addBut->setText( "D"); | 241 | addBut->setText( "D"); |
240 | connect(addBut,SIGNAL(clicked()),SLOT(defaultInfo())); | 242 | connect(addBut,SIGNAL(clicked()),SLOT(defaultInfo())); |
241 | //addBut->setPixmap ( SmallIcon("greenhook16")); | 243 | //addBut->setPixmap ( SmallIcon("greenhook16")); |
242 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 244 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
243 | int max = addBut->sizeHint().height(); | 245 | int max = addBut->sizeHint().height(); |
244 | addBut = new QPushButton ( mw ); | 246 | addBut = new QPushButton ( mw ); |
245 | addBut->setFocusPolicy(NoFocus); | 247 | addBut->setFocusPolicy(NoFocus); |
246 | mainLayout->addWidget( addBut,0,++ii ); | 248 | mainLayout->addWidget( addBut,0,++ii ); |
247 | addBut->setPixmap ( SmallIcon("eye")); | 249 | addBut->setPixmap ( SmallIcon("eye")); |
248 | connect(addBut,SIGNAL(clicked()),SLOT(enableAll())); | 250 | connect(addBut,SIGNAL(clicked()),SLOT(enableAll())); |
249 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 251 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
250 | 252 | ||
251 | QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw ); | 253 | QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw ); |
252 | mainLayout->addWidget( lab,0,++ii ); | 254 | mainLayout->addWidget( lab,0,++ii ); |
253 | //lab = new QLabel ( i18n(" "), mw ); | 255 | //lab = new QLabel ( i18n(" "), mw ); |
254 | //mainLayout->addWidget( lab,0,++ii ); | 256 | //mainLayout->addWidget( lab,0,++ii ); |
255 | //lab->setFixedWidth( 1 ); | 257 | //lab->setFixedWidth( 1 ); |
256 | addBut = new QPushButton ( mw ); | 258 | addBut = new QPushButton ( mw ); |
257 | addBut->setFocusPolicy(NoFocus); | 259 | addBut->setFocusPolicy(NoFocus); |
258 | mainLayout->addWidget( addBut,0,++ii ); | 260 | mainLayout->addWidget( addBut,0,++ii ); |
259 | addBut->setPixmap ( SmallIcon("bell")); | 261 | addBut->setPixmap ( SmallIcon("bell")); |
260 | connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm())); | 262 | connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm())); |
261 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 263 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
262 | 264 | ||
263 | addBut = new QPushButton ( mw ); | 265 | addBut = new QPushButton ( mw ); |
264 | addBut->setFocusPolicy(NoFocus); | 266 | addBut->setFocusPolicy(NoFocus); |
265 | mainLayout->addWidget( addBut,0,++ii ); | 267 | mainLayout->addWidget( addBut,0,++ii ); |
266 | addBut->setPixmap ( SmallIcon("pencil")); | 268 | addBut->setPixmap ( SmallIcon("pencil")); |
267 | connect(addBut,SIGNAL(clicked()),SLOT(disableRO())); | 269 | connect(addBut,SIGNAL(clicked()),SLOT(disableRO())); |
268 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 270 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
269 | lab = new QLabel ( "", mw ); | 271 | lab = new QLabel ( "", mw ); |
270 | mainLayout->addWidget( lab,0,++ii ); | 272 | mainLayout->addWidget( lab,0,++ii ); |
271 | 273 | ||
272 | addBut = new QPushButton ( mw ); | 274 | addBut = new QPushButton ( mw ); |
273 | addBut->setFocusPolicy(NoFocus); | 275 | addBut->setFocusPolicy(NoFocus); |
274 | mainLayout->addWidget( addBut,0,++ii ); | 276 | mainLayout->addWidget( addBut,0,++ii ); |
275 | addBut->setPixmap ( SmallIcon("plus")); | 277 | addBut->setPixmap ( SmallIcon("plus")); |
276 | connect(addBut,SIGNAL(clicked()),SLOT(addCal())); | 278 | connect(addBut,SIGNAL(clicked()),SLOT(addCal())); |
277 | 279 | ||
278 | lab = new QLabel ( " ", mw ); | 280 | lab = new QLabel ( " ", mw ); |
279 | mainLayout->addWidget( lab,0,++ii ); | 281 | mainLayout->addWidget( lab,0,++ii ); |
280 | 282 | ||
281 | 283 | ||
282 | #if 0 | ||
283 | addBut = new QPushButton ( mw ); | ||
284 | mainLayout->addWidget( addBut,0,6 ); | ||
285 | addBut->setPixmap ( SmallIcon("minus")); | ||
286 | connect(addBut,SIGNAL(clicked()),SLOT(deleteAll())); | ||
287 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | ||
288 | #endif | ||
289 | |||
290 | |||
291 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | 284 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); |
292 | int row = 1; | 285 | int row = 1; |
293 | while ( kkf ) { | 286 | while ( kkf ) { |
294 | int iii = 0; | 287 | int iii = 0; |
295 | KOCalRadioButton* rb = new KOCalRadioButton( mw ); | 288 | KOCalRadioButton* rb = new KOCalRadioButton( mw ); |
296 | mainLayout->addWidget( rb,row,0 );mStdandardB.append( rb ); | 289 | mainLayout->addWidget( rb,row,0 );mStdandardB.append( rb ); |
297 | rb->setChecked( kkf->isStandard ); | 290 | rb->setChecked( kkf->isStandard ); |
298 | rb->setNum( kkf->mCalNumber ); | 291 | rb->setNum( kkf->mCalNumber ); |
299 | connect (rb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); | 292 | connect (rb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); |
300 | if ( kkf->mErrorOnLoad || kkf->isReadOnly ) | 293 | if ( kkf->mErrorOnLoad || kkf->isReadOnly ) |
301 | rb->setEnabled( false ); | 294 | rb->setEnabled( false ); |
302 | KOCalCheckButton* cb = new KOCalCheckButton( mw ); | 295 | KOCalCheckButton* cb = new KOCalCheckButton( mw ); |
303 | mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb ); | 296 | mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb ); |
304 | cb->setChecked( kkf->isEnabled ); | 297 | cb->setChecked( kkf->isEnabled ); |
305 | cb->setNum( kkf->mCalNumber ); | 298 | cb->setNum( kkf->mCalNumber ); |
306 | if ( kkf->mErrorOnLoad ) | 299 | if ( kkf->mErrorOnLoad ) |
307 | cb->setEnabled( false ); | 300 | cb->setEnabled( false ); |
308 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) ); | 301 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) ); |
309 | KOCalButton* name = new KOCalButton( mw ); | 302 | KOCalButton* name = new KOCalButton( mw ); |
310 | name->setNum( kkf->mCalNumber ); | 303 | name->setNum( kkf->mCalNumber ); |
311 | name->setText( kkf->mName ); | 304 | name->setText( kkf->mName ); |
312 | mainLayout->addWidget( name,row,++iii ); | 305 | mainLayout->addWidget( name,row,++iii ); |
313 | connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) ); | 306 | connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) ); |
314 | //lab = new QLabel (" ", mw ); | 307 | //lab = new QLabel (" ", mw ); |
315 | //mainLayout->addWidget( lab,row,++iii ); | 308 | //mainLayout->addWidget( lab,row,++iii ); |
316 | cb = new KOCalCheckButton( mw ); | 309 | cb = new KOCalCheckButton( mw ); |
317 | mainLayout->addWidget( cb,row,++iii );mAlarmB.append( cb ); | 310 | mainLayout->addWidget( cb,row,++iii );mAlarmB.append( cb ); |
318 | cb->setChecked( kkf->isAlarmEnabled ); | 311 | cb->setChecked( kkf->isAlarmEnabled ); |
319 | cb->setNum( kkf->mCalNumber ); | 312 | cb->setNum( kkf->mCalNumber ); |
320 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCalAlarm(int,bool) ) ); | 313 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCalAlarm(int,bool) ) ); |
321 | if ( kkf->mErrorOnLoad ) | 314 | if ( kkf->mErrorOnLoad ) |
322 | cb->setEnabled( false ); | 315 | cb->setEnabled( false ); |
323 | cb = new KOCalCheckButton( mw ); | 316 | cb = new KOCalCheckButton( mw ); |
324 | mainLayout->addWidget( cb,row,++iii );mROB.append( cb ); | 317 | mainLayout->addWidget( cb,row,++iii );mROB.append( cb ); |
325 | cb->setChecked( kkf->isReadOnly ); | 318 | cb->setChecked( kkf->isReadOnly ); |
326 | cb->setNum( kkf->mCalNumber ); | 319 | cb->setNum( kkf->mCalNumber ); |
327 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectReadOnly(int,bool) ) ); | 320 | connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectReadOnly(int,bool) ) ); |
328 | if ( kkf->mErrorOnLoad ) | 321 | if ( kkf->mErrorOnLoad ) |
329 | cb->setEnabled( false ); | 322 | cb->setEnabled( false ); |
330 | if ( row > 1) { | 323 | if ( row > 1) { |
331 | KColorButton *colb = new KColorButton( mw ); | 324 | KColorButton *colb = new KColorButton( mw ); |
332 | mainLayout->addWidget( colb,row,++iii ); | 325 | mainLayout->addWidget( colb,row,++iii ); |
333 | colb->setID( kkf->mCalNumber ); | 326 | colb->setID( kkf->mCalNumber ); |
334 | colb->setColor( kkf->mDefaultColor ); | 327 | colb->setColor( kkf->mDefaultColor ); |
335 | connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) ); | 328 | connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) ); |
336 | KOCalButton* calb = new KOCalButton( mw ); | 329 | KOCalButton* calb = new KOCalButton( mw ); |
337 | mainLayout->addWidget( calb,row,++iii ); | 330 | mainLayout->addWidget( calb,row,++iii ); |
338 | calb->setNum( kkf->mCalNumber ); | 331 | calb->setNum( kkf->mCalNumber ); |