Skip to content

Commit 29287ef

Browse files
u-235u-235
committed
Fix various typos
1 parent 24d8bb6 commit 29287ef

File tree

12 files changed

+112
-112
lines changed

12 files changed

+112
-112
lines changed

‎addons/src/bhc/bhcdialog.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ BHCDialog::~BHCDialog()
105105
void BHCDialog::comChk()
106106
{
107107
BHCTab* tab;
108-
int tabId, roat, activTab;
108+
int tabId, rotate, activTab;
109109
bool mirX, mirY;
110110

111111
tab = (BHCTab*)tabBar->currentWidget();
112112
activTab = tabBar->currentIndex();
113113

114114
if (tab->all->isChecked()) {
115-
roat = tab->roateInput->value();
115+
rotate = tab->rotateInput->value();
116116
mirX = tab->mirrorX->isChecked();
117117
mirY = tab->mirrorY->isChecked();
118118

@@ -128,7 +128,7 @@ void BHCDialog::comChk()
128128
}
129129

130130
if (tab->all->isChecked()) {
131-
tab->roateInput->setValue(roat);
131+
tab->rotateInput->setValue(rotate);
132132
tab->mirrorX->setChecked(mirX);
133133
tab->mirrorY->setChecked(mirY);
134134
}
@@ -153,7 +153,7 @@ void BHCDialog::clearAll()
153153
tab->angleStartInput->setText("0");
154154
tab->angleBeetwenInput->setText("0");
155155
tab->holesInput->setText("0");
156-
tab->roateInput->setValue(0);
156+
tab->rotateInput->setValue(0);
157157

158158
tab->resultTable->setRowCount(0);
159159
tab->resultTable->clearContents();
@@ -172,7 +172,7 @@ void BHCDialog::computeButtonClicked()
172172
int tabId, i, textPosY, textPosX, dir;
173173
bool ok;
174174
int holeCount;
175-
qreal dia, firstAngle, angleBeetwen, roate, x, y, ang, xCenter, yCenter;
175+
qreal dia, firstAngle, angleBeetwen, rotate, x, y, ang, xCenter, yCenter;
176176
double maxDia;
177177

178178
maxDia = 0;
@@ -240,7 +240,7 @@ void BHCDialog::computeButtonClicked()
240240
holeCount = 0;
241241
}
242242

243-
roate = tab->roateInput->text().toInt(&ok);
243+
rotate = tab->rotateInput->text().toInt(&ok);
244244

245245
if ((holeCount == 0) && (angleBeetwen == 0)) {
246246
tab->resultTable->setRowCount(0);
@@ -251,7 +251,7 @@ void BHCDialog::computeButtonClicked()
251251
continue;
252252
}
253253

254-
roate = roate / 10;
254+
rotate = rotate / 10;
255255

256256
if (holeCount <= 0) {
257257
holeCount = 360 / angleBeetwen;
@@ -261,7 +261,7 @@ void BHCDialog::computeButtonClicked()
261261
angleBeetwen = double(360 / double(holeCount));
262262
}
263263

264-
firstAngle += roate;
264+
firstAngle += rotate;
265265

266266
tab->resultTable->setRowCount(holeCount);
267267

@@ -377,14 +377,14 @@ void BHCDialog::computeButtonClicked()
377377
holeCount = 0;
378378
}
379379

380-
roate = tab->roateInput->text().toInt(&ok);
380+
rotate = tab->rotateInput->text().toInt(&ok);
381381

382382
if ((holeCount == 0) && (angleBeetwen == 0)) {
383383
tab->resultTable->setRowCount(0);
384384
continue;
385385
}
386386

387-
roate = roate / 10;
387+
rotate = rotate / 10;
388388

389389
if (holeCount <= 0) {
390390
holeCount = 360 / angleBeetwen;
@@ -432,7 +432,7 @@ void BHCDialog::computeButtonClicked()
432432
QString(tr("Angle between holes : %1")).arg(angleBeetwen), col);
433433
drawing->printText(textPosX, textPosY, 4 - dir,
434434
QString(tr("Center position : X%1 Y%2")).arg(xCenter).arg(yCenter), col);
435-
firstAngle += roate;
435+
firstAngle += rotate;
436436

437437
tab->resultTable->setRowCount(holeCount);
438438

‎addons/src/bhc/bhctab.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ BHCTab::BHCTab(QWidget* parent) : QWidget(parent)
7474
angleBeetwenInput->setValidator(angleBeetwenInputValid);
7575
angleBeetwenInput->installEventFilter(this);
7676

