Built-in name detection
diff --git a/gcodeshared/serialporttestdialog.cpp b/gcodeshared/serialporttestdialog.cpp
index 4ff5c936..b554fcc6 100644
--- a/gcodeshared/serialporttestdialog.cpp
+++ b/gcodeshared/serialporttestdialog.cpp
@@ -320,7 +320,7 @@ void SerialPortTestDialog::updateLeds()
}
count++;
- errorLabel->setText(tr("Recived: %1 bytes.").arg(count));
+ errorLabel->setText(tr("Received: %1 bytes.").arg(count));
tx = ch;
qApp->processEvents();
@@ -430,7 +430,7 @@ void SerialPortTestDialog::showError(int error)
{
switch (error) {
case QSerialPort::NoError:
- errorLabel->setText("No Error has occured");
+ errorLabel->setText("No Error has occurred");
break;
case QSerialPort::DeviceNotFoundError:
diff --git a/gcodeshared/serialtransmissiondialog.cpp b/gcodeshared/serialtransmissiondialog.cpp
index 656cd7c2..9d68af71 100644
--- a/gcodeshared/serialtransmissiondialog.cpp
+++ b/gcodeshared/serialtransmissiondialog.cpp
@@ -295,7 +295,7 @@ void SerialTransmissionDialog::updateStatus()
}
}
} else {
- if (writeBufferIterator != serialPortWriteBuffer.end()) { // try to restart trasmission
+ if (writeBufferIterator != serialPortWriteBuffer.end()) { // try to restart transmission
serialPortBytesWritten(0);
}
@@ -351,7 +351,7 @@ void SerialTransmissionDialog::showSerialPortError(QSerialPort::SerialPortError
switch (error) {
case QSerialPort::NoError:
- text = tr("No Error has occured");
+ text = tr("No Error has occurred");
//statusBar()->showMessage(text);
return;
@@ -457,7 +457,7 @@ void SerialTransmissionDialog::serialPortBytesWritten(qint64 bytes)
sendTimeoutCountner = 0;
sendTimeoutTimer->stop();
setLabelText(tr("OK:\t Sending completed."), serverMode, true);
- setLabelText(tr("Wainting for data..."));
+ setLabelText(tr("Waiting for data..."));
setRange(0, 0);
} else {
autoCloseCountner = portSettings.autoCloseTimeout;
@@ -530,7 +530,7 @@ void SerialTransmissionDialog::serialPortBytesWritten(qint64 bytes)
// if(QString(buff).contains(endOfProgChar) && (!endOfProgChar.isEmpty()))
// {
// qDebug() << "endOfProgChar" << endOfProgChar;
-// qDebug() << "Procces data" << processReceivedData();
+// qDebug() << "Process data" << processReceivedData();
// }
// }
@@ -695,7 +695,7 @@ void SerialTransmissionDialog::prepareDataBeforeSending(QString* data)
auto behavior = Qt::SkipEmptyParts;
#endif
serialPortWriteBuffer = data->split("\n", behavior);
- // insert line endings. \r is replaced with choosen line ending
+ // insert line endings. \r is replaced with chosen line ending
serialPortWriteBuffer.replaceInStrings("\r", portSettings.eobChar);
noOfBytes = serialPortWriteBuffer.join("").length(); // get new size
@@ -1116,7 +1116,7 @@ QStringList SerialTransmissionDialog::guessFileName(QString* text)
}
//**************************************************************************************************
-// Save received program to a file. Return filename and empty program text if succes or leave program text unchanged
+// Save received program to a file. Return filename and empty program text if successful or leave program text unchanged
//**************************************************************************************************
QString SerialTransmissionDialog::saveDataToFile(QString* text)
@@ -1474,7 +1474,7 @@ void SerialTransmissionDialog::fileServerBytesWritten(qint64 bytes)
void SerialTransmissionDialog::sendTimeoutTimerTimeout()
{
if (sendTimeoutCountner == 0) {
- setLabelText(tr("ERROR:\t Sending timedout. Reseting."), serverMode, true);
+ setLabelText(tr("ERROR:\t Sending timedout. Resetting."), serverMode, true);
sendTimeoutTimer->stop();
reset(false);
return;
diff --git a/gcodeshared/utils/medium.cpp b/gcodeshared/utils/medium.cpp
index 65a57870..8270dae8 100644
--- a/gcodeshared/utils/medium.cpp
+++ b/gcodeshared/utils/medium.cpp
@@ -64,10 +64,10 @@ Medium::Medium(QObject* parent) :
setupDirs();
mShareDirs.append(COLON);
- qDebug() << "Seting directoryes:";
+ qDebug() << "Setting directories:";
qDebug() << " translation " << mTranslationDirs;
qDebug() << " config " << mSettingsDir;
- qDebug() << " programm data " << mShareDirs;
+ qDebug() << " program data " << mShareDirs;
QString settingFile = mSettingsDir;
settingFile.append(SLASH).append(APP_NAME).append(".ini");
diff --git a/gcodeworkshop/include/document.h b/gcodeworkshop/include/document.h
index 0035bb15..3757ed32 100644
--- a/gcodeworkshop/include/document.h
+++ b/gcodeworkshop/include/document.h
@@ -40,8 +40,8 @@ class QWidget;
*
* The derived class must have a unique type returned by type(). The value returned by
* brief() is used in a widget with a list of open documents. The guessFileName() function
- * is called when an unitled document is saved to guess a possible file name. Whether the
- * document is unitled can be checked using the isUntitled() function.
+ * is called when an untitled document is saved to guess a possible file name. Whether the
+ * document is untitled can be checked using the isUntitled() function.
*
* The class has an associated widget, accessible using widget() function. The descendants
* must call setWidget() in the constructor to associate the widget with the document.
diff --git a/gcodeworkshop/src/documentmanager.cpp b/gcodeworkshop/src/documentmanager.cpp
index 39540793..0568b0bf 100644
--- a/gcodeworkshop/src/documentmanager.cpp
+++ b/gcodeworkshop/src/documentmanager.cpp
@@ -141,7 +141,7 @@ DocumentStyle::Ptr DocumentManager::documentStyle(const QString& type) const
DocumentProducer* producer = documentProducer(type);
if (!producer) {
- qWarning() << "DocumentManager::documentStyle() : The" << type << "type is not registred." ;
+ qWarning() << "DocumentManager::documentStyle() : The" << type << "type is not registered." ;
return DocumentStyle::Ptr(new DocumentStyle());
}
@@ -159,7 +159,7 @@ void DocumentManager::setDocumentStyle(const DocumentStyle::Ptr& style)
DocumentProducer* producer = documentProducer(type);
if (!producer) {
- qWarning() << "DocumentManager::setDocumentStyle() : The" << type << "type is not registred." ;
+ qWarning() << "DocumentManager::setDocumentStyle() : The" << type << "type is not registered." ;
return;
}
@@ -171,7 +171,7 @@ DocumentWidgetProperties::Ptr DocumentManager::documentWidgetProperties(const QS
DocumentProducer* producer = documentProducer(type);
if (!producer) {
- qWarning() << "DocumentManager::documentWidgetProperties() : The" << type << "type is not registred." ;
+ qWarning() << "DocumentManager::documentWidgetProperties() : The" << type << "type is not registered." ;
return DocumentWidgetProperties::Ptr(new DocumentWidgetProperties());
}
@@ -189,7 +189,7 @@ void DocumentManager::setDocumentWidgetProperties(const DocumentWidgetProperties
DocumentProducer* producer = documentProducer(type);
if (!producer) {
- qWarning() << "DocumentManager::setDocumentWidgetProperties() : The" << type << "type is not registred." ;
+ qWarning() << "DocumentManager::setDocumentWidgetProperties() : The" << type << "type is not registered." ;
return;
}
@@ -201,7 +201,7 @@ void DocumentManager::updateDocuments(const QString& type)
DocumentProducer* producer = documentProducer(type);
if (!producer) {
- qWarning() << "DocumentManager::updateDocuments() : The" << type << "type is not registred." ;
+ qWarning() << "DocumentManager::updateDocuments() : The" << type << "type is not registered." ;
return;
}
@@ -217,7 +217,7 @@ Document* DocumentManager::createDocument(const QString& type, const QString& id
DocumentProducer* producer = documentProducer(type);
if (!producer) {
- qWarning() << "DocumentManager::createDocument() : The" << type << "type is not registred." ;
+ qWarning() << "DocumentManager::createDocument() : The" << type << "type is not registered." ;
return nullptr;
}
@@ -239,7 +239,7 @@ DocumentInfo::Ptr DocumentManager::createDocumentInfo(const QString& type)
if (producer) {
info = producer->createDocumentInfo();
} else {
- qWarning() << "DocumentManager::createDocumentInfo() : The" << type << "type is not registred." ;
+ qWarning() << "DocumentManager::createDocumentInfo() : The" << type << "type is not registered." ;
}
return DocumentInfo::Ptr(info);
@@ -253,7 +253,7 @@ DocumentStyle::Ptr DocumentManager::createDocumentStyle(const QString& type)
if (producer) {
style = producer->createDocumentStyle();
} else {
- qWarning() << "DocumentManager::createDocumentStyle() : The" << type << "type is not registred." ;
+ qWarning() << "DocumentManager::createDocumentStyle() : The" << type << "type is not registered." ;
}
return DocumentStyle::Ptr(style);
@@ -267,7 +267,7 @@ DocumentWidgetProperties::Ptr DocumentManager::createDocumentWidgetProperties(co
if (producer) {
properties = producer->createDocumentWidgetProperties();
} else {
- qWarning() << "DocumentManager::createDocumentWidgetProperties() : The" << type << "type is not registred." ;
+ qWarning() << "DocumentManager::createDocumentWidgetProperties() : The" << type << "type is not registered." ;
}
return DocumentWidgetProperties::Ptr(properties);
@@ -328,7 +328,7 @@ void DocumentManager::registerDocumentProducer(DocumentProducer* producer)
const QString& type = producer->documentType();
if (m_producers.contains(type)) {
- qWarning() << "DocumentManager::registerProducer() : The" << type << "type always registred." ;
+ qWarning() << "DocumentManager::registerProducer() : The" << type << "type always registered." ;
return;
}
diff --git a/gcodeworkshop/src/gcodeworkshop.cpp b/gcodeworkshop/src/gcodeworkshop.cpp
index 27d81893..0f5b9581 100644
--- a/gcodeworkshop/src/gcodeworkshop.cpp
+++ b/gcodeworkshop/src/gcodeworkshop.cpp
@@ -507,7 +507,7 @@ bool GCodeWorkShop::save(Document* doc, bool forceSaveAs)
}
if (QFileInfo(oldFileName).suffix() == "") {
- // sometimes when file has no extension QFileDialog::getSaveFileName will no apply choosen filter (extension)
+ // sometimes when file has no extension QFileDialog::getSaveFileName will not apply chosen filter (extension)
oldFileName.append(".nc");
}
@@ -1687,8 +1687,8 @@ void GCodeWorkShop::createActions()
closeAllAct->setToolTip(tr("Close all the windows"));
connect(closeAllAct, SIGNAL(triggered()), this, SLOT(closeAllMdiWindows()));
- tileHAct = new QAction(QIcon(":/images/tile_h.png"), tr("Tile &horyzontally"), this);
- tileHAct->setToolTip(tr("Tile the windows horyzontally"));
+ tileHAct = new QAction(QIcon(":/images/tile_h.png"), tr("Tile &horizontally"), this);
+ tileHAct->setToolTip(tr("Tile the windows horizontally"));
connect(tileHAct, SIGNAL(triggered()), ui->mdiArea, SLOT(tileSubWindows()));
tileVAct = new QAction(QIcon(":/images/tile_v.png"), tr("Tile &vertycally"), this);
@@ -2319,7 +2319,7 @@ void GCodeWorkShop::createFindToolBar()
findEdit->setToolTip(
tr("Letter$$ - matches any number.Letter$max$min - matches number <=max >=min.
"
\
- "$min can be ommited, then equal 0
" \
+ "$min can be omitted, then equal 0
" \
"X$100$-10 - matches all X with value -10 to 100
"));
CapsLockEventFilter* findEditEventFilter = new CapsLockEventFilter(findEdit);
connect(this, SIGNAL(intCapsLockChanged(bool)), findEditEventFilter, SLOT(setCapsLockEnable(bool)));
@@ -3333,7 +3333,7 @@ void GCodeWorkShop::updateSessionMenus(const QStringList& sessionList)
{
sessionsMenu->clear();
- // TODO memory leack?
+ // TODO memory leak?
QActionGroup* actionGroup = new QActionGroup(sessionsMenu);
actionGroup->setExclusive(true);
diff --git a/gcodeworkshop/src/inlinecalc.cpp b/gcodeworkshop/src/inlinecalc.cpp
index 068e0803..3df7f9b2 100644
--- a/gcodeworkshop/src/inlinecalc.cpp
+++ b/gcodeworkshop/src/inlinecalc.cpp
@@ -47,7 +47,7 @@ InLineCalc::InLineCalc(QWidget* parent) : QLineEdit(parent)
"ABS(x)\n" +
"TRUNC(x)\n" +
"PI\n" +
- tr("Press Enter to accept or click anywere to canacel"));
+ tr("Press Enter to accept or click anywhere to cancel"));
connect(this, SIGNAL(editingFinished()), this, SLOT(done()));
diff --git a/gcodeworkshop/src/setupdialog.ui b/gcodeworkshop/src/setupdialog.ui
index e79bc679..22f744ff 100644
--- a/gcodeworkshop/src/setupdialog.ui
+++ b/gcodeworkshop/src/setupdialog.ui
@@ -270,7 +270,7 @@
-
- Backgroud
+ Background
true
@@ -309,10 +309,10 @@
-
- Highlighed current line color
+ Highlighted current line color
- Hi&ghlighed current line color
+ Hi&ghlighted current line color
false
@@ -512,7 +512,7 @@
-
- Show all avalaible codecs
+ Show all available codecs
diff --git a/gcodeworkshop/src/tooltips.h b/gcodeworkshop/src/tooltips.h
index 957f36f7..c6121837 100644
--- a/gcodeworkshop/src/tooltips.h
+++ b/gcodeworkshop/src/tooltips.h
@@ -268,7 +268,7 @@ QString writeTooltipFile()
settings.setValue("G97", _TR("G97 Sxx - constant spindle speed xx"));
settings.setValue("NCYL",
- _TR("NCYL - if specified in fixed cycle, positioning to the definied hole position is performed, but the cycle axis does not operate"));
+ _TR("NCYL - if specified in fixed cycle, positioning to the defined hole position is performed, but the cycle axis does not operate"));
settings.setValue("NOEX",
_TR("NOEX - if specified in fixed cycle, no axis movements may be performed"));
@@ -294,10 +294,10 @@ QString writeTooltipFile()
_TR("DFUP[val] - unit integer implementation (raising)"));
settings.setValue("MOD", _TR("MOD[val,yy] - remainder of val/yy"));
- settings.setValue("VDIN", _TR("VDIN[xx] - imput variable no. xx"));
+ settings.setValue("VDIN", _TR("VDIN[xx] - input variable no. xx"));
settings.setValue("VDOUT", _TR("VDOUT[xx] - output variable no. xx"));
settings.setValue("VUACM",
- _TR("VUACM[n]='text' - sub message for user definied alarms, n - subscript expression, text - max. 16 chracters"));
+ _TR("VUACM[n]='text' - sub message for user defined alarms, n - subscript expression, text - max. 16 characters"));
settings.setValue("MODIN",
_TR("MODIN Onnnn [Q]xx - subprogram call after axis movement, nnnn - prog. name, xx - number of repetitions"));
@@ -320,10 +320,10 @@ QString writeTooltipFile()
settings.setValue("EQ", _TR("EQ - equal to"));
settings.setValue("NE", _TR("NE - not equal to"));
- settings.setValue("GT", _TR("GT - greather than"));
+ settings.setValue("GT", _TR("GT - greater than"));
settings.setValue("LE", _TR("LE - less than or equal to"));
settings.setValue("LT", _TR("LT - less than"));
- settings.setValue("GE", _TR("GE - greather than or equal to"));
+ settings.setValue("GE", _TR("GE - greater than or equal to"));
settings.setValue("IF",
_TR("IF[condition] Nxxxx - if condition is true goto block xxxx"));
@@ -480,16 +480,16 @@ QString writeTooltipFile()
settings.setValue("EQ", _TR("EQ - equal to"));
settings.setValue("NE", _TR("NE - not equal to"));
- settings.setValue("GT", _TR("GT - greather than"));
+ settings.setValue("GT", _TR("GT - greater than"));
settings.setValue("LE", _TR("LE - less than or equal to"));
settings.setValue("LT", _TR("LT - less than"));
- settings.setValue("GE", _TR("GE - greather than or equal to"));
+ settings.setValue("GE", _TR("GE - greater than or equal to"));
settings.setValue("IF",
_TR("IF[condition]do something - if condition is true do something"));
settings.setValue("GOTO", _TR("GOTOnnnn - jump to block nnnn"));
settings.setValue("WHILE",
- _TR("WHILE[condition] DOn
...
commands
...
ENDn - loop - while condition true do commands beetwen DOn and ENDn"));
+ _TR("WHILE[condition] DOn
...
commands
...
ENDn - loop - while condition true do commands between DOn and ENDn"));
settings.setValue("END", _TR("ENDn - end of WHILE DOn loop"));
settings.setValue("EOR", _TR("EOR - exclusive OR"));
@@ -572,9 +572,9 @@ QString writeTooltipFile()
settings.setValue("@124",
_TR("@124 R|Kyy R|Kxx Knnnn - if yy is less than xx jump to nnnn"));
settings.setValue("@125",
- _TR("@125 R|Kyy R|Kxx Knnnn - if yy is greather than or equal to xx jump to nnnn"));
+ _TR("@125 R|Kyy R|Kxx Knnnn - if yy is greater than or equal to xx jump to nnnn"));
settings.setValue("@126",
- _TR("@126 R|Kyy R|Kxx Knnnn - if yy is greather than xx jump to nnnn"));
+ _TR("@126 R|Kyy R|Kxx Knnnn - if yy is greater than xx jump to nnnn"));
settings.setValue("@620", _TR("@620 Rxx - increment value in param. xx"));
settings.setValue("@621", _TR("@621 Rxx - decrement value in param. xx"));
diff --git a/install/build-helper.sh b/install/build-helper.sh
index 487a915f..9fccee7c 100755
--- a/install/build-helper.sh
+++ b/install/build-helper.sh
@@ -44,10 +44,10 @@ Options:
By default this is /_
-q qmake The name or full path of the qmake utility. In some
distributives, qmake for Qt 6 is named qmake6.
- -s suffux The suffix that will be added to the package name after the
+ -s suffix The suffix that will be added to the package name after the
version and before the architecture type.
Nothing is added by default.
- -v version Define the package version. By default version gettings from
+ -v version Define the package version. By default version settings from
the version.h file.
-w browser Define the webengine to be used. Possible values:
WebEngine or WebKit (default).