HelpDialog.cpp   HelpDialog.cpp 
skipping to change at line 56 skipping to change at line 56
#include "StelGui.hpp" #include "StelGui.hpp"
#include "StelGuiItems.hpp" #include "StelGuiItems.hpp"
#include "StelLocaleMgr.hpp" #include "StelLocaleMgr.hpp"
#include "StelLogger.hpp" #include "StelLogger.hpp"
#include "StelStyle.hpp" #include "StelStyle.hpp"
#include "StelActionMgr.hpp" #include "StelActionMgr.hpp"
HelpDialog::HelpDialog(QObject* parent) HelpDialog::HelpDialog(QObject* parent)
: StelDialog(parent) : StelDialog(parent)
{ {
dialogName = "Help";
ui = new Ui_helpDialogForm; ui = new Ui_helpDialogForm;
} }
HelpDialog::~HelpDialog() HelpDialog::~HelpDialog()
{ {
delete ui; delete ui;
ui = NULL; ui = NULL;
} }
void HelpDialog::retranslate() void HelpDialog::retranslate()
skipping to change at line 89 skipping to change at line 90
} }
} }
void HelpDialog::createDialogContent() void HelpDialog::createDialogContent()
{ {
ui->setupUi(dialog); ui->setupUi(dialog);
connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SL OT(retranslate())); connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SL OT(retranslate()));
ui->stackedWidget->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0);
ui->stackListWidget->setCurrentRow(0); ui->stackListWidget->setCurrentRow(0);
connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())) ; connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())) ;
connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMove dTo(QPoint)));
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
//Kinetic scrolling for tablet pc and pc //Kinetic scrolling for tablet pc and pc
QList<QWidget *> addscroll; QList<QWidget *> addscroll;
addscroll << ui->helpBrowser << ui->aboutBrowser << ui->logBrowser; addscroll << ui->helpBrowser << ui->aboutBrowser << ui->logBrowser;
installKineticScrolling(addscroll); installKineticScrolling(addscroll);
#endif #endif
// Help page // Help page
updateText(); updateText();
skipping to change at line 271 skipping to change at line 273
<< "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" << "Froenchenko Leonid"
<< "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" << "Maciej Serylak" << "Eleni Mar ia Stea" << "Kirill Snezhko"
<< "Simon Parzer" << "Peter Neubauer" << "Andrei Borza" << "Florian Schaukowitsch" << "Simon Parzer" << "Peter Neubauer" << "Andrei Borza" << "Florian Schaukowitsch"
<< "Allan Johnson" << "Felix Zeltner" << "Paolo Cancedd a" << "Ross Mitchell" << "Allan Johnson" << "Felix Zeltner" << "Paolo Cancedd a" << "Ross Mitchell"
<< "David Baucum" << "Maciej Serylak" << "Adriano Steff ler" << "Sibi Antony" << "David Baucum" << "Maciej Serylak" << "Adriano Steff ler" << "Sibi Antony"
<< "Tony Furr" << "misibacsi" << "Pavel Klimenko"; << "Tony Furr" << "misibacsi" << "Pavel Klimenko" << "R
umen G. Bogdanovski"
<< "Colin Gaudion" << "Annette S. Lee" << "Vancho Stojk
oski" << "Robert S. Fuller";
contributors.sort(); contributors.sort();
// populate About tab // populate About tab
newHtml = "<h1>" + StelUtils::getApplicationName() + "</h1>"; 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>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_("Doc author/developer: %1").arg(QString("Matt hew Gates")).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("Bogdan Marinov" )).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Timothy Reaves" )).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("Ferdinand Majer newHtml += "<li>" + q_("Developer: %1").arg(QString("Florian Schauko
ech")).toHtmlEscaped() + "</li>"; witsch")).toHtmlEscaped() + "</li>";
newHtml += "<li>" + q_("Developer: %1").arg(QString("Jörg Müller")).
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_("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("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("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>";
ui->aboutBrowser->clear(); ui->aboutBrowser->clear();
ui->aboutBrowser->document()->setDefaultStyleSheet(QString(gui->getS telStyle().htmlStyleSheet)); ui->aboutBrowser->document()->setDefaultStyleSheet(QString(gui->getS telStyle().htmlStyleSheet));
ui->aboutBrowser->insertHtml(newHtml); ui->aboutBrowser->insertHtml(newHtml);
ui->aboutBrowser->scrollToAnchor("top"); ui->aboutBrowser->scrollToAnchor("top");
} }
 End of changes. 8 change blocks. 
6 lines changed or deleted 14 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/