Name the runtime part of kdepim actually "runtime", and move stuff out

of it that belongs in the apps part.

svn path=/branches/work/akonadi-ports/kdepim/runtime/; revision=1061292

akonadi/CMakeLists.txt → CMakeLists.txt

@@ -97,19 +97,15 @@ endmacro( akonadi_add_resourcetest )
 add_subdirectory(libkdepim-copy)
 add_subdirectory(xml)
 add_subdirectory(resourcetester)
-add_subdirectory(clients)
 add_subdirectory(resources)
 add_subdirectory(agents)
 add_subdirectory(kioslave)
 add_subdirectory(plugins)
-add_subdirectory(kcal)
 add_subdirectory(kcm)
 add_subdirectory(tray)
 add_subdirectory(migration)
 add_subdirectory(defaultsetup)
-add_subdirectory(akonadi_next)
 add_subdirectory(kresources)
-add_subdirectory(akonadiconsole)
 add_subdirectory(accountwizard)
 
 #if(OPENSYNC_FOUND)

accountwizard/CMakeLists.txt

+set(accountwizard_srcs
+  main.cpp
+  dialog.cpp
+  typepage.cpp
+  loadpage.cpp
+  global.cpp
+  page.cpp
+  dynamicpage.cpp
+  setupmanager.cpp
+  setuppage.cpp
+  resource.cpp
+  setupobject.cpp
+  transport.cpp
+)
+
+kde4_add_ui_files(accountwizard_srcs
+  typepage.ui
+  loadpage.ui
+  setuppage.ui
+)
+kde4_add_executable(accountwizard ${accountwizard_srcs})
+
+target_link_libraries(accountwizard
+  ${KDEPIMLIBS_AKONADI_LIBS}
+  ${KDEPIMLIBS_MAILTRANSPORT_LIBS}
+  ${KDE4_KROSSCORE_LIBS}
+  ${KDE4_KROSSUI_LIBS}
+  ${KDE4_KDECORE_LIBS}
+  ${QT_QTGUI_LIBRARY}
+  ${QT_QTUITOOLS_LIBRARY}
+)
+
+install(TARGETS accountwizard ${INSTALL_TARGETS_DEFAULT_ARGS})
+

accountwizard/Messages.sh

+#!/bin/sh
+$XGETTEXT *.cpp *.h -o $podir/accountwizard.pot

accountwizard/TODO

+- figure out i18n for the actual wizards (DONE)
+- GHNS support for downloading new wizards
+- add support for creating LDAP accounts
+- add support for creating identities
+- remember which set up resources/transports/ldap accounts/identities belong together so we can offer to remove them in one go again
+- add more wizards (In progress)
+- implement type filtering, for integration into applications (DONE)

accountwizard/dialog.cpp

+/*
+    Copyright (c) 2009 Volker Krause <vkrause@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "dialog.h"
+#include "typepage.h"
+#include "loadpage.h"
+#include "global.h"
+#include "dynamicpage.h"
+#include "setupmanager.h"
+
+#include <klocalizedstring.h>
+#include <kross/core/action.h>
+#include <kdebug.h>
+#include "setuppage.h"
+
+Dialog::Dialog(QWidget* parent) :
+  KAssistantDialog( parent )
+{
+  SetupManager *setupManager = new SetupManager( this );
+  Kross::Action* action = new Kross::Action( this, "AccountWizard" );
+  action->addQObject( this, QLatin1String( "Dialog" ) );
+  action->addQObject( setupManager, QLatin1String( "SetupManager" ) );
+
+  if ( Global::assistant().isEmpty() ) {
+    TypePage *page = new TypePage( this );
+    connect( page->treeview(), SIGNAL(doubleClicked(QModelIndex)), SLOT(slotNextPage()) );
+    addPage( page, i18n( "Select Account Type" ) );
+  }
+
+  LoadPage *loadPage = new LoadPage( this );
+  loadPage->setAction( action );
+  addPage( loadPage, i18n( "Loading Assistant" ) );
+
+  SetupPage *setupPage = new SetupPage( this );
+  mLastPage = addPage( setupPage, i18n( "Setting up Account" )  );
+  setupManager->setSetupPage( setupPage );
+
+  Page *page = qobject_cast<Page*>( currentPage()->widget() );
+  page->enterPageNext();
+  emit page->pageEnteredNext();
+}
+
+
+KPageWidgetItem* Dialog::addPage(Page* page, const QString &title)
+{
+  KPageWidgetItem *item = KAssistantDialog::addPage( page, title );
+  page->setPageWidgetItem( item );
+  return item;
+}
+
+void Dialog::slotNextPage()
+{
+  next();
+}
+
+void Dialog::next()
+{
+  Page *page = qobject_cast<Page*>( currentPage()->widget() );
+  page->leavePageNext();
+  emit page->pageLeftNext();
+  KAssistantDialog::next();
+  page = qobject_cast<Page*>( currentPage()->widget() );
+  page->enterPageNext();
+  emit page->pageEnteredNext();
+}
+
+
+void Dialog::back()
+{
+  Page *page = qobject_cast<Page*>( currentPage()->widget() );
+  page->leavePageBack();
+  emit page->pageLeftBack();
+  KAssistantDialog::back();
+  page = qobject_cast<Page*>( currentPage()->widget() );
+  page->enterPageBack();
+  emit page->pageEnteredBack();
+}
+
+QObject* Dialog::addPage(const QString& uiFile, const QString &title )
+{
+  kDebug() << uiFile;
+  DynamicPage *page = new DynamicPage( Global::assistantBasePath() + uiFile, this );
+  KPageWidgetItem* item = insertPage( mLastPage, page, title );
+  page->setPageWidgetItem( item );
+  return page;
+}
+
+#include "dialog.moc"

accountwizard/dialog.h

+/*
+    Copyright (c) 2009 Volker Krause <vkrause@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef DIALOG_H
+#define DIALOG_H
+
+#include <kassistantdialog.h>
+
+class Page;
+
+class Dialog : public KAssistantDialog
+{
+  Q_OBJECT
+  public:
+    explicit Dialog( QWidget *parent = 0 );
+
+    /* reimpl */ void next();
+    /* reimpl */ void back();
+
+  public slots:
+    Q_SCRIPTABLE QObject* addPage( const QString &uiFile, const QString &title );
+  private slots:
+    void slotNextPage();
+  private:
+    KPageWidgetItem* addPage( Page* page, const QString &title );
+
+  private:
+    KPageWidgetItem* mLastPage;
+};
+
+#endif

accountwizard/dynamicpage.cpp

+/*
+    Copyright (c) 2009 Volker Krause <vkrause@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "dynamicpage.h"
+
+#include <KDebug>