r21026 by craig -
scribus-commit
scribus-commit at lists.scribus.net
Mon Feb 22 22:43:11 UTC 2016
Author: craig
Date: Mon Feb 22 22:43:11 2016
New Revision: 21026
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21026
Log:
#13647: Apply lastest, betterest, spooleng pooch
Modified:
trunk/Scribus/scribus/canvasgesture_resize.cpp
trunk/Scribus/scribus/canvasmode_drawbezier.cpp
trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
trunk/Scribus/scribus/canvasmode_edit.cpp
trunk/Scribus/scribus/canvasmode_editgradient.cpp
trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
trunk/Scribus/scribus/canvasmode_editweldpoint.cpp
trunk/Scribus/scribus/canvasmode_framelinks.cpp
trunk/Scribus/scribus/canvasmode_magnifier.cpp
trunk/Scribus/scribus/canvasmode_nodeedit.cpp
trunk/Scribus/scribus/canvasmode_normal.cpp
trunk/Scribus/scribus/canvasmode_objimport.cpp
trunk/Scribus/scribus/collapsedtablepainterex.cpp
trunk/Scribus/scribus/guidesdelegate.cpp
trunk/Scribus/scribus/sclayer.cpp
trunk/Scribus/scribus/sclayer.h
trunk/Scribus/scribus/ui/notesstyleseditor.cpp
trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
trunk/Scribus/scribus/ui/propertiespalette_group.cpp
trunk/Scribus/scribus/ui/propertiespalette_image.cpp
trunk/Scribus/scribus/ui/propertiespalette_line.cpp
trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
trunk/Scribus/scribus/ui/propertiespalette_text.cpp
trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
trunk/Scribus/scribus/ui/propertywidget_distance.cpp
trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp
trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
trunk/Scribus/scribus/ui/scdockpalette.h
trunk/Scribus/scribus/undotransaction.cpp
Modified: trunk/Scribus/scribus/canvasgesture_resize.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/canvasgesture_resize.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_resize.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_resize.cpp Mon Feb 22 22:43:11 2016
@@ -507,7 +507,7 @@
{
adjustBounds(m);
FPoint where = m_canvas->globalToCanvas(m->globalPos());
- if (// directly after a create the shape of an item isnt really usable, so we fix here
+ if (// directly after a create the shape of an item isn't really usable, so we fix here
m_origBounds.width() < 20 || m_origBounds.height() < 20 ||
// and if we resize outside of the current canvas dimensions, we need to enlarge it
where.x() < m_doc->minCanvasCoordinate.x() || where.y() < m_doc->minCanvasCoordinate.y() ||
Modified: trunk/Scribus/scribus/canvasmode_drawbezier.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/canvasmode_drawbezier.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawbezier.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawbezier.cpp Mon Feb 22 22:43:11 2016
@@ -453,7 +453,7 @@
// {
// m_doc->itemAddCommit(m_doc->m_Selection->itemAt(0)->ItemNr);
// }
- //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas
+ //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas
m_view->m_ScMW->zoomSpinBox->clearFocus();
m_view->m_ScMW->pageSelector->clearFocus();
if (m_doc->m_Selection->itemAt(0) != 0) // is there the old clip stored for the undo action
Modified: trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp Mon Feb 22 22:43:11 2016
@@ -322,7 +322,7 @@
{
m_doc->itemAddCommit(m_doc->m_Selection->itemAt(0));
}
- //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas
+ //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas
m_view->m_ScMW->zoomSpinBox->clearFocus();
m_view->m_ScMW->pageSelector->clearFocus();
if (m_doc->m_Selection->itemAt(0) != 0) // is there the old clip stored for the undo action
Modified: trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawfreehand.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawfreehand.cpp Mon Feb 22 22:43:11 2016
@@ -309,7 +309,7 @@
{
m_doc->itemAddCommit(m_doc->m_Selection->itemAt(0));
}
- //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas
+ //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas
m_view->m_ScMW->zoomSpinBox->clearFocus();
m_view->m_ScMW->pageSelector->clearFocus();
if (m_doc->m_Selection->itemAt(0) != 0) // is there the old clip stored for the undo action
Modified: trunk/Scribus/scribus/canvasmode_edit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/canvasmode_edit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_edit.cpp Mon Feb 22 22:43:11 2016
@@ -444,7 +444,7 @@
currItem->itemText.deselectAll();
currItem->HasSel = false;
m_view->slotSetCurs(m->globalPos().x(), m->globalPos().y());
- //Make sure we dont go here if the old cursor position was not set
+ //Make sure we don't go here if the old cursor position was not set
if (oldCp!=-1 && currItem->itemText.length() > 0)
{
if (currItem->itemText.cursorPosition() < oldCp)
@@ -932,7 +932,7 @@
{
m_doc->itemAddCommit(m_doc->m_Selection->itemAt(0));
}
- //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas
+ //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas
m_view->m_ScMW->zoomSpinBox->clearFocus();
m_view->m_ScMW->pageSelector->clearFocus();
if (m_doc->m_Selection->itemAt(0) != 0) // is there the old clip stored for the undo action
Modified: trunk/Scribus/scribus/canvasmode_editgradient.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/canvasmode_editgradient.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editgradient.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editgradient.cpp Mon Feb 22 22:43:11 2016
@@ -286,7 +286,7 @@
m_view->Deselect(false);
m_doc->m_Selection->addItem(currItem);
currItem->isSingleSel = true;
- //CB FIXME dont call this if the added item is item 0
+ //CB FIXME don't call this if the added item is item 0
if (!m_doc->m_Selection->primarySelectionIs(currItem))
currItem->emitAllToGUI();
m_view->updateContents(currItem->getRedrawBounding(m_canvas->scale()));
Modified: trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp Mon Feb 22 22:43:11 2016
@@ -546,7 +546,7 @@
m_view->Deselect(false);
m_doc->m_Selection->addItem(currItem);
currItem->isSingleSel = true;
- //CB FIXME dont call this if the added item is item 0
+ //CB FIXME don't call this if the added item is item 0
if (!m_doc->m_Selection->primarySelectionIs(currItem))
currItem->emitAllToGUI();
m_view->updateContents(currItem->getRedrawBounding(m_canvas->scale()));
Modified: trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp Mon Feb 22 22:43:11 2016
@@ -545,7 +545,7 @@
m_view->Deselect(false);
m_doc->m_Selection->addItem(currItem);
currItem->isSingleSel = true;
- //CB FIXME dont call this if the added item is item 0
+ //CB FIXME don't call this if the added item is item 0
if (!m_doc->m_Selection->primarySelectionIs(currItem))
currItem->emitAllToGUI();
m_view->updateContents(currItem->getRedrawBounding(m_canvas->scale()));
Modified: trunk/Scribus/scribus/canvasmode_editweldpoint.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/canvasmode_editweldpoint.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editweldpoint.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editweldpoint.cpp Mon Feb 22 22:43:11 2016
@@ -322,7 +322,7 @@
m_view->Deselect(false);
m_doc->m_Selection->addItem(currItem);
currItem->isSingleSel = true;
- //CB FIXME dont call this if the added item is item 0
+ //CB FIXME don't call this if the added item is item 0
if (!m_doc->m_Selection->primarySelectionIs(currItem))
currItem->emitAllToGUI();
m_view->updateContents(currItem->getRedrawBounding(m_canvas->scale()));
Modified: trunk/Scribus/scribus/canvasmode_framelinks.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/canvasmode_framelinks.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_framelinks.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_framelinks.cpp Mon Feb 22 22:43:11 2016
@@ -313,7 +313,7 @@
m_view->MidButt = false;
for (int i = 0; i < m_doc->m_Selection->count(); ++i)
m_doc->m_Selection->itemAt(i)->checkChanges(true);
- //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas
+ //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas
m_view->m_ScMW->zoomSpinBox->clearFocus();
m_view->m_ScMW->pageSelector->clearFocus();
}
Modified: trunk/Scribus/scribus/canvasmode_magnifier.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/canvasmode_magnifier.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_magnifier.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_magnifier.cpp Mon Feb 22 22:43:11 2016
@@ -238,7 +238,7 @@
m_canvas->m_viewMode.operItemMoving = false;
m_canvas->m_viewMode.operItemResizing = false;
m_view->MidButt = false;
- //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas
+ //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas
m_view->m_ScMW->zoomSpinBox->clearFocus();
m_view->m_ScMW->pageSelector->clearFocus();
}
Modified: trunk/Scribus/scribus/canvasmode_nodeedit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/canvasmode_nodeedit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_nodeedit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_nodeedit.cpp Mon Feb 22 22:43:11 2016
@@ -486,7 +486,7 @@
{
m_doc->itemAddCommit(m_doc->m_Selection->itemAt(0));
}
- //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas
+ //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas
m_view->m_ScMW->zoomSpinBox->clearFocus();
m_view->m_ScMW->pageSelector->clearFocus();
if (m_doc->m_Selection->itemAt(0) != 0) // is there the old clip stored for the undo action
Modified: trunk/Scribus/scribus/canvasmode_normal.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/canvasmode_normal.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_normal.cpp Mon Feb 22 22:43:11 2016
@@ -184,7 +184,7 @@
m_view->Deselect(false);
m_doc->m_Selection->addItem(currItem);
currItem->isSingleSel = true;
- //CB FIXME dont call this if the added item is item 0
+ //CB FIXME don't call this if the added item is item 0
if (!m_doc->m_Selection->primarySelectionIs(currItem))
currItem->emitAllToGUI();
m_view->updateContents(currItem->getRedrawBounding(m_canvas->scale()));
@@ -933,7 +933,7 @@
m_dragConstrainInitPtX = qRound(currItem->xPos());
m_dragConstrainInitPtY = qRound(currItem->yPos());
- // dont call SeleItem() without need here:
+ // don't call SeleItem() without need here:
m_frameResizeHandle = m_canvas->frameHitTest(QPointF(mousePointDoc.x(),mousePointDoc.y()), currItem);
//#6797
if (m_frameResizeHandle <= 0 || m->modifiers() != Qt::NoModifier)
@@ -1284,7 +1284,7 @@
m_doc->itemAddCommit(m_doc->m_Selection->itemAt(0));
}
}
- //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas
+ //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas
m_view->m_ScMW->zoomSpinBox->clearFocus();
m_view->m_ScMW->pageSelector->clearFocus();
if (m_doc->m_Selection->count() > 0)
Modified: trunk/Scribus/scribus/canvasmode_objimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/canvasmode_objimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_objimport.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_objimport.cpp Mon Feb 22 22:43:11 2016
@@ -206,7 +206,7 @@
m_canvas->m_viewMode.operItemMoving = false;
m_canvas->m_viewMode.operItemResizing = false;
m_view->MidButt = false;
- //Make sure the Zoom spinbox and page selector dont have focus if we click on the canvas
+ //Make sure the Zoom spinbox and page selector don't have focus if we click on the canvas
m_view->m_ScMW->zoomSpinBox->clearFocus();
m_view->m_ScMW->pageSelector->clearFocus();
}
Modified: trunk/Scribus/scribus/collapsedtablepainterex.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/collapsedtablepainterex.cpp
==============================================================================
--- trunk/Scribus/scribus/collapsedtablepainterex.cpp (original)
+++ trunk/Scribus/scribus/collapsedtablepainterex.cpp Mon Feb 22 22:43:11 2016
@@ -467,7 +467,7 @@
QPointF lineStart, lineEnd;
foreach (const TableBorderLine& line, border.borderLines())
{
- // Adjust line start and ends by line width multipled by offset factors.
+ // Adjust line start and ends by line width multiplied by offset factors.
lineStart.setX(start.x() + line.width() * startOffsetFactors.x());
lineStart.setY(start.y() + line.width() * startOffsetFactors.y());
lineEnd.setX(end.x() + line.width() * endOffsetFactors.x());
Modified: trunk/Scribus/scribus/guidesdelegate.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/guidesdelegate.cpp
==============================================================================
--- trunk/Scribus/scribus/guidesdelegate.cpp (original)
+++ trunk/Scribus/scribus/guidesdelegate.cpp Mon Feb 22 22:43:11 2016
@@ -42,7 +42,7 @@
const QModelIndex &index) const
{
ScrSpinBox *w = static_cast<ScrSpinBox*>(editor);
- // When user exit widget, editor value may not be commited at this point
+ // When user exit widget, editor value may not be committed at this point
// so we have to get value from widget text
double value = w->valueFromText(w->text());
model->setData(index, value, Qt::EditRole);
Modified: trunk/Scribus/scribus/sclayer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/sclayer.cpp
==============================================================================
--- trunk/Scribus/scribus/sclayer.cpp (original)
+++ trunk/Scribus/scribus/sclayer.cpp Mon Feb 22 22:43:11 2016
@@ -7,9 +7,9 @@
#include "sclayer.h"
-#include <QHash> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates
+#include <QHash> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instantiation of templates
#include <QObject>
-#include <QVector> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates
+#include <QVector> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instantiation of templates
#include <QtAlgorithms>
ScLayer::ScLayer(void)
Modified: trunk/Scribus/scribus/sclayer.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/sclayer.h
==============================================================================
--- trunk/Scribus/scribus/sclayer.h (original)
+++ trunk/Scribus/scribus/sclayer.h Mon Feb 22 22:43:11 2016
@@ -10,7 +10,7 @@
#include <QColor>
#include <QString>
#include <QList>
-#include <QSet> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates
+#include <QSet> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instantiation of templates
#include "scribusapi.h"
Modified: trunk/Scribus/scribus/ui/notesstyleseditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/ui/notesstyleseditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/notesstyleseditor.cpp (original)
+++ trunk/Scribus/scribus/ui/notesstyleseditor.cpp Mon Feb 22 22:43:11 2016
@@ -280,7 +280,7 @@
}
else
{
- //remeber current NStyle
+ //remember current NStyle
QString currNS = NSlistBox->currentText();
NotesStyle* NS = NULL;
Modified: trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_masterpages.cpp Mon Feb 22 22:43:11 2016
@@ -400,7 +400,7 @@
m_doc->setCurrentPage(m_doc->addMasterPage(nr, MasterPageName2));
qApp->processEvents();
//CB TODO: If we are loading to a new name, we rely on doc->onpage in
- //FileLoader::PasteItem as this call doesnt pass in the new destination page
+ //FileLoader::PasteItem as this call doesn't pass in the new destination page
m_doc->scMW()->loadPage(dia->getFromDoc(), dia->getMasterPageNameItem(), true, MasterPageName2);
qApp->processEvents();
Modified: trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp Mon Feb 22 22:43:11 2016
@@ -395,7 +395,7 @@
void Prefs_KeyboardShortcuts::applySearch( const QString & newss )
{
- //Must run this as if newss is not empty and we go to the next for loop, the set visible doesnt work
+ //Must run this as if newss is not empty and we go to the next for loop, the set visible doesn't work
for (QList<QTreeWidgetItem*>::iterator it=lviToMenuMap.begin(); it!=lviToMenuMap.end(); ++it)
(*it)->setHidden(false);
if (newss.isEmpty())
@@ -404,7 +404,7 @@
it.key()->setHidden(false);
return;
}
- //Seem to need to do this.. isOpen doesnt seem to do what it says
+ //Seem to need to do this.. isOpen doesn't seem to do what it says
for (QMap<QTreeWidgetItem*, QString>::iterator it=lviToActionMap.begin(); it!=lviToActionMap.end(); ++it)
{
if (it.key()->text(0).contains(newss, Qt::CaseInsensitive))
Modified: trunk/Scribus/scribus/ui/propertiespalette_group.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/ui/propertiespalette_group.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_group.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_group.cpp Mon Feb 22 22:43:11 2016
@@ -273,10 +273,10 @@
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
- //CB We shouldnt really need to process this if our item is the same one
+ //CB We shouldn't really need to process this if our item is the same one
//maybe we do if the item has been changed by scripter.. but that should probably
//set some status if so.
- //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL.
+ //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL.
//if (m_item == i)
// return;
Modified: trunk/Scribus/scribus/ui/propertiespalette_image.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/ui/propertiespalette_image.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_image.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_image.cpp Mon Feb 22 22:43:11 2016
@@ -439,10 +439,10 @@
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
- //CB We shouldnt really need to process this if our item is the same one
+ //CB We shouldn't really need to process this if our item is the same one
//maybe we do if the item has been changed by scripter.. but that should probably
//set some status if so.
- //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL.
+ //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL.
//if (m_item == i)
// return;
@@ -557,7 +557,7 @@
return;
if ((m_haveDoc) && (m_haveItem))
{
- //CB Dont pass in the scale to the offset change as its taken from the new scale
+ //CB Don't pass in the scale to the offset change as its taken from the new scale
m_doc->itemSelection_SetImageScaleAndOffset(imageXScaleSpinBox->value() / 100.0 / m_item->pixm.imgInfo.xres * 72.0, imageYScaleSpinBox->value() / 100.0 / m_item->pixm.imgInfo.yres * 72.0, imageXOffsetSpinBox->value() / m_unitRatio, imageYOffsetSpinBox->value() / m_unitRatio);
imgDpiX->showValue(qRound(720.0 / m_item->imageXScale()) / 10.0);
imgDpiY->showValue(qRound(720.0 / m_item->imageYScale()) / 10.0);
@@ -570,7 +570,7 @@
return;
if ((m_haveDoc) && (m_haveItem))
{
- //CB Dont pass in the scale to the offset change as its taken from the new scale
+ //CB Don't pass in the scale to the offset change as its taken from the new scale
m_doc->itemSelection_SetImageScaleAndOffset(72.0 / imgDpiX->value(), 72.0 / imgDpiY->value(), imageXOffsetSpinBox->value() / m_unitRatio, imageYOffsetSpinBox->value() / m_unitRatio);
imageXScaleSpinBox->showValue(m_item->imageXScale() * 100 / 72.0 * m_item->pixm.imgInfo.xres);
Modified: trunk/Scribus/scribus/ui/propertiespalette_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/ui/propertiespalette_line.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_line.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_line.cpp Mon Feb 22 22:43:11 2016
@@ -241,10 +241,10 @@
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
- //CB We shouldnt really need to process this if our item is the same one
+ //CB We shouldn't really need to process this if our item is the same one
//maybe we do if the item has been changed by scripter.. but that should probably
//set some status if so.
- //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL.
+ //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL.
//if (m_item == i)
// return;
Modified: trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shape.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shape.cpp Mon Feb 22 22:43:11 2016
@@ -321,10 +321,10 @@
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
- //CB We shouldnt really need to process this if our item is the same one
+ //CB We shouldn't really need to process this if our item is the same one
//maybe we do if the item has been changed by scripter.. but that should probably
//set some status if so.
- //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL.
+ //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL.
//if (m_item == i)
// return;
Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp Mon Feb 22 22:43:11 2016
@@ -295,10 +295,10 @@
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
- //CB We shouldnt really need to process this if our item is the same one
+ //CB We shouldn't really need to process this if our item is the same one
//maybe we do if the item has been changed by scripter.. but that should probably
//set some status if so.
- //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL.
+ //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL.
//if (m_item == i)
// return;
Modified: trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp Mon Feb 22 22:43:11 2016
@@ -282,10 +282,10 @@
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
- //CB We shouldnt really need to process this if our item is the same one
+ //CB We shouldn't really need to process this if our item is the same one
//maybe we do if the item has been changed by scripter.. but that should probably
//set some status if so.
- //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL.
+ //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL.
//if (m_item == i)
// return;
@@ -505,7 +505,7 @@
flipV->setChecked(false);
}
- //CB Why cant we do this for lines?
+ //CB Why can't we do this for lines?
// flipH->setEnabled((itemType !=-1) && (itemType !=5));
// flipV->setEnabled((itemType !=-1) && (itemType !=5));
flipH->setEnabled(itemType !=-1);
Modified: trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_advanced.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_advanced.cpp Mon Feb 22 22:43:11 2016
@@ -90,10 +90,10 @@
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
- //CB We shouldnt really need to process this if our item is the same one
+ //CB We shouldn't really need to process this if our item is the same one
//maybe we do if the item has been changed by scripter.. but that should probably
//set some status if so.
- //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL.
+ //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL.
//if (m_item == i)
// return;
Modified: trunk/Scribus/scribus/ui/propertywidget_distance.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/ui/propertywidget_distance.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_distance.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_distance.cpp Mon Feb 22 22:43:11 2016
@@ -101,10 +101,10 @@
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
- //CB We shouldnt really need to process this if our item is the same one
+ //CB We shouldn't really need to process this if our item is the same one
//maybe we do if the item has been changed by scripter.. but that should probably
//set some status if so.
- //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL.
+ //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL.
//if (m_item == i)
// return;
Modified: trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_optmargins.cpp Mon Feb 22 22:43:11 2016
@@ -65,10 +65,10 @@
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
- //CB We shouldnt really need to process this if our item is the same one
+ //CB We shouldn't really need to process this if our item is the same one
//maybe we do if the item has been changed by scripter.. but that should probably
//set some status if so.
- //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL.
+ //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL.
//if (m_item == i)
// return;
Modified: trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp Mon Feb 22 22:43:11 2016
@@ -81,10 +81,10 @@
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
- //CB We shouldnt really need to process this if our item is the same one
+ //CB We shouldn't really need to process this if our item is the same one
//maybe we do if the item has been changed by scripter.. but that should probably
//set some status if so.
- //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL.
+ //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL.
//if (m_item == i)
// return;
Modified: trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp Mon Feb 22 22:43:11 2016
@@ -88,10 +88,10 @@
{
if (!m_ScMW || m_ScMW->scriptIsRunning())
return;
- //CB We shouldnt really need to process this if our item is the same one
+ //CB We shouldn't really need to process this if our item is the same one
//maybe we do if the item has been changed by scripter.. but that should probably
//set some status if so.
- //FIXME: This wont work until when a canvas deselect happens, m_item must be NULL.
+ //FIXME: This won't work until when a canvas deselect happens, m_item must be NULL.
//if (m_item == i)
// return;
Modified: trunk/Scribus/scribus/ui/scdockpalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/ui/scdockpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/scdockpalette.h (original)
+++ trunk/Scribus/scribus/ui/scdockpalette.h Mon Feb 22 22:43:11 2016
@@ -52,7 +52,7 @@
virtual void setFontSize();
signals:
- /** @brief Let the action for this palette know when something changes and it hasnt caused it */
+ /** @brief Let the action for this palette know when something changes and it hasn't caused it */
void paletteShown(bool);
protected:
Modified: trunk/Scribus/scribus/undotransaction.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21026&path=/trunk/Scribus/scribus/undotransaction.cpp
==============================================================================
--- trunk/Scribus/scribus/undotransaction.cpp (original)
+++ trunk/Scribus/scribus/undotransaction.cpp Mon Feb 22 22:43:11 2016
@@ -135,7 +135,7 @@
UM->transactions_.erase(UM->transactions_.begin() + stackLevel);
}
- if (tmps->sizet() > 0) // are there any actions inside the commited transaction
+ if (tmps->sizet() > 0) // are there any actions inside the committed transaction
{
if (tmps->getName().isEmpty())
tmps->useActionName();
More information about the scribus-commit
mailing list