r20681 by craig -
scribus-commit
scribus-commit at lists.scribus.net
Tue Jan 12 21:23:13 UTC 2016
Author: craig
Date: Tue Jan 12 21:23:13 2016
New Revision: 20681
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20681
Log:
#13647: Correct some speeeeling mistooks in the code comments
Modified:
trunk/Scribus/CMakeLists.txt
trunk/Scribus/PACKAGING
trunk/Scribus/resources/templates/template.xml
trunk/Scribus/scribus/canvas.h
trunk/Scribus/scribus/canvasmode_nodeedit.cpp
trunk/Scribus/scribus/chartablemodel.h
trunk/Scribus/scribus/exif.cpp
trunk/Scribus/scribus/guidemanagercore.h
trunk/Scribus/scribus/loadsaveplugin.cpp
trunk/Scribus/scribus/pageitem.cpp
trunk/Scribus/scribus/pageitem.h
trunk/Scribus/scribus/pdflib_core.cpp
trunk/Scribus/scribus/pluginmanager.h
trunk/Scribus/scribus/scplugin.h
trunk/Scribus/scribus/scribusapp.cpp
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/scribusview.cpp
trunk/Scribus/scribus/text/storytext.cpp
trunk/Scribus/scribus/ui/annot.cpp
trunk/Scribus/scribus/ui/guidemanager.h
trunk/Scribus/scribus/ui/marginwidget.cpp
trunk/Scribus/scribus/undomanager.h
trunk/Scribus/scribus/util.cpp
Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Tue Jan 12 21:23:13 2016
@@ -426,8 +426,13 @@
ENDIF(APPLE_10_11_X)
IF(APPLE_10_10_X)
SET(OSXMINVER "10.10" CACHE TYPE STRING)
+ SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.10")
IF (WANT_OSX_SDK)
- SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk")
+ IF(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk"))
+ SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk")
+ ELSEIF(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk"))
+ SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk")
+ ENDIF()
ENDIF (WANT_OSX_SDK)
ENDIF(APPLE_10_10_X)
IF(APPLE_10_9_X)
Modified: trunk/Scribus/PACKAGING
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/PACKAGING
==============================================================================
--- trunk/Scribus/PACKAGING (original)
+++ trunk/Scribus/PACKAGING Tue Jan 12 21:23:13 2016
@@ -56,7 +56,7 @@
We have IANA approval for our mime type.
An example command to install and refresh the mime database in a spec file
-(distro specfic macros might vary):
+(distro specific macros might vary):
%install
Modified: trunk/Scribus/resources/templates/template.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/resources/templates/template.xml
==============================================================================
--- trunk/Scribus/resources/templates/template.xml (original)
+++ trunk/Scribus/resources/templates/template.xml Tue Jan 12 21:23:13 2016
@@ -49,7 +49,7 @@
<img>textbased/textbased.png</img>
<psize>A4</psize>
<color>Color</color>
- <descr>A decent newsletter/magazine originaly created for one non-profit organization. Unrealized unfortunately.</descr>
+ <descr>A decent newsletter/magazine originally created for one non-profit organization. Unrealized unfortunately.</descr>
<usage>Right click on text replace what's inside with your own. Or whatever you want to... ;)</usage>
<scribus_version>1.2RC1cvs</scribus_version>
<date>2004-07-10</date>
Modified: trunk/Scribus/scribus/canvas.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/canvas.h
==============================================================================
--- trunk/Scribus/scribus/canvas.h (original)
+++ trunk/Scribus/scribus/canvas.h Tue Jan 12 21:23:13 2016
@@ -111,7 +111,7 @@
friend class FreehandMode;
friend class CalligraphicMode;
- /* Dont rely on these codes!
+ /* Don't rely on these codes!
* 2 8 3
* 7 6
* 4 5 1
Modified: trunk/Scribus/scribus/canvasmode_nodeedit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/canvasmode_nodeedit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_nodeedit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_nodeedit.cpp Tue Jan 12 21:23:13 2016
@@ -304,7 +304,7 @@
}
}
- else // shouldnt be in nodeedit mode now, should it??
+ else // shouldn't be in nodeedit mode now, should it??
{
npf = m_canvas->globalToCanvas(m->globalPos());
if ((m_canvas->m_viewMode.m_MouseButtonPressed) && (m->buttons() & Qt::LeftButton) && (m_GyM == -1) && (m_GxM == -1))
Modified: trunk/Scribus/scribus/chartablemodel.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/chartablemodel.h
==============================================================================
--- trunk/Scribus/scribus/chartablemodel.h (original)
+++ trunk/Scribus/scribus/chartablemodel.h Tue Jan 12 21:23:13 2016
@@ -75,7 +75,7 @@
signals:
/*! \brief Inform its view about internal selection changes.
- It's emitted everytime user adds an existing glyph to the
+ It's emitted every time a user adds an existing glyph to the
CharClassDef list. */
void selectionChanged(QItemSelectionModel * model);
//! \brief Emitted when there is a new row
Modified: trunk/Scribus/scribus/exif.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/exif.cpp
==============================================================================
--- trunk/Scribus/scribus/exif.cpp (original)
+++ trunk/Scribus/scribus/exif.cpp Tue Jan 12 21:23:13 2016
@@ -924,7 +924,7 @@
f.close();
//now make the strings clean,
- // for exmaple my Casio is a "QV-4000 "
+ // for example my Casio is a "QV-4000 "
CameraMake = CameraMake.trimmed();
CameraModel = CameraModel.trimmed();
UserComment = UserComment.trimmed();
Modified: trunk/Scribus/scribus/guidemanagercore.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/guidemanagercore.h
==============================================================================
--- trunk/Scribus/scribus/guidemanagercore.h (original)
+++ trunk/Scribus/scribus/guidemanagercore.h Tue Jan 12 21:23:13 2016
@@ -130,7 +130,7 @@
};
-/*! \brief A separate clas for Guides IO operations in reading or closing
+/*! \brief A separate class for Guides IO operations in reading or closing
the documents.
\author Petr Vanek <petr at scribus.info>
*/
Modified: trunk/Scribus/scribus/loadsaveplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/loadsaveplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/loadsaveplugin.cpp (original)
+++ trunk/Scribus/scribus/loadsaveplugin.cpp Tue Jan 12 21:23:13 2016
@@ -241,12 +241,12 @@
void LoadSavePlugin::setFileReadError()
{
- m_lastError = tr("An error occured while opening file or file is damaged");
+ m_lastError = tr("An error occurred while opening file or file is damaged");
}
void LoadSavePlugin::setDomParsingError(const QString& msg, int line, int column)
{
- m_lastError = tr("An error occured while parsing file at line %1, column %2 :\n%3").arg(line).arg(column).arg(msg);
+ m_lastError = tr("An error occurred while parsing file at line %1, column %2 :\n%3").arg(line).arg(column).arg(msg);
}
const QString& LoadSavePlugin::lastSavedFile(void)
Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Tue Jan 12 21:23:13 2016
@@ -7790,7 +7790,7 @@
void PageItem::select()
{
m_Doc->view()->Deselect(false);
- //CB #2969 add this true parm to addItem so we dont connectToGUI, the rest of view->SelectItem isnt needed anyway
+ //CB #2969 add this true parm to addItem so we don't connectToGUI, the rest of view->SelectItem isn't needed anyway
m_Doc->m_Selection->addItem(this, true);
}
Modified: trunk/Scribus/scribus/pageitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h (original)
+++ trunk/Scribus/scribus/pageitem.h Tue Jan 12 21:23:13 2016
@@ -1072,7 +1072,7 @@
bool textFlowUsesImageClipping() const { return (textFlowModeVal == TextFlowUsesImageClipping); }
/**
- * @brief To be called carefully because it eventually triggers a relayout of long text frames strings, but necesarily when you change the document.
+ * @brief To be called carefully because it eventually triggers a relayout of long text frames strings, but neccesarily when you change the document.
* @param allItems While you generally want to check for items below, it can happen that you want to update full range of text frames (e.g. when shuffle items order). Default to false.
*/
void checkTextFlowInteractions(bool allItems = false);
Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp (original)
+++ trunk/Scribus/scribus/pdflib_core.cpp Tue Jan 12 21:23:13 2016
@@ -278,7 +278,7 @@
progressDialog->setOverallProgress(pc_exportmasterpages+pc_exportpages);
}
}
- ret = true;//Even when aborting we return true. Dont want that "couldnt write msg"
+ ret = true;//Even when aborting we return true. Don't want that "couldnt write msg"
if (!abortExport)
{
if (PDF_IsPDFX(doc.pdfOptions().Version))
@@ -11013,7 +11013,7 @@
cm = PDFOptions::Compression_JPEG;
}
// We can't unfortunately use directly cmyk jpeg files. Otherwise we have to use the /Decode argument in image
- // dictionnary, which we do not quite want as this argument is simply ignored by some rips and software
+ // dictionary, which we do not quite want as this argument is simply ignored by some rips and software
// amongst which photoshop and illustrator
/*else if (((!Options.UseRGB) && (!Options.isGrayscale) && (!Options.UseProfiles2)) && (cm== 0) && (c->effectsInUse.count() == 0) && (img.imgInfo.colorspace == ColorSpaceCMYK) && (!((Options.RecalcPic) && (Options.PicRes < (qMax(72.0 / c->imageXScale(), 72.0 / c->imageYScale()))))) && (!img.imgInfo.progressive))
{
Modified: trunk/Scribus/scribus/pluginmanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/pluginmanager.h
==============================================================================
--- trunk/Scribus/scribus/pluginmanager.h (original)
+++ trunk/Scribus/scribus/pluginmanager.h Tue Jan 12 21:23:13 2016
@@ -49,13 +49,13 @@
static void* resolveSym( void* plugin, const char* sym );
static void unloadDLL( void* plugin );
- /*! \brief Initalization of all plugins. It's called at scribus start.
+ /*! \brief Initialization of all plugins. It's called at scribus start.
*
* Walk through all plugins, try to init them and try to re-load failed
* ones then. See initPlugin for more info.
* Reload uses a "brute force" method - Repeat until there is something
* to load again. It's not elegant I know. But there are no additional
- * dependancy relations addons (XML config, plugin classes change etc.).
+ * dependency relations addons (XML config, plugin classes change etc.).
*/
void initPlugs();
Modified: trunk/Scribus/scribus/scplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/scplugin.h
==============================================================================
--- trunk/Scribus/scribus/scplugin.h (original)
+++ trunk/Scribus/scribus/scplugin.h Tue Jan 12 21:23:13 2016
@@ -180,7 +180,7 @@
*
* Returns a structure containing descriptive information about the
* plug-in. This information is used in places like the Help->About
- * Plug-ins menu item. The stucture MUST be deleted using
+ * Plug-ins menu item. The structure MUST be deleted using
* deleteAboutData(AboutData* about) when finished with.
*
* Every plugin MUST reimplement getAboutData(...) and deleteAboutData(...).
Modified: trunk/Scribus/scribus/scribusapp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/scribusapp.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusapp.cpp (original)
+++ trunk/Scribus/scribus/scribusapp.cpp Tue Jan 12 21:23:13 2016
@@ -343,7 +343,7 @@
UpgradeChecker uc;
uc.fetch();
}
- //Dont run the GUI init process called from main.cpp, and return
+ //Don't run the GUI init process called from main.cpp, and return
if (header)
std::exit(EXIT_SUCCESS);
//proceed
Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Tue Jan 12 21:23:13 2016
@@ -550,7 +550,7 @@
docParagraphStyles[0].breakImplicitCharStyleInheritance();
docParagraphStyles[0].charStyle().setContext( & docCharStyles );
-// docParagraphStyles[0].charStyle().setName( "cdocdefault" ); // DONT TRANSLATE
+// docParagraphStyles[0].charStyle().setName( "cdocdefault" ); // DON'T TRANSLATE
currentStyle = pstyle;
@@ -1550,7 +1550,7 @@
{
sty.breakImplicitCharStyleInheritance(true);
sty.charStyle().setContext( & docCharStyles );
-// sty.charStyle().setName( "cdocdefault" ); // DONT TRANSLATE
+// sty.charStyle().setName( "cdocdefault" ); // DON'T TRANSLATE
}
else {
sty.breakImplicitCharStyleInheritance(false);
@@ -1632,7 +1632,7 @@
* including plugins.
* - 2004-09-14 Craig Ringer
*/
-// dont like this here. could as well be a static method for reading this stuff into temp., then always use redefineXY() - av
+// don't like this here. could as well be a static method for reading this stuff into temp., then always use redefineXY() - av
void ScribusDoc::loadStylesFromFile(QString fileName)
{
StyleSet<ParagraphStyle> *wrkStyles = &docParagraphStyles;
@@ -2699,7 +2699,7 @@
ScPage* ScribusDoc::addMasterPage(const int pageNumber, const QString& pageName)
{
- //CB We dont create master pages (yet) with a pageCount based location
+ //CB We don't create master pages (yet) with a pageCount based location
//Page* addedPage = new Page(ScratchLeft, MasterPages.count()*(pageHeight+ScratchBottom+ScratchTop)+ScratchTop, pageWidth, pageHeight);
ScPage* addedPage = new ScPage(docPrefsData.displayPrefs.scratch.left(), docPrefsData.displayPrefs.scratch.top(), docPrefsData.docSetupPrefs.pageWidth, docPrefsData.docSetupPrefs.pageHeight);
assert(addedPage!=NULL);
@@ -5389,7 +5389,7 @@
int nr = MasterPages.count();
ScPage* targetPage=addMasterPage(nr, masterPageName);
assert(targetPage!=NULL);
- //Backup currentpage, and dont use sourcepage here as we might convert a non current page
+ //Backup currentpage, and don't use sourcepage here as we might convert a non current page
ScPage* oldCurrentPage = currentPage();
//Must set current page for pasteitem to work properly
setLoading(true);
@@ -5617,7 +5617,7 @@
//If the item is created "complete" (ie, not being created by drag/resize, commit to undomanager)
if (activeTransaction)
{
- //dont think we need this now ... newItem->checkChanges(true);
+ //don't think we need this now ... newItem->checkChanges(true);
activeTransaction.commit(target->getUName(), newItem->getUPixmap(),
Um::Create + " " + newItem->getUName(), "", Um::ICreate);
}
@@ -6521,7 +6521,7 @@
Q_ASSERT(currItem!=NULL);
if (currItem == NULL)
return NULL;
- //Dont attempt a Line conversion
+ //Don't attempt a Line conversion
// if (currItem->itemType()==PageItem::Line || newType==PageItem::Line)
if (newType==PageItem::Line)
return NULL;
@@ -6551,7 +6551,7 @@
if (UndoManager::undoEnabled() && oldItem->itemType()==PageItem::PathText)
transactionConversion = undoManager->beginTransaction(currentPage()->getUName(), 0, Um::TextFrame, "", Um::ITextFrame);
break;
- //We dont allow this
+ //We don't allow this
/* case PageItem::Line:
newItem = new PageItem_PolyLine(*oldItem);
break; */
@@ -6609,7 +6609,7 @@
newItem->setRedrawBounding();
}
break;
- //We dont allow this right now
+ //We don't allow this right now
/* case PageItem::Line:
break; */
case PageItem::Polygon:
@@ -9957,7 +9957,7 @@
-/* CB Dont delete, backups
+/* CB Don't delete, backups
void ScribusDoc::FlipImageH()
{
uint docSelectionCount=m_Selection->count();
Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Tue Jan 12 21:23:13 2016
@@ -348,7 +348,7 @@
double scale = m_canvas->scale();
int newCanvasWidth = qRound((Doc->maxCanvasCoordinate.x() - Doc->minCanvasCoordinate.x()) * scale);
int newCanvasHeight = qRound((Doc->maxCanvasCoordinate.y() - Doc->minCanvasCoordinate.y()) * scale);
- if (!re.isValid() && // dont check this all the time
+ if (!re.isValid() && // don't check this all the time
( m_oldCanvasWidth != newCanvasWidth || m_oldCanvasHeight != newCanvasHeight))
{
QSize maxViewport = maximumViewportSize();
@@ -426,7 +426,7 @@
/**
switches between appmodes:
- - for submodes, activate the appropiate dialog or palette
+ - for submodes, activate the appropriate dialog or palette
- set a new CanvasMode if necessary
- call ScribusMainWindow::setAppMode(), which de/activates actions
*/
@@ -3963,7 +3963,7 @@
bool linkmode = (Doc->appMode == modeLinkFrames);
firstFrame = Doc->m_Selection->itemAt(0);
m_canvasMode->mousePressEvent(m);
- //if user dont click any frame he want to draw new frame and link it
+ //if user don't click any frame he want to draw new frame and link it
bool requestDrawMode = (Doc->ElemToLink == NULL);
if (linkmode && requestDrawMode)
{
Modified: trunk/Scribus/scribus/text/storytext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/text/storytext.cpp
==============================================================================
--- trunk/Scribus/scribus/text/storytext.cpp (original)
+++ trunk/Scribus/scribus/text/storytext.cpp Tue Jan 12 21:23:13 2016
@@ -370,8 +370,8 @@
applyStyle(pos, d->trailingStyle);
d->trailingStyle.erase();
}
-// it->parstyle->setName("para"); // DONT TRANSLATE
-// it->parstyle->charStyle().setName("cpara"); // DONT TRANSLATE
+// it->parstyle->setName("para"); // DON'T TRANSLATE
+// it->parstyle->charStyle().setName("cpara"); // DON'T TRANSLATE
// it->parstyle->charStyle().setContext( d->defaultStyle.charStyleContext() );
}
d->replaceCharStyleContextInParagraph(pos, it->parstyle->charStyleContext());
@@ -391,7 +391,7 @@
it->parstyle = 0;
}
// demote this parsep so the assert code in replaceCharStyleContextInParagraph()
- // doesnt choke:
+ // doesn't choke:
it->ch = 0;
d->replaceCharStyleContextInParagraph(pos, paragraphStyle(pos+1).charStyleContext());
}
@@ -972,8 +972,8 @@
qDebug("inserting default parstyle at %i", pos);
current->parstyle = new ParagraphStyle();
current->parstyle->setContext( & d->pstyleContext);
-// current->parstyle->setName( "para(paragraphStyle)" ); // DONT TRANSLATE
-// current->parstyle->charStyle().setName( "cpara(paragraphStyle)" ); // DONT TRANSLATE
+// current->parstyle->setName( "para(paragraphStyle)" ); // DON'T TRANSLATE
+// current->parstyle->charStyle().setName( "cpara(paragraphStyle)" ); // DON'T TRANSLATE
// current->parstyle->charStyle().setContext( d->defaultStyle.charStyleContext());
}
else {
@@ -996,8 +996,8 @@
// const StyleContext * oldCContext = d->defaultStyle.charStyle().context();
d->defaultStyle = style;
d->defaultStyle.setContext( oldPContext );
-// d->defaultStyle.setName( "storydefault" ); // DONT TRANSLATE
-// d->defaultStyle.charStyle().setName( "cstorydefault" ); // DONT TRANSLATE
+// d->defaultStyle.setName( "storydefault" ); // DON'T TRANSLATE
+// d->defaultStyle.charStyle().setName( "cstorydefault" ); // DON'T TRANSLATE
// qDebug() << QString("defstyle %1 context %2 defcstyle %3 ccontext %4 newcontext %5")
// .arg((uint)&d->defaultStyle,16).arg((uint)oldPContext,16)
// .arg((uint)&d->defaultStyle.charStyle(),16).arg((uint)oldCContext,16)
@@ -1098,8 +1098,8 @@
qDebug("PARSEP without style at pos %i", i);
d->at(i)->parstyle = new ParagraphStyle();
d->at(i)->parstyle->setContext( & d->pstyleContext);
-// d->at(i)->parstyle->setName( "para(applyStyle)" ); // DONT TRANSLATE
-// d->at(i)->parstyle->charStyle().setName( "cpara(applyStyle)" ); // DONT TRANSLATE
+// d->at(i)->parstyle->setName( "para(applyStyle)" ); // DON'T TRANSLATE
+// d->at(i)->parstyle->charStyle().setName( "cpara(applyStyle)" ); // DON'T TRANSLATE
// d->at(i)->parstyle->charStyle().setContext( d->defaultStyle.charStyleContext() );
}
// qDebug() << QString("applying parstyle %2 at %1 for %3").arg(i).arg(paragraphStyle(pos).name()).arg(pos);
@@ -1139,8 +1139,8 @@
qDebug("PARSEP without style at pos %i", i);
d->at(i)->parstyle = new ParagraphStyle();
d->at(i)->parstyle->setContext( & d->pstyleContext);
-// d->at(i)->parstyle->setName( "para(eraseStyle)" ); // DONT TRANSLATE
-// d->at(i)->parstyle->charStyle().setName( "cpara(eraseStyle)" ); // DONT TRANSLATE
+// d->at(i)->parstyle->setName( "para(eraseStyle)" ); // DON'T TRANSLATE
+// d->at(i)->parstyle->charStyle().setName( "cpara(eraseStyle)" ); // DON'T TRANSLATE
// d->at(i)->parstyle->charStyle().setContext( d->defaultStyle.charStyleContext());
}
// qDebug() << QString("applying parstyle %2 at %1 for %3").arg(i).arg(paragraphStyle(pos).name()).arg(pos);
Modified: trunk/Scribus/scribus/ui/annot.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/ui/annot.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/annot.cpp (original)
+++ trunk/Scribus/scribus/ui/annot.cpp Tue Jan 12 21:23:13 2016
@@ -116,8 +116,8 @@
QString borders[] = {CommonStrings::tr_NoneColor, tr("Thin"), tr("Normal"), tr("Wide")};
size_t bordersArray = sizeof(borders) / sizeof(*borders);
BorderW->clear();
- for (uint propogate = 0; propogate < bordersArray; ++propogate)
- BorderW->addItem(borders[propogate]);
+ for (uint propagate = 0; propagate < bordersArray; ++propagate)
+ BorderW->addItem(borders[propagate]);
BorderW->setCurrentIndex(annotation.Bwid());
BorderS->setCurrentIndex(annotation.Bsty());
Modified: trunk/Scribus/scribus/ui/guidemanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/ui/guidemanager.h
==============================================================================
--- trunk/Scribus/scribus/ui/guidemanager.h (original)
+++ trunk/Scribus/scribus/ui/guidemanager.h Tue Jan 12 21:23:13 2016
@@ -122,7 +122,7 @@
/*! \brief Draw guides into painter */
void drawGuides();
- /*! \brief Theese methods simulate old button group behaviour.
+ /*! \brief These methods simulate old button group behaviour.
Is there a better way to do it? QButtonGroup? It's more code...
*/
void setHorizontalRefer(int button);
Modified: trunk/Scribus/scribus/ui/marginwidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/ui/marginwidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/marginwidget.cpp (original)
+++ trunk/Scribus/scribus/ui/marginwidget.cpp Tue Jan 12 21:23:13 2016
@@ -24,7 +24,7 @@
{
marginData=*margs;
savedMargins=*margs;
- savedPresetItem=PresetLayout::none;//we dont recheck if we are using a layout but always start at none
+ savedPresetItem=PresetLayout::none; //we don't recheck if we are using a layout but always start at none
facingPages = false;
useBleeds = showBleeds;
marginPage = new QWidget(this);
Modified: trunk/Scribus/scribus/undomanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/undomanager.h
==============================================================================
--- trunk/Scribus/scribus/undomanager.h (original)
+++ trunk/Scribus/scribus/undomanager.h Tue Jan 12 21:23:13 2016
@@ -128,7 +128,7 @@
* <code>UndoGui</code> widgets but stores all incoming <code>UndoState</code> objects into
* the transaction container which after call to the method commit() will be sent
* to the guis as a single undo action. Transaction can be named when starting it or
- * naming can be done when commiting it.
+ * naming can be done when committing it.
* @param targetName name for the target of this transaction (f.e. "Selection")
* @param targetPixmap Icon for the target on which this transaction works.
* this icon will be drawn first when the action is presented in Action History
@@ -160,8 +160,8 @@
/*
* @brief Commit the current transaction.
*
- * Current transaction will be commited and <code>UndoManager</code> will be switched
- * to the normal mode. Commited transaction will be sent to the attached undo gui
+ * Current transaction will be committed and <code>UndoManager</code> will be switched
+ * to the normal mode. Committed transaction will be sent to the attached undo gui
* widgets and it will show up there as a single undo action. Details used as a parameter
* will be details shown in the gui widgets.
* @param targetName name for the target of this transaction (f.e. "Selection")
@@ -301,7 +301,7 @@
/**
* @brief Stores the transactions which are currently started but not
- * @brief canceled or commited.
+ * @brief canceled or committed.
*/
std::vector<TransactionData*> transactions_;
Modified: trunk/Scribus/scribus/util.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20681&path=/trunk/Scribus/scribus/util.cpp
==============================================================================
--- trunk/Scribus/scribus/util.cpp (original)
+++ trunk/Scribus/scribus/util.cpp Tue Jan 12 21:23:13 2016
@@ -501,7 +501,7 @@
newName+=extension.toLower();
return newName;
}
- //If filename doesnt end with the period+extension, add it on
+ //If filename doesn't end with the period+extension, add it on
QString dotExt("." + extension.toLower());
if (!newName.endsWith(dotExt, Qt::CaseInsensitive))
newName+=dotExt;
More information about the scribus-commit
mailing list