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

List:       kde-commits
Subject:    KDE/kdepim/wizards
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-03-18 17:40:14
Message-ID: 20100318174014.941CDAC855 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1104827 by tokoe:

slox wizard is not needed without kresource based slox resource :)


 M  +2 -29     CMakeLists.txt  
 M  +1 -12     overviewpage.cpp  
 M  +0 -1      overviewpage.h  
 D             slox.kcfg  
 D             sloxconfig.kcfgc  
 D             sloxmain.cpp  
 D             sloxwizard.cpp  
 D             sloxwizard.h  


--- trunk/KDE/kdepim/wizards/CMakeLists.txt #1104826:1104827
@@ -17,11 +17,10 @@
 
   set(groupwarewizard_SRCS ${libknotesresources_SRCS} groupwarewizard.cpp \
groupwaremain.cpp overviewpage.cpp  groupwisewizard.cpp
-      sloxwizard.cpp
       kmailchanges.cpp
   )
 
-  kde4_add_kcfg_files(groupwarewizard_SRCS groupwiseconfig.kcfgc sloxconfig.kcfgc)
+  kde4_add_kcfg_files(groupwarewizard_SRCS groupwiseconfig.kcfgc)
 
   # todo: more appropriate icon?
   kde4_add_app_icon(groupwarewizard_SRCS \
"${KDE4_ICON_DIR}/oxygen/*/actions/tools-wizard.png") @@ -37,10 +36,8 @@
                         ${KDEPIMLIBS_KPIMUTILS_LIBS}
                         kabc
                         kabcgroupwise
-                        kabc_slox
                         kcal
                         kcalgroupwise
-                        kcal_slox
                         kresources
                         wizardprivate)
 
@@ -72,30 +69,6 @@
 
   install(TARGETS groupwisewizard  ${INSTALL_TARGETS_DEFAULT_ARGS})
 
-
-  ########### next target ###############
-
-  set(sloxwizard_SRCS ${libknotesresources_SRCS} sloxwizard.cpp sloxmain.cpp)
-
-  kde4_add_kcfg_files(sloxwizard_SRCS sloxconfig.kcfgc)
-
-  # todo: more appropriate icon?
-  kde4_add_app_icon(sloxwizard_SRCS \
                "${KDE4_ICON_DIR}/oxygen/*/actions/tools-wizard.png")
-
-  kde4_add_executable(sloxwizard ${sloxwizard_SRCS})
-
-  target_link_libraries(sloxwizard
-                        ${QT_QTXML_LIBRARY}
-                        ${KDE4_KDECORE_LIBS}
-                        ${KDE4_KIO_LIBS}
-                        ${KDEPIMLIBS_KABC_LIBS}
-                        ${KDEPIMLIBS_KCAL_LIBS}
-                        kabc_slox
-                        kcal_slox
-                        wizardprivate)
-
-  install(TARGETS sloxwizard  ${INSTALL_TARGETS_DEFAULT_ARGS})
-
 endif(KDEPIM_BUILD_EVERYTHING)
 
 
@@ -103,5 +76,5 @@
 
 if(KDEPIM_BUILD_EVERYTHING)
   install(FILES groupwarewizard.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
-  install(FILES slox.kcfg groupwise.kcfg DESTINATION ${KCFG_INSTALL_DIR})
+  install(FILES groupwise.kcfg DESTINATION ${KCFG_INSTALL_DIR})
 endif(KDEPIM_BUILD_EVERYTHING)
--- trunk/KDE/kdepim/wizards/overviewpage.cpp #1104826:1104827
@@ -20,7 +20,6 @@
 */
 
 #include "overviewpage.h"
-#include "sloxwizard.h"
 #include "groupwisewizard.h"
 
 #include <kacceleratormanager.h>
@@ -64,11 +63,7 @@
   layout->addWidget( button, 4, 0, 1, 4 );
   connect( button, SIGNAL( clicked() ), SLOT( showWizardKolab() ) );*/
 
-  QPushButton *button = new QPushButton( i18n("SUSE Linux Openexchange (SLOX)"), \
                this );
-  layout->addWidget( button, 5, 0, 1, 4 );
-  connect( button, SIGNAL( clicked() ), SLOT( showWizardSlox() ) );
-
-  button = new QPushButton( i18n("Novell GroupWise"), this );
+  QPushButton *button = new QPushButton( i18n("Novell GroupWise"), this );
   layout->addWidget( button, 6, 0, 1, 4 );
   connect( button, SIGNAL( clicked() ), SLOT( showWizardGroupwise() ) );
 
@@ -97,12 +92,6 @@
   wizard.exec();*/
 }
 
-void OverViewPage::showWizardSlox()
-{
-  SloxWizard wizard;
-  wizard.exec();
-}
-
 void OverViewPage::showWizardGroupwise()
 {
   GroupwiseWizard wizard;
--- trunk/KDE/kdepim/wizards/overviewpage.h #1104826:1104827
@@ -34,7 +34,6 @@
 
   private slots:
     void showWizardKolab();
-    void showWizardSlox();
     void showWizardGroupwise();
 
   signals:


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