r19834 by craig - #12523 and #12522: Also set master page image frames to not show images when image visibility is turned off. Refactor some of the related methods/vars

scribus-commit scribus-commit at lists.scribus.net
Thu Feb 19 19:42:33 UTC 2015


Author: craig
Date: Thu Feb 19 19:42:33 2015
New Revision: 19834

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19834
Log:
#12523 and #12522: Also set master page image frames to not show images when image visibility is turned off. Refactor some of the related methods/vars

Modified:
    trunk/Scribus/scribus/actionmanager.cpp
    trunk/Scribus/scribus/appmodehelper.cpp
    trunk/Scribus/scribus/canvasgesture_resize.cpp
    trunk/Scribus/scribus/canvasmode_normal.cpp
    trunk/Scribus/scribus/documentchecker.cpp
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem.h
    trunk/Scribus/scribus/pageitem_imageframe.cpp
    trunk/Scribus/scribus/pageitem_latexframe.cpp
    trunk/Scribus/scribus/pageitem_textframe.cpp
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
    trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
    trunk/Scribus/scribus/plugins/import/ai/importai.cpp
    trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
    trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
    trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
    trunk/Scribus/scribus/pslib.cpp
    trunk/Scribus/scribus/scpageoutput.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribus.h
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusdoc.h
    trunk/Scribus/scribus/scribusview.cpp
    trunk/Scribus/scribus/ui/annot.cpp
    trunk/Scribus/scribus/ui/contextmenu.cpp
    trunk/Scribus/scribus/ui/picstatus.cpp
    trunk/Scribus/scribus/ui/propertiespalette_image.cpp

Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp (original)
+++ trunk/Scribus/scribus/actionmanager.cpp Thu Feb 19 19:42:33 2015
@@ -758,7 +758,7 @@
 	connect( (*scrActions)["viewShowBleeds"], SIGNAL(triggered()), mainWindow, SLOT(ToggleBleeds()) );
 	connect( (*scrActions)["viewShowFrames"], SIGNAL(triggered()), mainWindow, SLOT(ToggleFrames()) );
 	connect( (*scrActions)["viewShowLayerMarkers"], SIGNAL(triggered()), mainWindow, SLOT(ToggleLayerMarkers()) );
-	connect( (*scrActions)["viewShowImages"], SIGNAL(triggered()), mainWindow, SLOT(TogglePics()) );
+	connect( (*scrActions)["viewShowImages"], SIGNAL(triggered()), mainWindow, SLOT(toggleImageVisibility()) );
 	connect( (*scrActions)["viewShowGrid"], SIGNAL(triggered()), mainWindow, SLOT(ToggleGrid()) );
 	connect( (*scrActions)["viewShowGuides"], SIGNAL(triggered()), mainWindow, SLOT(ToggleGuides()) );
 	connect( (*scrActions)["viewShowColumnBorders"], SIGNAL(triggered()), mainWindow, SLOT(ToggleColumnBorders()) );

Modified: trunk/Scribus/scribus/appmodehelper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/appmodehelper.cpp
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.cpp (original)
+++ trunk/Scribus/scribus/appmodehelper.cpp Thu Feb 19 19:42:33 2015
@@ -430,20 +430,20 @@
 		(*a_scrActions)["editDeselectAll"]->setEnabled(SelectedType != -1);
 	}
 	(*a_scrActions)["itemDetachTextFromPath"]->setEnabled(false);
-	(*a_scrActions)["itemUpdateImage"]->setEnabled(SelectedType==PageItem::ImageFrame && (currItem->PictureIsAvailable || currItem->asLatexFrame()));
-	(*a_scrActions)["itemAdjustFrameToImage"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->PictureIsAvailable);
-	(*a_scrActions)["itemAdjustImageToFrame"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->PictureIsAvailable);
-	(*a_scrActions)["itemExtendedImageProperties"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->PictureIsAvailable && currItem->pixm.imgInfo.valid);
-	(*a_scrActions)["itemToggleInlineImage"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->PictureIsAvailable);
+	(*a_scrActions)["itemUpdateImage"]->setEnabled(SelectedType==PageItem::ImageFrame && (currItem->imageIsAvailable || currItem->asLatexFrame()));
+	(*a_scrActions)["itemAdjustFrameToImage"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->imageIsAvailable);
+	(*a_scrActions)["itemAdjustImageToFrame"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->imageIsAvailable);
+	(*a_scrActions)["itemExtendedImageProperties"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->imageIsAvailable && currItem->pixm.imgInfo.valid);
+	(*a_scrActions)["itemToggleInlineImage"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->imageIsAvailable);
 	(*a_scrActions)["itemImageIsVisible"]->setEnabled(SelectedType==PageItem::ImageFrame);
 	(*a_scrActions)["itemPreviewFull"]->setEnabled(SelectedType==PageItem::ImageFrame);
 	(*a_scrActions)["itemPreviewNormal"]->setEnabled(SelectedType==PageItem::ImageFrame);
 	(*a_scrActions)["itemPreviewLow"]->setEnabled(SelectedType==PageItem::ImageFrame);
 	(*a_scrActions)["styleImageEffects"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->isRaster);
-	(*a_scrActions)["editCopyContents"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->PictureIsAvailable);
+	(*a_scrActions)["editCopyContents"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->imageIsAvailable);
 	(*a_scrActions)["editPasteContents"]->setEnabled(SelectedType==PageItem::ImageFrame);
 	(*a_scrActions)["editPasteContentsAbs"]->setEnabled(SelectedType==PageItem::ImageFrame);
-	(*a_scrActions)["editEditWithImageEditor"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->PictureIsAvailable && currItem->isRaster);
+	(*a_scrActions)["editEditWithImageEditor"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem->imageIsAvailable && currItem->isRaster);
 #ifdef HAVE_OSG
 	(*a_scrActions)["editEditRenderSource"]->setEnabled(SelectedType==PageItem::ImageFrame && currItem && (currItem->asLatexFrame() || currItem->asOSGFrame()));
 #else
@@ -561,7 +561,7 @@
 			(*a_scrActions)["toolsEditWithStoryEditor"]->setEnabled(false);
 			(*a_scrActions)["toolsRotate"]->setEnabled(!inAnEditMode);
 			(*a_scrActions)["toolsCopyProperties"]->setEnabled(!inAnEditMode);
-			(*a_scrActions)["itemImageIsVisible"]->setChecked(currItem->imageShown());
+			(*a_scrActions)["itemImageIsVisible"]->setChecked(currItem->imageVisible());
 			(*a_scrActions)["itemToggleInlineImage"]->setChecked(currItem->isImageInline());
 			(*a_scrActions)["itemPreviewFull"]->setChecked(currItem->pixm.imgInfo.lowResType==(*a_scrActions)["itemPreviewFull"]->actionInt());
 			(*a_scrActions)["itemPreviewNormal"]->setChecked(currItem->pixm.imgInfo.lowResType==(*a_scrActions)["itemPreviewNormal"]->actionInt());

Modified: trunk/Scribus/scribus/canvasgesture_resize.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/canvasgesture_resize.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_resize.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_resize.cpp Thu Feb 19 19:42:33 2015
@@ -338,7 +338,7 @@
 			}
 			currItem->setImageXYScale(imgScX, imgScY);
 		}
-		else if (currItem->itemType() == PageItem::ImageFrame && currItem->PictureIsAvailable && !currItem->fitImageToFrame())
+		else if (currItem->itemType() == PageItem::ImageFrame && currItem->imageIsAvailable && !currItem->fitImageToFrame())
 		{
 			QTransform mm = currItem->getTransform();
 			QPointF itPos = mm.map(QPointF(0, 0));

Modified: trunk/Scribus/scribus/canvasmode_normal.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/canvasmode_normal.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_normal.cpp Thu Feb 19 19:42:33 2015
@@ -201,7 +201,7 @@
 			{
 				return;
 			}
-			if (currItem->imageShown())
+			if (currItem->imageVisible())
 				m_view->requestMode(modeEdit);
 		}
 #ifdef HAVE_OSG
