r20448 by fschmid -

scribus-commit scribus-commit at lists.scribus.net
Fri Oct 9 18:33:04 UTC 2015 

Author: fschmid
Date: Fri Oct  9 18:33:03 2015
New Revision: 20448

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20448
Log:
Added an RTF importer for Textframes.

Added:
    trunk/Scribus/scribus/plugins/gettext/rtfim/
    trunk/Scribus/scribus/plugins/gettext/rtfim/CMakeLists.txt   (with props)
    trunk/Scribus/scribus/plugins/gettext/rtfim/rtfim.cpp   (with props)
    trunk/Scribus/scribus/plugins/gettext/rtfim/rtfim.h   (with props)
    trunk/Scribus/scribus/third_party/rtf-qt/
    trunk/Scribus/scribus/third_party/rtf-qt/AbstractRtfOutput.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/AbstractRtfOutput.h
    trunk/Scribus/scribus/third_party/rtf-qt/AuthorPcdataDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/AuthorPcdataDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt
    trunk/Scribus/scribus/third_party/rtf-qt/CategoryPcdataDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/CategoryPcdataDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/ColorTableDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/ColorTableDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/CommentPcdataDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/CommentPcdataDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/CompanyPcdataDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/CompanyPcdataDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/Destination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/Destination.h
    trunk/Scribus/scribus/third_party/rtf-qt/DocumentCommentPcdataDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/DocumentCommentPcdataDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/DocumentDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/DocumentDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/FontTableDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/FontTableDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/FontTableEntry.h
    trunk/Scribus/scribus/third_party/rtf-qt/GeneratorPcdataDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/GeneratorPcdataDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/HLinkBasePcdataDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/HLinkBasePcdataDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/IgnoredDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/IgnoredDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/InfoCreatedTimeDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/InfoCreatedTimeDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/InfoDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/InfoDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/InfoPrintedTimeDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/InfoPrintedTimeDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/InfoRevisedTimeDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/InfoRevisedTimeDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/InfoTimeDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/InfoTimeDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/KeywordsPcdataDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/KeywordsPcdataDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/ManagerPcdataDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/ManagerPcdataDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/OperatorPcdataDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/OperatorPcdataDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/PcdataDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/PcdataDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/PictDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/PictDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/RtfGroupState.h
    trunk/Scribus/scribus/third_party/rtf-qt/StyleSheetDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/StyleSheetDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/StyleSheetTableEntry.h
    trunk/Scribus/scribus/third_party/rtf-qt/SubjectPcdataDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/SubjectPcdataDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/TitlePcdataDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/TitlePcdataDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/Token.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/Token.h
    trunk/Scribus/scribus/third_party/rtf-qt/Tokenizer.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/Tokenizer.h
    trunk/Scribus/scribus/third_party/rtf-qt/UserPropsDestination.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/UserPropsDestination.h
    trunk/Scribus/scribus/third_party/rtf-qt/controlword.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/controlword.h
    trunk/Scribus/scribus/third_party/rtf-qt/rtfreader.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/rtfreader.h
    trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.cpp
    trunk/Scribus/scribus/third_party/rtf-qt/sladocumentrtfoutput.h
Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/third_party/CMakeLists.txt

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20448&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Fri Oct  9 18:33:03 2015
@@ -1045,6 +1045,7 @@
 	${CMAKE_CURRENT_BINARY_DIR}/text
 	${CMAKE_CURRENT_BINARY_DIR}/third_party/wpg
 	${CMAKE_CURRENT_BINARY_DIR}/third_party/pgf
+	${CMAKE_CURRENT_BINARY_DIR}/third_party/rtf-qt
 	${CMAKE_CURRENT_BINARY_DIR}/third_party/zip
 )
 
@@ -1079,6 +1080,7 @@
 SET(SCRIBUS_WPG_LIB "scribus_wpg_lib")
 SET(SCRIBUS_PGF_LIB "scribus_pgf_lib")
 SET(SCRIBUS_ZIP_LIB "scribus_zip_lib")
+SET(SCRIBUS_RTF_LIB "scribus_rtf_lib")
 
 INCLUDE_DIRECTORIES(
 	${CMAKE_SOURCE_DIR}
@@ -1257,6 +1259,7 @@
 	${SCRIBUS_WPG_LIB}
 	${SCRIBUS_PGF_LIB}
 	${SCRIBUS_ZIP_LIB}
+	${SCRIBUS_RTF_LIB}
 	${LCMS2_LIBRARIES}
 )
 

Modified: trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20448&path=/trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt	Fri Oct  9 18:33:03 2015
@@ -6,6 +6,7 @@
   ADD_SUBDIRECTORY(odtim)
 ENDIF(HAVE_XML)
 ADD_SUBDIRECTORY(pdbim)
+ADD_SUBDIRECTORY(rtfim)
 IF(HAVE_XML)
   ADD_SUBDIRECTORY(sxwim)
 ENDIF(HAVE_XML)

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20448&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Fri Oct  9 18:33:03 2015
@@ -3912,6 +3912,10 @@
 			styleManager->setDoc(doc);
 			marksManager->setDoc(doc);
 			nsEditor->setDoc(doc);
+			inlinePalette->unsetDoc();
+			inlinePalette->setDoc(doc);
+			if (outlinePalette->isVisible())
+				outlinePalette->BuildTree();
 		}
 	}
 }

Modified: trunk/Scribus/scribus/third_party/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20448&path=/trunk/Scribus/scribus/third_party/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/third_party/CMakeLists.txt	Fri Oct  9 18:33:03 2015
@@ -8,4 +8,5 @@
 
 ADD_SUBDIRECTORY(wpg)
 ADD_SUBDIRECTORY(pgf)
+ADD_SUBDIRECTORY(rtf-qt)
 ADD_SUBDIRECTORY(zip)

More information about the scribus-commit mailing list