HelpDialog.cpp   HelpDialog.cpp 
skipping to change at line 38 skipping to change at line 38
#include <QList> #include <QList>
#include <QSet> #include <QSet>
#include <QPair> #include <QPair>
#include <QtAlgorithms> #include <QtAlgorithms>
#include <QDebug> #include <QDebug>
#include <QFileInfo> #include <QFileInfo>
#include <QFile> #include <QFile>
#include <QDir> #include <QDir>
#include <QProcess> #include <QProcess>
#include <QSysInfo> #include <QSysInfo>
#include <QGLFormat>
#include "ui_helpDialogGui.h" #include "ui_helpDialogGui.h"
#include "HelpDialog.hpp" #include "HelpDialog.hpp"
#include "StelUtils.hpp" #include "StelUtils.hpp"
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelFileMgr.hpp" #include "StelFileMgr.hpp"
#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("Help", 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()
{ {
if (dialog) if (dialog)
{ {
ui->retranslateUi(dialog); ui->retranslateUi(dialog);
updateText(); updateHelpText();
updateAboutText();
} }
} }
void HelpDialog::styleChanged() void HelpDialog::styleChanged()
{ {
if (dialog) if (dialog)
{ {
updateText(); updateHelpText();
updateAboutText();
} }
} }
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))); 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(); updateHelpText();
connect(ui->editShortcutsButton, SIGNAL(clicked()), this, SLOT(showS hortcutsWindow())); connect(ui->editShortcutsButton, SIGNAL(clicked()), this, SLOT(showS hortcutsWindow()));
connect(StelApp::getInstance().getStelActionManager(), SIGNAL(shortc
utsChanged()), this, SLOT(updateHelpText()));
// About page
updateAboutText();
// Log page // Log page
ui->logPathLabel->setText(QString("%1/log.txt:").arg(StelFileMgr::ge tUserDir())); ui->logPathLabel->setText(QString("%1/log.txt:").arg(StelFileMgr::ge tUserDir()));
connect(ui->stackedWidget, SIGNAL(currentChanged(int)), this, SLOT(u pdateLog(int))); connect(ui->stackedWidget, SIGNAL(currentChanged(int)), this, SLOT(u pdateLog(int)));
connect(ui->refreshButton, SIGNAL(clicked()), this, SLOT(refreshLog( ))); connect(ui->refreshButton, SIGNAL(clicked()), this, SLOT(refreshLog( )));
connect(ui->stackListWidget, SIGNAL(currentItemChanged(QListWidgetIt em *, QListWidgetItem *)), this, SLOT(changePage(QListWidgetItem *, QListWi dgetItem*))); connect(ui->stackListWidget, SIGNAL(currentItemChanged(QListWidgetIt em *, QListWidgetItem *)), this, SLOT(changePage(QListWidgetItem *, QListWi dgetItem*)));
} }
skipping to change at line 130 skipping to change at line 134
{ {
if (ui->stackedWidget->currentWidget() == ui->pageLog) if (ui->stackedWidget->currentWidget() == ui->pageLog)
refreshLog(); refreshLog();
} }
void HelpDialog::refreshLog() void HelpDialog::refreshLog()
{ {
ui->logBrowser->setPlainText(StelLogger::getLog()); ui->logBrowser->setPlainText(StelLogger::getLog());
} }
QString HelpDialog::getHelpText(void) void HelpDialog::updateHelpText(void)
{ {
QString htmlText = "<html><head><title>"; QString htmlText = "<html><head><title>";
htmlText += q_("Stellarium Help").toHtmlEscaped(); htmlText += q_("Stellarium Help").toHtmlEscaped();
htmlText += "</title></head><body>\n"; htmlText += "</title></head><body>\n";
// WARNING! Section titles are re-used below! // WARNING! Section titles are re-used below!
htmlText += "<p align=\"center\"><a href=\"#keys\">" + htmlText += "<p align=\"center\"><a href=\"#keys\">" +
q_("Keys").toHtmlEscaped() + q_("Keys").toHtmlEscaped() +
"</a> &bull; <a href=\"#links\">" + "</a> &bull; <a href=\"#links\">" +
q_("Further Reading").toHtmlEscaped() + q_("Further Reading").toHtmlEscaped() +
"</a></p>\n"; "</a></p>\n";
htmlText += "<h2 id='keys'>" + q_("Keys").toHtmlEscaped() + "</h2>\n "; htmlText += "<h2 id='keys'>" + q_("Keys").toHtmlEscaped() + "</h2>\n ";
htmlText += "<table cellpadding=\"10%\">\n"; htmlText += "<table cellpadding=\"10%\">\n";
// Describe keys for those keys which do not have actions. // Describe keys for those keys which do not have actions.
// navigate // navigate
htmlText += "<tr><td>" + q_("Pan view around the sky").toHtmlEscaped () + "</td>"; htmlText += "<tr><td>" + q_("Pan view around the sky").toHtmlEscaped () + "</td>";
htmlText += "<td><b>" + q_("Arrow keys & left mouse drag").toHtmlEsc aped() + "</b></td></tr>\n"; htmlText += "<td><b>" + q_("Arrow keys & left mouse drag").toHtmlEsc aped() + "</b></td></tr>\n";
// zoom in/out // zoom in/out
htmlText += "<tr><td rowspan='2'>" + q_("Zoom in/out").toHtmlEscaped () + htmlText += "<tr><td rowspan='2'>" + q_("Zoom in/out").toHtmlEscaped () +
"</td>"; "</td>";
htmlText += "<td><b>" + q_("Page Up/Down").toHtmlEscaped() + htmlText += "<td><b>" + q_("Page Up/Down").toHtmlEscaped() +
"</b></td></tr>\n"; "</b></td></tr>\n";
htmlText += "<tr><td><b>" + q_("Ctrl+Up/Down").toHtmlEscaped() + htmlText += "<tr><td><b>" + q_("Ctrl+Up/Down").toHtmlEscaped() +
"</b></td></tr>\n"; "</b></td></tr>\n";
// time dragging/scrolling // time dragging/scrolling
htmlText += "<tr><td>" + q_("Time dragging").toHtmlEscaped() + "</td ><td><b>" + htmlText += "<tr><td>" + q_("Time dragging").toHtmlEscaped() + "</td ><td><b>" +
q_("Ctrl & left mouse drag").toHtmlEscaped() + "</b> </td></tr>"; q_("Ctrl & left mouse drag").toHtmlEscaped() + "</b> </td></tr>";
htmlText += "<tr><td>" + q_("Time scrolling: minutes").toHtmlEscaped () + "</td><td><b>" + htmlText += "<tr><td>" + q_("Time scrolling: minutes").toHtmlEscaped () + "</td><td><b>" +
q_("Ctrl & mouse wheel").toHtmlEscaped() + "</b></td ></tr>"; q_("Ctrl & mouse wheel").toHtmlEscaped() + "</b></td ></tr>";
htmlText += "<tr><td>" + q_("Time scrolling: hours").toHtmlEscaped() + "</td><td><b>" + htmlText += "<tr><td>" + q_("Time scrolling: hours").toHtmlEscaped() + "</td><td><b>" +
q_("Ctrl+Shift & mouse wheel").toHtmlEscaped() + "</ b></td></tr>"; q_("Ctrl+Shift & mouse wheel").toHtmlEscaped() + "</ b></td></tr>";
htmlText += "<tr><td>" + q_("Time scrolling: days").toHtmlEscaped() + "</td><td><b>" + htmlText += "<tr><td>" + q_("Time scrolling: days").toHtmlEscaped() + "</td><td><b>" +
q_("Ctrl+Alt & mouse wheel").toHtmlEscaped() + "</b> </td></tr>"; q_("Ctrl+Alt & mouse wheel").toHtmlEscaped() + "</b> </td></tr>";
htmlText += "<tr><td>" + q_("Time scrolling: years").toHtmlEscaped() + "</td><td><b>" + htmlText += "<tr><td>" + q_("Time scrolling: years").toHtmlEscaped() + "</td><td><b>" +
skipping to change at line 187 skipping to change at line 191
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 custom markers
htmlText += "<tr><td>" + q_("Delete all custom markers").toHtmlEscap ed() + "</td>"; htmlText += "<tr><td>" + q_("Delete all custom markers").toHtmlEscap ed() + "</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";
htmlText += "</table>\n<p>" + htmlText += "</table>\n<p>" +
q_("Below are listed only the actions with assigned q_("Below are listed only the actions with assigned
keys. Further actions may be available via the \"%1\" button.") 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())
{ {
QList<KeyDescription> descriptions; QList<KeyDescription> descriptions;
foreach (StelAction* action, actionMgr->getActionList(group) ) foreach (StelAction* action, actionMgr->getActionList(group) )
{ {
if (action->getShortcut().isEmpty()) if (action->getShortcut().isEmpty())
continue; continue;
QString text = action->getText(); QString text = action->getText();
QString key = action->getShortcut().toString(QKeySe quence::NativeText); QString key = action->getShortcut().toString(QKeySe quence::NativeText);
descriptions.append(KeyDescription(text, key)); descriptions.append(KeyDescription(text, key));
} }
qSort(descriptions); qSort(descriptions);
htmlText += "<tr></tr><tr><td><b><u>" + q_(group) + htmlText += "<tr></tr><tr><td><b><u>" + q_(group) +
":</u></b></td></tr>\n"; ":</u></b></td></tr>\n";
foreach (const KeyDescription& desc, descriptions) foreach (const KeyDescription& desc, descriptions)
{ {
htmlText += "<tr><td>" + desc.first.toHtmlEscaped() + "</td>"; htmlText += "<tr><td>" + desc.first.toHtmlEscaped() + "</td>";
htmlText += "<td><b>" + desc.second.toHtmlEscaped() + htmlText += "<td><b>" + desc.second.toHtmlEscaped() +
"</b></td></tr>\n"; "</b></td></tr>\n";
} }
} }
htmlText += "<tr></tr><tr><td><b><u>" + q_("Text User Interface (TUI )") + htmlText += "<tr></tr><tr><td><b><u>" + q_("Text User Interface (TUI )") +
":</u></b></td></tr>\n"; ":</u></b></td></tr>\n";
htmlText += "<tr><td>" + q_("Activate TUI") + "</td>"; htmlText += "<tr><td>" + q_("Activate TUI") + "</td>";
htmlText += "<td><b>Alt+T</b></td></tr>\n"; htmlText += "<td><b>Alt+T</b></td></tr>\n";
htmlText += "</table>"; htmlText += "</table>";
// Regexp to replace {text} with an HTML link. // Regexp to replace {text} with an HTML link.
skipping to change at line 256 skipping to change at line 260
// TRANSLATORS: The text between braces is the text of an HTML link. // TRANSLATORS: The text between braces is the text of an HTML link.
htmlText += q_("{Bug reporting and feature request system} - if some thing doesn't work properly or is missing and is not listed in the tracker, you can open bug reports here.").toHtmlEscaped().replace(a_rx, "<a href=\" http://bugs.launchpad.net/stellarium/\">\\1</a>"); htmlText += q_("{Bug reporting and feature request system} - if some thing doesn't work properly or is missing and is not listed in the tracker, you can open bug reports here.").toHtmlEscaped().replace(a_rx, "<a href=\" http://bugs.launchpad.net/stellarium/\">\\1</a>");
htmlText += "</p>\n"; htmlText += "</p>\n";
htmlText += "<p>"; htmlText += "<p>";
// TRANSLATORS: The text between braces is the text of an HTML link. // TRANSLATORS: The text between braces is the text of an HTML link.
htmlText += q_("{Forums} - discuss Stellarium with other users.").to HtmlEscaped().replace(a_rx, "<a href=\"http://sourceforge.net/forum/forum.p hp?forum_id=278769\">\\1</a>"); htmlText += q_("{Forums} - discuss Stellarium with other users.").to HtmlEscaped().replace(a_rx, "<a href=\"http://sourceforge.net/forum/forum.p hp?forum_id=278769\">\\1</a>");
htmlText += "</p>\n"; htmlText += "</p>\n";
htmlText += "</body></html>\n"; htmlText += "</body></html>\n";
return htmlText;
#undef E #undef E
}
void HelpDialog::updateText(void)
{
QString newHtml = getHelpText();
ui->helpBrowser->clear(); ui->helpBrowser->clear();
StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui( )); StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui( ));
Q_ASSERT(gui); Q_ASSERT(gui);
ui->helpBrowser->document()->setDefaultStyleSheet(QString(gui->getSt elStyle().htmlStyleSheet)); ui->helpBrowser->document()->setDefaultStyleSheet(QString(gui->getSt elStyle().htmlStyleSheet));
ui->helpBrowser->insertHtml(newHtml); ui->helpBrowser->insertHtml(htmlText);
ui->helpBrowser->scrollToAnchor("top"); ui->helpBrowser->scrollToAnchor("top");
}
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" << "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" << "Simon Parzer" << "Peter Neubauer" << "Andrei Borza"
<< "Florian Schaukowitsch" << "Allan Johnson"
<< "Allan Johnson" << "Felix Zeltner" << "Paolo Cancedd << "Felix Zeltner" << "Paolo Cancedda" << "Ross Mitchel
a" << "Ross Mitchell" l" << "David Baucum"
<< "David Baucum" << "Maciej Serylak" << "Adriano Steff << "Maciej Serylak" << "Adriano Steffler" << "Sibi Anto
ler" << "Sibi Antony" ny" << "Tony Furr"
<< "Tony Furr" << "misibacsi" << "Pavel Klimenko" << "R << "misibacsi" << "Pavel Klimenko" << "Rumen G. Bogdano
umen G. Bogdanovski" vski" << "Colin Gaudion"
<< "Colin Gaudion" << "Annette S. Lee" << "Vancho Stojk << "Annette S. Lee" << "Vancho Stojkoski" << "Robert S.
oski" << "Robert S. Fuller"; Fuller" << "Giuseppe Putzolu"
<< "henrysky";
contributors.sort(); contributors.sort();
// populate About tab // populate About tab
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 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 ";
skipping to change at line 337 skipping to change at line 339
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("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(
));
Q_ASSERT(gui);
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");
} }
void HelpDialog::changePage(QListWidgetItem *current, QListWidgetItem *prev ious) void HelpDialog::changePage(QListWidgetItem *current, QListWidgetItem *prev ious)
{ {
if (!current) if (!current)
current = previous; current = previous;
 End of changes. 25 change blocks. 
37 lines changed or deleted 43 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/