77-
connect(roateInput, SIGNAL(valueChanged(int)), SLOT(inputChk()));
77+
connect(rotateInput, SIGNAL(valueChanged(int)), SLOT(inputChk()));
7878
connect(mirrorX, SIGNAL(toggled(bool)), SLOT(inputChk()));
7979
connect(mirrorY, SIGNAL(toggled(bool)), SLOT(inputChk()));
8080

@@ -276,7 +276,7 @@ void BHCTab::setOptions(const BHCTabOptions& options)
276276
angleStartInput->setText(QString::number(options.start));
277277
angleBeetwenInput->setText(QString::number(options.step));
278278
holesInput->setText(QString::number(options.count));
279-
roateInput->setValue(options.rotate);
279+
rotateInput->setValue(options.rotate);
280280
mirrorX->setChecked(options.mirrorX);
281281
mirrorY->setChecked(options.mirrorY);
282282
all->setChecked(options.common);
@@ -294,7 +294,7 @@ BHCTabOptions BHCTab::options()
294294
options.start = angleStartInput->text().toDouble();
295295
options.step = angleBeetwenInput->text().toDouble();
296296
options.count = holesInput->text().toInt();
297-
options.rotate = roateInput->value();
297+
options.rotate = rotateInput->value();
298298
options.mirrorX = mirrorX->isChecked();
299299
options.mirrorY = mirrorY->isChecked();
300300
options.common = all->isChecked();

‎addons/src/bhc/bhctab.ui

+5-5
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@
8181
</sizepolicy>
8282
</property>
8383
<property name="text">
84-
<string>Roate by (x0.1) :</string>
84+
<string>Rotate by (x0.1) :</string>
8585
</property>
8686
<property name="buddy">
87-
<cstring>roateInput</cstring>
87+
<cstring>rotateInput</cstring>
8888
</property>
8989
</widget>
9090
</item>
@@ -167,7 +167,7 @@
167167
</widget>
168168
</item>
169169
<item row="6" column="1">
170-
<widget class="QSpinBox" name="roateInput">
170+
<widget class="QSpinBox" name="rotateInput">
171171
<property name="sizePolicy">
172172
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
173173
<horstretch>0</horstretch>
@@ -346,7 +346,7 @@
346346
<item>
347347
<widget class="QCheckBox" name="all">
348348
<property name="text">
349-
<string>Common mirror and roate</string>
349+
<string>Common mirror and rotate</string>
350350
</property>
351351
<property name="checked">
352352
<bool>true</bool>
@@ -423,7 +423,7 @@
423423
<tabstop>holesInput</tabstop>
424424
<tabstop>angleStartInput</tabstop>
425425
<tabstop>angleBeetwenInput</tabstop>
426-
<tabstop>roateInput</tabstop>
426+
<tabstop>rotateInput</tabstop>
427427
<tabstop>mirrorX</tabstop>
428428
<tabstop>mirrorY</tabstop>
429429
<tabstop>all</tabstop>

