-rw-r--r-- | korganizer/calendarview.cpp | 4 | ||||
-rw-r--r-- | korganizer/incomingdialog.cpp | 3 | ||||
-rw-r--r-- | korganizer/korganizerE.pro | 4 | ||||
-rw-r--r-- | korganizer/publishdialog.cpp | 3 |
4 files changed, 10 insertions, 4 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 369c7a0..56b3fb0 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1305,91 +1305,93 @@ void CalendarView::syncExternal( int mode ) | |||
1305 | lse->setDescription( "" ); | 1305 | lse->setDescription( "" ); |
1306 | lse->setReadOnly( true ); | 1306 | lse->setReadOnly( true ); |
1307 | } | 1307 | } |
1308 | } | 1308 | } |
1309 | } | 1309 | } |
1310 | setModified( true ); | 1310 | setModified( true ); |
1311 | } else { | 1311 | } else { |
1312 | QString question = i18n("Sorry, the database access\ncommand failed!\n\nNothing synced!\n") ; | 1312 | QString question = i18n("Sorry, the database access\ncommand failed!\n\nNothing synced!\n") ; |
1313 | QMessageBox::information( 0, i18n("KO/Pi Import - ERROR"), | 1313 | QMessageBox::information( 0, i18n("KO/Pi Import - ERROR"), |
1314 | question, i18n("Ok")) ; | 1314 | question, i18n("Ok")) ; |
1315 | 1315 | ||
1316 | } | 1316 | } |
1317 | delete calendar; | 1317 | delete calendar; |
1318 | updateView(); | 1318 | updateView(); |
1319 | return ;//syncOK; | 1319 | return ;//syncOK; |
1320 | 1320 | ||
1321 | } | 1321 | } |
1322 | void CalendarView::syncSharp() | 1322 | void CalendarView::syncSharp() |
1323 | { | 1323 | { |
1324 | syncExternal( 0 ); | 1324 | syncExternal( 0 ); |
1325 | 1325 | ||
1326 | } | 1326 | } |
1327 | 1327 | ||
1328 | 1328 | ||
1329 | #include <kabc/stdaddressbook.h> | 1329 | //#include <kabc/stdaddressbook.h> |
1330 | bool CalendarView::importBday() | 1330 | bool CalendarView::importBday() |
1331 | { | 1331 | { |
1332 | #if 0 | ||
1332 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); | 1333 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); |
1333 | KABC::AddressBook::Iterator it; | 1334 | KABC::AddressBook::Iterator it; |
1334 | int count = 0; | 1335 | int count = 0; |
1335 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { | 1336 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { |
1336 | ++count; | 1337 | ++count; |
1337 | } | 1338 | } |
1338 | QProgressBar bar(count,0 ); | 1339 | QProgressBar bar(count,0 ); |
1339 | int w = 300; | 1340 | int w = 300; |
1340 | if ( QApplication::desktop()->width() < 320 ) | 1341 | if ( QApplication::desktop()->width() < 320 ) |
1341 | w = 220; | 1342 | w = 220; |
1342 | int h = bar.sizeHint().height() ; | 1343 | int h = bar.sizeHint().height() ; |
1343 | int dw = QApplication::desktop()->width(); | 1344 | int dw = QApplication::desktop()->width(); |
1344 | int dh = QApplication::desktop()->height(); | 1345 | int dh = QApplication::desktop()->height(); |
1345 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 1346 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
1346 | bar.show(); | 1347 | bar.show(); |
1347 | bar.setCaption (i18n("Reading addressbook - close to abort!") ); | 1348 | bar.setCaption (i18n("Reading addressbook - close to abort!") ); |
1348 | qApp->processEvents(); | 1349 | qApp->processEvents(); |
1349 | count = 0; | 1350 | count = 0; |
1350 | int addCount = 0; | 1351 | int addCount = 0; |
1351 | KCal::Attendee* a = 0; | 1352 | KCal::Attendee* a = 0; |
1352 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { | 1353 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { |
1353 | if ( ! bar.isVisible() ) | 1354 | if ( ! bar.isVisible() ) |
1354 | return false; | 1355 | return false; |
1355 | bar.setProgress( count++ ); | 1356 | bar.setProgress( count++ ); |
1356 | qApp->processEvents(); | 1357 | qApp->processEvents(); |
1357 | //qDebug("add BDay %s %s", (*it).realName().latin1(),(*it).birthday().date().toString().latin1() ); | 1358 | //qDebug("add BDay %s %s", (*it).realName().latin1(),(*it).birthday().date().toString().latin1() ); |
1358 | if ( (*it).birthday().date().isValid() ){ | 1359 | if ( (*it).birthday().date().isValid() ){ |
1359 | a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ; | 1360 | a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ; |
1360 | if ( addAnniversary( (*it).birthday().date(), (*it).assembledName(), a, true ) ) | 1361 | if ( addAnniversary( (*it).birthday().date(), (*it).assembledName(), a, true ) ) |
1361 | ++addCount; | 1362 | ++addCount; |
1362 | } | 1363 | } |
1363 | QDate anni = KGlobal::locale()->readDate( (*it).custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); | 1364 | QDate anni = KGlobal::locale()->readDate( (*it).custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); |
1364 | if ( anni.isValid() ){ | 1365 | if ( anni.isValid() ){ |
1365 | a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ; | 1366 | a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ; |
1366 | if ( addAnniversary( anni, (*it).assembledName(), a, false ) ) | 1367 | if ( addAnniversary( anni, (*it).assembledName(), a, false ) ) |
1367 | ++addCount; | 1368 | ++addCount; |
1368 | } | 1369 | } |
1369 | } | 1370 | } |
1370 | updateView(); | 1371 | updateView(); |
1371 | topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!")); | 1372 | topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!")); |
1373 | #endif | ||
1372 | return true; | 1374 | return true; |
1373 | } | 1375 | } |
1374 | 1376 | ||
1375 | bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a, bool birthday) | 1377 | bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a, bool birthday) |
1376 | { | 1378 | { |
1377 | //qDebug("addAnni "); | 1379 | //qDebug("addAnni "); |
1378 | Event * ev = new Event(); | 1380 | Event * ev = new Event(); |
1379 | if ( a ) { | 1381 | if ( a ) { |
1380 | ev->addAttendee( a ); | 1382 | ev->addAttendee( a ); |
1381 | } | 1383 | } |
1382 | QString kind; | 1384 | QString kind; |
1383 | if ( birthday ) | 1385 | if ( birthday ) |
1384 | kind = i18n( "Birthday" ); | 1386 | kind = i18n( "Birthday" ); |
1385 | else | 1387 | else |
1386 | kind = i18n( "Anniversary" ); | 1388 | kind = i18n( "Anniversary" ); |
1387 | ev->setSummary( name + " - " + kind ); | 1389 | ev->setSummary( name + " - " + kind ); |
1388 | ev->setOrganizer( "nobody@nowhere" ); | 1390 | ev->setOrganizer( "nobody@nowhere" ); |
1389 | ev->setCategories( kind ); | 1391 | ev->setCategories( kind ); |
1390 | ev->setDtStart( QDateTime(date) ); | 1392 | ev->setDtStart( QDateTime(date) ); |
1391 | ev->setDtEnd( QDateTime(date) ); | 1393 | ev->setDtEnd( QDateTime(date) ); |
1392 | ev->setFloats( true ); | 1394 | ev->setFloats( true ); |
1393 | Recurrence * rec = ev->recurrence(); | 1395 | Recurrence * rec = ev->recurrence(); |
1394 | rec->setYearly(Recurrence::rYearlyMonth,1,-1); | 1396 | rec->setYearly(Recurrence::rYearlyMonth,1,-1); |
1395 | rec->addYearlyNum( date.month() ); | 1397 | rec->addYearlyNum( date.month() ); |
diff --git a/korganizer/incomingdialog.cpp b/korganizer/incomingdialog.cpp index f3bd09f..50e3077 100644 --- a/korganizer/incomingdialog.cpp +++ b/korganizer/incomingdialog.cpp | |||
@@ -29,49 +29,50 @@ | |||
29 | #include <kmessagebox.h> | 29 | #include <kmessagebox.h> |
30 | 30 | ||
31 | #include <libkcal/incidence.h> | 31 | #include <libkcal/incidence.h> |
32 | #include <libkcal/event.h> | 32 | #include <libkcal/event.h> |
33 | #include <libkcal/calendar.h> | 33 | #include <libkcal/calendar.h> |
34 | #include <libkcal/freebusy.h> | 34 | #include <libkcal/freebusy.h> |
35 | #include <libkcal/attendee.h> | 35 | #include <libkcal/attendee.h> |
36 | #include <libkcal/calendarresources.h> | 36 | #include <libkcal/calendarresources.h> |
37 | #include <libkcal/resourcecalendar.h> | 37 | #include <libkcal/resourcecalendar.h> |
38 | #include <kresources/resourceselectdialog.h> | 38 | #include <kresources/resourceselectdialog.h> |
39 | 39 | ||
40 | #ifndef KORG_NOMAIL | 40 | #ifndef KORG_NOMAIL |
41 | #include "mailscheduler.h" | 41 | #include "mailscheduler.h" |
42 | #else | 42 | #else |
43 | #include <libkcal/dummyscheduler.h> | 43 | #include <libkcal/dummyscheduler.h> |
44 | #endif | 44 | #endif |
45 | 45 | ||
46 | 46 | ||
47 | #include "incomingdialog.h" | 47 | #include "incomingdialog.h" |
48 | #include "koeventviewerdialog.h" | 48 | #include "koeventviewerdialog.h" |
49 | #include "kocounterdialog.h" | 49 | #include "kocounterdialog.h" |
50 | #include "koprefs.h" | 50 | #include "koprefs.h" |
51 | 51 | ||
52 | #ifndef KORG_NOKABC | 52 | #ifndef KORG_NOKABC |
53 | #include <kabc/stdaddressbook.h> | 53 | #define KORG_NOKABC |
54 | //#include <kabc/stdaddressbook.h> | ||
54 | #define size count | 55 | #define size count |
55 | #endif | 56 | #endif |
56 | 57 | ||
57 | 58 | ||
58 | ScheduleItemIn::ScheduleItemIn(QListView *parent,IncidenceBase *ev, | 59 | ScheduleItemIn::ScheduleItemIn(QListView *parent,IncidenceBase *ev, |
59 | Scheduler::Method method,ScheduleMessage::Status status) | 60 | Scheduler::Method method,ScheduleMessage::Status status) |
60 | : QListViewItem(parent) | 61 | : QListViewItem(parent) |
61 | { | 62 | { |
62 | mIncidence = ev; | 63 | mIncidence = ev; |
63 | mMethod = method; | 64 | mMethod = method; |
64 | mStatus = status; | 65 | mStatus = status; |
65 | setText(6,Scheduler::translatedMethodName(mMethod)+" "); | 66 | setText(6,Scheduler::translatedMethodName(mMethod)+" "); |
66 | setText(7,ScheduleMessage::statusName(status)); | 67 | setText(7,ScheduleMessage::statusName(status)); |
67 | } | 68 | } |
68 | 69 | ||
69 | 70 | ||
70 | /* Visitor */ | 71 | /* Visitor */ |
71 | ScheduleItemVisitor::ScheduleItemVisitor(ScheduleItemIn *item) | 72 | ScheduleItemVisitor::ScheduleItemVisitor(ScheduleItemIn *item) |
72 | { | 73 | { |
73 | mItem = item; | 74 | mItem = item; |
74 | } | 75 | } |
75 | 76 | ||
76 | ScheduleItemVisitor::~ScheduleItemVisitor() | 77 | ScheduleItemVisitor::~ScheduleItemVisitor() |
77 | { | 78 | { |
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro index 4247838..d841193 100644 --- a/korganizer/korganizerE.pro +++ b/korganizer/korganizerE.pro | |||
@@ -1,47 +1,49 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
3 | TARGET = kopi | 3 | TARGET = kopi |
4 | OBJECTS_DIR = obj/$(PLATFORM) | 4 | OBJECTS_DIR = obj/$(PLATFORM) |
5 | MOC_DIR = moc/$(PLATFORM) | 5 | MOC_DIR = moc/$(PLATFORM) |
6 | DESTDIR=$(QPEDIR)/bin | 6 | DESTDIR=$(QPEDIR)/bin |
7 | 7 | ||
8 | INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/libkdepim interfaces $(KDEPIMDIR)/kabc $(QPEDIR)/include | 8 | INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/libkdepim interfaces $(KDEPIMDIR)/kabc $(QPEDIR)/include |
9 | 9 | ||
10 | DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL | 10 | DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL |
11 | DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER | 11 | DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER |
12 | DEFINES += KORG_NOLVALTERNATION | 12 | DEFINES += KORG_NOLVALTERNATION |
13 | #KORG_NOKABC | 13 | #KORG_NOKABC |
14 | LIBS += -lmicrokdepim | 14 | LIBS += -lmicrokdepim |
15 | LIBS += -lmicrokcal | 15 | LIBS += -lmicrokcal |
16 | LIBS += -lmicrokde | 16 | LIBS += -lmicrokde |
17 | LIBS += -lmicroqtcompat | 17 | LIBS += -lmicroqtcompat |
18 | LIBS += -lmicrokabc | 18 | #LIBS += -lmicrokabc |
19 | 19 | ||
20 | #LIBS += $(QPEDIR)/lib/gammu | 20 | #LIBS += $(QPEDIR)/lib/gammu |
21 | #LIBS += -lmicrogammu | 21 | #LIBS += -lmicrogammu |
22 | #LIBS += -lbluetooth | 22 | #LIBS += -lbluetooth |
23 | #LIBS += -lsdp | 23 | #LIBS += -lsdp |
24 | LIBS += $(GCC3EXTRALIB1) | ||
25 | LIBS += $(GCC3EXTRALIB2) | ||
24 | 26 | ||
25 | 27 | ||
26 | LIBS += -lqpe | 28 | LIBS += -lqpe |
27 | LIBS += -ljpeg | 29 | LIBS += -ljpeg |
28 | LIBS += $(QTOPIALIB) | 30 | LIBS += $(QTOPIALIB) |
29 | LIBS += -L$(QPEDIR)/lib | 31 | LIBS += -L$(QPEDIR)/lib |
30 | 32 | ||
31 | INTERFACES = kofilterview_base.ui | 33 | INTERFACES = kofilterview_base.ui |
32 | #filteredit_base.ui | 34 | #filteredit_base.ui |
33 | 35 | ||
34 | HEADERS = \ | 36 | HEADERS = \ |
35 | wordsgerman.h \ | 37 | wordsgerman.h \ |
36 | filteredit_base.h \ | 38 | filteredit_base.h \ |
37 | alarmclient.h \ | 39 | alarmclient.h \ |
38 | calendarview.h \ | 40 | calendarview.h \ |
39 | customlistviewitem.h \ | 41 | customlistviewitem.h \ |
40 | datenavigator.h \ | 42 | datenavigator.h \ |
41 | docprefs.h \ | 43 | docprefs.h \ |
42 | filtereditdialog.h \ | 44 | filtereditdialog.h \ |
43 | incomingdialog.h \ | 45 | incomingdialog.h \ |
44 | incomingdialog_base.h \ | 46 | incomingdialog_base.h \ |
45 | interfaces/korganizer/baseview.h \ | 47 | interfaces/korganizer/baseview.h \ |
46 | interfaces/korganizer/calendarviewbase.h \ | 48 | interfaces/korganizer/calendarviewbase.h \ |
47 | journalentry.h \ | 49 | journalentry.h \ |
diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp index 4323b91..2ae6720 100644 --- a/korganizer/publishdialog.cpp +++ b/korganizer/publishdialog.cpp | |||
@@ -6,49 +6,50 @@ | |||
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 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <qlineedit.h> | 24 | #include <qlineedit.h> |
25 | #include <kdebug.h> | 25 | #include <kdebug.h> |
26 | 26 | ||
27 | #include <kglobal.h> | 27 | #include <kglobal.h> |
28 | #include <klocale.h> | 28 | #include <klocale.h> |
29 | #ifndef KORG_NOKABC | 29 | #ifndef KORG_NOKABC |
30 | #include <kabc/addresseedialog.h> | 30 | #define KORG_NOKABC |
31 | //#include <kabc/addresseedialog.h> | ||
31 | #endif | 32 | #endif |
32 | 33 | ||
33 | #include "koprefs.h" | 34 | #include "koprefs.h" |
34 | #include "publishdialog.h" | 35 | #include "publishdialog.h" |
35 | 36 | ||
36 | PublishDialog::PublishDialog(QWidget* parent, const char* name, | 37 | PublishDialog::PublishDialog(QWidget* parent, const char* name, |
37 | bool modal, WFlags fl) | 38 | bool modal, WFlags fl) |
38 | : PublishDialog_base(parent,name,modal,fl) | 39 | : PublishDialog_base(parent,name,modal,fl) |
39 | { | 40 | { |
40 | setCaption(i18n("Select Addresses")); | 41 | setCaption(i18n("Select Addresses")); |
41 | mNameLineEdit->setEnabled(false); | 42 | mNameLineEdit->setEnabled(false); |
42 | mEmailLineEdit->setEnabled(false); | 43 | mEmailLineEdit->setEnabled(false); |
43 | connect(mAddressListView,SIGNAL(selectionChanged(QListViewItem *)), | 44 | connect(mAddressListView,SIGNAL(selectionChanged(QListViewItem *)), |
44 | SLOT(updateInput())); | 45 | SLOT(updateInput())); |
45 | } | 46 | } |
46 | 47 | ||
47 | PublishDialog::~PublishDialog() | 48 | PublishDialog::~PublishDialog() |
48 | { | 49 | { |
49 | } | 50 | } |
50 | 51 | ||
51 | void PublishDialog::addAttendee(Attendee *attendee) | 52 | void PublishDialog::addAttendee(Attendee *attendee) |
52 | { | 53 | { |
53 | mNameLineEdit->setEnabled(true); | 54 | mNameLineEdit->setEnabled(true); |
54 | mEmailLineEdit->setEnabled(true); | 55 | mEmailLineEdit->setEnabled(true); |