HelpDialog.cpp   HelpDialog.cpp 
skipping to change at line 43 skipping to change at line 43
#include <QDebug> #include <QDebug>
#include "ui_helpDialogGui.h" #include "ui_helpDialogGui.h"
#include "HelpDialog.hpp" #include "HelpDialog.hpp"
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelFileMgr.hpp" #include "StelFileMgr.hpp"
#include "StelLocaleMgr.hpp" #include "StelLocaleMgr.hpp"
#include "StelStyle.hpp" #include "StelStyle.hpp"
#include "StelLogger.hpp" #include "StelLogger.hpp"
#include "StelGui.hpp"
HelpDialog::HelpDialog() HelpDialog::HelpDialog()
{ {
ui = new Ui_helpDialogForm; ui = new Ui_helpDialogForm;
// Make some key and mouse bindings translatable. Keys starting with // Make some key and mouse bindings translatable. Keys starting with
// "!NUMBER-" are made up; the number is there to keep the entries // "!NUMBER-" are made up; the number is there to keep the entries
// sorted (at least relative to each other). // sorted (at least relative to each other).
specialKeys["Space"] = N_("Space"); specialKeys["Space"] = N_("Space");
specialKeys["!01-arrows-and-left-drag"] = N_("Arrow keys & left mous e drag"); specialKeys["!01-arrows-and-left-drag"] = N_("Arrow keys & left mous e drag");
skipping to change at line 267 skipping to change at line 268
// Finally, add HTML table data for the key as it's help text // Finally, add HTML table data for the key as it's help text
newHtml += "<tr><td><b>" + Qt::escape(key) + "</b></ td>"; newHtml += "<tr><td><b>" + Qt::escape(key) + "</b></ td>";
newHtml += "<td>" + Qt::escape(q_( keys.at(i).second )) + "</td></tr>\n"; newHtml += "<td>" + Qt::escape(q_( keys.at(i).second )) + "</td></tr>\n";
} }
} }
newHtml += "</table>"; newHtml += "</table>";
newHtml += getFooterText(); newHtml += getFooterText();
ui->helpBrowser->clear(); ui->helpBrowser->clear();
ui->helpBrowser->document()->setDefaultStyleSheet(QString(StelApp::g StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui(
etInstance().getCurrentStelStyle()->htmlStyleSheet)); ));
Q_ASSERT(gui);
ui->helpBrowser->document()->setDefaultStyleSheet(QString(gui->getSt
elStyle().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>" + 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 += "<h3>Copyright &copy; 2000-2010 Stellarium Developers</h3 >"; newHtml += "<h3>Copyright &copy; 2000-2010 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 ";
skipping to change at line 300 skipping to change at line 303
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_("Doc author/developer: %1").arg(QS tring("Matthew Gates"))) + "</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_("Developer: %1").arg(QString("Rob Spearman"))) + "</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 %1s Mohari").arg(QChar(0x00E1)))) + "</li>"; newHtml += "<li>" + Qt::escape(q_("Developer: %1").arg(QString("Andr %1s Mohari").arg(QChar(0x00E1)))) + "</li>";
newHtml += "<li>" + Qt::escape(q_("Developer: %1").arg(QString("Mike Storm"))) + "</li><ul><p>"; 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(gui->getS telStyle().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
// of keys has F1-F9, and one from F10-F12 in it, so it doesn't real ly matter. // of keys has F1-F9, and one from F10-F12 in it, so it doesn't real ly matter.
// -MNG 2008-06-01 // -MNG 2008-06-01
 End of changes. 3 change blocks. 
3 lines changed or deleted 7 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/