* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 60 insertions, 21 deletions

diff --git a/korganizer/korganizer.kcfg b/korganizer/korganizer.kcfg
index eaf23fb34..c299aa75c 100644
--- a/korganizer/korganizer.kcfg
+++ b/korganizer/korganizer.kcfg
@@ -148,10 +148,38 @@
       <whatsthis>Enter default duration for events here. The default is used if you do not supply an end time.</whatsthis>
       <default>QDateTime(QDate(), QTime(2,0))</default>
     </entry>
-    <entry type="Int" key="Default Alarm Time" name="AlarmTime">
-      <label>Default Reminder Time</label>
-      <whatsthis>Enter the reminder time here.</whatsthis>
-      <default>3</default>
+
+    <entry type="Int" key="Default Reminder Time" name="ReminderTime">
+      <label>Default reminder time</label>
+      <whatsthis>Enter the default reminder time for all newly created items. The time unit is specified in the adjacent combobox.</whatsthis>
+      <tooltip>Default time for reminders</tooltip>
+      <default>15</default>
+    </entry>
+    <entry type="Int" key="Default Reminder Time Units" name="ReminderTimeUnits">
+      <whatsthis>Enter the default reminder time units for all newly created items. The time is specified in the adjacent spinbox.</whatsthis>
+      <tooltip>Default time unit for reminders</tooltip>
+      <default>0</default>
+    </entry>
+    <entry type="Bool" key="Enable Default Audio File" name="defaultAudioFileReminders">
+      <label>Enable a default sound file for audio reminders</label>
+      <whatsthis>Check this box if you want to enable the specified file to be used as the default sound file for new reminders. You can always specify another file in the Advanced Reminder accessible from the Event or To-do editors.</whatsthis>
+      <default>false</default>
+    </entry>
+    <entry type="Path" key="Reminder Audio File"  name="audioFilePath">
+      <label>Default audio file</label>
+      <whatsthis>Set a file to be used as the default sound file for new reminders. You can always specify another file in the Advanced Reminder accessible from the Event or To-do editors.</whatsthis>
+    </entry>
+    <entry type="Bool" key="Enable Event Reminders" name="defaultEventReminders">
+      <label>Enable reminders for new Events</label>
+      <whatsthis>Check this box if you want to enable reminders for all newly created Events. You can always turn-off the reminders in the Event editor dialog.</whatsthis>
+      <tooltip>By default, enable reminders for new events</tooltip>
+      <default>false</default>
+    </entry>
+    <entry type="Bool" key="Enable To-do Reminders" name="defaultTodoReminders">
+      <label>Enable reminders for new To-dos</label>
+      <whatsthis>Check this box if you want to enable reminders for all newly created To-dos. You can always turn-off the reminders in the To-do editor dialog.</whatsthis>
+      <tooltip>By default, enable reminders for new to-dos</tooltip>
+      <default>false</default>
     </entry>
   </group>
 
@@ -173,6 +201,11 @@
       <whatsthis>Check this box to show the days containing weekly recurring events in bold typeface in the Date Navigator, or uncheck it to give more prominence to other (non weekly recurring) events.</whatsthis>
       <default>true</default>
     </entry>
+    <entry type="Bool" key="Week Numbers Show Work Week" name="weekNumbersShowWork">
+      <label>Week numbers select a work week when in work week view</label>
+      <whatsthis>Check this box to select a work week when clicking on date navigator's week numbers or uncheck it to chose the whole week.</whatsthis>
+      <default>false</default>
+    </entry>
     <entry type="Bool" key="Enable ToolTips">
       <label>Enable tooltips displaying summary of events</label>
       <whatsthis>Check this box to display an event summary tooltip when hovering the mouse over an event.</whatsthis>
@@ -222,7 +255,7 @@
           <label>Only calendar</label>
         </choice>
       </choices>
-      <default>CategoryInsideResourceOutside</default>
+      <default>ResourceInsideCategoryOutside</default>
     </entry>
 
     <entry type="Enum" name="Agenda View Calendar Display">
@@ -241,8 +274,6 @@
       <default>CalendarsMerged</default>
     </entry>
 
-
-
     <entry type="DateTime" name="DayBegins">
       <label>Day begins at</label>
       <whatsthis>Enter the start time for events here. This time should be the earliest time that you use for events, as it will be displayed at the top.</whatsthis>
@@ -268,16 +299,24 @@
       <default>true</default>
     </entry>
 
-    <entry type="Bool" key="Month View Uses Category Color">
-      <label>Month view uses category colors</label>
-      <whatsthis>Check this box to make the month view use the category colors of an item.</whatsthis>
-      <default>true</default>
-    </entry>
-
-    <entry type="Bool" key="Month View Uses Resource Color">
-      <label>Month view uses resource colors</label>
-      <whatsthis>Check this box to make the month view use the resource colors of an item.</whatsthis>
-      <default>true</default>
+    <entry type="Enum" key="MonthItemColors">
+      <label>Colors used in month view</label>
+      <whatsthis>Choose the colors of the month view items.</whatsthis>
+      <choices>
+        <choice name="MonthItemCategoryInsideResourceOutside">
+          <label>Category inside, calendar outside</label>
+        </choice>
+        <choice name="MonthItemResourceInsideCategoryOutside">
+          <label>Calendar inside, category outside</label>
+        </choice>
+        <choice name="MonthItemCategoryOnly">
+          <label>Only category</label>
+        </choice>
+        <choice name="MonthItemResourceOnly">
+          <label>Only calendar</label>
+        </choice>
+      </choices>
+      <default>MonthItemResourceInsideCategoryOutside</default>
     </entry>
 
     <entry type="Bool" key="Full View Month">
@@ -391,9 +430,9 @@
       <whatsthis>Select the to-do overdue color here.</whatsthis>
       <default>255, 100, 100</default>
     </entry>
-    <entry type="Color" key="EventColor">
-      <label>Default event color</label>
-      <whatsthis>Select the default event color here. The default event color will be used for events categories in your agenda. Note that you can specify a separate color for each event category below.</whatsthis>
+    <entry type="Color" key="Unset Category Color">
+      <label>"No category" color (for "Only category" drawing schemes)</label>
+      <whatsthis>Select a color to use for the "no category" or "unset category" situation, when an item does not belong to any category. This color is used when drawing items in the agenda or month views using the "Only category" scheme.</whatsthis>
       <default>151, 235, 121</default>
     </entry>
 
@@ -465,7 +504,7 @@
     <entry type="Bool" name="FreeBusyCheckHostname">
       <label>Check whether hostname and retrieval email address match</label>
       <whatsthis>With this setting you can configure whether the domain part of the free/busy url has to match the domain part of the user id you are looking for. For example if this option is 'true' then looking for the free/busy data of joe@mydomain.com on the server www.yourdomain.com won't work.</whatsthis>
-      <default>true</default>
+      <default>false</default>
     </entry>
 
     <entry type="Bool" name="FreeBusyFullDomainRetrieval">