-rw-r--r-- | korganizer/kofilterview.cpp | 74 |
1 files changed, 36 insertions, 38 deletions
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index 105028a..36ee2eb 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp | |||
@@ -24,60 +24,27 @@ | |||
24 | #include <qcheckbox.h> | 24 | #include <qcheckbox.h> |
25 | #include <qcombobox.h> | 25 | #include <qcombobox.h> |
26 | #include <qpushbutton.h> | 26 | #include <qpushbutton.h> |
27 | #include <qlayout.h> | 27 | #include <qlayout.h> |
28 | #include <qlabel.h> | 28 | #include <qlabel.h> |
29 | #include <qdialog.h> | 29 | #include <qdialog.h> |
30 | #include <qtextstream.h> | ||
31 | #include <qtextcodec.h> | ||
30 | 32 | ||
31 | 33 | ||
32 | #include <libkcal/calfilter.h> | 34 | #include <libkcal/calfilter.h> |
33 | 35 | ||
34 | #include "kofilterview.h" | 36 | #include "kofilterview.h" |
35 | #include "koprefs.h" | 37 | #include "koprefs.h" |
36 | #include <kiconloader.h> | 38 | #include <kiconloader.h> |
37 | #include <kglobal.h> | 39 | #include <kglobal.h> |
38 | #include <kcolorbutton.h> | 40 | #include <kcolorbutton.h> |
39 | #include <kmessagebox.h> | 41 | #include <kmessagebox.h> |
40 | 42 | ||
41 | 43 | ||
42 | #include <kurlrequester.h> | ||
43 | #include <klineedit.h> | ||
44 | 44 | ||
45 | class KONewCalPrefs : public QDialog | ||
46 | { | ||
47 | public: | ||
48 | KONewCalPrefs( QWidget *parent=0, const char *name=0 ) : | ||
49 | QDialog( parent, name, true ) | ||
50 | { | ||
51 | setCaption( i18n("Add new Calendar") ); | ||
52 | QVBoxLayout* lay = new QVBoxLayout( this ); | ||
53 | lay->setSpacing( 3 ); | ||
54 | lay->setMargin( 3 ); | ||
55 | QLabel * lab = new QLabel( i18n("<b>Name of new calendar:</b>"), this ); | ||
56 | lay->addWidget( lab ); | ||
57 | nameE = new KLineEdit( this ); | ||
58 | lay->addWidget( nameE ); | ||
59 | lab = new QLabel( i18n("Local ical (*.ics) file:"), this ); | ||
60 | lay->addWidget( lab ); | ||
61 | url = new KURLRequester ( this ); | ||
62 | lay->addWidget( url ); | ||
63 | QPushButton * ok = new QPushButton( i18n("OK"), this ); | ||
64 | lay->addWidget( ok ); | ||
65 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); | ||
66 | lay->addWidget( cancel ); | ||
67 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); | ||
68 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); | ||
69 | //resize( 200, 200 ); | ||
70 | } | ||
71 | |||
72 | QString calName() { return nameE->text(); } | ||
73 | QString calFileName() { return url->url(); } | ||
74 | private: | ||
75 | KLineEdit* nameE; | ||
76 | KURLRequester *url; | ||
77 | }; | ||
78 | 45 | ||
79 | 46 | ||
80 | KOFilterView::KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent, | 47 | KOFilterView::KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent, |
81 | const char* name,WFlags fl ) | 48 | const char* name,WFlags fl ) |
82 | : KOFilterView_base(parent,name,fl) | 49 | : KOFilterView_base(parent,name,fl) |
83 | { | 50 | { |
@@ -370,22 +337,53 @@ void KOCalEditView::readConfig() | |||
370 | mainLayout->addWidget( lab,row,0 ); | 337 | mainLayout->addWidget( lab,row,0 ); |
371 | mw->show(); | 338 | mw->show(); |
372 | 339 | ||
373 | } | 340 | } |
374 | void KOCalEditView::addCal() | 341 | void KOCalEditView::addCal() |
375 | { | 342 | { |
343 | bool tryagain = true; | ||
344 | QString name, file; | ||
345 | while ( tryagain ) { | ||
376 | KONewCalPrefs prefs ( this ); | 346 | KONewCalPrefs prefs ( this ); |
347 | if ( !name.isEmpty() ) prefs.nameE->setText( name ); | ||
348 | if ( !file.isEmpty() ) prefs.url->setURL( file ); | ||
377 | if ( ! prefs.exec() ) | 349 | if ( ! prefs.exec() ) |
378 | return; | 350 | return; |
379 | QString name = prefs.calName(); | 351 | name = prefs.calName(); |
380 | QString file = prefs.calFileName(); | 352 | file = prefs.calFileName(); |
353 | tryagain = false; | ||
354 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | ||
355 | while ( kkf ) { | ||
356 | if ( kkf->mName == name ) { | ||
357 | KMessageBox::information( this, i18n("Sorry, the calendar name already exists!\nPlease choose another name!") ); | ||
358 | name = ""; | ||
359 | break; | ||
360 | tryagain = true; | ||
361 | } | ||
362 | if ( kkf->mFileName == file ) { | ||
363 | |||
364 | break; | ||
365 | tryagain = true; | ||
366 | } | ||
367 | kkf = KOPrefs::instance()->mCalendars.next(); | ||
368 | } | ||
369 | } | ||
381 | QFileInfo fi ( file ); | 370 | QFileInfo fi ( file ); |
382 | if (!fi.exists() ) { | 371 | if (!fi.exists() ) { |
383 | KMessageBox::information( this, i18n("File does not exist!\nNo calendar added!")); | 372 | if ( KMessageBox::questionYesNo(this, i18n("The file does not exist!\nShall I create it for you?")) == KMessageBox::No ) |
373 | return; | ||
374 | QFile fileIn( file ); | ||
375 | if (!fileIn.open( IO_WriteOnly ) ) { | ||
376 | KMessageBox::sorry( this, i18n("Sorry, cannot create the file!\nNo calendar added!") ); | ||
384 | return; | 377 | return; |
385 | } | 378 | } |
379 | QTextStream tsIn( &fileIn ); | ||
380 | tsIn.setCodec( QTextCodec::codecForName("utf8") ); | ||
381 | tsIn << "BEGIN:VCALENDAR\nPRODID:-//KDE-Pim//Platform-independent 2.1.0\nVERSION:2.0\nEND:VCALENDAR\n"; | ||
382 | fileIn.close(); | ||
383 | } | ||
386 | KopiCalendarFile * kkf = KOPrefs::instance()->getNewCalendar(); | 384 | KopiCalendarFile * kkf = KOPrefs::instance()->getNewCalendar(); |
387 | kkf->mName = name; | 385 | kkf->mName = name; |
388 | kkf->mFileName = file; | 386 | kkf->mFileName = file; |
389 | emit calendarAdded( kkf->mCalNumber ); | 387 | emit calendarAdded( kkf->mCalNumber ); |
390 | emit needsUpdate(); | 388 | emit needsUpdate(); |
391 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | 389 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); |