... |
... |
@@ -12,7 +12,7 @@ namespace |
12
|
12
|
extern const char* ComparatorDefaultText;
|
13
|
13
|
}
|
14
|
14
|
|
15
|
|
-ComperatorTab::ComperatorTab(QWidget* parent, Engine* engine)
|
|
15
|
+ComparatorTab::ComparatorTab(QWidget* parent, Engine* engine)
|
16
|
16
|
: QWidget(parent),
|
17
|
17
|
engine_(engine)
|
18
|
18
|
{
|
... |
... |
@@ -22,13 +22,13 @@ ComperatorTab::ComperatorTab(QWidget* parent, Engine* engine) |
22
|
22
|
}
|
23
|
23
|
|
24
|
24
|
|
25
|
|
-ComperatorTab::~ComperatorTab()
|
|
25
|
+ComparatorTab::~ComparatorTab()
|
26
|
26
|
{
|
27
|
27
|
}
|
28
|
28
|
|
29
|
29
|
|
30
|
30
|
void
|
31
|
|
-ComperatorTab::repaintGlyph()
|
|
31
|
+ComparatorTab::repaintGlyph()
|
32
|
32
|
{
|
33
|
33
|
sizeSelector_->applyToEngine(engine_);
|
34
|
34
|
|
... |
... |
@@ -47,7 +47,7 @@ ComperatorTab::repaintGlyph() |
47
|
47
|
|
48
|
48
|
|
49
|
49
|
void
|
50
|
|
-ComperatorTab::reloadFont()
|
|
50
|
+ComparatorTab::reloadFont()
|
51
|
51
|
{
|
52
|
52
|
{
|
53
|
53
|
QSignalBlocker blocker(sizeSelector_);
|
... |
... |
@@ -64,7 +64,7 @@ ComperatorTab::reloadFont() |
64
|
64
|
|
65
|
65
|
|
66
|
66
|
bool
|
67
|
|
-ComperatorTab::eventFilter(QObject* watched,
|
|
67
|
+ComparatorTab::eventFilter(QObject* watched,
|
68
|
68
|
QEvent* event)
|
69
|
69
|
{
|
70
|
70
|
auto ptr = qobject_cast<GlyphContinuous*>(watched);
|
... |
... |
@@ -75,7 +75,7 @@ ComperatorTab::eventFilter(QObject* watched, |
75
|
75
|
|
76
|
76
|
|
77
|
77
|
void
|
78
|
|
-ComperatorTab::resizeEvent(QResizeEvent* event)
|
|
78
|
+ComparatorTab::resizeEvent(QResizeEvent* event)
|
79
|
79
|
{
|
80
|
80
|
QWidget::resizeEvent(event);
|
81
|
81
|
forceEqualWidths();
|
... |
... |
@@ -84,7 +84,7 @@ ComperatorTab::resizeEvent(QResizeEvent* event) |
84
|
84
|
|
85
|
85
|
|
86
|
86
|
void
|
87
|
|
-ComperatorTab::createLayout()
|
|
87
|
+ComparatorTab::createLayout()
|
88
|
88
|
{
|
89
|
89
|
sizeSelector_ = new FontSizeSelector(this, true, true);
|
90
|
90
|
charMapLabel_ = new QLabel(tr("Char Map:"), this);
|
... |
... |
@@ -149,38 +149,38 @@ ComperatorTab::createLayout() |
149
|
149
|
|
150
|
150
|
|
151
|
151
|
void
|
152
|
|
-ComperatorTab::createConnections()
|
|
152
|
+ComparatorTab::createConnections()
|
153
|
153
|
{
|
154
|
154
|
connect(sizeSelector_, &FontSizeSelector::valueChanged,
|
155
|
|
- this, &ComperatorTab::reloadGlyphsAndRepaint);
|
|
155
|
+ this, &ComparatorTab::reloadGlyphsAndRepaint);
|
156
|
156
|
connect(sourceTextEdit_, &QPlainTextEdit::textChanged,
|
157
|
|
- this, &ComperatorTab::sourceTextChanged);
|
|
157
|
+ this, &ComparatorTab::sourceTextChanged);
|
158
|
158
|
connect(charMapSelector_,
|
159
|
159
|
QOverload<int>::of(&CharMapComboBox::currentIndexChanged),
|
160
|
|
- this, &ComperatorTab::reloadStringAndRepaint);
|
|
160
|
+ this, &ComparatorTab::reloadStringAndRepaint);
|
161
|
161
|
|
162
|
162
|
for (auto panel : settingPanels_)
|
163
|
163
|
{
|
164
|
164
|
// We're treating the two events identically, because we need to do a
|
165
|
165
|
// complete flush anyway
|
166
|
166
|
connect(panel, &SettingPanel::repaintNeeded,
|
167
|
|
- this, &ComperatorTab::repaintGlyph);
|
|
167
|
+ this, &ComparatorTab::repaintGlyph);
|
168
|
168
|
connect(panel, &SettingPanel::fontReloadNeeded,
|
169
|
|
- this, &ComperatorTab::repaintGlyph);
|
|
169
|
+ this, &ComparatorTab::repaintGlyph);
|
170
|
170
|
}
|
171
|
171
|
|
172
|
172
|
for (auto canvas : canvas_)
|
173
|
173
|
{
|
174
|
174
|
connect(canvas, &GlyphContinuous::wheelZoom,
|
175
|
|
- this, &ComperatorTab::wheelZoom);
|
|
175
|
+ this, &ComparatorTab::wheelZoom);
|
176
|
176
|
connect(canvas, &GlyphContinuous::wheelResize,
|
177
|
|
- this, &ComperatorTab::wheelResize);
|
|
177
|
+ this, &ComparatorTab::wheelResize);
|
178
|
178
|
}
|
179
|
179
|
}
|
180
|
180
|
|
181
|
181
|
|
182
|
182
|
void
|
183
|
|
-ComperatorTab::setupCanvases()
|
|
183
|
+ComparatorTab::setupCanvases()
|
184
|
184
|
{
|
185
|
185
|
for (auto canvas : canvas_)
|
186
|
186
|
{
|
... |
... |
@@ -196,7 +196,7 @@ ComperatorTab::setupCanvases() |
196
|
196
|
|
197
|
197
|
|
198
|
198
|
void
|
199
|
|
-ComperatorTab::forceEqualWidths()
|
|
199
|
+ComparatorTab::forceEqualWidths()
|
200
|
200
|
{
|
201
|
201
|
if (canvas_.empty())
|
202
|
202
|
return;
|
... |
... |
@@ -213,7 +213,7 @@ ComperatorTab::forceEqualWidths() |
213
|
213
|
|
214
|
214
|
|
215
|
215
|
void
|
216
|
|
-ComperatorTab::reloadStringAndRepaint()
|
|
216
|
+ComparatorTab::reloadStringAndRepaint()
|
217
|
217
|
{
|
218
|
218
|
int i = 0;
|
219
|
219
|
for (auto canvas : canvas_)
|
... |
... |
@@ -230,7 +230,7 @@ ComperatorTab::reloadStringAndRepaint() |
230
|
230
|
|
231
|
231
|
|
232
|
232
|
void
|
233
|
|
-ComperatorTab::reloadGlyphsAndRepaint()
|
|
233
|
+ComparatorTab::reloadGlyphsAndRepaint()
|
234
|
234
|
{
|
235
|
235
|
int i = 0;
|
236
|
236
|
for (auto canvas : canvas_)
|
... |
... |
@@ -244,7 +244,7 @@ ComperatorTab::reloadGlyphsAndRepaint() |
244
|
244
|
|
245
|
245
|
|
246
|
246
|
void
|
247
|
|
-ComperatorTab::sourceTextChanged()
|
|
247
|
+ComparatorTab::sourceTextChanged()
|
248
|
248
|
{
|
249
|
249
|
for (auto canvas : canvas_)
|
250
|
250
|
canvas->setSourceText(sourceTextEdit_->toPlainText());
|
... |
... |
@@ -253,7 +253,7 @@ ComperatorTab::sourceTextChanged() |
253
|
253
|
|
254
|
254
|
|
255
|
255
|
void
|
256
|
|
-ComperatorTab::syncSettings(int index)
|
|
256
|
+ComparatorTab::syncSettings(int index)
|
257
|
257
|
{
|
258
|
258
|
if (index < 0 || static_cast<unsigned>(index) >= settingPanels_.size())
|
259
|
259
|
return;
|
... |
... |
@@ -273,14 +273,14 @@ ComperatorTab::syncSettings(int index) |
273
|
273
|
|
274
|
274
|
|
275
|
275
|
void
|
276
|
|
-ComperatorTab::wheelResize(int steps)
|
|
276
|
+ComparatorTab::wheelResize(int steps)
|
277
|
277
|
{
|
278
|
278
|
sizeSelector_->handleWheelResizeBySteps(steps);
|
279
|
279
|
}
|
280
|
280
|
|
281
|
281
|
|
282
|
282
|
void
|
283
|
|
-ComperatorTab::wheelZoom(int steps)
|
|
283
|
+ComparatorTab::wheelZoom(int steps)
|
284
|
284
|
{
|
285
|
285
|
sizeSelector_->handleWheelZoomBySteps(steps);
|
286
|
286
|
}
|