[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/korganizer
From:       Andras Mantia <amantia () kde ! org>
Date:       2010-10-12 17:41:00
Message-ID: 20101012174100.79212AC894 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1185236 by amantia:

Use archivedialog and eventarchiver from calendarsupport

 M  +0 -2      CMakeLists.txt  
 M  +4 -4      actionmanager.cpp  
 D             archivedialog.cpp  
 D             archivedialog.h  
 D             eventarchiver.cpp  
 D             eventarchiver.h  
 M  +2 -2      kodialogmanager.cpp  
 M  +5 -2      kodialogmanager.h  
 M  +0 -58     korganizer.kcfg  


--- trunk/KDE/kdepim/korganizer/CMakeLists.txt #1185235:1185236
@@ -168,7 +168,6 @@
     calendarview.cpp
     koviewmanager.cpp
     kodialogmanager.cpp
-    archivedialog.cpp
     kowindowlist.cpp
     koeventpopupmenu.cpp
     publishdialog.cpp
@@ -184,7 +183,6 @@
     aboutdata.cpp
     importdialog.cpp
     korganizerifaceimpl.cpp
-    eventarchiver.cpp
     exportwebdialog.cpp
     kocorehelper.cpp
     kohelper.cpp
--- trunk/KDE/kdepim/korganizer/actionmanager.cpp #1185235:1185236
@@ -30,7 +30,6 @@
 #include "actionmanager.h"
 #include "calendaradaptor.h"
 #include "calendarview.h"
-#include "eventarchiver.h"
 #include "history.h"
 #include "importdialog.h"
 #include "kocore.h"
@@ -54,6 +53,7 @@
 #include <calendarsupport/calendarmodel.h>
 #include <calendarsupport/collectionselection.h>
 #include <calendarsupport/entitymodelstatesaver.h>
+#include <calendarsupport/eventarchiver.h>
 #include <calendarsupport/freebusymanager.h>
 #include <calendarsupport/groupware.h>
 #include <calendarsupport/incidencechanger.h>
@@ -211,7 +211,7 @@
   connect( mAutoArchiveTimer, SIGNAL(timeout()), SLOT(slotAutoArchive()) );
 
   // First auto-archive should be in 5 minutes (like in kmail).
-  if ( KOPrefs::instance()->mAutoArchive ) {
+  if ( CalendarSupport::KCalPrefs::instance()->mAutoArchive ) {
     mAutoArchiveTimer->start( 5 * 60 * 1000 ); // singleshot
   }
 
@@ -2031,7 +2031,7 @@
 
 void ActionManager::slotAutoArchivingSettingsModified()
 {
-  if ( KOPrefs::instance()->mAutoArchive ) {
+  if ( CalendarSupport::KCalPrefs::instance()->mAutoArchive ) {
     mAutoArchiveTimer->start( 4 * 60 * 60 * 1000 ); // check again in 4 hours
   } else {
     mAutoArchiveTimer->stop();
@@ -2045,7 +2045,7 @@
   }
 
   mAutoArchiveTimer->stop();
-  EventArchiver archiver;
+  CalendarSupport::EventArchiver archiver;
   connect( &archiver, SIGNAL(eventsDeleted()), mCalendarView, SLOT(updateView()) ); \
//AKONADI_PORT this signal shouldn't be needed anymore?  //AKONADI_PORT avoid this \
local incidence changer copy...  CalendarSupport::IncidenceChanger changer( \
                mCalendar, 0, Akonadi::Collection().id() );
--- trunk/KDE/kdepim/korganizer/kodialogmanager.cpp #1185235:1185236
@@ -25,7 +25,7 @@
 
 #include "kodialogmanager.h"
 #ifndef KORG_NOARCHIVE
-#include "archivedialog.h"
+#include <calendarsupport/archivedialog.h>
 #endif
 #include "calendarview.h"
 #include "categoryeditdialog.h"
@@ -145,7 +145,7 @@
 {
 #ifndef KORG_NOARCHIVE
   if ( !mArchiveDialog ) {
-    mArchiveDialog = new ArchiveDialog( mMainView->calendar(), \
mMainView->incidenceChanger() ); +    mArchiveDialog = new \
CalendarSupport::ArchiveDialog( mMainView->calendar(), mMainView->incidenceChanger() \
);  connect( mArchiveDialog, SIGNAL(eventsDeleted()),
              mMainView, SLOT(updateView()) );
     connect( mArchiveDialog, SIGNAL(autoArchivingSettingsModified()),
--- trunk/KDE/kdepim/korganizer/kodialogmanager.h #1185235:1185236
@@ -30,7 +30,6 @@
 #include <QList>
 #include <QPointer>
 
-class ArchiveDialog;
 class CalendarView;
 class CategoryEditDialog;
 class FilterEditDialog;
@@ -49,6 +48,10 @@
   class CalFilter;
 }
 
+namespace CalendarSupport {
+  class ArchiveDialog;
+}
+
 /**
   This class manages the dialogs used by the calendar view. It owns the objects
   and handles creation and selection.
@@ -86,7 +89,7 @@
     KCMultiDialog *mOptionsDialog;
     QPointer<CategoryEditDialog> mCategoryEditDialog;
     SearchDialog *mSearchDialog;
-    ArchiveDialog *mArchiveDialog;
+    CalendarSupport::ArchiveDialog *mArchiveDialog;
     FilterEditDialog *mFilterEditDialog;
 };
 
--- trunk/KDE/kdepim/korganizer/korganizer.kcfg #1185235:1185236
@@ -438,64 +438,6 @@
 
 <!-- Custom Pages Page -->
 
-
-
-<!-- ARCHIVE DIALOG -->
-  <group name="Archive Dialog">
-    <entry type="Bool" key="Auto Archive">
-      <label>Regularly archive events</label>
-      <default>false</default>
-    </entry>
-
-    <entry type="Int" key="Expiry Time">
-      <label>If auto-archiving is enabled, events older than this amount will be \
                archived. The unit of this value is specified in another \
                field.</label>
-      <default>1</default>
-    </entry>
-
-    <entry type="Enum" key="Expiry Unit" name="ExpiryUnit">
-      <label>The unit in which the expiry time is expressed.</label>
-      <choices>
-        <choice name="UnitDays">
-          <label>In days</label>
-        </choice>
-        <choice name="UnitWeeks">
-          <label>In weeks</label>
-        </choice>
-        <choice name="UnitMonths">
-          <label>In months</label>
-        </choice>
-      </choices>
-      <default>UnitMonths</default>
-    </entry>
-
-    <entry type="String" key="Archive File">
-      <label>URL of the file where old events should be archived</label>
-    </entry>
-
-    <entry type="Bool" key="Archive Events">
-      <label>Archive events</label>
-      <default>true</default>
-    </entry>
-
-    <entry type="Bool" key="Archive Todos">
-      <label>Archive to-dos</label>
-      <default>true</default>
-    </entry>
-
-    <entry type="Enum" key="Archive Action">
-      <label>What to do when archiving</label>
-      <choices>
-        <choice name="actionDelete">
-          <label>Delete old events</label>
-        </choice>
-        <choice name="actionArchive">
-          <label>Archive old events to a separate file</label>
-        </choice>
-      </choices>
-      <default>actionArchive</default>
-    </entry>
-  </group>
-
 <!-- Options currently not visible in the GUI -->
   <group name="Hidden Options">
    <entry type="Bool" key="Quick Todo" name="EnableQuickTodo">


[prev in list] [next in list] [prev in thread] [next in thread]