‎addons/src/chamfer/chamferdialog.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ void ChamferDialog::setOptions(const ChamferOptions& options)
294294
{
295295
angInput->setText(QString::number(options.angle.value));
296296
angCheckBox->setChecked(options.angle.in);
297-
dlInput->setText(QString::number(options.hight.value));
298-
dlCheckBox->setChecked(options.hight.in);
297+
dlInput->setText(QString::number(options.height.value));
298+
dlCheckBox->setChecked(options.height.in);
299299
xdInput->setText(QString::number(options.maxDiam.value));
300300
xdCheckBox->setChecked(options.maxDiam.in);
301301
xoInput->setText(QString::number(options.minDiam.value));
@@ -312,8 +312,8 @@ ChamferOptions ChamferDialog::options()
312312

313313
options.angle.value = angInput->text().toDouble();
314314
options.angle.in = angCheckBox->isChecked();
315-
options.hight.value = dlInput->text().toDouble();
316-
options.hight.in = dlCheckBox->isChecked();
315+
options.height.value = dlInput->text().toDouble();
316+
options.height.in = dlCheckBox->isChecked();
317317
options.maxDiam.value = xdInput->text().toDouble();
318318
options.maxDiam.in = xdCheckBox->isChecked();
319319
options.minDiam.value = xoInput->text().toDouble();

‎addons/src/chamfer/chamferoptions.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
#define CFG_KEY_ANGLE_VALUE "Angle"
2626
#define CFG_KEY_ANGLE_IN "AngleIn"
27-
#define CFG_KEY_HIGHT_VALUE "Hight"
28-
#define CFG_KEY_HIGHT_IN "HightIn"
27+
#define CFG_KEY_HEIGHT_VALUE "Height"
28+
#define CFG_KEY_HEIGHT_IN "HeightIn"
2929
#define CFG_KEY_MAX_DIAM_VALUE "MaxDiam"
3030
#define CFG_KEY_MAX_DIAM_IN "MaxDiamIn"
3131
#define CFG_KEY_MIN_DIAM_VALUE "MinDiam"
@@ -37,7 +37,7 @@
3737
ChamferOptions::ChamferOptions() :
3838
angle{true, 45.0},
3939
width{true, 1.0},
40-
hight{false, 0.0},
40+
height{false, 0.0},
4141
minDiam{false, 0.0},
4242
maxDiam{true, 32.0}
4343
{
@@ -47,8 +47,8 @@ void ChamferOptions::load(QSettings* settings)
4747
{
4848
angle.value = settings->value(CFG_KEY_ANGLE_VALUE, angle.value).toDouble();
4949
angle.in = settings->value(CFG_KEY_ANGLE_IN, angle.in).toBool();
50-
hight.value = settings->value(CFG_KEY_HIGHT_VALUE, hight.value).toDouble();
51-
hight.in = settings->value(CFG_KEY_HIGHT_IN, hight.in).toBool();
50+
height.value = settings->value(CFG_KEY_HEIGHT_VALUE, height.value).toDouble();
51+
height.in = settings->value(CFG_KEY_HEIGHT_IN, height.in).toBool();
5252
maxDiam.value = settings->value(CFG_KEY_MAX_DIAM_VALUE, maxDiam.value).toDouble();
5353
maxDiam.in = settings->value(CFG_KEY_MAX_DIAM_IN, maxDiam.in).toBool();
5454
minDiam.value = settings->value(CFG_KEY_MIN_DIAM_VALUE, minDiam.value).toDouble();
@@ -61,8 +61,8 @@ void ChamferOptions::save(QSettings* settings)
6161
{
6262
settings->setValue(CFG_KEY_ANGLE_VALUE, angle.value);
6363
settings->setValue(CFG_KEY_ANGLE_IN, angle.in);
64-
settings->setValue(CFG_KEY_HIGHT_VALUE, hight.value);
65-
settings->setValue(CFG_KEY_HIGHT_IN, hight.in);
64+
settings->setValue(CFG_KEY_HEIGHT_VALUE, height.value);
65+
settings->setValue(CFG_KEY_HEIGHT_IN, height.in);
6666
settings->setValue(CFG_KEY_MAX_DIAM_VALUE, maxDiam.value);
6767
settings->setValue(CFG_KEY_MAX_DIAM_IN, maxDiam.in);
6868
settings->setValue(CFG_KEY_MIN_DIAM_VALUE, minDiam.value);

‎addons/src/chamfer/chamferoptions.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ struct ChamferOptions {
3333

3434
InOut angle;
3535
InOut width;
36-
InOut hight;
36+
InOut height;
3737
InOut minDiam;
3838
InOut maxDiam;
3939

‎gcodeshared/include/ui/longjobhelper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class LongJobHelper
8787
/**
8888
* @brief End of checks.
8989
* @details The operation time is fixed, a cursor is restored and, if necessary, a progress
90-
* dialog is hided.
90+
* dialog is hiding.
9191
* @see time()
9292
*/
9393
void end();

‎gcodeworkshop/src/findinf.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ FindInFiles::FindInFiles(QSplitter* parent): QWidget(parent)
7474
setObjectName("FindInFiles");
7575

7676
highlighter = nullptr;
77-
highligh = false;
77+
highlight = false;
7878

7979
connect(browseButton, SIGNAL(clicked()), SLOT(browse()));
8080
connect(findButton, SIGNAL(clicked()), SLOT(find()));
@@ -567,7 +567,7 @@ void FindInFiles::filePreview(int x, int y)
567567
preview->setPlainText(in.readAll());
568568
file.close();
569569

570-
if (highligh) {
570+
if (highlight) {
571571
if (highlighter == nullptr) {
572572
highlighter = new Highlighter(preview->document());
573573
}
@@ -658,7 +658,7 @@ bool FindInFiles::findText(const QString& exp, QTextDocument::FindFlags options,
658658

659659
void FindInFiles::setHighlightColors(const HighlightColors colors)
660660
{
661-
highligh = true;
661+
highlight = true;
662662
highlighterColors = colors;
663663
}
664664

‎gcodeworkshop/src/findinf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private slots:
8787
QTextEdit::ExtraSelection selection;
8888
bool intCapsLock;
8989
HighlightColors highlighterColors;
90-
bool highligh;
90+
bool highlight;
9191
QList<int> currentHeight;
9292
QSplitter* f_parent;
9393

0 commit comments

Comments
 (0)