Skip to content

Commit 77cb318

Browse files
committed
2-3-4: ui improvements 1
1 parent 0edfe09 commit 77cb318

9 files changed

Lines changed: 90 additions & 326 deletions

plugins/SkyCultureMaker/src/gui/ScmConstellationDialog.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ void ScmConstellationDialog::loadFromConstellation(scm::ScmConstellation *conste
7979
constellationPronounce = constellation->getPronounce();
8080
constellationIPA = constellation->getIPA();
8181

82-
ui->enNameTE->setPlainText(constellationEnglishName);
83-
ui->idTE->setPlainText(constellationId);
84-
ui->natNameTE->setPlainText(constellationNativeName.value_or(""));
85-
ui->pronounceTE->setPlainText(constellationPronounce.value_or(""));
86-
ui->ipaTE->setPlainText(constellationIPA.value_or(""));
82+
ui->enNameLE->setText(constellationEnglishName);
83+
ui->idLE->setText(constellationId);
84+
ui->natNameLE->setText(constellationNativeName.value_or(""));
85+
ui->pronounceLE->setText(constellationPronounce.value_or(""));
86+
ui->ipaLE->setText(constellationIPA.value_or(""));
8787

8888
// Hide the original constellation while editing
8989
constellation->hide();
@@ -200,38 +200,38 @@ void ScmConstellationDialog::createDialogContent()
200200

201201
// LABELS TAB
202202

203-
connect(ui->enNameTE, &QTextEdit::textChanged, this,
203+
connect(ui->enNameLE, &QLineEdit::textChanged, this,
204204
[this]()
205205
{
206-
constellationEnglishName = ui->enNameTE->toPlainText();
206+
constellationEnglishName = ui->enNameLE->text();
207207

208208
QString newConstId = constellationEnglishName.toLower().replace(" ", "_");
209209
constellationPlaceholderId = newConstId;
210-
ui->idTE->setPlaceholderText(newConstId);
210+
ui->idLE->setPlaceholderText(newConstId);
211211
});
212-
connect(ui->idTE, &QTextEdit::textChanged, this, [this]() { constellationId = ui->idTE->toPlainText(); });
213-
connect(ui->natNameTE, &QTextEdit::textChanged, this,
212+
connect(ui->idLE, &QLineEdit::textChanged, this, [this]() { constellationId = ui->idLE->text(); });
213+
connect(ui->natNameLE, &QLineEdit::textChanged, this,
214214
[this]()
215215
{
216-
constellationNativeName = ui->natNameTE->toPlainText();
216+
constellationNativeName = ui->natNameLE->text();
217217
if (constellationNativeName->isEmpty())
218218
{
219219
constellationNativeName = std::nullopt;
220220
}
221221
});
222-
connect(ui->pronounceTE, &QTextEdit::textChanged, this,
222+
connect(ui->pronounceLE, &QLineEdit::textChanged, this,
223223
[this]()
224224
{
225-
constellationPronounce = ui->pronounceTE->toPlainText();
225+
constellationPronounce = ui->pronounceLE->text();
226226
if (constellationPronounce->isEmpty())
227227
{
228228
constellationPronounce = std::nullopt;
229229
}
230230
});
231-
connect(ui->ipaTE, &QTextEdit::textChanged, this,
231+
connect(ui->ipaLE, &QLineEdit::textChanged, this,
232232
[this]()
233233
{
234-
constellationIPA = ui->ipaTE->toPlainText();
234+
constellationIPA = ui->ipaLE->text();
235235
if (constellationIPA->isEmpty())
236236
{
237237
constellationIPA = std::nullopt;
@@ -524,22 +524,22 @@ void ScmConstellationDialog::resetDialog()
524524
setIsDarkConstellation(false);
525525

526526
constellationId.clear();
527-
ui->idTE->clear();
527+
ui->idLE->clear();
528528

529529
constellationPlaceholderId.clear();
530-
ui->idTE->setPlaceholderText("");
530+
ui->idLE->setPlaceholderText("");
531531

532532
constellationEnglishName.clear();
533-
ui->enNameTE->clear();
533+
ui->enNameLE->clear();
534534

535535
constellationNativeName = std::nullopt;
536-
ui->natNameTE->clear();
536+
ui->natNameLE->clear();
537537

538538
constellationPronounce = std::nullopt;
539-
ui->pronounceTE->clear();
539+
ui->pronounceLE->clear();
540540

541541
constellationIPA = std::nullopt;
542-
ui->ipaTE->clear();
542+
ui->ipaLE->clear();
543543

544544
ui->bind_star->setEnabled(false);
545545
imageItem->hide();

plugins/SkyCultureMaker/src/gui/ScmSkyCultureDialog.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ void ScmSkyCultureDialog::createDialogContent()
8686
connect(ui->titleBar, &TitleBar::closeClicked, this, &ScmSkyCultureDialog::close);
8787

8888
// Overview Tab
89-
connect(ui->skyCultureNameTE, &QTextEdit::textChanged, this,
89+
connect(ui->skyCultureNameLE, &QLineEdit::textChanged, this,
9090
[this]()
9191
{
92-
name = ui->skyCultureNameTE->toPlainText();
92+
name = ui->skyCultureNameLE->text();
9393
if (name.isEmpty())
9494
{
9595
ui->ExportSkyCultureBtn->setEnabled(false);
@@ -300,7 +300,7 @@ scm::Description ScmSkyCultureDialog::getDescriptionFromTextEdit() const
300300
{
301301
scm::Description desc;
302302

303-
desc.name = ui->skyCultureNameTE->toPlainText();
303+
desc.name = ui->skyCultureNameLE->text();
304304
desc.authors = ui->authorsTE->toPlainText();
305305
desc.license = ui->licenseCB->currentData().value<scm::LicenseType>();
306306
desc.cultureDescription = ui->cultureDescriptionTE->toPlainText();
@@ -337,7 +337,7 @@ void ScmSkyCultureDialog::resetDialog()
337337
{
338338
if (ui && dialog)
339339
{
340-
ui->skyCultureNameTE->clear();
340+
ui->skyCultureNameLE->clear();
341341
ui->authorsTE->clear();
342342
ui->cultureDescriptionTE->clear();
343343
ui->aboutTE->clear();

plugins/SkyCultureMaker/src/gui/ScmStartDialog.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include <QFile>
3535
#include <QFileInfo>
3636
#include <QLabel>
37-
#include <QMessageBox>
3837
#include <QVBoxLayout>
3938

4039
ScmStartDialog::ScmStartDialog(SkyCultureMaker *maker)

0 commit comments

Comments
 (0)