r15672 by craig - #9418: Add BMP back to list of formatted image types

[scribus-commit]

Author: craig
Date: Thu Oct 28 16:49:02 2010
New Revision: 15672

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15672
Log:
#9418: Add BMP back to list of formatted image types

Modified:
    branches/Version135/Scribus/scribus/util_formats.cpp
    branches/Version135/Scribus/scribus/util_formats.h

Modified: branches/Version135/Scribus/scribus/util_formats.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15672&path=/branches/Version135/Scribus/scribus/util_formats.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/util_formats.cpp (original)
+++ branches/Version135/Scribus/scribus/util_formats.cpp Thu Oct 28 16:49:02 2010
@@ -32,7 +32,8 @@
 	m_fmts.insert(FormatsManager::XFIG, QStringList() << "fig");
 	m_fmts.insert(FormatsManager::CVG,  QStringList() << "cvg");
 	m_fmts.insert(FormatsManager::PCT,  QStringList() << "pct" << "pic" << "pict");
-	
+	m_fmts.insert(FormatsManager::BMP,  QStringList() << "bmp");	
+
 	m_fmtNames[FormatsManager::EPS]  = QObject::tr("Encapsulated PostScript");
 	m_fmtNames[FormatsManager::GIF]  = QObject::tr("GIF");
 	m_fmtNames[FormatsManager::JPEG] = QObject::tr("JPEG");
@@ -47,8 +48,9 @@
 	m_fmtNames[FormatsManager::SVG]  = QObject::tr("Scalable Vector Graphics");
 	m_fmtNames[FormatsManager::AI]   = QObject::tr("Adobe Illustrator");
 	m_fmtNames[FormatsManager::XFIG] = QObject::tr("Xfig File");
-	m_fmtNames[FormatsManager::CVG]  = QObject::tr("Calamus Cvg File");
+	m_fmtNames[FormatsManager::CVG]  = QObject::tr("Calamus CVG File");
 	m_fmtNames[FormatsManager::PCT]  = QObject::tr("Macintosh Pict File");
+	m_fmtNames[FormatsManager::BMP]  = QObject::tr("BMP");
 	
 	m_fmtMimeTypes.insert(FormatsManager::EPS,  QStringList() << "application/postscript");
 	m_fmtMimeTypes.insert(FormatsManager::GIF,  QStringList() << "image/gif");

Modified: branches/Version135/Scribus/scribus/util_formats.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15672&path=/branches/Version135/Scribus/scribus/util_formats.h
==============================================================================
--- branches/Version135/Scribus/scribus/util_formats.h (original)
+++ branches/Version135/Scribus/scribus/util_formats.h Thu Oct 28 16:49:02 2010
@@ -36,10 +36,10 @@
 
 		enum ScImageFormatType
 		{
-			ALLIMAGES 		= 1|2|4|8|16|32|64|128|256|512|1024|2048|4096|8192,
-			IMAGESIMGFRAME	= 1|2|4|16|32|64|128|256|512,  // all Types suitable for Image Frames
+			ALLIMAGES 	= 1|2|4|8|16|32|64|128|256|512|1024|2048|4096|8192|524288,
+			IMAGESIMGFRAME	= 1|2|4|16|32|64|128|256|512|524288,  // all Types suitable for Image Frames
 			VECTORIMAGES	= 1|64|1024|2048|16384|32768,  // All pure vector image types
-			RASTORIMAGES	= 2|4|8|32|512,  // All pure rastor image types
+			RASTORIMAGES	= 2|4|8|32|512|524288,  // All pure rastor image types
 			EPS				= 1,      // Encapsulated PostScript
 			GIF				= 2,      // GIF files
 			JPEG			= 4,      // JPEG
@@ -56,6 +56,7 @@
 			XFIG			= 8192,   // Xfig files
 			CVG				= 16384,  // Calamus Cvg files
 			PCT				= 32768,  // Mac Pict
+			BMP				= 524288,  // BMP
 		};
 	
 /*