Author: jghali
Date: Wed Jan 23 23:17:04 2019
New Revision: 22821
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22821
Log:
Rename PageItem::AdjustPictScale() to adjustPictScale()
Modified:
trunk/Scribus/scribus/canvasgesture_resize.cpp
trunk/Scribus/scribus/pageitem.cpp
trunk/Scribus/scribus/pageitem.h
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
trunk/Scribus/scribus/plugins/scripter/api_imageitem.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/scribusdoc.h
trunk/Scribus/scribus/scribusview.cpp
trunk/Scribus/scribus/ui/propertiespalette_image.cpp
trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
Modified: trunk/Scribus/scribus/canvasgesture_resize.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/canvasgesture_resize.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_resize.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_resize.cpp Wed Jan 23 23:17:04 2019
@@ -225,7 +225,7 @@
doResize(m->modifiers() & Qt::AltModifier);
m_doc->setRedrawBounding(currItem);
if (currItem->asImageFrame())
- currItem->AdjustPictScale();
+ currItem->adjustPictScale();
}
//add action itemResizeToMargin for right click on item`s
handlers
else if (m->button() == Qt::RightButton)
Modified: trunk/Scribus/scribus/pageitem.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Wed Jan 23 23:17:04 2019
@@ -4256,7 +4256,7 @@
}
ScaleType = freeScale;
AspectRatio = keepRatio;
- AdjustPictScale();
+ adjustPictScale();
update();
}
@@ -9423,7 +9423,7 @@
else
IProfile = pixm.imgInfo.profileName;
- AdjustPictScale();
+ adjustPictScale();
// #12408 : we set the old* variables to avoid creation of unwanted
undo states
// when user perform actions such as double clicking image. We might
want to
@@ -9726,7 +9726,7 @@
}
}
-void PageItem::AdjustPictScale()
+void PageItem::adjustPictScale()
{
if (itemType() != PageItem::ImageFrame)
return;
Modified: trunk/Scribus/scribus/pageitem.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h (original)
+++ trunk/Scribus/scribus/pageitem.h Wed Jan 23 23:17:04 2019
@@ -358,7 +358,7 @@
* @brief Adjust the picture scale, moved from the view, no view code
here
* FIXME: Move to PageItem_TextFrame
*/
- void AdjustPictScale();
+ void adjustPictScale();
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&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
Wed Jan 23 23:17:04 2019
@@ -569,7 +569,7 @@
currItem->ClipEdited = true;
}
if (currItem->asImageFrame())
- currItem->AdjustPictScale();
+ currItem->adjustPictScale();
if (currItem->asPathText())
{
currItem->ClipEdited = true;
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&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
Wed Jan 23 23:17:04 2019
@@ -1946,7 +1946,7 @@
currItem->setHeight(1.0);
}
if (currItem->asImageFrame())
- currItem->AdjustPictScale();
+ currItem->adjustPictScale();
if (currItem->asPathText())
currItem->updatePolyClip();
currItem->GrType = obj->attribute("GRTYP", "0").toInt();
Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp Wed Jan 23
23:17:04 2019
@@ -1579,7 +1579,7 @@
ite->setImageFlippedH(flipX);
ite->setImageFlippedV(flipY);
ite->setImageScalingMode(false, false);
- ite->AdjustPictScale();
+ ite->adjustPictScale();
colorPrecision = t_colorPrecision;
colorIndexPrecision = t_colorIndexPrecision;
}
Modified: trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/emf/importemf.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/emf/importemf.cpp Wed Jan 23
23:17:04 2019
@@ -2976,7 +2976,7 @@
ite->updateClip();
}
m_Doc->loadPict(fileName, ite);
- ite->AdjustPictScale();
+ ite->adjustPictScale();
}
}
delete tempFile;
Modified: trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/importidml.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/idml/importidml.cpp Wed Jan 23
23:17:04 2019
@@ -2614,7 +2614,7 @@
item->setImageXYScale(scXi / item->pixm.imgInfo.xres * 72, scYi /
item->pixm.imgInfo.xres * 72);
item->setImageXYOffset(-imageDX * scXi / item->imageXScale(), -imageDY * scXi /
item->imageYScale());
item->setImageRotation(-roti);
- item->AdjustPictScale();
+ item->adjustPictScale();
}
}
delete tempFile;
@@ -2650,7 +2650,7 @@
item->setImageXYOffset(-imageDX * scXi
/ item->imageXScale(), -imageDY * scXi / item->imageYScale());
item->setImageRotation(-roti);
if (imageFit != "None")
- item->AdjustPictScale();
+ item->adjustPictScale();
}
}
GElements.append(m_Doc->Items->takeAt(z));
Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.cpp Wed Jan 23
23:17:04 2019
@@ -1568,7 +1568,7 @@
retObj->AspectRatio = false;
retObj->ScaleType = false;
m_Doc->loadPict(fileName, retObj);
-
retObj->AdjustPictScale();
+
retObj->adjustPictScale();
}
}
delete tempFile;
@@ -1658,7 +1658,7 @@
retObj->AspectRatio = false;
retObj->ScaleType = false;
m_Doc->loadPict(fileName, retObj);
-
retObj->AdjustPictScale();
+
retObj->adjustPictScale();
}
}
delete tempFile;
Modified: trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/importpages.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pages/importpages.cpp Wed Jan 23
23:17:04 2019
@@ -1889,7 +1889,7 @@
retObj->AspectRatio =
false;
retObj->ScaleType =
false;
m_Doc->loadPict(fileName, retObj);
-
retObj->AdjustPictScale();
+
retObj->adjustPictScale();
}
}
delete tempFile;
Modified: trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp Wed Jan 23
23:17:04 2019
@@ -3605,14 +3605,14 @@
{
int rot =
QString(m_style["librevenge:rotate"]->getStr().cstr()).toInt();
ite->setImageRotation(rot);
- ite->AdjustPictScale();
+ ite->adjustPictScale();
}
#else
if (m_style["libwpg:rotate"])
{
int rot =
QString(m_style["libwpg:rotate"]->getStr().cstr()).toInt();
ite->setImageRotation(rot);
- ite->AdjustPictScale();
+ ite->adjustPictScale();
}
#endif
}
Modified: trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp Wed Jan 23
23:17:04 2019
@@ -2057,7 +2057,7 @@
ite->AspectRatio = false;
ite->ScaleType = false;
m_Doc->loadPict(fileName, ite);
- ite->AdjustPictScale();
+ ite->adjustPictScale();
}
}
delete tempFile;
@@ -2113,7 +2113,7 @@
ite->AspectRatio = false;
ite->ScaleType = false;
m_Doc->loadPict(fileName, ite);
- ite->AdjustPictScale();
+ ite->adjustPictScale();
}
}
delete tempFile;
Modified: trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/importxps.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xps/importxps.cpp Wed Jan 23
23:17:04 2019
@@ -1718,7 +1718,7 @@
retObj->AspectRatio = false;
retObj->ScaleType = false;
m_Doc->loadPict(fileName,
retObj);
- retObj->AdjustPictScale();
+ retObj->adjustPictScale();
}
}
delete tempFile;
Modified: trunk/Scribus/scribus/plugins/scripter/api_imageitem.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/plugins/scripter/api_imageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scripter/api_imageitem.cpp (original)
+++ trunk/Scribus/scribus/plugins/scripter/api_imageitem.cpp Wed Jan 23
23:17:04 2019
@@ -206,8 +206,8 @@
//FIXME emit or something so we dont need this
ScCore->primaryMainWindow()->propertiesPalette->imagePal->showScaleAndOffset(item->imageXScale(),
item->imageYScale(), item->imageXOffset(), item->imageYOffset());
- item->AdjustPictScale();
- //ScCore->primaryMainWindow()->view->AdjustPictScale(item);
+ item->adjustPictScale();
+ //ScCore->primaryMainWindow()->view->adjustPictScale(item);
item->update();
}
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp Wed Jan 23
23:17:04 2019
@@ -578,7 +578,7 @@
if (proportional != -1)
item->AspectRatio = proportional > 0;
- item->AdjustPictScale();
+ item->adjustPictScale();
item->update();
Py_RETURN_NONE;
Modified: trunk/Scribus/scribus/scribus.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Wed Jan 23 23:17:04 2019
@@ -3087,7 +3087,7 @@
b->OldB2 = b->width();
b->OldH2 = b->height();
b->updateClip();
- b->AdjustPictScale();
+ b->adjustPictScale();
}
else
{
Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Wed Jan 23 23:17:04 2019
@@ -10192,7 +10192,7 @@
currItem->setImageFlippedV(fvo);
currItem->setImageXOffset(imgX);
currItem->setImageYOffset(imgY);
- currItem->AdjustPictScale();
+ currItem->adjustPictScale();
ca++;
m_ScMW->mainWindowProgressBar->setValue(ca);
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
@@ -10226,7 +10226,7 @@
currItem->setImageFlippedV(fvo);
currItem->setImageXOffset(imgX);
currItem->setImageYOffset(imgY);
- currItem->AdjustPictScale();
+ currItem->adjustPictScale();
ca++;
m_ScMW->mainWindowProgressBar->setValue(ca);
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
@@ -10261,7 +10261,7 @@
currItem->setImageFlippedV(fvo);
currItem->setImageXOffset(imgX);
currItem->setImageYOffset(imgY);
- currItem->AdjustPictScale();
+ currItem->adjustPictScale();
ca++;
m_ScMW->mainWindowProgressBar->setValue(ca);
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
@@ -10300,7 +10300,7 @@
currItem->setImageFlippedV(fvo);
currItem->setImageXOffset(imgX);
currItem->setImageYOffset(imgY);
- currItem->AdjustPictScale();
+ currItem->adjustPictScale();
ca++;
m_ScMW->mainWindowProgressBar->setValue(ca);
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
@@ -14229,7 +14229,7 @@
}
if ((currItem->asImageFrame()) && (!currItem->Sizing) && (appMode !=
modeEditClip))
{
- currItem->AdjustPictScale();
+ currItem->adjustPictScale();
}
if (currItem->asLine())
{
@@ -15248,7 +15248,7 @@
item->rotateBy(-gRot);
item->setLineWidth(item->lineWidth() * qMax(grScXi, grScYi));
if (!item->ScaleType)
- item->AdjustPictScale();
+ item->adjustPictScale();
else
{
item->setImageXScale(item->imageXScale() * grScXi);
Modified: trunk/Scribus/scribus/scribusdoc.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h (original)
+++ trunk/Scribus/scribus/scribusdoc.h Wed Jan 23 23:17:04 2019
@@ -1125,7 +1125,7 @@
item->loadImage(item->Pfile,
true, -1, false);
item->setImageFlippedH(fho);
item->setImageFlippedV(fvo);
- item->AdjustPictScale();
+ item->adjustPictScale();
}
}
allItems.clear();
Modified: trunk/Scribus/scribus/scribusview.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Wed Jan 23 23:17:04 2019
@@ -832,7 +832,7 @@
item->OldB2 = item->width();
item->OldH2 = item->height();
item->updateClip();
- item->AdjustPictScale();
+ item->adjustPictScale();
item->update();
dropOffsetX += Doc->opToolPrefs().dispX;
dropOffsetY += Doc->opToolPrefs().dispY;
@@ -1011,7 +1011,7 @@
item->OldB2 = item->width();
item->OldH2 = item->height();
item->updateClip();
- item->AdjustPictScale();
+ item->adjustPictScale();
item->update();
emit DocChanged();
update();
Modified: trunk/Scribus/scribus/ui/propertiespalette_image.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/ui/propertiespalette_image.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_image.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_image.cpp Wed Jan 23
23:17:04 2019
@@ -587,7 +587,7 @@
{
m_doc->itemSelection_SetImageRotation(360 -
imageRotation->value());
if (frameScale->isChecked())
- m_item->AdjustPictScale();
+ m_item->adjustPictScale();
}
}
Modified: trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22821&path=/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp Wed Jan 23 23:17:04 2019
@@ -1143,7 +1143,7 @@
// FIXME
if (false /*!FreeScale->isChecked()*/)
{
- m_item->AdjustPictScale();
+ m_item->adjustPictScale();
m_item->update();
}
}
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
