HelpDialog.cpp   HelpDialog.cpp 
skipping to change at line 17 skipping to change at line 17
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#include <QString> #include <QString>
#include <QTextBrowser> #include <QTextBrowser>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget> #include <QWidget>
#include <QFrame> #include <QFrame>
#include <QSettings> #include <QSettings>
#include <QResizeEvent> #include <QResizeEvent>
#include <QSize> #include <QSize>
skipping to change at line 75 skipping to change at line 75
setKey(group, "", "!04-left-click", N_("Select object")); setKey(group, "", "!04-left-click", N_("Select object"));
setKey(group, "", "!05-right-click", N_("Clear selection")); setKey(group, "", "!05-right-click", N_("Clear selection"));
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
setKey(group, "", "!06-ctrl+left-click", N_("Clear selection")); setKey(group, "", "!06-ctrl+left-click", N_("Clear selection"));
#endif #endif
group = N_("When a Script is Running"); group = N_("When a Script is Running");
setKey(group, "", "J", N_("Slow down the script execution rate")); setKey(group, "", "J", N_("Slow down the script execution rate"));
setKey(group, "", "L", N_("Speed up the script execution rate")); setKey(group, "", "L", N_("Speed up the script execution rate"));
setKey(group, "", "K", N_("Set the normal script execution rate")); setKey(group, "", "K", N_("Set the normal script execution rate"));
// Add keys for those plugins which do not have GUI actions.
group = N_("Plugin Key Bindings");
setKey(group, "", "Alt+M", N_("Text User Interface"));
} }
HelpDialog::~HelpDialog() HelpDialog::~HelpDialog()
{ {
delete ui; delete ui;
ui = NULL; ui = NULL;
} }
void HelpDialog::languageChanged() void HelpDialog::retranslate()
{ {
if (dialog) if (dialog)
{ {
ui->retranslateUi(dialog); ui->retranslateUi(dialog);
updateText(); updateText();
} }
} }
void HelpDialog::styleChanged() void HelpDialog::styleChanged()
{ {
if (dialog) if (dialog)
{ {
updateText(); updateText();
} }
} }
void HelpDialog::createDialogContent() void HelpDialog::createDialogContent()
{ {
ui->setupUi(dialog); ui->setupUi(dialog);
connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SL OT(languageChanged())); 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())) ;
updateText(); updateText();
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( )));
skipping to change at line 278 skipping to change at line 282
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(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-2011 Stellarium Developers</h3 >"; newHtml += "<h3>Copyright &copy; 2000-2012 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 += "51 Franklin Street, Suite 500\n";
newHtml += "Boston, MA 02111-1307, 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>" + 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_("Developer: %1").arg(QString("Bogd
an Marinov"))) + "</li>";
newHtml += "<li>" + Qt::escape(q_("Developer: %1").arg(QString("Timo
thy Reaves"))) + "</li>";
newHtml += "<li>" + Qt::escape(q_("Developer: %1").arg(QString("Guil
laume Ch%1reau").arg(QChar(0x00E9)))) + "</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_("OSX Developer: %1").arg(QString("
Diego Marcos"))) + "</li>";
newHtml += "<li>" + Qt::escape(q_("Developer: %1").arg(QString("Alex
ander Wolf"))) + "</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 newHtml += "<li>" + Qt::escape(q_("Developer: %1").arg(QString("Mike
Storm"))) + "</li><ul><p>"; Storm"))) + "</li>";
newHtml += "<li>" + Qt::escape(q_("Tester: %1").arg(QString("Barry G
erdes"))) + "</li>";
newHtml += "<li>" + Qt::escape(q_("Tester: %1").arg(QString("Khalid
AlAjaji"))) + "</li><ul><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");
} }
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. 9 change blocks. 
8 lines changed or deleted 26 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/