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

[scribus-commit]

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

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

Modified:
    trunk/Scribus/scribus/util_formats.cpp
    trunk/Scribus/scribus/util_formats.h

Modified: trunk/Scribus/scribus/util_formats.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15673&path=/trunk/Scribus/scribus/util_formats.cpp
==============================================================================
--- trunk/Scribus/scribus/util_formats.cpp (original)
+++ trunk/Scribus/scribus/util_formats.cpp Thu Oct 28 16:49:16 2010
@@ -32,6 +32,7 @@
 	m_fmts.insert(FormatsManager::XFIG, QStringList() << "fig");
 	m_fmts.insert(FormatsManager::CVG,  QStringList() << "cvg");
 	m_fmts.insert(FormatsManager::WPG,  QStringList() << "wpg");
+	m_fmts.insert(FormatsManager::BMP,  QStringList() << "bmp");
 #ifdef GMAGICK_FOUND
 	m_fmts.insert(FormatsManager::GMAGICK, QStringList() << "xbm" << "tga" << "ptif" << "ppm" << "pnm" << "pgm" << "pcds" << "pcd" << "pbm" << "mng" << "ico" << "gif" << "fax" << "dpx" << "bmp" << "xcf");
 #endif
@@ -52,8 +53,9 @@
 	m_fmtNames[FormatsManager::SVG]  = QObject::tr("Scalable Vector Graphics \"*.svg\"");
 	m_fmtNames[FormatsManager::AI]   = QObject::tr("Adobe Illustrator \"*.ai\"");
 	m_fmtNames[FormatsManager::XFIG] = QObject::tr("Xfig File");
-	m_fmtNames[FormatsManager::CVG]  = QObject::tr("Calamus Cvg File");
-	m_fmtNames[FormatsManager::WPG]  = QObject::tr("Word Perfect Wpg File");
+	m_fmtNames[FormatsManager::CVG]  = QObject::tr("Calamus CVG File");
+	m_fmtNames[FormatsManager::WPG]  = QObject::tr("Word Perfect WPG File");
+	m_fmtNames[FormatsManager::BMP]  = QObject::tr("BMP");
 #ifdef GMAGICK_FOUND
 	m_fmtNames[FormatsManager::GMAGICK] = QObject::tr("GraphicsMagick File");
 #endif

Modified: trunk/Scribus/scribus/util_formats.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15673&path=/trunk/Scribus/scribus/util_formats.h
==============================================================================
--- trunk/Scribus/scribus/util_formats.h (original)
+++ trunk/Scribus/scribus/util_formats.h Thu Oct 28 16:49:16 2010
@@ -37,14 +37,14 @@
 
 		enum ScImageFormatType
 		{
-			ALLIMAGES 		= 1|2|4|8|16|32|64|128|256|512|1024|2048|4096|8192|16384|32768,
+			ALLIMAGES 		= 1|2|4|8|16|32|64|128|256|512|1024|2048|4096|8192|16384|32768|524288,
 #ifdef GMAGICK_FOUND
 			IMAGESIMGFRAME	= 1|2|4|16|32|64|128|256|512|65536,  // all Types suitable for Image Frames
 #else
-			IMAGESIMGFRAME	= 1|2|4|16|32|64|128|256|512,  // all Types suitable for Image Frames
+			IMAGESIMGFRAME	= 1|2|4|16|32|64|128|256|512|524288,  // all Types suitable for Image Frames
 #endif
 			VECTORIMAGES	= 1|64|1024|2048|16384|32768|131072|262144,  // All pure vector image types
-			RASTORIMAGES	= 2|4|8|32|128|256|512|65536,  // All pure rastor image types
+			RASTORIMAGES	= 2|4|8|32|128|256|512|65536|524288,  // All pure rastor image types
 			EPS				= 1,      // Encapsulated PostScript
 			GIF				= 2,      // GIF files
 			JPEG			= 4,      // JPEG
@@ -66,6 +66,7 @@
 #endif
 			UNICONV			= 131072, // UniConvertor
 			PCT				= 262144,  // Mac Pict
+			BMP				= 524288,  // BMP
 		};
 	
 /*