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

List:       kde-commits
Subject:    kdepim/wizards
From:       Daniel Molkentin <molkentin () kde ! org>
Date:       2005-02-02 23:16:53
Message-ID: 20050202231653.194A61BB19 () office ! kde ! org
[Download RAW message or body]

CVS commit by danimo: 

adding exchange wizard skeleton with i18n strings


  A            exchangewizard.cpp   1.1 [GPL (v2+)]
  A            exchangewizard.h   1.1 [GPL (v2+)]
  M +20 -5     Makefile.am   1.37
  M +12 -0     overviewpage.cpp   1.16
  M +1 -0      overviewpage.h   1.5


--- kdepim/wizards/Makefile.am  #1.36:1.37
@@ -6,16 +6,19 @@
            -I$(top_srcdir)/certmanager/lib \
            -I$(top_builddir)/kresources/groupwise \
+           -I$(top_srcdir)/kresources/lib \
            $(all_includes)
 
 bin_PROGRAMS = groupwarewizard egroupwarewizard sloxwizard kolabwizard \
-               groupwisewizard
+               groupwisewizard exchangewizard
 
 kde_module_LTLIBRARIES = libegroupwarewizard.la libsloxwizard.la \
-                         libkolabwizard.la libgroupwisewizard.la
+                         libkolabwizard.la libgroupwisewizard.la \
+                         libexchangewizard.la
 
 
 groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 groupwarewizard_LDADD = libegroupwarewizard.la libsloxwizard.la $(LIB_KDEUI) \
-                        libkolabwizard.la libgroupwisewizard.la
+                        libkolabwizard.la libgroupwisewizard.la \
+                        libexchangewizard.la
 groupwarewizard_SOURCES = groupwarewizard.cpp main.cpp overviewpage.cpp
 
@@ -77,9 +80,21 @@
 groupwisewizard_SOURCES = groupwisemain.cpp
 
+# Exchange
+libexchangewizard_la_LDFLAGS = $(all_libraries) -no-undefined
+libexchangewizard_la_SOURCES = exchangewizard.cpp
+libexchangewizard_la_LIBADD = $(top_builddir)/kresources/newexchange/libkcal_newexchange.la \
+                              $(top_builddir)/kresources/newexchange/libkabc_newexchange.la \
+                              $(top_builddir)/libkdepim/libkdepim.la
+
+exchangewizard_LDADD = libexchangewizard.la
+exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+exchangewizard_SOURCES = exchangemain.cpp
+
+
 noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \
-                 groupwisewizard.h
+                 groupwisewizard.h exchangewizard.h
 
 kde_kcfg_DATA = egroupware.kcfg slox.kcfg kolab.kcfg groupwise.kcfg
 
-messages: rc.cpp
+oessages: rc.cpp
         $(XGETTEXT) *.cpp -o $(podir)/kdepimwizards.pot

--- kdepim/wizards/overviewpage.cpp  #1.15:1.16
@@ -37,4 +37,5 @@
 #include "sloxwizard.h"
 #include "groupwisewizard.h"
+#include "exchangewizard.h"
 
 #include "overviewpage.h"
@@ -79,4 +80,9 @@ OverViewPage::OverViewPage( QWidget *par
   connect( button, SIGNAL( clicked() ), SLOT( showWizardGroupwise() ) );
 
+  button = new QPushButton( i18n("Microsoft Exchange"), this );
+  layout->addMultiCellWidget( button, 6, 6, 0, 3 );
+  connect( button, SIGNAL( clicked() ), SLOT( showWizardExchange() ) );
+
+
   QFrame *frame = new QFrame( this );
   frame->setFrameStyle( QFrame::HLine | QFrame::Sunken );
@@ -121,3 +127,9 @@ void OverViewPage::showWizardGroupwise()
 }
 
+void OverViewPage::showWizardExchange()
+{
+  ExchangeWizard wizard;
+  wizard.exec();
+}
+
 #include "overviewpage.moc"

--- kdepim/wizards/overviewpage.h  #1.4:1.5
@@ -38,4 +38,5 @@ class OverViewPage : public QWidget
     void showWizardSlox();
     void showWizardGroupwise();
+    void showWizardExchange();
 
   signals:


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