HelpDialog.cpp   HelpDialog.cpp 
skipping to change at line 96 skipping to change at line 96
void HelpDialog::styleChanged() void HelpDialog::styleChanged()
{ {
if (dialog) if (dialog)
{ {
updateText(); updateText();
} }
} }
void HelpDialog::createDialogContent() void HelpDialog::createDialogContent()
{ {
ui->setupUi(dialog); ui->setupUi(dialog);
ui->helpTabWidget->setCurrentIndex(0); ui->helpTabWidget->setCurrentIndex(0);
connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(c connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()))
lose())); ;
updateText(); updateText();
ui->logPathLabel->setText(QString("%1/log.txt:").arg(StelApp::getIns
tance().getFileMgr().getUserDir()));
connect(ui->helpTabWidget, SIGNAL(currentChanged(int)), this, SLOT(u
pdateLog(int)));
connect(ui->refreshButton, SIGNAL(clicked()), this, SLOT(refreshLog(
)));
}
void HelpDialog::updateLog(int)
{
if(ui->helpTabWidget->currentWidget() == ui->logTab)
refreshLog();
}
void HelpDialog::refreshLog()
{
ui->logBrowser->setPlainText(StelApp::getInstance().getLog());
} }
void HelpDialog::setKey(QString group, QString oldKey, QString newKey, QStr ing description) void HelpDialog::setKey(QString group, QString oldKey, QString newKey, QStr ing description)
{ {
// For adding keys like this, the choice of a QMultiMap seems like // For adding keys like this, the choice of a QMultiMap seems like
// madness. However, when we update the text it does the grouping // madness. However, when we update the text it does the grouping
// for us... we have to live with ugliness in one of these functions // for us... we have to live with ugliness in one of these functions
// and it seems easier here. // and it seems easier here.
// For new key bindings we just insert and return // For new key bindings we just insert and return
skipping to change at line 256 skipping to change at line 271
newHtml += "</table>"; newHtml += "</table>";
newHtml += getFooterText(); newHtml += getFooterText();
ui->helpBrowser->clear(); ui->helpBrowser->clear();
ui->helpBrowser->document()->setDefaultStyleSheet(QString(StelApp::g etInstance().getCurrentStelStyle()->htmlStyleSheet)); ui->helpBrowser->document()->setDefaultStyleSheet(QString(StelApp::g etInstance().getCurrentStelStyle()->htmlStyleSheet));
ui->helpBrowser->insertHtml(newHtml); ui->helpBrowser->insertHtml(newHtml);
ui->helpBrowser->scrollToAnchor("top"); ui->helpBrowser->scrollToAnchor("top");
// populate About tab // populate About tab
newHtml = "<h1>" + StelApp::getInstance().getApplicationName() + "</ h1>"; newHtml = "<h1>" + StelApp::getInstance().getApplicationName() + "</ h1>";
// Note: this legal notice is not suitable for traslation // Note: this legal notice is not suitable for traslation
newHtml += "<h3>Copyright &copy; 2000-2008 Stellarium Developers</h3 >"; newHtml += "<h3>Copyright &copy; 2000-2009 Stellarium Developers</h3 >";
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 += "59 Temple Place - Suite 330\n"; newHtml += "59 Temple Place - Suite 330\n";
newHtml += "Boston, MA 02111-1307, USA.\n</pre>"; newHtml += "Boston, MA 02111-1307, 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>" + Qt::escape(q_("Developers")) + "</h3><ul>"; newHtml += "<h3>" + Qt::escape(q_("Developers")) + "</h3><ul>";
newHtml += "<li>" + Qt::escape(q_("Project coordinator & lead develo per: %1").arg(QString("Fabien Ch%1reau").arg(QChar(0x00E9)))) + "</li>"; newHtml += "<li>" + Qt::escape(q_("Project coordinator & lead develo per: %1").arg(QString("Fabien Ch%1reau").arg(QChar(0x00E9)))) + "</li>";
newHtml += "<li>" + Qt::escape(q_("Developer: %1").arg(QString("Rob Spearman"))) + "</li>"; newHtml += "<li>" + Qt::escape(q_("Doc author/developer: %1").arg(QS tring("Matthew Gates"))) + "</li>";
newHtml += "<li>" + Qt::escape(q_("Graphic/other designer: %1").arg( QString("Johan Meuris"))) + "</li>"; newHtml += "<li>" + Qt::escape(q_("Graphic/other designer: %1").arg( QString("Johan Meuris"))) + "</li>";
newHtml += "<li>" + Qt::escape(q_("Developer: %1").arg(QString("Joha nnes Gajdosik"))) + "</li>"; newHtml += "<li>" + Qt::escape(q_("Developer: %1").arg(QString("Joha nnes Gajdosik"))) + "</li>";
newHtml += "<li>" + Qt::escape(q_("Doc author/developer: %1").arg(QS tring("Matthew Gates"))) + "</li>"; newHtml += "<li>" + Qt::escape(q_("Developer: %1").arg(QString("Rob Spearman"))) + "</li>";
newHtml += "<li>" + Qt::escape(q_("OSX Developer: %1").arg(QString(" Nigel Kerr"))) + "</li>"; newHtml += "<li>" + Qt::escape(q_("OSX Developer: %1").arg(QString(" Nigel Kerr"))) + "</li>";
newHtml += "<li>" + Qt::escape(q_("Developer: %1").arg(QString("Andr newHtml += "<li>" + Qt::escape(q_("Developer: %1").arg(QString("Andr
%1s Mohari").arg(QChar(0x00E1)))) + "</li><ul><p>"; %1s Mohari").arg(QChar(0x00E1)))) + "</li>";
newHtml += "<li>" + Qt::escape(q_("Developer: %1").arg(QString("Mike
Storm"))) + "</li><ul><p>";
ui->aboutBrowser->clear(); ui->aboutBrowser->clear();
ui->aboutBrowser->document()->setDefaultStyleSheet(QString(StelApp:: getInstance().getCurrentStelStyle()->htmlStyleSheet)); ui->aboutBrowser->document()->setDefaultStyleSheet(QString(StelApp:: getInstance().getCurrentStelStyle()->htmlStyleSheet));
ui->aboutBrowser->insertHtml(newHtml); ui->aboutBrowser->insertHtml(newHtml);
ui->aboutBrowser->scrollToAnchor("top"); ui->aboutBrowser->scrollToAnchor("top");
} }
bool HelpDialog::helpItemSort(const QPair<QString, QString>& p1, const QPai r<QString, QString>& p2) bool HelpDialog::helpItemSort(const QPair<QString, QString>& p1, const QPai r<QString, QString>& p2)
{ {
// To be 100% proper, we should sort F1 F2 F11 F12 in that order, al though // To be 100% proper, we should sort F1 F2 F11 F12 in that order, al though
// right now we will get F1 F11 F12 F2. However, at time of writing , no group // right now we will get F1 F11 F12 F2. However, at time of writing , no group
 End of changes. 6 change blocks. 
10 lines changed or deleted 30 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/