@@ -223,9 +223,9 @@
 			{
 				if (currItem->Pfile.isEmpty())
 					m_view->requestMode(submodeLoadPic);
-				else if (!currItem->PictureIsAvailable)
+				else if (!currItem->imageIsAvailable)
 					m_view->requestMode(submodeStatusPic);
-				else if (currItem->imageShown())
+				else if (currItem->imageVisible())
 					m_view->requestMode(modeEdit);
  			}
  			else if (currItem->itemType() == PageItem::TextFrame)

Modified: trunk/Scribus/scribus/documentchecker.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/documentchecker.cpp
==============================================================================
--- trunk/Scribus/scribus/documentchecker.cpp (original)
+++ trunk/Scribus/scribus/documentchecker.cpp Thu Feb 19 19:42:33 2015
@@ -238,11 +238,11 @@
 					itemError.insert(PartFilledImageFrame, 0);
 				}
 
-				if ((!currItem->PictureIsAvailable) && (checkerSettings.checkPictures))
+				if ((!currItem->imageIsAvailable) && (checkerSettings.checkPictures))
 					itemError.insert(MissingImage, 0);
 				else
 				{
-					if (currItem->PictureIsAvailable)
+					if (currItem->imageIsAvailable)
 					{
 						if (checkerSettings.checkTransparency && currItem->pixm.hasSmoothAlpha())
 							itemError.insert(Transparency, 0);
@@ -531,11 +531,11 @@
 					itemError.insert(PartFilledImageFrame, 0);
 				}
 
-				if ((!currItem->PictureIsAvailable) && (checkerSettings.checkPictures))
+				if ((!currItem->imageIsAvailable) && (checkerSettings.checkPictures))
 					itemError.insert(MissingImage, 0);
 				else
 				{
-					if (currItem->PictureIsAvailable)
+					if (currItem->imageIsAvailable)
 					{
 						if (checkerSettings.checkTransparency && currItem->pixm.hasSmoothAlpha())
 							itemError.insert(Transparency, 0);

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Thu Feb 19 19:42:33 2015
@@ -169,7 +169,7 @@
 	OverrideCompressionQuality(other.OverrideCompressionQuality),
 	CompressionQualityIndex(other.CompressionQualityIndex),
 
-	PictureIsAvailable(other.PictureIsAvailable),
+	imageIsAvailable(other.imageIsAvailable),
 	OrigW(other.OrigW),
 	OrigH(other.OrigH),
 	BBoxX(other.BBoxX),
@@ -241,7 +241,7 @@
 	m_Doc(other.m_Doc),
 	m_isAnnotation(other.m_isAnnotation),
 	m_annotation(other.m_annotation),
-	PicArt(other.PicArt),
+	m_imageVisible(other.m_imageVisible),
 	m_lineWidth(other.m_lineWidth),
 	Oldm_lineWidth(other.Oldm_lineWidth),
 	patternStrokeVal(other.patternStrokeVal),
@@ -357,6 +357,7 @@
 	hatchForegroundQ(other.hatchForegroundQ)
 {
 	QString tmp;
+	m_imageVisible=m_Doc->guidesPrefs().showPic;
 	m_Doc->TotalItems++;
 	AnName += tmp.setNum(m_Doc->TotalItems);
 	uniqueNr = m_Doc->TotalItems;
@@ -541,8 +542,8 @@
 	OwnPage = m_Doc->currentPage() ? m_Doc->currentPage()->pageNr() : -1;
 	oldOwnPage = OwnPage;
 	savedOwnPage = OwnPage;
-	PicArt = true;
-	PictureIsAvailable = false;
+	m_imageVisible = m_Doc->guidesPrefs().showPic;
+	imageIsAvailable = false;
 	m_PrintEnabled = true;
 	isBookmark = false;
 	m_isAnnotation = false;
@@ -6960,9 +6961,9 @@
 {
 	bool old = state->getBool("OLD");
 	if (isUndo)
-		PicArt = old;
-	else
-		PicArt = !old;
+		m_imageVisible = old;
+	else
+		m_imageVisible = !old;
 	update();
 }
 
@@ -9315,7 +9316,7 @@
 	if (!pixm.loadPicture(imgcache, fromCache, pixm.imgInfo.actualPageNumber, cms, ScImage::RGBData, gsRes, &dummy, showMsg))
 	{
 		Pfile = fi.absoluteFilePath();
-		PictureIsAvailable = false;
+		imageIsAvailable = false;
 //		PicArt = false;
 		return false;
 	}
@@ -9342,7 +9343,7 @@
 	}
 	double xres = pixm.imgInfo.xres;
 	double yres = pixm.imgInfo.yres;
-	PictureIsAvailable = true;
+	imageIsAvailable = true;
 //	PicArt = true;
 		
 	if (Pfile != filename)
@@ -9414,7 +9415,7 @@
 	oldLocalScX = m_imageXScale;
 	oldLocalScY = m_imageYScale;
 
-	if (PictureIsAvailable && !fromCache)
+	if (imageIsAvailable && !fromCache)
 	{
 		if ((pixm.imgInfo.colorspace == ColorSpaceDuotone) && (pixm.imgInfo.duotoneColors.count() != 0) && (!reload))
 		{
@@ -9562,7 +9563,7 @@
 				pixm.imgInfo.lowResScale = 1.0;
 		}
 	}
-	if (PictureIsAvailable && m_Doc->viewAsPreview)
+	if (imageIsAvailable && m_Doc->viewAsPreview)
 	{
 		VisionDefectColor defect;
 		QColor tmpC;
@@ -10095,18 +10096,18 @@
 	m_annotation=ad;
 }
 
-void PageItem::setImageShown(bool isShown)
-{
-	if (PicArt==isShown)
+void PageItem::setImageVisible(bool isShown)
+{
+	if (m_imageVisible==isShown)
 		return;
 	if (UndoManager::undoEnabled())
 	{
 		SimpleState *ss = new SimpleState(Um::ResTyp,"",Um::IImageFrame);
 		ss->set("SHOW_IMAGE","show_image");
-		ss->set("OLD",PicArt);
+		ss->set("OLD",m_imageVisible);
 		undoManager->action(this,ss);
 	}
-	PicArt=isShown;
+	m_imageVisible=isShown;
 }
 
 void PageItem::updateConstants()

Modified: trunk/Scribus/scribus/pageitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h (original)
+++ trunk/Scribus/scribus/pageitem.h Thu Feb 19 19:42:33 2015
@@ -1178,8 +1178,8 @@
 	Annotation& annotation() { return m_annotation; }
 	const Annotation& annotation() const { return m_annotation; }
 
-	bool imageShown() const { return PicArt; }
-	void setImageShown(bool);
+	bool imageVisible() const { return m_imageVisible; }
+	void setImageVisible(bool);
 
 	void updateConstants();
 	bool isWelded()  {return !weldList.isEmpty(); }  //true if to this item some other items are welded (weldList is list of these items)
@@ -1278,7 +1278,7 @@
 	int CompressionMethodIndex;
 	bool OverrideCompressionQuality;
 	int CompressionQualityIndex;
-	bool PictureIsAvailable; ///< Flag to hiold image file availability
+	bool imageIsAvailable; ///< Flag to hiold image file availability
 	int OrigW;
 	int OrigH;
 	double BBoxX; ///< Bounding Box-X
@@ -1366,7 +1366,7 @@
 		bool m_isAnnotation; ///< Flag to tell if this item is a PDF annotation item
 		Annotation m_annotation; ///< PDF annotation data
 
-		bool PicArt; ///< Darstellungsart Bild/Titel
+		bool m_imageVisible; ///< Darstellungsart Bild/Titel
 
 		double m_lineWidth; //< Line width
 		double Oldm_lineWidth;

Modified: trunk/Scribus/scribus/pageitem_imageframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/pageitem_imageframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_imageframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_imageframe.cpp Thu Feb 19 19:42:33 2015
@@ -58,7 +58,7 @@
 
 PageItem_ImageFrame::~PageItem_ImageFrame()
 {
-	if ((PictureIsAvailable) && (!Pfile.isEmpty()))
+	if ((imageIsAvailable) && (!Pfile.isEmpty()))
 	{
 		ScCore->fileWatcher->removeFile(Pfile);
 		QFileInfo fi(Pfile);
@@ -92,14 +92,14 @@
 	else
 	{
 		//If we are missing our image, draw a red cross in the frame
-		if ((!PicArt) || (!PictureIsAvailable))
+		if ((!m_imageVisible) || (!imageIsAvailable))
 		{
 			if ((drawFrame()) && (m_Doc->guidesPrefs().framesShown))
 			{
 				p->setBrush(Qt::white);
 				QString htmlText = "";
 				QFileInfo fi = QFileInfo(Pfile);
-				if (PictureIsAvailable)
+				if (imageIsAvailable)
 				{
 					p->setPen(Qt::black, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 					if (isInlineImage)
@@ -228,7 +228,7 @@
 		undoManager->action(this, is);
 	}
 	effectsInUse.clear();
-	PictureIsAvailable = false;
+	imageIsAvailable = false;
 	Pfile = "";
 	pixm = ScImage();
 
@@ -358,7 +358,7 @@
 	infoCT->setText( tr("Image"));
 	infoGroupLayout->addWidget( infoCT, 0, 0, 1, 2, Qt::AlignHCenter );
 	
-	if (PictureIsAvailable)
+	if (imageIsAvailable)
 	{
 		fileT = new QLabel(infoGroup);
 		oPpiT = new QLabel(infoGroup);
@@ -431,7 +431,7 @@
 	actionList << "itemPreviewLow";
 	actionList << "itemPreviewNormal";
 
-	if (PictureIsAvailable)
+	if (imageIsAvailable)
 	{
 		actionList << "itemAdjustFrameToImage";
 		actionList << "itemAdjustImageToFrame";
@@ -463,7 +463,7 @@
 	QString htmlText;
 	htmlText.append( tr("Image") + "<br/>");
 	
-	if (PictureIsAvailable)
+	if (imageIsAvailable)
 	{
 		QFileInfo fi = QFileInfo(Pfile);
 		if (isInlineImage)

Modified: trunk/Scribus/scribus/pageitem_latexframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/pageitem_latexframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_latexframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_latexframe.cpp Thu Feb 19 19:42:33 2015
@@ -190,7 +190,7 @@
 
 	//Save state and restore afterwards
 	double xres, yres;
-	if (PictureIsAvailable)
+	if (imageIsAvailable)
 	{
 		xres = pixm.imgInfo.xres;
 		yres = pixm.imgInfo.yres;
@@ -550,7 +550,7 @@
 	actionList << "itemPreviewNormal";
 	actionList << "itemUpdateImage";
 	actionList << "editEditRenderSource";
-	if (PictureIsAvailable)
+	if (imageIsAvailable)
 	{
 		/*if (!isTableItem)
 			actionList << "itemAdjustFrameToImage";*/

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Thu Feb 19 19:42:33 2015
@@ -3334,7 +3334,7 @@
 				p->setFont(QFont(fontName, fontSize));
 				p->drawText(QRectF(wdt, wdt, m_width - (2 * wdt), m_height - (2 * wdt)), bmUtf16, false);
 			}
-			if ((!Pfile.isEmpty()) && (PictureIsAvailable) && (PicArt) && (annotation().UseIcons()))
+			if ((!Pfile.isEmpty()) && (imageIsAvailable) && (m_imageVisible) && (annotation().UseIcons()))
 			{
 				p->save();//SA2
 				p->setupPolygon(&PoLine);

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp (original)
+++ trunk/Scribus/scribus/pdflib_core.cpp Thu Feb 19 19:42:33 2015
@@ -2181,7 +2181,7 @@
 						if (ite->imageClip.size() != 0)
 							PutPage(SetImagePathAndClip(ite));
 						PutPage(SetPathAndClip(ite, true));
-						if ((ite->PictureIsAvailable) && (!ite->Pfile.isEmpty()))
+						if ((ite->imageIsAvailable) && (!ite->Pfile.isEmpty()))
 						{
 							if (!PDF_Image(ite, ite->Pfile, ite->imageXScale(), ite->imageYScale(), ite->imageXOffset(), -ite->imageYOffset(), false, ite->IProfile, ite->UseEmbedded, ite->IRender, &tmpOut))
 								return false;
@@ -3833,7 +3833,7 @@
 			if (ite->imageClip.size() != 0)
 				tmp += SetImagePathAndClip(ite);
 			tmp += SetPathAndClip(ite, true);
-			if ((ite->PictureIsAvailable) && (!ite->Pfile.isEmpty()))
+			if ((ite->imageIsAvailable) && (!ite->Pfile.isEmpty()))
 			{
 				if (!PDF_Image(ite, ite->Pfile, ite->imageXScale(), ite->imageYScale(), ite->imageXOffset(), -ite->imageYOffset(), false, ite->IProfile, ite->UseEmbedded, ite->IRender, &tmpOut))
 					return false;

Modified: trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp Thu Feb 19 19:42:33 2015
@@ -1032,7 +1032,7 @@
 			ob.appendChild(ob1);
 		}
 	}
-	if ((Item->PictureIsAvailable) && (!Item->Pfile.isEmpty()))
+	if ((Item->imageIsAvailable) && (!Item->Pfile.isEmpty()))
 	{
 		QDomElement cl, ob2;
 		if (Item->imageClip.size() != 0)

Modified: trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp Thu Feb 19 19:42:33 2015
@@ -712,7 +712,7 @@
 			grp.appendChild(ob);
 		}
 	}
-	if ((Item->PictureIsAvailable) && (!Item->Pfile.isEmpty()))
+	if ((Item->imageIsAvailable) && (!Item->Pfile.isEmpty()))
 	{
 		QDomElement ob2 = p_docu.createElement("Path");
 		ob2.setAttribute("Data", pa);

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp Thu Feb 19 19:42:33 2015
@@ -221,7 +221,7 @@
 		if (!currItem->Pfile.isEmpty())
 			m_Doc->loadPict(currItem->Pfile, currItem);
 		currItem->setImageXYScale(Buffer->LocalScX, Buffer->LocalScY);
-		currItem->setImageShown(Buffer->PicArt);
+		currItem->setImageVisible(Buffer->PicArt);
 		currItem->ScaleType = Buffer->ScaleType;
 		currItem->AspectRatio = Buffer->AspectRatio;
 		currItem->setLineWidth(Buffer->Pwidth);
@@ -254,7 +254,7 @@
 			currItem->UseEmbedded = Buffer->UseEmbedded;
 			m_Doc->loadPict(currItem->Pfile, currItem);
 			currItem->setImageXYScale(Buffer->LocalScX, Buffer->LocalScY);
-			currItem->setImageShown(Buffer->PicArt);
+			currItem->setImageVisible(Buffer->PicArt);
 		}
 		if (!Buffer->itemText.isEmpty())
 		{
@@ -401,7 +401,7 @@
 		if (!currItem->Pfile.isEmpty())
 			m_Doc->loadPict(currItem->Pfile, currItem);
 		currItem->setImageXYScale(Buffer->LocalScX, Buffer->LocalScY);
-		currItem->setImageShown(Buffer->PicArt);
+		currItem->setImageVisible(Buffer->PicArt);
 		currItem->ScaleType = Buffer->ScaleType;
 		currItem->AspectRatio = Buffer->AspectRatio;
 		currItem->setLineWidth(Buffer->Pwidth);

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp Thu Feb 19 19:42:33 2015
@@ -2574,7 +2574,7 @@
 			cl.scale(currItem->imageXScale(), currItem->imageYScale());
 			currItem->imageClip.map(cl);
 		}
-		currItem->setImageShown( attrs.valueAsInt("PICART"));
+		currItem->setImageVisible( attrs.valueAsInt("PICART"));
 /*		currItem->BBoxX = ScCLocale::toDoubleC( obj->attribute("BBOXX"));
 		currItem->BBoxH = ScCLocale::toDoubleC( obj->attribute("BBOXH")); */
 		currItem->setLineWidth(pw);
@@ -2818,7 +2818,7 @@
 			currItem->UseEmbedded = attrs.valueAsInt("EMBEDDED", 1);
 			doc->loadPict(currItem->Pfile, currItem);
 			currItem->setImageXYScale(scx, scy);
-			currItem->setImageShown( attrs.valueAsInt("PICART"));
+			currItem->setImageVisible( attrs.valueAsInt("PICART"));
 /*			currItem->BBoxX = ScCLocale::toDoubleC( obj->attribute("BBOXX"));
 			currItem->BBoxH = ScCLocale::toDoubleC( obj->attribute("BBOXH")); */
 		}

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp Thu Feb 19 19:42:33 2015
@@ -1557,7 +1557,7 @@
 			cl.scale(currItem->imageXScale(), currItem->imageYScale());
 			currItem->imageClip.map(cl);
 		}
-		currItem->setImageShown(obj->attribute("PICART").toInt());
+		currItem->setImageVisible(obj->attribute("PICART").toInt());
 /*		currItem->BBoxX = obj->attribute("BBOXX").toDouble();
 		currItem->BBoxH = obj->attribute("BBOXH").toDouble(); */
 		currItem->setLineWidth(pw);
@@ -1821,7 +1821,7 @@
 			currItem->UseEmbedded = obj->attribute("EMBEDDED", "1").toInt();
 			doc->loadPict(currItem->Pfile, currItem);
 			currItem->setImageXYScale(scx, scy);
-			currItem->setImageShown(obj->attribute("PICART").toInt());
+			currItem->setImageVisible(obj->attribute("PICART").toInt());
 /*			currItem->BBoxX = obj->attribute("BBOXX").toDouble();
 			currItem->BBoxH = obj->attribute("BBOXH").toDouble(); */
 		}

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp Thu Feb 19 19:42:33 2015
@@ -4764,7 +4764,7 @@
 			clipPath = clPath;
 			layerFound = true;
 		}
-		currItem->setImageShown( attrs.valueAsInt("PICART"));
+		currItem->setImageVisible( attrs.valueAsInt("PICART"));
 		currItem->setLineWidth(pw);
 		UndoManager::instance()->setUndoEnabled(true);
 		break;
@@ -5080,7 +5080,7 @@
 			currItem->UseEmbedded = attrs.valueAsInt("EMBEDDED", 1);
 			doc->loadPict(currItem->Pfile, currItem);
 			currItem->setImageXYScale(scx, scy);
-			currItem->setImageShown( attrs.valueAsInt("PICART"));
+			currItem->setImageVisible( attrs.valueAsInt("PICART"));
 /*			currItem->BBoxX = ScCLocale::toDoubleC( obj->attribute("BBOXX"));
 			currItem->BBoxH = ScCLocale::toDoubleC( obj->attribute("BBOXH")); */
 			currItem->ScaleType   = attrs.valueAsInt("SCALETYPE", 1);

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp Thu Feb 19 19:42:33 2015
@@ -2552,7 +2552,7 @@
 		docu.writeAttribute("LOCALX",item->imageXOffset());
 		docu.writeAttribute("LOCALY",item->imageYOffset());
 		docu.writeAttribute("LOCALROT" ,item->imageRotation());
-		docu.writeAttribute("PICART", item->imageShown() ? 1 : 0);
+		docu.writeAttribute("PICART", item->imageVisible() ? 1 : 0);
 		docu.writeAttribute("SCALETYPE", item->ScaleType ? 1 : 0);
 		docu.writeAttribute("RATIO", item->AspectRatio ? 1 : 0);
 		const ParagraphStyle& dStyle(item->itemText.defaultStyle());

Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importai.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ai/importai.cpp Thu Feb 19 19:42:33 2015
@@ -1443,7 +1443,7 @@
 					ite->isTempFile = true;
 					m_Doc->loadPict(imgName, ite);
 					delete tempFile;
-					if (ite->PictureIsAvailable)
+					if (ite->imageIsAvailable)
 						ite->setImageXYScale(ite->width() / ite->pixm.width(), ite->height() / ite->pixm.height());
 					ite->setImageFlippedV(true);
 					ite->Clip = FlattenPath(ite->PoLine, ite->Segments);
@@ -3090,7 +3090,7 @@
 		TIFFClose(tif);
 	}
 	m_Doc->loadPict(imgName, ite);
-	if (ite->PictureIsAvailable)
+	if (ite->imageIsAvailable)
 		ite->setImageXYScale(ite->width() / ite->pixm.width(), ite->height() / ite->pixm.height());
 	if (importerFlags & LoadSavePlugin::lfCreateDoc)
 		ite->setLocked(itemLocked);

Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp Thu Feb 19 19:42:33 2015
@@ -617,7 +617,7 @@
 //			item->moveBy(mm.dx(), mm.dy());
 //			item->setWidthHeight(item->width() * mm.m11(), item->height() * mm.m22());
 //			item->setLineWidth(item->lineWidth() * (coeff1 + coeff2) / 2.0);
-			if (item->PictureIsAvailable)
+			if (item->imageIsAvailable)
 			{
 				item->setImageXYOffset(0.0, 0.0);
 				item->setImageXYScale(item->width() / (item->pixm.width() * (item->pixm.imgInfo.xres / 72.0)),

Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp Thu Feb 19 19:42:33 2015
@@ -761,7 +761,7 @@
 		item->moveBy(gcm.dx(), gcm.dy());
 		item->setWidthHeight(item->width() * gcm.m11(), item->height() * gcm.m22());
 		item->setLineWidth(qMax(item->lineWidth() * (coeff1 + coeff2) / 2.0, 0.25));
-		if (item->PictureIsAvailable)
+		if (item->imageIsAvailable)
 			item->setImageXYScale(item->width() / item->pixm.width(), item->height() / item->pixm.height());
 	}
 	else if( item->asTextFrame() )

Modified: trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp (original)
+++ trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp Thu Feb 19 19:42:33 2015
@@ -201,7 +201,7 @@
 			if ( ( pItem->itemType() == PageItem::ImageFrame ) && ( !pItem->asLatexFrame() ) )
 			{
 				QString itemText;
-				if ( pItem->PictureIsAvailable )
+				if ( pItem->imageIsAvailable )
 					itemText = QString ( "Frame %1" ).arg ( pItem->itemName() );
 				else
 					itemText = QString ( "Frame %1 (empty)" ).arg ( pItem->itemName() );
@@ -223,7 +223,7 @@
 			if ( ( pItem->itemType() == PageItem::ImageFrame ) && ( !pItem->asLatexFrame() ) )
 			{
 				QString itemText;
-				if ( pItem->PictureIsAvailable )
+				if ( pItem->imageIsAvailable )
 					itemText = QString ( "Frame %1" ).arg ( pItem->itemName() );
 				else
 					itemText = QString ( "Frame %1 (empty)" ).arg ( pItem->itemName() );
@@ -625,7 +625,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			pItem = allItems.at(ii);
-			if ( ( pItem->itemType() == PageItem::ImageFrame ) && ( pItem->PictureIsAvailable ) && ( !pItem->asLatexFrame() ) )
+			if ( ( pItem->itemType() == PageItem::ImageFrame ) && ( pItem->imageIsAvailable ) && ( !pItem->asLatexFrame() ) )
 			{
 				if ( ( id == 0 ) || ( ( id-1 ) == pItem->OwnPage ) )
 				{
@@ -645,7 +645,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			pItem = allItems.at(ii);
-			if ( ( pItem->itemType() == PageItem::ImageFrame ) && ( pItem->PictureIsAvailable ) && ( !pItem->asLatexFrame() ) )
+			if ( ( pItem->itemType() == PageItem::ImageFrame ) && ( pItem->imageIsAvailable ) && ( !pItem->asLatexFrame() ) )
 			{
 				if ( ( id == 0 ) || ( ( id-1 ) == pItem->OwnPage ) )
 				{

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp (original)
+++ trunk/Scribus/scribus/pslib.cpp Thu Feb 19 19:42:33 2015
@@ -470,7 +470,7 @@
 		for (int em = 0; em < pa.items.count(); ++em)
 		{
 			PageItem* item = pa.items.at(em);
-			if ((item->asImageFrame()) && (item->PictureIsAvailable) && (!item->Pfile.isEmpty()) && (item->printEnabled()) && (!sep) && (farb))
+			if ((item->asImageFrame()) && (item->imageIsAvailable) && (!item->Pfile.isEmpty()) && (item->printEnabled()) && (!sep) && (farb))
 			{
 				if (!PS_ImageData(item, item->Pfile, item->itemName(), item->IProfile, item->UseEmbedded, ic))
 					return false;
@@ -1557,7 +1557,7 @@
 							continue;
 						if ((it->OwnPage != static_cast<int>(Doc->MasterPages.at(ap)->pageNr())) && (it->OwnPage != -1))
 							continue;
-						if ((optimization == OptimizeSize) && it->asImageFrame() && it->PictureIsAvailable && (!it->Pfile.isEmpty()) && it->printEnabled() && (!sep) && farb)
+						if ((optimization == OptimizeSize) && it->asImageFrame() && it->imageIsAvailable && (!it->Pfile.isEmpty()) && it->printEnabled() && (!sep) && farb)
 						{
 							errorOccured = !PS_ImageData(it, it->Pfile, it->itemName(), it->IProfile, it->UseEmbedded, Ic);
 							if (errorOccured) break;
@@ -1736,7 +1736,7 @@
 			if (c->imageClip.size() != 0)
 				SetPathAndClip(c->imageClip, true);
 			SetPathAndClip(c->PoLine, true);
-			if ((c->PictureIsAvailable) && (!c->Pfile.isEmpty()))
+			if ((c->imageIsAvailable) && (!c->Pfile.isEmpty()))
 			{
 				bool imageOk = false;
 				PS_translate(0, -c->BBoxH*c->imageYScale());

Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp (original)
+++ trunk/Scribus/scribus/scpageoutput.cpp Thu Feb 19 19:42:33 2015
@@ -892,7 +892,7 @@
 	}
 	else
 	{
-		if ((!item->imageShown()) || (!item->PictureIsAvailable))
+		if ((!item->imageVisible()) || (!item->imageIsAvailable))
 		{
 			/*painter->setPen( ScColorShade(Qt::red, 100), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 			painter->drawLine(FPoint(0, 0), FPoint(item->width(), item->height()));
@@ -1602,7 +1602,7 @@
 		painter->setupPolygon(&item->PoLine);
 		fillPath(item, painter, clip);
 	}
-	if ((item->isAnnotation()) && (item->annotation().Type() == Annotation::Button) && (!item->Pfile.isEmpty()) && (item->PictureIsAvailable) && (item->imageShown()) && (item->annotation().UseIcons()))
+	if ((item->isAnnotation()) && (item->annotation().Type() == Annotation::Button) && (!item->Pfile.isEmpty()) && (item->imageIsAvailable) && (item->imageVisible()) && (item->annotation().UseIcons()))
 	{
 		painter->save();
 		painter->setupPolygon(&item->PoLine);

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Thu Feb 19 19:42:33 2015
@@ -3677,9 +3677,9 @@
 		doc->reformPages();
 		doc->refreshGuides();
 		doc->setLoading(false);
-		for (int azz=0; azz<doc->MasterItems.count(); ++azz)
-		{
-			PageItem *ite = doc->MasterItems.at(azz);
+		for (int i=0; i<doc->MasterItems.count(); ++i)
+		{
+			PageItem *ite = doc->MasterItems.at(i);
 			// TODO fix that for Groups on Masterpages
 //			if (ite->Groups.count() != 0)
 //				view->GroupOnPage(ite);
@@ -3692,9 +3692,9 @@
 		t.start();*/
 		int docItemsCount=doc->Items->count();
 		doc->flag_Renumber = false;
-		for (int azz=0; azz<docItemsCount; ++azz)
-		{
-			PageItem *ite = doc->Items->at(azz);
+		for (int i=0; i<docItemsCount; ++i)
+		{
+			PageItem *ite = doc->Items->at(i);
 			if((ite->nextInChain() == NULL) && !ite->isNoteFrame())  //do not layout notes frames
 				ite->layout();
 		}
@@ -3893,7 +3893,7 @@
 		if (currItem->itemType() == PageItem::ImageFrame)
 		{
 			int t = QMessageBox::Yes;
-			if (currItem->PictureIsAvailable)
+			if (currItem->imageIsAvailable)
 				t = ScMessageBox::warning(this, CommonStrings::trWarning, tr("Do you really want to replace your existing image?"),
 							QMessageBox::Yes | QMessageBox::No,
 							QMessageBox::No,	// GUI default
@@ -3942,7 +3942,7 @@
 	PageItem *currItem = doc->m_Selection->itemAt(0);
 	if (currItem->itemType() != PageItem::ImageFrame)
 		return;
-	if (!currItem->PictureIsAvailable)
+	if (!currItem->imageIsAvailable)
 		return;
 	if (currItem->isImageInline())
 	{
@@ -5432,24 +5432,38 @@
 	palettesStatus[0] = false;
 }
 
-void ScribusMainWindow::TogglePics()
+void ScribusMainWindow::toggleImageVisibility()
 {
 	if (!doc)
 		return;
 	doc->guidesPrefs().showPic = !doc->guidesPrefs().showPic;
 	QList<PageItem*> allItems;
-	for (int a = 0; a < doc->Items->count(); ++a)
-	{
-		PageItem *currItem = doc->Items->at(a);
+	for (int i = 0; i < doc->DocItems.count(); ++i)
+	{
+		PageItem *currItem = doc->DocItems.at(i);
 		if (currItem->isGroup())
 			allItems = currItem->asGroupFrame()->getItemList();
 		else
 			allItems.append(currItem);
-		for (int ii = 0; ii < allItems.count(); ii++)
-		{
-			PageItem* item = allItems.at(ii);
+		for (int j = 0; j < allItems.count(); j++)
+		{
+			PageItem* item = allItems.at(j);
 			if (item->asImageFrame())
-				item->setImageShown(doc->guidesPrefs().showPic);
+				item->setImageVisible(doc->guidesPrefs().showPic);
+		}
+	}
+	for (int i=0; i<doc->MasterItems.count(); ++i)
+	{
+		PageItem *currItem = doc->MasterItems.at(i);
+		if (currItem->isGroup())
+			allItems = currItem->asGroupFrame()->getItemList();
+		else
+			allItems.append(currItem);
+		for (int j = 0; j < allItems.count(); j++)
+		{
+			PageItem* item = allItems.at(j);
+			if (item->asImageFrame())
+				item->setImageVisible(doc->guidesPrefs().showPic);
 		}
 	}
 	view->DrawNew();
@@ -6282,7 +6296,7 @@
 	}
 	if (ite->asLatexFrame())
 	{
-		if (ite->imageShown())
+		if (ite->imageVisible())
 			view->requestMode(modeEdit);
 	}
 #ifdef HAVE_OSG
@@ -6295,9 +6309,9 @@
 		{
 			if (ite->Pfile.isEmpty())
 				view->requestMode(submodeLoadPic);
-			else if (!ite->PictureIsAvailable)
+			else if (!ite->imageIsAvailable)
 				view->requestMode(submodeStatusPic);
-			else if (ite->imageShown())
+			else if (ite->imageVisible())
 				view->requestMode(modeEdit);
 		}
 		else if (ite->itemType() == PageItem::TextFrame)
@@ -8254,7 +8268,7 @@
 		ScMessageBox::information(this, tr("Information"), "<qt>" + tr("The program %1 is already running!").arg(ieExe) + "</qt>");
 		return;
 	}
-	if (currItem->PictureIsAvailable)
+	if (currItem->imageIsAvailable)
 	{
 		int index;
 		QString imEditor;
@@ -8598,7 +8612,7 @@
 		return;
 
 	PageItem_ImageFrame* imageItem = currItem->asImageFrame();
-	if (!imageItem->PictureIsAvailable)
+	if (!imageItem->imageIsAvailable)
 		return;
 	contentsBuffer.sourceType = PageItem::ImageFrame;
 	contentsBuffer.contentsFileName = imageItem->Pfile;
@@ -8627,7 +8641,7 @@
 
 	PageItem_ImageFrame* imageItem=currItem->asImageFrame();
 	int t=QMessageBox::Yes;
-	if (imageItem->PictureIsAvailable)
+	if (imageItem->imageIsAvailable)
 		t = ScMessageBox::warning(this, CommonStrings::trWarning,
 								tr("Do you really want to replace your existing image?"),
 								QMessageBox::Yes | QMessageBox::No,

Modified: trunk/Scribus/scribus/scribus.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/scribus.h
==============================================================================
--- trunk/Scribus/scribus/scribus.h (original)
+++ trunk/Scribus/scribus/scribus.h Thu Feb 19 19:42:33 2015
@@ -447,7 +447,7 @@
 	void setUndoPalette(bool visible);
 	void toggleCheckPal();
 	/** \brief Schaltet M_ViewShowImages ein/aus */
-	void TogglePics();
+	void toggleImageVisibility();
 	/** \brief Schaltet Raster ein/aus */
 	void ToggleGrid();
 	/** \brief Schaltet Rasterbenutzung ein/aus */

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Thu Feb 19 19:42:33 2015
@@ -622,7 +622,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if (currItem->PictureIsAvailable)
+			if (currItem->imageIsAvailable)
 				ScCore->fileWatcher->removeFile(currItem->Pfile);
 			if ((currItem->asImageFrame()) && (!currItem->Pfile.isEmpty()))
 			{
@@ -642,7 +642,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if (currItem->PictureIsAvailable)
+			if (currItem->imageIsAvailable)
 				ScCore->fileWatcher->removeFile(currItem->Pfile);
 			if ((currItem->asImageFrame()) && (!currItem->Pfile.isEmpty()))
 			{
@@ -662,7 +662,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if (currItem->PictureIsAvailable)
+			if (currItem->imageIsAvailable)
 				ScCore->fileWatcher->removeFile(currItem->Pfile);
 			if ((currItem->asImageFrame()) && (!currItem->Pfile.isEmpty()))
 			{
@@ -688,7 +688,7 @@
 				currItem = allItems.at(ii);
 				if (currItem->itemType() == PageItem::ImageFrame)
 				{
-					if ((currItem->PictureIsAvailable) && (!currItem->Pfile.isEmpty()))
+					if ((currItem->imageIsAvailable) && (!currItem->Pfile.isEmpty()))
 					{
 						ScCore->fileWatcher->removeFile(currItem->Pfile);
 						QFileInfo fi(currItem->Pfile);
@@ -5828,7 +5828,7 @@
 {
 	if (!reload)
 	{
-		if ((ScCore->fileWatcher->files().contains(pageItem->Pfile) != 0) && (pageItem->PictureIsAvailable))
+		if ((ScCore->fileWatcher->files().contains(pageItem->Pfile) != 0) && (pageItem->imageIsAvailable))
 		{
 			ScCore->fileWatcher->removeFile(pageItem->Pfile);
 			if (pageItem->isTempFile)
@@ -7424,7 +7424,7 @@
 			for (int ii = 0; ii < allItems.count(); ii++)
 			{
 				it = allItems.at(ii);
-				if ((it->itemType() == PageItem::ImageFrame) && (it->PictureIsAvailable))
+				if ((it->itemType() == PageItem::ImageFrame) && (it->imageIsAvailable))
 				{
 					if (it->pixm.imgInfo.colorspace == ColorSpaceCMYK)
 					{
@@ -7471,7 +7471,7 @@
 			for (int ii = 0; ii < allItems.count(); ii++)
 			{
 				it = allItems.at(ii);
-				if ((it->itemType() == PageItem::ImageFrame) && (it->PictureIsAvailable))
+				if ((it->itemType() == PageItem::ImageFrame) && (it->imageIsAvailable))
 				{
 					if (it->pixm.imgInfo.colorspace == ColorSpaceCMYK)
 					{
@@ -10068,7 +10068,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if ((!currItem->PictureIsAvailable) || (currItem->Pfile != name))
+			if ((!currItem->imageIsAvailable) || (currItem->Pfile != name))
 				continue;
 			bool fho = currItem->imageFlippedH();
 			bool fvo = currItem->imageFlippedV();
@@ -10093,7 +10093,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if ((!currItem->PictureIsAvailable) || (currItem->Pfile != name))
+			if ((!currItem->imageIsAvailable) || (currItem->Pfile != name))
 				continue;
 			bool fho = currItem->imageFlippedH();
 			bool fvo = currItem->imageFlippedV();
@@ -10118,7 +10118,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if ((!currItem->PictureIsAvailable) || (currItem->Pfile != name))
+			if ((!currItem->imageIsAvailable) || (currItem->Pfile != name))
 				continue;
 			bool fho = currItem->imageFlippedH();
 			bool fvo = currItem->imageFlippedV();
@@ -10149,7 +10149,7 @@
 			for (int ii = 0; ii < allItems.count(); ii++)
 			{
 				currItem = allItems.at(ii);
-				if ((!currItem->PictureIsAvailable) || (currItem->Pfile != name))
+				if ((!currItem->imageIsAvailable) || (currItem->Pfile != name))
 					continue;
 				bool fho = currItem->imageFlippedH();
 				bool fvo = currItem->imageFlippedV();
@@ -10198,7 +10198,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if (!currItem->asImageFrame() || currItem->PictureIsAvailable || currItem->Pfile.isEmpty())
+			if (!currItem->asImageFrame() || currItem->imageIsAvailable || currItem->Pfile.isEmpty())
 				continue;
 			QFileInfo fi(currItem->Pfile);
 			if ((fi.absolutePath() != name) || !fi.exists())
@@ -10227,7 +10227,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if (!currItem->asImageFrame() || currItem->PictureIsAvailable || currItem->Pfile.isEmpty())
+			if (!currItem->asImageFrame() || currItem->imageIsAvailable || currItem->Pfile.isEmpty())
 				continue;
 			QFileInfo fi(currItem->Pfile);
 			if ((fi.absolutePath() != name) || !fi.exists())
@@ -10256,7 +10256,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if (!currItem->asImageFrame() || currItem->PictureIsAvailable || currItem->Pfile.isEmpty())
+			if (!currItem->asImageFrame() || currItem->imageIsAvailable || currItem->Pfile.isEmpty())
 				continue;
 			QFileInfo fi(currItem->Pfile);
 			if ((fi.absolutePath() != name) || !fi.exists())
@@ -10291,7 +10291,7 @@
 			for (int ii = 0; ii < allItems.count(); ii++)
 			{
 				currItem = allItems.at(ii);
-				if (!currItem->asImageFrame() || currItem->PictureIsAvailable || currItem->Pfile.isEmpty())
+				if (!currItem->asImageFrame() || currItem->imageIsAvailable || currItem->Pfile.isEmpty())
 					continue;
 				QFileInfo fi(currItem->Pfile);
 				if ((fi.absolutePath() != name) || !fi.exists())
@@ -10357,7 +10357,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if (currItem->PictureIsAvailable)
+			if (currItem->imageIsAvailable)
 				cc++;
 		}
 		allItems.clear();
@@ -10372,7 +10372,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if (currItem->PictureIsAvailable)
+			if (currItem->imageIsAvailable)
 				cc++;
 		}
 		allItems.clear();
@@ -10387,7 +10387,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if (currItem->PictureIsAvailable)
+			if (currItem->imageIsAvailable)
 				cc++;
 		}
 		allItems.clear();
@@ -10405,7 +10405,7 @@
 			for (int ii = 0; ii < allItems.count(); ii++)
 			{
 				currItem = allItems.at(ii);
-				if (currItem->PictureIsAvailable)
+				if (currItem->imageIsAvailable)
 					cc++;
 			}
 			allItems.clear();
@@ -10422,7 +10422,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if (!currItem->PictureIsAvailable)
+			if (!currItem->imageIsAvailable)
 				continue;
 			bool fho = currItem->imageFlippedH();
 			bool fvo = currItem->imageFlippedV();
@@ -10456,7 +10456,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if (!currItem->PictureIsAvailable)
+			if (!currItem->imageIsAvailable)
 				continue;
 			bool fho = currItem->imageFlippedH();
 			bool fvo = currItem->imageFlippedV();
@@ -10491,7 +10491,7 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if (!currItem->PictureIsAvailable)
+			if (!currItem->imageIsAvailable)
 				continue;
 			bool fho = currItem->imageFlippedH();
 			bool fvo = currItem->imageFlippedV();
@@ -10530,7 +10530,7 @@
 			for (int ii = 0; ii < allItems.count(); ii++)
 			{
 				currItem = allItems.at(ii);
-				if (!currItem->PictureIsAvailable)
+				if (!currItem->imageIsAvailable)
 					continue;
 				bool fho = currItem->imageFlippedH();
 				bool fvo = currItem->imageFlippedV();
@@ -10592,9 +10592,9 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if ((currItem->PictureIsAvailable) && (currItem->Pfile == name))
-			{
-				currItem->PictureIsAvailable = false;
+			if ((currItem->imageIsAvailable) && (currItem->Pfile == name))
+			{
+				currItem->imageIsAvailable = false;
 				currItem->pixm = ScImage();
 				updated=true;
 			}
@@ -10611,9 +10611,9 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if ((currItem->PictureIsAvailable) && (currItem->Pfile == name))
-			{
-				currItem->PictureIsAvailable = false;
+			if ((currItem->imageIsAvailable) && (currItem->Pfile == name))
+			{
+				currItem->imageIsAvailable = false;
 				currItem->pixm = ScImage();
 				updated=true;
 			}
@@ -10630,9 +10630,9 @@
 		for (int ii = 0; ii < allItems.count(); ii++)
 		{
 			currItem = allItems.at(ii);
-			if ((currItem->PictureIsAvailable) && (currItem->Pfile == name))
-			{
-				currItem->PictureIsAvailable = false;
+			if ((currItem->imageIsAvailable) && (currItem->Pfile == name))
+			{
+				currItem->imageIsAvailable = false;
 				currItem->pixm = ScImage();
 				updated=true;
 			}
@@ -10655,9 +10655,9 @@
 			for (int ii = 0; ii < allItems.count(); ii++)
 			{
 				currItem = allItems.at(ii);
-				if ((currItem->PictureIsAvailable) && (currItem->Pfile == name))
+				if ((currItem->imageIsAvailable) && (currItem->Pfile == name))
 				{
-					currItem->PictureIsAvailable = false;
+					currItem->imageIsAvailable = false;
 					currItem->pixm = ScImage();
 					updated=true;
 				}
@@ -10712,7 +10712,7 @@
 		else if (currItem->asImageFrame())
 #endif
 		{
-			if (currItem->PictureIsAvailable)
+			if (currItem->imageIsAvailable)
 			{
 				int fho = currItem->imageFlippedH();
 				int fvo = currItem->imageFlippedV();
@@ -10874,7 +10874,7 @@
 			PageItem_ImageFrame* imageItem=m_Selection->itemAt(a)->asImageFrame();
 			if (imageItem==NULL)
 				continue;
-			imageItem->setImageShown(!imageItem->imageShown());
+			imageItem->setImageVisible(!imageItem->imageVisible());
 			imageItem->update();
 		}
 		m_updateManager.setUpdatesEnabled();
@@ -11547,7 +11547,7 @@
 		PageItem *currItem = itemSelection->itemAt(i);
 		if (currItem->asImageFrame())
 		{
-			if ((ScCore->fileWatcher->files().contains(currItem->Pfile) != 0) && (currItem->PictureIsAvailable))
+			if ((ScCore->fileWatcher->files().contains(currItem->Pfile) != 0) && (currItem->imageIsAvailable))
 				ScCore->fileWatcher->removeFile(currItem->Pfile);
 		}
 		currItem->clearContents();
@@ -11670,7 +11670,7 @@
 		itemList = GroupOfItem(Items, currItem);
 		if (itemList == NULL)
 			continue;
-		if ((currItem->asImageFrame()) && ((ScCore->fileWatcher->files().contains(currItem->Pfile) != 0) && (currItem->PictureIsAvailable)))
+		if ((currItem->asImageFrame()) && ((ScCore->fileWatcher->files().contains(currItem->Pfile) != 0) && (currItem->imageIsAvailable)))
 			ScCore->fileWatcher->removeFile(currItem->Pfile);
 		//delete marks pointed to that item
 		for (int a=0; a < m_docMarksList.count(); a++)
@@ -15750,7 +15750,7 @@
 			PageItem *currItem = itemSelection->itemAt(i);
 			if (currItem!=NULL)
 			{
-				if (currItem->asImageFrame() && currItem->PictureIsAvailable)
+				if (currItem->asImageFrame() && currItem->imageIsAvailable)
 				{
 					double w, h, x, y;
 					w = currItem->OrigW * currItem->imageXScale();
@@ -15790,7 +15790,7 @@
 			PageItem *currItem = itemSelection->itemAt(i);
 			if (currItem!=NULL)
 			{
-				if (currItem->asImageFrame() && currItem->PictureIsAvailable)
+				if (currItem->asImageFrame() && currItem->imageIsAvailable)
 					currItem->setImageScalingMode(false, true);
 			}
 		}
@@ -16615,7 +16615,7 @@
 	for (uint b=0; b<itemCount; ++b)
 	{
 		if (Items->at(b)->itemType() == PageItem::ImageFrame)
-			Items->at(b)->setImageShown(docPrefsData.guidesPrefs.showPic);
+			Items->at(b)->setImageVisible(docPrefsData.guidesPrefs.showPic);
 	}
 
 	double oldBaseGridValue  = oldPrefsData.guidesPrefs.valueBaselineGrid;

Modified: trunk/Scribus/scribus/scribusdoc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h (original)
+++ trunk/Scribus/scribus/scribusdoc.h Thu Feb 19 19:42:33 2015
@@ -1129,7 +1129,7 @@
 			for (int ii = 0; ii < allItems.count(); ii++)
 			{
 				item = allItems.at(ii);
-				if (item->PictureIsAvailable)
+				if (item->imageIsAvailable)
 				{
 					bool fho = item->imageFlippedH();
 					bool fvo = item->imageFlippedV();

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Thu Feb 19 19:42:33 2015
@@ -2736,7 +2736,7 @@
 				for (uint a = 0; a < pageFromMasterCount; ++a)
 				{
 					currItem = page->FromMaster.at(a);
-					if (!currItem->asImageFrame() || !currItem->PictureIsAvailable)
+					if (!currItem->asImageFrame() || !currItem->imageIsAvailable)
 						continue;
 					if (currItem->pixm.imgInfo.lowResType == 0)
 						continue;
@@ -2762,7 +2762,7 @@
 					currItem = Doc->Items->at(it);
 					if (!cullingArea.intersects(currItem->getBoundingRect().adjusted(0.0, 0.0, 1.0, 1.0)))
 						continue;
-					if (!currItem->asImageFrame() || !currItem->PictureIsAvailable)
+					if (!currItem->asImageFrame() || !currItem->imageIsAvailable)
 						continue;
 					if (currItem->pixm.imgInfo.lowResType == 0)
 						continue;

Modified: trunk/Scribus/scribus/ui/annot.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/ui/annot.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/annot.cpp (original)
+++ trunk/Scribus/scribus/ui/annot.cpp Thu Feb 19 19:42:33 2015
@@ -1346,7 +1346,7 @@
 {
 	NiconPrev->clear();
 	item->Pfile = "";
-	item->PictureIsAvailable = false;
+	item->imageIsAvailable = false;
 	IconNR->setEnabled(false);
 }
 
@@ -1401,7 +1401,7 @@
 		pmI1=QPixmap::fromImage(item->pixm.qImage());
 		NiconPrev->setPixmap(pmI1);
 		item->Pfile = fileName;
-		item->PictureIsAvailable = true;
+		item->imageIsAvailable = true;
 		int w = item->pixm.width();
 		int h = item->pixm.height();
 		double sw = item->width() / w;

Modified: trunk/Scribus/scribus/ui/contextmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp (original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp Thu Feb 19 19:42:33 2015
@@ -307,13 +307,13 @@
 			menuImage->addAction(m_ScMW->scrActions["editEditWithImageEditor"]);
 		if (selectedItemCount==1 && currItem->asImageFrame())
 		{
-			if (currItem->PictureIsAvailable)
+			if (currItem->imageIsAvailable)
 			{
 				if (m_actionList.contains("itemExtendedImageProperties"))
 					menuImage->addAction(m_ScMW->scrActions["itemExtendedImageProperties"]);
 				if (m_actionList.contains("itemAdjustFrameToImage"))
 				{
-					if (currItem->PictureIsAvailable)
+					if (currItem->imageIsAvailable)
 						menuImage->addAction(m_ScMW->scrActions["itemToggleInlineImage"]);
 				}
 				if (m_actionList.contains("itemImageInfo"))

Modified: trunk/Scribus/scribus/ui/picstatus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/ui/picstatus.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/picstatus.cpp (original)
+++ trunk/Scribus/scribus/ui/picstatus.cpp Thu Feb 19 19:42:33 2015
@@ -93,7 +93,7 @@
 	p.setPen(Qt::NoPen);
 	p.setBrush(b);
 	p.drawRect(12, 12, 104, 104);
-	if (item->PictureIsAvailable && QFile::exists(item->externalFile()))
+	if (item->imageIsAvailable && QFile::exists(item->externalFile()))
 	{
 		QImage im2 = item->pixm.scaled(104, 104, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 		p.drawImage((104 - im2.width()) / 2 + 12, (104 - im2.height()) / 2 + 12, im2);
@@ -280,7 +280,7 @@
 				displayPage->setText(QString::number(currItem->OwnPage + 1));
 		}
 		displayObjekt->setText(currItem->itemName());
-		if (currItem->PictureIsAvailable)
+		if (currItem->imageIsAvailable)
 		{
 			QFileInfo fi = QFileInfo(currItem->Pfile);
 			QString ext = fi.suffix().toLower();
@@ -337,7 +337,7 @@
 			displayScale->setText(QString("%1 x %2 %").arg(currItem->imageXScale() * 100 / 72.0 * currItem->pixm.imgInfo.xres, 5, 'f', 1).arg(currItem->imageYScale() * 100 / 72.0 * currItem->pixm.imgInfo.yres, 5, 'f', 1));
 			displayPrintSize->setText(QString("%1 x %2%3").arg(currItem->OrigW * currItem->imageXScale() * m_Doc->unitRatio(), 7, 'f', 2).arg(currItem->OrigH * currItem->imageXScale() * m_Doc->unitRatio(), 7, 'f', 2).arg(unitGetSuffixFromIndex(m_Doc->unitIndex())));
 			isPrinting->setChecked(currItem->printEnabled());
-			isVisibleCheck->setChecked(currItem->imageShown());
+			isVisibleCheck->setChecked(currItem->imageVisible());
 			buttonEdit->setEnabled(currItem->isRaster);
 			effectsButton->setEnabled(currItem->isRaster);
 			buttonLayers->setEnabled(currItem->pixm.imgInfo.valid);
@@ -387,7 +387,7 @@
 {
 	if (currItem != NULL)
 	{
-		currItem->setImageShown(isVisibleCheck->isChecked());
+		currItem->setImageVisible(isVisibleCheck->isChecked());
 		emit refreshItem(currItem);
 	}
 }
@@ -431,7 +431,7 @@
 	m_Doc->loadPict(newFilePath, currItem, true);
 	if (masterPageMode != oldMasterPageMode)
 		m_Doc->setMasterPageMode(oldMasterPageMode);
-	return currItem->PictureIsAvailable;
+	return currItem->imageIsAvailable;
 }
 
 void PicStatus::SearchPic()

Modified: trunk/Scribus/scribus/ui/propertiespalette_image.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19834&path=/trunk/Scribus/scribus/ui/propertiespalette_image.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_image.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_image.cpp Thu Feb 19 19:42:33 2015
@@ -443,7 +443,7 @@
 	if (m_item->asImageFrame())
 	{
 		imagePageNumber->blockSignals(true);
-		if(m_item->PictureIsAvailable)
+		if(m_item->imageIsAvailable)
 		{
 			imagePageNumber->setMaximum(m_item->pixm.imgInfo.numberOfPages);
 			imagePageNumber->setEnabled(true);
@@ -462,8 +462,8 @@
 		imageYOffsetSpinBox->blockSignals(true);
 		imageRotation->blockSignals(true);
 
-		imgEffectsButton->setVisible(m_item->PictureIsAvailable && m_item->isRaster);
-		imgExtProperties->setVisible(m_item->PictureIsAvailable && m_item->pixm.imgInfo.valid);
+		imgEffectsButton->setVisible(m_item->imageIsAvailable && m_item->isRaster);
+		imgExtProperties->setVisible(m_item->imageIsAvailable && m_item->pixm.imgInfo.valid);
 		bool setter = m_item->ScaleType;
 		freeScale->setChecked(setter);
 		frameScale->setChecked(!setter);




More information about the scribus-commit mailing list