From kde-commits  Tue Jan 29 09:41:13 2008
From: Kevin Ottens <ervin () kde ! org>
Date: Tue, 29 Jan 2008 09:41:13 +0000
To: kde-commits
Subject: branches/kdepim/enterprise/kdepim/kresources
Message-Id: <1201599673.059120.26594.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=120159968522893

SVN commit 768070 by ervin:

kolab/issue2036 Don't allow to cancel ongoing operation when selecting
in which calendar folder we add the item.


 M  +2 -2      kolab/shared/Makefile.am  
 M  +4 -2      kolab/shared/resourcekolabbase.cpp  
 M  +1 -1      lib/Makefile.am  
 A             lib/folderselectdialog.cpp   [License: LGPL (v2+)]
 A             lib/folderselectdialog.h   [License: LGPL (v2+)]
 M  +2 -2      scalix/shared/Makefile.am  
 M  +6 -4      scalix/shared/resourcescalixbase.cpp  


--- branches/kdepim/enterprise/kdepim/kresources/kolab/shared/Makefile.am #768069:768070
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/lib $(all_includes)
 
 noinst_HEADERS = resourcekolabbase.h kolabbase.h subresource.h
 
@@ -9,7 +9,7 @@
         subresource.cpp \
 	kmailconnection.skel kmailicalIface.stub
 libresourcekolabshared_la_METASOURCES = AUTO
-libresourcekolabshared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la
+libresourcekolabshared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la ../../lib/libkgroupwarebase.la
 libresourcekolabshared_la_LDFLAGS = -no-undefined
 
 kmailicalIface_DCOPIDLNG = true
--- branches/kdepim/enterprise/kdepim/kresources/kolab/shared/resourcekolabbase.cpp #768069:768070
@@ -34,6 +34,8 @@
 #include "resourcekolabbase.h"
 #include "kmailconnection.h"
 
+#include <folderselectdialog.h>
+
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kinputdialog.h>
@@ -238,8 +240,8 @@
           "Please select the one you want to write to." );
 
   // Several found, ask the user
-  QString chosenLabel = KInputDialog::getItem( i18n( "Select Resource Folder" ),
-                                               t, possible.keys() );
+  QString chosenLabel = KPIM::FolderSelectDialog::getItem( i18n( "Select Resource Folder" ),
+                                                           t, possible.keys() );
   if ( chosenLabel.isEmpty() ) // cancelled
     return QString::null;
   return possible[chosenLabel];
--- branches/kdepim/enterprise/kdepim/kresources/lib/Makefile.am #768069:768070
@@ -5,7 +5,7 @@
 
 lib_LTLIBRARIES = libkgroupwarebase.la libkgroupwaredav.la
 
-libkgroupwarebase_la_SOURCES = folderlister.cpp folderconfig.cpp folderlistview.cpp \
+libkgroupwarebase_la_SOURCES = folderlister.cpp folderconfig.cpp folderlistview.cpp folderselectdialog.cpp \
   groupwaredataadaptor.cpp groupwaredownloadjob.cpp \
   calendaradaptor.cpp addressbookadaptor.cpp groupwareresourcejob.cpp \
   groupwareuploadjob.cpp kcal_resourcegroupwarebase.cpp kabc_resourcegroupwarebase.cpp \
--- branches/kdepim/enterprise/kdepim/kresources/scalix/shared/Makefile.am #768069:768070
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/lib $(all_includes)
 
 noinst_HEADERS = resourcescalixbase.h scalixbase.h subresource.h
 
@@ -9,7 +9,7 @@
   subresource.cpp \
 	kmailconnection.skel kmailicalIface.stub
 libresourcescalixshared_la_METASOURCES = AUTO
-libresourcescalixshared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la
+libresourcescalixshared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la ../../lib/libkgroupwaredav.la
 libresourcescalixshared_la_LDFLAGS = -no-undefined
 
 kmailicalIface_DCOPIDLNG = true
--- branches/kdepim/enterprise/kdepim/kresources/scalix/shared/resourcescalixbase.cpp #768069:768070
@@ -33,6 +33,8 @@
 #include "resourcescalixbase.h"
 #include "kmailconnection.h"
 
+#include <folderselectdialog.h>
+
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kinputdialog.h>
@@ -160,10 +162,10 @@
     return possible.begin().data(); // yes this is the subresource key, i.e. location
 
   // Several found, ask the user
-  QString chosenLabel = KInputDialog::getItem( i18n( "Select Resource Folder" ),
-                                               i18n( "You have more than one writable resource folder. "
-                                                     "Please select the one you want to write to." ),
-                                               possible.keys() );
+  QString chosenLabel = KPIM::FolderSelectDialog::getItem( i18n( "Select Resource Folder" ),
+                                                           i18n( "You have more than one writable resource folder. "
+                                                                 "Please select the one you want to write to." ),
+                                                           possible.keys() );
   if ( chosenLabel.isEmpty() ) // cancelled
     return QString::null;
   return possible[chosenLabel];