Skip to content

Commit 4fd63c5

Browse files
authored
feat: improve Sky Culture Overview UX (#140)
1 parent 822749d commit 4fd63c5

File tree

5 files changed

+392
-243
lines changed

5 files changed

+392
-243
lines changed

plugins/SkyCultureMaker/src/ScmSkyCulture.cpp

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ QJsonObject scm::ScmSkyCulture::toJson() const
7171
{
7272
QJsonObject scJsonObj;
7373
scJsonObj["id"] = id;
74-
scJsonObj["region"] = description.geoRegion;
7574
// for some reason, the classification is inside an array, eg. ["historical"]
7675
QJsonArray classificationArray = QJsonArray::fromStringList(
7776
QStringList() << classificationTypeToString(description.classification));
@@ -109,24 +108,27 @@ bool scm::ScmSkyCulture::saveDescriptionAsMarkdown(QFile &file)
109108

110109
QTextStream out(&file);
111110
out << "# " << desc.name << "\n\n";
112-
out << "## Authors\n" << desc.authors << "\n\n";
113-
out << "## License\n### " << license.name << "\n" << license.description << "\n\n";
111+
114112
out << "## Culture Description\n" << desc.cultureDescription << "\n\n";
115-
out << "## About\n" << desc.about << "\n\n";
116113

117-
out << "## Geographical Region\n" << desc.geoRegion << "\n\n";
118114
out << "## Sky\n" << desc.sky << "\n\n";
119-
out << "## Moon and Sun\n" << desc.moonAndSun << "\n\n";
120-
out << "## Planets\n" << desc.planets << "\n\n";
121-
out << "## Zodiac\n" << desc.zodiac << "\n\n";
122-
out << "## Milky Way\n" << desc.milkyWay << "\n\n";
123-
out << "## Other Celestial Objects\n" << desc.otherObjects << "\n\n";
115+
out << "### Moon and Sun\n" << desc.moonAndSun << "\n\n";
116+
out << "### Planets\n" << desc.planets << "\n\n";
117+
out << "### Zodiac\n" << desc.zodiac << "\n\n";
118+
out << "### Constellations\n" << desc.constellations << "\n\n";
119+
out << "### Milky Way\n" << desc.milkyWay << "\n\n";
120+
out << "### Other Celestial Objects\n" << desc.otherObjects << "\n\n";
121+
122+
out << "## About\n" << desc.about << "\n\n";
123+
out << "### Authors\n" << desc.authors << "\n\n";
124+
out << "### Acknowledgements\n" << desc.acknowledgements << "\n\n";
124125

125-
out << "## Constellations\n" << desc.constellations << "\n\n";
126126
out << "## References\n" << desc.references << "\n\n";
127-
out << "## Acknowledgements\n" << desc.acknowledgements << "\n\n";
127+
128128
out << "## Classification\n " << classificationTypeToString(desc.classification) << "\n\n";
129129

130+
out << "## License\n### " << license.name << "\n" << license.description << "\n\n";
131+
130132
try
131133
{
132134
file.close();

plugins/SkyCultureMaker/src/gui/ScmSkyCultureDialog.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ scm::Description ScmSkyCultureDialog::getDescriptionFromTextEdit() const
279279
desc.cultureDescription = ui->cultureDescriptionTE->toPlainText();
280280
desc.about = ui->aboutTE->toPlainText();
281281

282-
desc.geoRegion = ui->geoRegionTE->toPlainText();
283282
desc.sky = ui->skyTE->toPlainText();
284283
desc.moonAndSun = ui->moonSunTE->toPlainText();
285284
desc.planets = ui->planetsTE->toPlainText();
@@ -315,7 +314,6 @@ void ScmSkyCultureDialog::resetDialog()
315314
ui->authorsTE->clear();
316315
ui->cultureDescriptionTE->clear();
317316
ui->aboutTE->clear();
318-
ui->geoRegionTE->clear();
319317
ui->skyTE->clear();
320318
ui->moonSunTE->clear();
321319
ui->planetsTE->clear();

plugins/SkyCultureMaker/src/gui/scmConstellationDialog.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<bool>false</bool>
5555
</property>
5656
<property name="currentIndex">
57-
<number>2</number>
57+
<number>0</number>
5858
</property>
5959
<property name="iconSize">
6060
<size>

0 commit comments

Comments
 (0)