HelpDialog.cpp   HelpDialog.cpp 
skipping to change at line 61 skipping to change at line 61
HelpDialog::HelpDialog(QObject* parent) HelpDialog::HelpDialog(QObject* parent)
: StelDialog("Help", parent) : StelDialog("Help", parent)
{ {
ui = new Ui_helpDialogForm; ui = new Ui_helpDialogForm;
} }
HelpDialog::~HelpDialog() HelpDialog::~HelpDialog()
{ {
delete ui; delete ui;
ui = NULL; ui = Q_NULLPTR;
} }
void HelpDialog::retranslate() void HelpDialog::retranslate()
{ {
if (dialog) if (dialog)
{ {
ui->retranslateUi(dialog); ui->retranslateUi(dialog);
updateHelpText(); updateHelpText();
updateAboutText(); updateAboutText();
} }
skipping to change at line 186 skipping to change at line 186
htmlText += "<tr><td>"; htmlText += "<tr><td>";
htmlText += q_("Clear selection").toHtmlEscaped() + "</td>"; htmlText += q_("Clear selection").toHtmlEscaped() + "</td>";
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
htmlText += "<td><b>" + q_("Ctrl & left click").toHtmlEscaped() + "< /b></td></tr>\n"; htmlText += "<td><b>" + q_("Ctrl & left click").toHtmlEscaped() + "< /b></td></tr>\n";
#else #else
htmlText += "<td><b>" + q_("Right click").toHtmlEscaped() + "</b></t d></tr>\n"; htmlText += "<td><b>" + q_("Right click").toHtmlEscaped() + "</b></t d></tr>\n";
#endif #endif
// add custom marker // add custom marker
htmlText += "<tr><td>" + q_("Add custom marker").toHtmlEscaped() + " </td>"; htmlText += "<tr><td>" + q_("Add custom marker").toHtmlEscaped() + " </td>";
htmlText += "<td><b>" + q_("Shift & left click").toHtmlEscaped() + " </b></td></tr>\n"; htmlText += "<td><b>" + q_("Shift & left click").toHtmlEscaped() + " </b></td></tr>\n";
// delete custom markers // delete one custom marker
htmlText += "<tr><td>" + q_("Delete all custom markers").toHtmlEscap htmlText += "<tr><td>" + q_("Delete marker closest to mouse cursor")
ed() + "</td>"; .toHtmlEscaped() + "</td>";
htmlText += "<td><b>" + q_("Shift & right click").toHtmlEscaped() + "</b></td></tr>\n"; htmlText += "<td><b>" + q_("Shift & right click").toHtmlEscaped() + "</b></td></tr>\n";
// delete all custom markers
htmlText += "<tr><td>" + q_("Delete all custom markers").toHtmlEscap
ed() + "</td>";
htmlText += "<td><b>" + q_("Shift & Alt & right click").toHtmlEscape
d() + "</b></td></tr>\n";
htmlText += "</table>\n<p>" + htmlText += "</table>\n<p>" +
q_("Below are listed only the actions with assigned keys. Further actions may be available via the \"%1\" button.") q_("Below are listed only the actions with assigned keys. Further actions may be available via the \"%1\" button.")
.arg(ui->editShortcutsButton->text()).toHtmlEscaped( ) + .arg(ui->editShortcutsButton->text()).toHtmlEscaped( ) +
"</p><table cellpadding=\"10%\">\n"; "</p><table cellpadding=\"10%\">\n";
// Append all StelAction shortcuts. // Append all StelAction shortcuts.
StelActionMgr* actionMgr = StelApp::getInstance().getStelActionManag er(); StelActionMgr* actionMgr = StelApp::getInstance().getStelActionManag er();
typedef QPair<QString, QString> KeyDescription; typedef QPair<QString, QString> KeyDescription;
foreach (QString group, actionMgr->getGroupList()) foreach (QString group, actionMgr->getGroupList())
skipping to change at line 279 skipping to change at line 282
void HelpDialog::updateAboutText(void) void HelpDialog::updateAboutText(void)
{ {
QStringList contributors; QStringList contributors;
contributors << "Vladislav Bataron" << "Barry Gerdes" << "Peter Wals er" << "Michal Sojka" contributors << "Vladislav Bataron" << "Barry Gerdes" << "Peter Wals er" << "Michal Sojka"
<< "Nick Fedoseev" << "Clement Sommelet" << "Ivan Marti -Vidal" << "Nicolas Martignoni" << "Nick Fedoseev" << "Clement Sommelet" << "Ivan Marti -Vidal" << "Nicolas Martignoni"
<< "Oscar Roig Felius" << "M.S. Adityan" << "Tomasz Buc hert" << "Adam Majer" << "Oscar Roig Felius" << "M.S. Adityan" << "Tomasz Buc hert" << "Adam Majer"
<< "Roland Bosa" << "Łukasz 'sil2100' Zemczak" << "Gábo r Péterffy" << "Roland Bosa" << "Łukasz 'sil2100' Zemczak" << "Gábo r Péterffy"
<< "Mircea Lite" << "Alexey Dokuchaev" << "William Form yduval" << "Daniel De Mickey" << "Mircea Lite" << "Alexey Dokuchaev" << "William Form yduval" << "Daniel De Mickey"
<< "François Scholder" << "Anton Samoylov" << "Mykyta S ytyi" << "Shantanu Agarwal" << "François Scholder" << "Anton Samoylov" << "Mykyta S ytyi" << "Shantanu Agarwal"
<< "Teemu Nätkinniemi" << "Kutaibaa Akraa" << "J.L.Cana les" << "Froenchenko Leonid" << "Teemu Nätkinniemi" << "Kutaibaa Akraa" << "J.L.Cana les" << "Leonid Froenchenko"
<< "Peter Mousley" << "Greg Alexander" << "Yuri Chornoi van" << "Daniel Michalik" << "Peter Mousley" << "Greg Alexander" << "Yuri Chornoi van" << "Daniel Michalik"
<< "Hleb Valoshka" << "Matthias Drochner" << "Kenan Der višević" << "Alex Gamper" << "Hleb Valoshka" << "Matthias Drochner" << "Kenan Der višević" << "Alex Gamper"
<< "Volker Hören" << "Max Digruber" << "Dan Smale" << " Victor Reijs" << "Volker Hören" << "Max Digruber" << "Dan Smale" << " Victor Reijs"
<< "Tanmoy Saha" << "Oleg Ginzburg" << "Peter Hickey" < < "Bernd Kreuss" << "Tanmoy Saha" << "Oleg Ginzburg" << "Peter Hickey" < < "Bernd Kreuss"
<< "Alexander Miller" << "Maciej Serylak" << "Eleni Mar ia Stea" << "Kirill Snezhko" << "Alexander Miller" << "Eleni Maria Stea" << "Kirill Snezhko"
<< "Simon Parzer" << "Peter Neubauer" << "Andrei Borza" << "Allan Johnson" << "Simon Parzer" << "Peter Neubauer" << "Andrei Borza" << "Allan Johnson"
<< "Felix Zeltner" << "Paolo Cancedda" << "Ross Mitchel l" << "David Baucum" << "Felix Zeltner" << "Paolo Cancedda" << "Ross Mitchel l" << "David Baucum"
<< "Maciej Serylak" << "Adriano Steffler" << "Sibi Anto ny" << "Tony Furr" << "Maciej Serylak" << "Adriano Steffler" << "Sibi Anto ny" << "Tony Furr"
<< "misibacsi" << "Pavel Klimenko" << "Rumen G. Bogdano vski" << "Colin Gaudion" << "misibacsi" << "Pavel Klimenko" << "Rumen G. Bogdano vski" << "Colin Gaudion"
<< "Annette S. Lee" << "Vancho Stojkoski" << "Robert S. Fuller" << "Giuseppe Putzolu" << "Annette S. Lee" << "Vancho Stojkoski" << "Robert S. Fuller" << "Giuseppe Putzolu"
<< "henrysky"; << "henrysky" << "Nick Kanel" << "Petr Kubánek";
contributors.sort(); contributors.sort();
// populate About tab // populate About tab
QString newHtml = "<h1>" + StelUtils::getApplicationName() + "</h1>" ; QString newHtml = "<h1>" + StelUtils::getApplicationName() + "</h1>" ;
// Note: this legal notice is not suitable for traslation // Note: this legal notice is not suitable for traslation
newHtml += QString("<h3>Copyright &copy; %1 Stellarium Developers</h 3>").arg(COPYRIGHT_YEARS); newHtml += QString("<h3>Copyright &copy; %1 Stellarium Developers</h 3>").arg(COPYRIGHT_YEARS);
newHtml += "<p><em>Version 0.15 is dedicated in memory of our team m ember Barry Gerdes.</em></p>"; // newHtml += "<p><em>Version 0.15 is dedicated in memory of our tea m member Barry Gerdes.</em></p>";
newHtml += "<p>This program is free software; you can redistribute i t and/or "; newHtml += "<p>This program is free software; you can redistribute i t and/or ";
newHtml += "modify it under the terms of the GNU General Public Lice nse "; newHtml += "modify it under the terms of the GNU General Public Lice nse ";
newHtml += "as published by the Free Software Foundation; either ver sion 2 "; newHtml += "as published by the Free Software Foundation; either ver sion 2 ";
newHtml += "of the License, or (at your option) any later version.</ p>"; newHtml += "of the License, or (at your option) any later version.</ p>";
newHtml += "<p>This program is distributed in the hope that it will be useful, "; newHtml += "<p>This program is distributed in the hope that it will be useful, ";
newHtml += "but WITHOUT ANY WARRANTY; without even the implied "; newHtml += "but WITHOUT ANY WARRANTY; without even the implied ";
newHtml += "warranty of MERCHANTABILITY or FITNESS FOR A "; newHtml += "warranty of MERCHANTABILITY or FITNESS FOR A ";
newHtml += "PARTICULAR PURPOSE. See the GNU General Public "; newHtml += "PARTICULAR PURPOSE. See the GNU General Public ";
newHtml += "License for more details.</p>"; newHtml += "License for more details.</p>";
newHtml += "<p>You should have received a copy of the GNU General Pu blic "; newHtml += "<p>You should have received a copy of the GNU General Pu blic ";
newHtml += "License along with this program; if not, write to:</p>"; newHtml += "License along with this program; if not, write to:</p>";
newHtml += "<pre>Free Software Foundation, Inc.\n"; newHtml += "<pre>Free Software Foundation, Inc.\n";
newHtml += "51 Franklin Street, Suite 500\n"; newHtml += "51 Franklin Street, Suite 500\n";
newHtml += "Boston, MA 02110-1335, USA.\n</pre>"; newHtml += "Boston, MA 02110-1335, USA.\n</pre>";
newHtml += "<p><a href=\"http://www.fsf.org\">www.fsf.org</a></p>"; newHtml += "<p><a href=\"http://www.fsf.org\">www.fsf.org</a></p>";
newHtml += "<h3>" + q_("Developers").toHtmlEscaped() + "</h3><ul>"; newHtml += "<h3>" + q_("Developers").toHtmlEscaped() + "</h3><ul>";
newHtml += "<li>" + q_("Project coordinator & lead developer: %1").a rg(QString("Fabien Ch%1reau").arg(QChar(0x00E9))).toHtmlEscaped() + "</li>" ; newHtml += "<li>" + q_("Project coordinator & lead developer: %1").a rg(QString("Fabien Ch%1reau").arg(QChar(0x00E9))).toHtmlEscaped() + "</li>" ;
newHtml += "<li>" + q_("Graphic/other designer: %1").arg(QString("Jo han Meuris")).toHtmlEscaped() + "</li>"; newHtml += "<li>" + q_("Graphic/other designer: %1").arg(QString("Jo han Meuris")).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Bogdan Marinov"
)).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Timothy Reaves"
)).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Guillaume Ch%1r eau").arg(QChar(0x00E9))).toHtmlEscaped() + "</li>"; newHtml += "<li>" + q_("Developer: %1").arg(QString("Guillaume Ch%1r eau").arg(QChar(0x00E9))).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Georg Zotti")). toHtmlEscaped() + "</li>"; newHtml += "<li>" + q_("Developer: %1").arg(QString("Georg Zotti")). toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Alexander Wolf" )).toHtmlEscaped() + "</li>"; newHtml += "<li>" + q_("Developer: %1").arg(QString("Alexander Wolf" )).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Marcos Cardinot ")).toHtmlEscaped() + "</li>"; newHtml += "<li>" + q_("Developer: %1").arg(QString("Marcos Cardinot ")).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Florian Schauko witsch")).toHtmlEscaped() + "</li>"; newHtml += "<li>" + q_("Developer: %1").arg(QString("Florian Schauko witsch")).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Continuous Integration: %1").arg(QString("Ha ns Lambermont")).toHtmlEscaped() + "</li>"; newHtml += "<li>" + q_("Continuous Integration: %1").arg(QString("Ha ns Lambermont")).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Tester: %1").arg(QString("Khalid AlAjaji")). toHtmlEscaped() + "</li></ul>"; newHtml += "<li>" + q_("Tester: %1").arg(QString("Khalid AlAjaji")). toHtmlEscaped() + "</li></ul>";
newHtml += "<h3>" + q_("Former Developers").toHtmlEscaped() + "</h3> "; newHtml += "<h3>" + q_("Former Developers").toHtmlEscaped() + "</h3> ";
newHtml += "<p>" + q_("Several people have made significant contrib utions, but are no longer active. Their work has made a big difference to t he project:").toHtmlEscaped() + "</p><ul>"; newHtml += "<p>" + q_("Several people have made significant contrib utions, but are no longer active. Their work has made a big difference to t he project:").toHtmlEscaped() + "</p><ul>";
newHtml += "<li>" + q_("Doc author/developer: %1").arg(QString("Matt hew Gates")).toHtmlEscaped() + "</li>"; newHtml += "<li>" + q_("Doc author/developer: %1").arg(QString("Matt hew Gates")).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Johannes Gajdos ik")).toHtmlEscaped() + "</li>"; newHtml += "<li>" + q_("Developer: %1").arg(QString("Johannes Gajdos ik")).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Rob Spearman")) .toHtmlEscaped() + "</li>"; newHtml += "<li>" + q_("Developer: %1").arg(QString("Rob Spearman")) .toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Bogdan Marinov"
)).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Timothy Reaves"
)).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Andr%1s Mohari" ).arg(QChar(0x00E1))).toHtmlEscaped() + "</li>"; newHtml += "<li>" + q_("Developer: %1").arg(QString("Andr%1s Mohari" ).arg(QChar(0x00E1))).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Mike Storm")).t oHtmlEscaped() + "</li>"; newHtml += "<li>" + q_("Developer: %1").arg(QString("Mike Storm")).t oHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Ferdinand Majer ech")).toHtmlEscaped() + "</li>"; newHtml += "<li>" + q_("Developer: %1").arg(QString("Ferdinand Majer ech")).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Jörg Müller")). toHtmlEscaped() + "</li>"; newHtml += "<li>" + q_("Developer: %1").arg(QString("Jörg Müller")). toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("OSX Developer: %1").arg(QString("Nigel Kerr" )).toHtmlEscaped() + "</li>"; newHtml += "<li>" + q_("OSX Developer: %1").arg(QString("Nigel Kerr" )).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("OSX Developer: %1").arg(QString("Diego Marco s")).toHtmlEscaped() + "</li></ul>"; newHtml += "<li>" + q_("OSX Developer: %1").arg(QString("Diego Marco s")).toHtmlEscaped() + "</li></ul>";
newHtml += "<h3>" + q_("Contributors").toHtmlEscaped() + "</h3>"; newHtml += "<h3>" + q_("Contributors").toHtmlEscaped() + "</h3>";
newHtml += "<p>" + q_("Several people have made contributions to th e project and their work has made Stellarium better (sorted alphabetically) : %1.").arg(contributors.join(", ")).toHtmlEscaped() + "</p>"; newHtml += "<p>" + q_("Several people have made contributions to th e project and their work has made Stellarium better (sorted alphabetically) : %1.").arg(contributors.join(", ")).toHtmlEscaped() + "</p>";
newHtml += "<p>"; newHtml += "<p>";
StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui( )); StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui( ));
 End of changes. 9 change blocks. 
12 lines changed or deleted 17 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/