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

List:       kde-commits
Subject:    koffice/filters/karbon
From:       Tim Beaulen <tbscope () gmail ! com>
Date:       2008-05-17 13:32:16
Message-ID: 1211031136.361630.25721.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 808760 by beaulen:

Make the eps import filter work again.
The export filter is commented out in the CMakeLists.txt

The problem I'm now facing is: Karbon doesn't seem to recognise the filter.
I checked everything already, I didn't forget kbuildsycoca4, but as far as I can see \
there's nothing wrong.



 M  +1 -1      CMakeLists.txt  
 M  +9 -6      eps/CMakeLists.txt  
 M  +11 -20    eps/epsimport.cc  
 M  +0 -6      eps/epsimport.h  
 M  +1 -1      eps/karbon_eps_import.desktop  


--- trunk/koffice/filters/karbon/CMakeLists.txt #808759:808760
@@ -29,10 +29,10 @@
 endif (LIBWPD AND LIBWPG_FOUND)
 add_subdirectory( wmf )
 add_subdirectory( karbon1.x )
+add_subdirectory( eps )
 
 # enable again when these filters are ported
 if(FALSE)
-add_subdirectory( eps )
 add_subdirectory( ai )
 add_subdirectory( kontour )
 add_subdirectory( xcf )
--- trunk/koffice/filters/karbon/eps/CMakeLists.txt #808759:808760
@@ -2,15 +2,15 @@
 
 ########### next target ###############
 
-set(karbonepsexport_PART_SRCS epsexport.cc epsexportdlg.cc )
+#set(karbonepsexport_PART_SRCS epsexport.cc epsexportdlg.cc )
 
-kde4_add_plugin(karbonepsexport WITH_PREFIX ${karbonepsexport_PART_SRCS})
+#kde4_add_plugin(karbonepsexport WITH_PREFIX ${karbonepsexport_PART_SRCS})
 
 
 
-target_link_libraries(karbonepsexport  ${KDE4_KDECORE_LIBS} koguiutils karboncommon \
) +#target_link_libraries(karbonepsexport  ${KDE4_KDECORE_LIBS} koguiutils \
karboncommon )  
-install(TARGETS karbonepsexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+#install(TARGETS karbonepsexport  DESTINATION ${PLUGIN_INSTALL_DIR})
 
 
 ########### next target ###############
@@ -28,9 +28,12 @@
 
 ########### install files ###############
 
-install(FILES  karbon_eps_export.desktop  
+install(
+FILES  
+#karbon_eps_export.desktop  
 	karbon_eps_import.desktop
-  	karbon_ps_import.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+#  	karbon_ps_import.desktop
+DESTINATION ${SERVICES_INSTALL_DIR})
 
 
 
--- trunk/koffice/filters/karbon/eps/epsimport.cc #808759:808760
@@ -26,45 +26,36 @@
 #include <KoFilterChain.h>
 #include <krun.h>
 #include <kprocess.h>
+#include <kshell.h>
 
 #include <kdebug.h>
 
 #include "epsimport.h"
 #include "pscommentlexer.h"
 
-class EpsImportFactory : KGenericFactory<EpsImport>
-{
-public:
-	EpsImportFactory( void )
-		: KGenericFactory<EpsImport>( "karbonepsimport" )
-	{}
+typedef KGenericFactory<EpsImport> EpsImportFactory;
+K_EXPORT_COMPONENT_FACTORY( libkarbonepsimport, EpsImportFactory( "kofficefilters" ) \
)  
-protected:
-	virtual void setupTranslations( void )
-	{
-		KGlobal::locale()->insertCatalog( "kofficefilters" );
-	}
-};
-
-K_EXPORT_COMPONENT_FACTORY( libkarbonepsimport, EpsImportFactory() )
-
 EpsImport::EpsImport( QObject*parent, const QStringList& )
 	: KoFilter(parent)
 {
+    kDebug() << "###   ###   EPS Import Filter" << endl;
 }
 
 EpsImport::~EpsImport()
 {
 }
 
-KoFilter::ConversionStatus
-EpsImport::convert( const QByteArray& from, const QByteArray& to )
+KoFilter::ConversionStatus EpsImport::convert( const QByteArray& from, const \
QByteArray& to )  {
 	if(
 		to != "application/illustrator" ||
 		(
 			from != "image/x-eps" &&
-			from != "application/postscript" ) )
+			from != "image/eps" &&
+			from != "application/eps" &&
+			from != "application/x-eps" &&
+			from != "application/postscript" ) ) 
 	{
 		return KoFilter::NotImplemented;
 	}
@@ -98,11 +89,11 @@
 	// Build ghostscript call to convert ps/eps -> ai:
 	QString command(
 		"gs -q -P- -dBATCH -dNOPAUSE -dSAFER -dPARANOIDSAFER -dNODISPLAY ps2ai.ps ");
-	command += KProcess::quote(input);
+	command += KShell::quoteArg(input);
 	command += " | ";
 	command += sedFilter;
 	command += " > ";
-	command += KProcess::quote(m_chain->outputFile());
+	command += KShell::quoteArg(m_chain->outputFile());
 
 	qDebug ("command to execute is (%s)", QFile::encodeName(command).data());
 
--- trunk/koffice/filters/karbon/eps/epsimport.h #808759:808760
@@ -21,15 +21,9 @@
 #define __EPSIMPORT_H__
 
 #include <QObject>
-//Added by qt3to4:
-#include <QTextStream>
-#include <Q3CString>
 
 #include <KoFilter.h>
 
-class QDomElement;
-class QTextStream;
-
 class EpsImport : public KoFilter
 {
 	Q_OBJECT
--- trunk/koffice/filters/karbon/eps/karbon_eps_import.desktop #808759:808760
@@ -57,7 +57,7 @@
 Name[zh_CN]=Karbon14 EPS 导入过滤器
 Name[zh_TW]=Karbon14 EPS 匯出過濾程式
 X-KDE-Export=application/illustrator
-X-KDE-Import=image/x-eps
+X-KDE-Import=image/x-eps,image/eps,application/eps,application/x-eps,application/postscript
  X-KDE-Weight=1
 X-KDE-Library=libkarbonepsimport
 X-KDE-ServiceTypes=KOfficeFilter


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