-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 2 | ||||
-rw-r--r-- | bin/kdepim/kopiemail/germantranslation.txt | 2 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 2 | ||||
-rw-r--r-- | bin/kdepim/pwmanager/germantranslation.txt | 2 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 14 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 4 | ||||
-rw-r--r-- | libkcal/icalformatimpl.cpp | 3 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 41 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.h | 4 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 7 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.h | 6 | ||||
-rw-r--r-- | libkdepim/kprefsdialog.cpp | 2 | ||||
-rw-r--r-- | libkdepim/kprefsdialog.h | 7 | ||||
-rw-r--r-- | microkde/kglobalsettings.cpp | 9 | ||||
-rw-r--r-- | microkde/kglobalsettings.h | 1 |
15 files changed, 86 insertions, 20 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index 0884a83..85aed43 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt | |||
@@ -451,17 +451,17 @@ | |||
451 | { "Locale","Locale" }, | 451 | { "Locale","Locale" }, |
452 | { "Date Format:","Datums Format:" }, | 452 | { "Date Format:","Datums Format:" }, |
453 | { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" }, | 453 | { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" }, |
454 | { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" }, | 454 | { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" }, |
455 | { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" }, | 455 | { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" }, |
456 | { "User defined","Benutzerdefiniert" }, | 456 | { "User defined","Benutzerdefiniert" }, |
457 | { "User long date:","Format langes Datum:" }, | 457 | { "User long date:","Format langes Datum:" }, |
458 | { "User short date:","Format kurzes Datum:" }, | 458 | { "User short date:","Format kurzes Datum:" }, |
459 | { "Daylight start:","Sommerzeit Beginn:" }, | 459 | { "Daylight start:","Sommerzeit Start:" }, |
460 | { "Daylight end:","Sommerzeit Ende:" }, | 460 | { "Daylight end:","Sommerzeit Ende:" }, |
461 | { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" }, | 461 | { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" }, |
462 | { "Monday 19 April 2004: %A %d %B %Y","Monday 19 April 2004: %A %d %B %Y" }, | 462 | { "Monday 19 April 2004: %A %d %B %Y","Monday 19 April 2004: %A %d %B %Y" }, |
463 | { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" }, | 463 | { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" }, |
464 | { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" }, | 464 | { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" }, |
465 | { "Date Format","Datums Format" }, | 465 | { "Date Format","Datums Format" }, |
466 | { "Timezone:","Zeitzone:" }, | 466 | { "Timezone:","Zeitzone:" }, |
467 | { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, | 467 | { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, |
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt index 903abdf..75fdd11 100644 --- a/bin/kdepim/kopiemail/germantranslation.txt +++ b/bin/kdepim/kopiemail/germantranslation.txt | |||
@@ -32,17 +32,17 @@ | |||
32 | { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" }, | 32 | { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" }, |
33 | { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" }, | 33 | { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" }, |
34 | { "Date Format","Datums Format" }, | 34 | { "Date Format","Datums Format" }, |
35 | { "Timezone:","Zeitzone:" }, | 35 | { "Timezone:","Zeitzone:" }, |
36 | { "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" }, | 36 | { "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" }, |
37 | { "Timezone has daylight saving","Zeitzone hat Sommerzeit" }, | 37 | { "Timezone has daylight saving","Zeitzone hat Sommerzeit" }, |
38 | { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" }, | 38 | { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" }, |
39 | { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, | 39 | { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, |
40 | { "Daylight start:","Sommerzeit Beginn:" }, | 40 | { "Daylight start:","Sommerzeit Start:" }, |
41 | { "Mon","Mo" }, | 41 | { "Mon","Mo" }, |
42 | { "Tue","Di" }, | 42 | { "Tue","Di" }, |
43 | { "Wed","Mi" }, | 43 | { "Wed","Mi" }, |
44 | { "Thu","Do" }, | 44 | { "Thu","Do" }, |
45 | { "Fri","Fr" }, | 45 | { "Fri","Fr" }, |
46 | { "Sat","Sa" }, | 46 | { "Sat","Sa" }, |
47 | { "Sun","So" }, | 47 | { "Sun","So" }, |
48 | { "January","Januar" }, | 48 | { "January","Januar" }, |
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 5693112..fa18304 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -440,17 +440,17 @@ | |||
440 | { "Yes","Ja" }, | 440 | { "Yes","Ja" }, |
441 | { "You have %d item(s) selected.\n","Sie haben %d Einträge ausgewählt.\n" }, | 441 | { "You have %d item(s) selected.\n","Sie haben %d Einträge ausgewählt.\n" }, |
442 | { "You have to restart KOrganizer for this setting to take effect.","Sie müssem Korganizer neu starten, damit diese Einstellung aktiviert wird." }, | 442 | { "You have to restart KOrganizer for this setting to take effect.","Sie müssem Korganizer neu starten, damit diese Einstellung aktiviert wird." }, |
443 | { "week(s) on:","Woche(n) am: " }, | 443 | { "week(s) on:","Woche(n) am: " }, |
444 | { "Full menu bar(nr)","Volle Menuleiste(bn)" }, | 444 | { "Full menu bar(nr)","Volle Menuleiste(bn)" }, |
445 | { "Timezone has daylight saving","Zeitzone hat Sommerzeit" }, | 445 | { "Timezone has daylight saving","Zeitzone hat Sommerzeit" }, |
446 | { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" }, | 446 | { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" }, |
447 | { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, | 447 | { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, |
448 | { "Daylight start:","Sommerzeit Beginn:" }, | 448 | { "Daylight start:","Sommerzeit Start:" }, |
449 | { "Daylight end:","Sommerzeit Ende:" }, | 449 | { "Daylight end:","Sommerzeit Ende:" }, |
450 | { "Time Zone","Zeitzone" }, | 450 | { "Time Zone","Zeitzone" }, |
451 | { "Monday 19 April 2004: %A %d %B %Y","Montag 19 April 2004: %A %d %B %Y" }, | 451 | { "Monday 19 April 2004: %A %d %B %Y","Montag 19 April 2004: %A %d %B %Y" }, |
452 | { "%A: Monday --- %a: Mon","%A: Montag --- %a: Mon" }, | 452 | { "%A: Monday --- %a: Mon","%A: Montag --- %a: Mon" }, |
453 | { "minutely","minütlich" }, | 453 | { "minutely","minütlich" }, |
454 | { "hourly","stündlich" }, | 454 | { "hourly","stündlich" }, |
455 | { "daily","täglich" }, | 455 | { "daily","täglich" }, |
456 | { "weekly","wöchentlich" }, | 456 | { "weekly","wöchentlich" }, |
diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt index beb066e..a50dd04 100644 --- a/bin/kdepim/pwmanager/germantranslation.txt +++ b/bin/kdepim/pwmanager/germantranslation.txt | |||
@@ -128,17 +128,17 @@ | |||
128 | { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" }, | 128 | { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" }, |
129 | { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" }, | 129 | { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" }, |
130 | { "Date Format","Datums Format" }, | 130 | { "Date Format","Datums Format" }, |
131 | { "Timezone:","Zeitzone:" }, | 131 | { "Timezone:","Zeitzone:" }, |
132 | { "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" }, | 132 | { "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" }, |
133 | { "Timezone has daylight saving","Zeitzone hat Sommerzeit" }, | 133 | { "Timezone has daylight saving","Zeitzone hat Sommerzeit" }, |
134 | { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" }, | 134 | { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" }, |
135 | { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, | 135 | { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." }, |
136 | { "Daylight start:","Sommerzeit Beginn:" }, | 136 | { "Daylight start:","Sommerzeit Start:" }, |
137 | { "Mon","Mo" }, | 137 | { "Mon","Mo" }, |
138 | { "Tue","Di" }, | 138 | { "Tue","Di" }, |
139 | { "Wed","Mi" }, | 139 | { "Wed","Mi" }, |
140 | { "Thu","Do" }, | 140 | { "Thu","Do" }, |
141 | { "Fri","Fr" }, | 141 | { "Fri","Fr" }, |
142 | { "Sat","Sa" }, | 142 | { "Sat","Sa" }, |
143 | { "Sun","So" }, | 143 | { "Sun","So" }, |
144 | { "January","Januar" }, | 144 | { "January","Januar" }, |
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index df606d0..c32a2a4 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -58,17 +58,17 @@ DynamicTip::DynamicTip( QWidget * parent ) | |||
58 | { | 58 | { |
59 | matrix = (KODayMatrix*)parent; | 59 | matrix = (KODayMatrix*)parent; |
60 | } | 60 | } |
61 | 61 | ||
62 | class KODaymatrixWhatsThis :public QWhatsThis | 62 | class KODaymatrixWhatsThis :public QWhatsThis |
63 | { | 63 | { |
64 | public: | 64 | public: |
65 | KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;}; | 65 | KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;}; |
66 | ~KODaymatrixWhatsThis() { ; }; | 66 | ~KODaymatrixWhatsThis() { qDebug("DELETE KODaymatrixWhatsThis "); }; |
67 | 67 | ||
68 | protected: | 68 | protected: |
69 | virtual QString text( const QPoint& p ) | 69 | virtual QString text( const QPoint& p ) |
70 | { | 70 | { |
71 | return _view->getWhatsThisText( p ) ; | 71 | return _view->getWhatsThisText( p ) ; |
72 | } | 72 | } |
73 | private: | 73 | private: |
74 | KODayMatrix * _view; | 74 | KODayMatrix * _view; |
@@ -100,21 +100,19 @@ void DynamicTip::maybeTip( const QPoint &pos ) | |||
100 | // ============================================================================ | 100 | // ============================================================================ |
101 | 101 | ||
102 | const int KODayMatrix::NOSELECTION = -1000; | 102 | const int KODayMatrix::NOSELECTION = -1000; |
103 | const int KODayMatrix::NUMDAYS = 42; | 103 | const int KODayMatrix::NUMDAYS = 42; |
104 | 104 | ||
105 | KODayMatrix::KODayMatrix( QWidget *parent, const char *name ) | 105 | KODayMatrix::KODayMatrix( QWidget *parent, const char *name ) |
106 | : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 ) | 106 | : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 ) |
107 | 107 | ||
108 | #if 0 | 108 | |
109 | KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) : | ||
110 | QFrame(parent, name) | ||
111 | #endif | ||
112 | { | 109 | { |
110 | mLastView = -1; | ||
113 | oldW = 0; | 111 | oldW = 0; |
114 | oldH = 0; | 112 | oldH = 0; |
115 | myPix.resize( 150, 120 ); | 113 | myPix.resize( 150, 120 ); |
116 | mRedrawNeeded = true; | 114 | mRedrawNeeded = true; |
117 | mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); | 115 | mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); |
118 | mPendingUpdateBeforeRepaint = false; | 116 | mPendingUpdateBeforeRepaint = false; |
119 | mouseDown = false; | 117 | mouseDown = false; |
120 | // initialize dynamic arrays | 118 | // initialize dynamic arrays |
@@ -239,16 +237,22 @@ QColor KODayMatrix::getShadedColor(QColor color) | |||
239 | v = 192+v/4; | 237 | v = 192+v/4; |
240 | shaded.setHsv(h,s,v); | 238 | shaded.setHsv(h,s,v); |
241 | 239 | ||
242 | return shaded; | 240 | return shaded; |
243 | } | 241 | } |
244 | 242 | ||
245 | KODayMatrix::~KODayMatrix() | 243 | KODayMatrix::~KODayMatrix() |
246 | { | 244 | { |
245 | #if QT_VERSION >= 0x030000 | ||
246 | |||
247 | #else | ||
248 | delete mKODaymatrixWhatsThis; | ||
249 | #endif | ||
250 | |||
247 | // delete mKODaymatrixWhatsThis; | 251 | // delete mKODaymatrixWhatsThis; |
248 | delete [] days; | 252 | delete [] days; |
249 | delete [] daylbls; | 253 | delete [] daylbls; |
250 | //delete [] events; | 254 | //delete [] events; |
251 | delete mToolTip; | 255 | delete mToolTip; |
252 | } | 256 | } |
253 | 257 | ||
254 | /* | 258 | /* |
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index d9d7924..e4bee63 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -1023,20 +1023,16 @@ dummy = | |||
1023 | 1023 | ||
1024 | dummyBox = new QHBox(topFrame); | 1024 | dummyBox = new QHBox(topFrame); |
1025 | new QLabel(i18n("Auto suspend count:"),dummyBox); | 1025 | new QLabel(i18n("Auto suspend count:"),dummyBox); |
1026 | mAlarmSuspendCount = new QSpinBox(0,60,1,dummyBox); | 1026 | mAlarmSuspendCount = new QSpinBox(0,60,1,dummyBox); |
1027 | topLayout->addWidget(dummyBox,iii++,0); | 1027 | topLayout->addWidget(dummyBox,iii++,0); |
1028 | 1028 | ||
1029 | 1029 | ||
1030 | 1030 | ||
1031 | |||
1032 | |||
1033 | |||
1034 | |||
1035 | QHBox* hbo = new QHBox ( topFrame ); | 1031 | QHBox* hbo = new QHBox ( topFrame ); |
1036 | mDefaultAlarmFile = new QLineEdit(hbo); | 1032 | mDefaultAlarmFile = new QLineEdit(hbo); |
1037 | QPushButton * loadTemplate = new QPushButton(hbo); | 1033 | QPushButton * loadTemplate = new QPushButton(hbo); |
1038 | QPixmap icon; | 1034 | QPixmap icon; |
1039 | if ( QApplication::desktop()->width() < 321 ) | 1035 | if ( QApplication::desktop()->width() < 321 ) |
1040 | icon = SmallIcon("fileimport16"); | 1036 | icon = SmallIcon("fileimport16"); |
1041 | else | 1037 | else |
1042 | icon = SmallIcon("fileimport"); | 1038 | icon = SmallIcon("fileimport"); |
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index fe7413f..2405682 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp | |||
@@ -690,22 +690,24 @@ icalcomponent *ICalFormatImpl::writeAlarm(Alarm *alarm) | |||
690 | switch (alarm->type()) { | 690 | switch (alarm->type()) { |
691 | case Alarm::Procedure: | 691 | case Alarm::Procedure: |
692 | action = ICAL_ACTION_PROCEDURE; | 692 | action = ICAL_ACTION_PROCEDURE; |
693 | attach = icalattach_new_from_url( QFile::encodeName(alarm->programFile()).data() ); | 693 | attach = icalattach_new_from_url( QFile::encodeName(alarm->programFile()).data() ); |
694 | icalcomponent_add_property(a,icalproperty_new_attach(attach)); | 694 | icalcomponent_add_property(a,icalproperty_new_attach(attach)); |
695 | if (!alarm->programArguments().isEmpty()) { | 695 | if (!alarm->programArguments().isEmpty()) { |
696 | icalcomponent_add_property(a,icalproperty_new_description(alarm->programArguments().utf8())); | 696 | icalcomponent_add_property(a,icalproperty_new_description(alarm->programArguments().utf8())); |
697 | } | 697 | } |
698 | icalattach_unref( attach ); | ||
698 | break; | 699 | break; |
699 | case Alarm::Audio: | 700 | case Alarm::Audio: |
700 | action = ICAL_ACTION_AUDIO; | 701 | action = ICAL_ACTION_AUDIO; |
701 | if (!alarm->audioFile().isEmpty()) { | 702 | if (!alarm->audioFile().isEmpty()) { |
702 | attach = icalattach_new_from_url(QFile::encodeName( alarm->audioFile() ).data()); | 703 | attach = icalattach_new_from_url(QFile::encodeName( alarm->audioFile() ).data()); |
703 | icalcomponent_add_property(a,icalproperty_new_attach(attach)); | 704 | icalcomponent_add_property(a,icalproperty_new_attach(attach)); |
705 | icalattach_unref( attach ); | ||
704 | } | 706 | } |
705 | break; | 707 | break; |
706 | case Alarm::Email: { | 708 | case Alarm::Email: { |
707 | action = ICAL_ACTION_EMAIL; | 709 | action = ICAL_ACTION_EMAIL; |
708 | QValueList<Person> addresses = alarm->mailAddresses(); | 710 | QValueList<Person> addresses = alarm->mailAddresses(); |
709 | for (QValueList<Person>::Iterator ad = addresses.begin(); ad != addresses.end(); ++ad) { | 711 | for (QValueList<Person>::Iterator ad = addresses.begin(); ad != addresses.end(); ++ad) { |
710 | icalproperty *p = icalproperty_new_attendee("MAILTO:" + (*ad).email().utf8()); | 712 | icalproperty *p = icalproperty_new_attendee("MAILTO:" + (*ad).email().utf8()); |
711 | if (!(*ad).name().isEmpty()) { | 713 | if (!(*ad).name().isEmpty()) { |
@@ -715,16 +717,17 @@ icalcomponent *ICalFormatImpl::writeAlarm(Alarm *alarm) | |||
715 | } | 717 | } |
716 | icalcomponent_add_property(a,icalproperty_new_summary(alarm->mailSubject().utf8())); | 718 | icalcomponent_add_property(a,icalproperty_new_summary(alarm->mailSubject().utf8())); |
717 | icalcomponent_add_property(a,icalproperty_new_description(alarm->text().utf8())); | 719 | icalcomponent_add_property(a,icalproperty_new_description(alarm->text().utf8())); |
718 | QStringList attachments = alarm->mailAttachments(); | 720 | QStringList attachments = alarm->mailAttachments(); |
719 | if (attachments.count() > 0) { | 721 | if (attachments.count() > 0) { |
720 | for (QStringList::Iterator at = attachments.begin(); at != attachments.end(); ++at) { | 722 | for (QStringList::Iterator at = attachments.begin(); at != attachments.end(); ++at) { |
721 | attach = icalattach_new_from_url(QFile::encodeName( *at ).data()); | 723 | attach = icalattach_new_from_url(QFile::encodeName( *at ).data()); |
722 | icalcomponent_add_property(a,icalproperty_new_attach(attach)); | 724 | icalcomponent_add_property(a,icalproperty_new_attach(attach)); |
725 | icalattach_unref( attach ); | ||
723 | } | 726 | } |
724 | } | 727 | } |
725 | break; | 728 | break; |
726 | } | 729 | } |
727 | case Alarm::Display: | 730 | case Alarm::Display: |
728 | action = ICAL_ACTION_DISPLAY; | 731 | action = ICAL_ACTION_DISPLAY; |
729 | icalcomponent_add_property(a,icalproperty_new_description(alarm->text().utf8())); | 732 | icalcomponent_add_property(a,icalproperty_new_description(alarm->text().utf8())); |
730 | break; | 733 | break; |
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 753d90a..fbfbc45 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -30,24 +30,27 @@ $Id$ | |||
30 | 30 | ||
31 | #include <qlayout.h> | 31 | #include <qlayout.h> |
32 | #include <qtabwidget.h> | 32 | #include <qtabwidget.h> |
33 | #include <qcombobox.h> | 33 | #include <qcombobox.h> |
34 | #include <qgroupbox.h> | 34 | #include <qgroupbox.h> |
35 | #include <qlabel.h> | 35 | #include <qlabel.h> |
36 | #include <qlineedit.h> | 36 | #include <qlineedit.h> |
37 | #include <qbuttongroup.h> | 37 | #include <qbuttongroup.h> |
38 | #include <qcheckbox.h> | ||
38 | #include <qfile.h> | 39 | #include <qfile.h> |
39 | #include <qvbox.h> | 40 | #include <qvbox.h> |
40 | #include <qdir.h> | 41 | #include <qdir.h> |
41 | #include <qregexp.h> | 42 | #include <qregexp.h> |
43 | #include <qspinbox.h> | ||
42 | 44 | ||
43 | #include <kdialog.h> | 45 | #include <kdialog.h> |
44 | #include <kprefsdialog.h> | 46 | #include <kprefsdialog.h> |
45 | #include <klocale.h> | 47 | #include <klocale.h> |
48 | #include <kglobalsettings.h> | ||
46 | #include <kdateedit.h> | 49 | #include <kdateedit.h> |
47 | #include <kglobal.h> | 50 | #include <kglobal.h> |
48 | #include <stdlib.h> | 51 | #include <stdlib.h> |
49 | 52 | ||
50 | /*US | 53 | /*US |
51 | #include <qcheckbox.h> | 54 | #include <qcheckbox.h> |
52 | #include <qframe.h> | 55 | #include <qframe.h> |
53 | #include <qpushbutton.h> | 56 | #include <qpushbutton.h> |
@@ -104,22 +107,58 @@ KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, | |||
104 | topLayout->addWidget( tabWidget ); | 107 | topLayout->addWidget( tabWidget ); |
105 | 108 | ||
106 | 109 | ||
107 | setupLocaleTab(); | 110 | setupLocaleTab(); |
108 | setupLocaleDateTab(); | 111 | setupLocaleDateTab(); |
109 | setupTimeZoneTab(); | 112 | setupTimeZoneTab(); |
110 | setupExternalAppTab(); | 113 | setupExternalAppTab(); |
111 | setupStoreTab(); | 114 | setupStoreTab(); |
112 | 115 | setupBackupTab(); | |
113 | } | 116 | } |
114 | void KDEPIMConfigWidget::showTimeZoneTab() | 117 | void KDEPIMConfigWidget::showTimeZoneTab() |
115 | { | 118 | { |
116 | tabWidget->setCurrentPage ( 3 ) ; | 119 | tabWidget->setCurrentPage ( 3 ) ; |
117 | } | 120 | } |
121 | void KDEPIMConfigWidget::setupBackupTab() | ||
122 | { | ||
123 | QVBox *colorPage = new QVBox( this ); | ||
124 | tabWidget->addTab( colorPage, i18n( "Backup" ) ); | ||
125 | QWidget* topFrame = new QWidget( colorPage ); | ||
126 | QVBoxLayout *topLayout = new QVBoxLayout(topFrame); | ||
127 | KPrefsWidBool *sb = addWidBool(i18n("Backup enabled"), | ||
128 | &(KPimGlobalPrefs::instance()->mBackupEnabled),topFrame); | ||
129 | topLayout->addWidget((QWidget*)sb->checkBox()); | ||
130 | QWidget* bupFrame = new QWidget( topFrame ); | ||
131 | topLayout->addWidget((bupFrame)); | ||
132 | QObject::connect ( sb->checkBox(), SIGNAL (toggled ( bool ) ), bupFrame, SLOT ( setEnabled( bool ) ) ); | ||
133 | QVBoxLayout *bupLayout = new QVBoxLayout(bupFrame); | ||
134 | sb = addWidBool(i18n("Use standard backup dir"), | ||
135 | &(KPimGlobalPrefs::instance()->mBackupEnabled),bupFrame); | ||
136 | bupLayout->addWidget((QWidget*)sb->checkBox()); | ||
137 | mBackupUrl = new KURLRequester( bupFrame ); | ||
138 | mBackupUrl->setURL( KGlobalSettings::backupDataDir() ); | ||
139 | QObject::connect ( sb->checkBox(), SIGNAL (toggled ( bool ) ), mBackupUrl ,SLOT ( setDisabled( bool ) ) ); | ||
140 | bupLayout->addWidget( mBackupUrl ); | ||
141 | |||
142 | |||
143 | QHBox *dummy = new QHBox(bupFrame); | ||
144 | new QLabel(i18n("Number of Backups:"),dummy); | ||
145 | mBackupNumbersSpin = new QSpinBox(1,21,1,dummy); | ||
146 | new QLabel(i18n(" "),dummy); | ||
147 | bupLayout->addWidget( dummy ); | ||
148 | |||
149 | dummy = new QHBox(bupFrame); | ||
150 | new QLabel(i18n("Make backup every "),dummy); | ||
151 | mBackupDayCountSpin = new QSpinBox(1,28,1,dummy); | ||
152 | new QLabel(i18n(" days"),dummy); | ||
153 | new QLabel(i18n(" "),dummy); | ||
154 | bupLayout->addWidget( dummy ); | ||
155 | |||
156 | } | ||
118 | void KDEPIMConfigWidget::setupStoreTab() | 157 | void KDEPIMConfigWidget::setupStoreTab() |
119 | { | 158 | { |
120 | QVBox *colorPage = new QVBox( this ); | 159 | QVBox *colorPage = new QVBox( this ); |
121 | tabWidget->addTab( colorPage, i18n( "Colors" ) ); | 160 | tabWidget->addTab( colorPage, i18n( "Colors" ) ); |
122 | QWidget* cw = new QWidget( colorPage ); | 161 | QWidget* cw = new QWidget( colorPage ); |
123 | KPrefsWidColor *holidayColor = | 162 | KPrefsWidColor *holidayColor = |
124 | addWidColor(i18n("Alternating background of list views"), | 163 | addWidColor(i18n("Alternating background of list views"), |
125 | &(KPimGlobalPrefs::instance()->mAlternateColor),cw); | 164 | &(KPimGlobalPrefs::instance()->mAlternateColor),cw); |
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h index 984e4e0..c0b92a9 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.h +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h | |||
@@ -74,16 +74,17 @@ class KDEPIMConfigWidget : public KPrefsWidget | |||
74 | void setLocalStore(); | 74 | void setLocalStore(); |
75 | 75 | ||
76 | private: | 76 | private: |
77 | void setupExternalAppTab(); | 77 | void setupExternalAppTab(); |
78 | void setupLocaleDateTab(); | 78 | void setupLocaleDateTab(); |
79 | void setupLocaleTab(); | 79 | void setupLocaleTab(); |
80 | void setupTimeZoneTab(); | 80 | void setupTimeZoneTab(); |
81 | void setupStoreTab(); | 81 | void setupStoreTab(); |
82 | void setupBackupTab(); | ||
82 | KURLRequester* mStoreUrl; | 83 | KURLRequester* mStoreUrl; |
83 | 84 | ||
84 | void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); | 85 | void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); |
85 | 86 | ||
86 | 87 | ||
87 | void saveEditFieldSettings(); | 88 | void saveEditFieldSettings(); |
88 | void updateClientWidgets(); | 89 | void updateClientWidgets(); |
89 | 90 | ||
@@ -147,15 +148,16 @@ class KDEPIMConfigWidget : public KPrefsWidget | |||
147 | QString mPagerOtherMessageParameters; | 148 | QString mPagerOtherMessageParameters; |
148 | 149 | ||
149 | int mSipClient; | 150 | int mSipClient; |
150 | QString mSipOtherChannel; | 151 | QString mSipOtherChannel; |
151 | QString mSipOtherMessage; | 152 | QString mSipOtherMessage; |
152 | QString mSipOtherMessageParameters; | 153 | QString mSipOtherMessageParameters; |
153 | 154 | ||
154 | 155 | ||
155 | 156 | KURLRequester* mBackupUrl; | |
157 | QSpinBox* mBackupDayCountSpin, *mBackupNumbersSpin ; | ||
156 | QMap<ExternalAppHandler::Types, QString> mExternalAppsMap; | 158 | QMap<ExternalAppHandler::Types, QString> mExternalAppsMap; |
157 | 159 | ||
158 | // AddresseeWidget *mAddresseeWidget; | 160 | // AddresseeWidget *mAddresseeWidget; |
159 | }; | 161 | }; |
160 | 162 | ||
161 | #endif | 163 | #endif |
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index 873f0eb..90321b2 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp | |||
@@ -106,16 +106,23 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) | |||
106 | addItemString( "SIPChannelMessage", &mSipOtherMessage, "" ); | 106 | addItemString( "SIPChannelMessage", &mSipOtherMessage, "" ); |
107 | addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" ); | 107 | addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" ); |
108 | 108 | ||
109 | KPrefs::setCurrentGroup( "PhoneAccess" ); | 109 | KPrefs::setCurrentGroup( "PhoneAccess" ); |
110 | addItemString("Ex2PhoneDevice",&mEx2PhoneDevice,"/dev/ircomm"); | 110 | addItemString("Ex2PhoneDevice",&mEx2PhoneDevice,"/dev/ircomm"); |
111 | addItemString("Ex2PhoneConnection",&mEx2PhoneConnection,"irda"); | 111 | addItemString("Ex2PhoneConnection",&mEx2PhoneConnection,"irda"); |
112 | addItemString("Ex2PhoneModel",&mEx2PhoneModel,"6310i"); | 112 | addItemString("Ex2PhoneModel",&mEx2PhoneModel,"6310i"); |
113 | 113 | ||
114 | KPrefs::setCurrentGroup( "BackupSettings" ); | ||
115 | addItemString("BackupDatadir",&mBackupDatadir,KGlobalSettings::backupDataDir()); | ||
116 | addItemInt( "BackupNumbers", &mBackupNumbers, 3 ); | ||
117 | addItemInt( "BackupDayCount", &mBackupDayCount, 2 ); | ||
118 | addItemBool( "BackupUseDefaultDir",&mBackupUseDefaultDir, true ); | ||
119 | addItemBool( "BackupEnabled",&mBackupEnabled, false ); | ||
120 | |||
114 | } | 121 | } |
115 | 122 | ||
116 | void KPimGlobalPrefs::setGlobalConfig() | 123 | void KPimGlobalPrefs::setGlobalConfig() |
117 | { | 124 | { |
118 | if ( mLocaleDict == 0 ) { | 125 | if ( mLocaleDict == 0 ) { |
119 | QString fileName ; | 126 | QString fileName ; |
120 | QString name = KGlobal::getAppName() +"/"; | 127 | QString name = KGlobal::getAppName() +"/"; |
121 | #ifndef DESKTOP_VERSION | 128 | #ifndef DESKTOP_VERSION |
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h index 36cc25a..94ac8ae 100644 --- a/libkdepim/kpimglobalprefs.h +++ b/libkdepim/kpimglobalprefs.h | |||
@@ -135,11 +135,17 @@ class KPimGlobalPrefs : public KPrefs | |||
135 | QString mSipOtherChannel; | 135 | QString mSipOtherChannel; |
136 | QString mSipOtherMessage; | 136 | QString mSipOtherMessage; |
137 | QString mSipOtherMessageParameters; | 137 | QString mSipOtherMessageParameters; |
138 | 138 | ||
139 | QString mEx2PhoneDevice; | 139 | QString mEx2PhoneDevice; |
140 | QString mEx2PhoneConnection; | 140 | QString mEx2PhoneConnection; |
141 | QString mEx2PhoneModel; | 141 | QString mEx2PhoneModel; |
142 | 142 | ||
143 | |||
144 | bool mBackupEnabled; | ||
145 | QString mBackupDatadir; | ||
146 | bool mBackupUseDefaultDir; | ||
147 | int mBackupNumbers; | ||
148 | int mBackupDayCount; | ||
143 | }; | 149 | }; |
144 | 150 | ||
145 | #endif | 151 | #endif |
diff --git a/libkdepim/kprefsdialog.cpp b/libkdepim/kprefsdialog.cpp index dd9a602..b6ae775 100644 --- a/libkdepim/kprefsdialog.cpp +++ b/libkdepim/kprefsdialog.cpp | |||
@@ -275,17 +275,17 @@ QLineEdit *KPrefsDialogWidString::lineEdit() | |||
275 | 275 | ||
276 | KPrefsDialog::KPrefsDialog(KPrefs *prefs,QWidget *parent,char *name,bool modal) : | 276 | KPrefsDialog::KPrefsDialog(KPrefs *prefs,QWidget *parent,char *name,bool modal) : |
277 | KDialogBase(IconList,i18n("Preferences"),Ok|Cancel|Default,Ok,parent, | 277 | KDialogBase(IconList,i18n("Preferences"),Ok|Cancel|Default,Ok,parent, |
278 | name,modal,true) | 278 | name,modal,true) |
279 | { | 279 | { |
280 | mPrefs = prefs; | 280 | mPrefs = prefs; |
281 | 281 | ||
282 | // This seems to cause a crash on exit. Investigate later. | 282 | // This seems to cause a crash on exit. Investigate later. |
283 | // mPrefsWids.setAutoDelete(true); | 283 | mPrefsWids.setAutoDelete(true); |
284 | 284 | ||
285 | connect(this,SIGNAL(defaultClicked()),SLOT(slotDefault())); | 285 | connect(this,SIGNAL(defaultClicked()),SLOT(slotDefault())); |
286 | //connect(this,SIGNAL(cancelClicked()),SLOT(slotDefault())); | 286 | //connect(this,SIGNAL(cancelClicked()),SLOT(slotDefault())); |
287 | //connect(this,SIGNAL(cancelClicked()),SLOT(reject())); | 287 | //connect(this,SIGNAL(cancelClicked()),SLOT(reject())); |
288 | } | 288 | } |
289 | 289 | ||
290 | KPrefsDialog::~KPrefsDialog() | 290 | KPrefsDialog::~KPrefsDialog() |
291 | { | 291 | { |
diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h index ad13b78..efcb86a 100644 --- a/libkdepim/kprefsdialog.h +++ b/libkdepim/kprefsdialog.h | |||
@@ -41,17 +41,17 @@ class QButtonGroup; | |||
41 | /** | 41 | /** |
42 | @short Base class for widgets used by @ref KPrefsDialog. | 42 | @short Base class for widgets used by @ref KPrefsDialog. |
43 | @author Cornelius Schumacher | 43 | @author Cornelius Schumacher |
44 | @see KPrefsDialog | 44 | @see KPrefsDialog |
45 | 45 | ||
46 | This class provides the interface for the preferences widgets used by | 46 | This class provides the interface for the preferences widgets used by |
47 | KPrefsDialog. | 47 | KPrefsDialog. |
48 | */ | 48 | */ |
49 | class KPrefsDialogWid | 49 | class KPrefsDialogWid : public QObject |
50 | { | 50 | { |
51 | public: | 51 | public: |
52 | /** | 52 | /** |
53 | This function is called to read value of the setting from the | 53 | This function is called to read value of the setting from the |
54 | stored configuration and display it in the widget. | 54 | stored configuration and display it in the widget. |
55 | */ | 55 | */ |
56 | virtual void readConfig() = 0; | 56 | virtual void readConfig() = 0; |
57 | /** | 57 | /** |
@@ -131,19 +131,18 @@ class KPrefsDialogWidTime : public KPrefsDialogWid | |||
131 | }; | 131 | }; |
132 | 132 | ||
133 | /** | 133 | /** |
134 | @short Widget for color settings in @ref KPrefsDialog. | 134 | @short Widget for color settings in @ref KPrefsDialog. |
135 | 135 | ||
136 | This class provides a widget for configuring color values. It is meant to be | 136 | This class provides a widget for configuring color values. It is meant to be |
137 | used by KPrefsDialog. The user is responsible for the layout management. | 137 | used by KPrefsDialog. The user is responsible for the layout management. |
138 | */ | 138 | */ |
139 | class KPrefsDialogWidColor : public QObject, public KPrefsDialogWid | 139 | class KPrefsDialogWidColor : public KPrefsDialogWid |
140 | { | 140 | { |
141 | Q_OBJECT | ||
142 | public: | 141 | public: |
143 | /** | 142 | /** |
144 | Create a color widget consisting of a test field and a button for opening | 143 | Create a color widget consisting of a test field and a button for opening |
145 | a color dialog. | 144 | a color dialog. |
146 | 145 | ||
147 | @param text Text of button. | 146 | @param text Text of button. |
148 | @param reference Pointer to variable read and written by this widget. | 147 | @param reference Pointer to variable read and written by this widget. |
149 | @param parent Parent widget. | 148 | @param parent Parent widget. |
@@ -174,17 +173,17 @@ class KPrefsDialogWidColor : public QObject, public KPrefsDialogWid | |||
174 | }; | 173 | }; |
175 | 174 | ||
176 | /** | 175 | /** |
177 | @short Widget for font settings in @ref KPrefsDialog. | 176 | @short Widget for font settings in @ref KPrefsDialog. |
178 | 177 | ||
179 | This class provides a widget for configuring font values. It is meant to be | 178 | This class provides a widget for configuring font values. It is meant to be |
180 | used by KPrefsDialog. The user is responsible for the layout management. | 179 | used by KPrefsDialog. The user is responsible for the layout management. |
181 | */ | 180 | */ |
182 | class KPrefsDialogWidFont : public QObject, public KPrefsDialogWid | 181 | class KPrefsDialogWidFont : public KPrefsDialogWid |
183 | { | 182 | { |
184 | Q_OBJECT | 183 | Q_OBJECT |
185 | public: | 184 | public: |
186 | /** | 185 | /** |
187 | Create a font widget consisting of a test field and a button for opening | 186 | Create a font widget consisting of a test field and a button for opening |
188 | a font dialog. | 187 | a font dialog. |
189 | 188 | ||
190 | @param label Text of label. | 189 | @param label Text of label. |
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp index 5976aae..3f8a630 100644 --- a/microkde/kglobalsettings.cpp +++ b/microkde/kglobalsettings.cpp | |||
@@ -49,16 +49,25 @@ QString KGlobalSettings::timeTrackerDir() | |||
49 | { | 49 | { |
50 | static QString dir; | 50 | static QString dir; |
51 | if ( dir.isEmpty() ) { | 51 | if ( dir.isEmpty() ) { |
52 | dir = locateLocal( "data", "timetrackerdir/d.ttl" ); | 52 | dir = locateLocal( "data", "timetrackerdir/d.ttl" ); |
53 | dir = dir.left ( dir.length() - 5); | 53 | dir = dir.left ( dir.length() - 5); |
54 | } | 54 | } |
55 | return dir; | 55 | return dir; |
56 | } | 56 | } |
57 | QString KGlobalSettings::backupDataDir() | ||
58 | { | ||
59 | static QString dir; | ||
60 | if ( dir.isEmpty() ) { | ||
61 | dir = locateLocal( "data", "backupdir/d.ttl" ); | ||
62 | dir = dir.left ( dir.length() - 5); | ||
63 | } | ||
64 | return dir; | ||
65 | } | ||
57 | 66 | ||
58 | QFont KGlobalSettings::toolBarFont() | 67 | QFont KGlobalSettings::toolBarFont() |
59 | { | 68 | { |
60 | return QApplication::font(); | 69 | return QApplication::font(); |
61 | } | 70 | } |
62 | 71 | ||
63 | QColor KGlobalSettings::toolBarHighlightColor() | 72 | QColor KGlobalSettings::toolBarHighlightColor() |
64 | { | 73 | { |
diff --git a/microkde/kglobalsettings.h b/microkde/kglobalsettings.h index 05ef279..4e4d87c 100644 --- a/microkde/kglobalsettings.h +++ b/microkde/kglobalsettings.h | |||
@@ -16,16 +16,17 @@ class KGlobalSettings | |||
16 | static QFont toolBarFont(); | 16 | static QFont toolBarFont(); |
17 | 17 | ||
18 | static QColor mAlternate; | 18 | static QColor mAlternate; |
19 | static QColor toolBarHighlightColor(); | 19 | static QColor toolBarHighlightColor(); |
20 | static QColor alternateBackgroundColor(); | 20 | static QColor alternateBackgroundColor(); |
21 | static void setAlternateBackgroundColor(QColor); | 21 | static void setAlternateBackgroundColor(QColor); |
22 | static QRect desktopGeometry( QWidget * ); | 22 | static QRect desktopGeometry( QWidget * ); |
23 | static QString timeTrackerDir(); | 23 | static QString timeTrackerDir(); |
24 | static QString backupDataDir(); | ||
24 | 25 | ||
25 | /** | 26 | /** |
26 | * Returns whether KDE runs in single (default) or double click | 27 | * Returns whether KDE runs in single (default) or double click |
27 | * mode. | 28 | * mode. |
28 | * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html | 29 | * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html |
29 | * @return true if single click mode, or false if double click mode. | 30 | * @return true if single click mode, or false if double click mode. |
30 | **/ | 31 | **/ |
31 | static bool singleClick(); | 32 | static bool singleClick(); |