HelpDialog.cpp   HelpDialog.cpp 
skipping to change at line 154 skipping to change at line 154
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
htmlText += "<tr><td>" + q_("Time dragging").toHtmlEscaped() + "</td
><td><b>" +
q_("Ctrl & left mouse drag").toHtmlEscaped() + "</b>
</td></tr>";
htmlText += "<tr><td>" + q_("Time scrolling: minutes").toHtmlEscaped
() + "</td><td><b>" +
q_("Ctrl & mouse wheel").toHtmlEscaped() + "</b></td
></tr>";
htmlText += "<tr><td>" + q_("Time scrolling: hours").toHtmlEscaped()
+ "</td><td><b>" +
q_("Ctrl+Shift & mouse wheel").toHtmlEscaped() + "</
b></td></tr>";
htmlText += "<tr><td>" + q_("Time scrolling: days").toHtmlEscaped()
+ "</td><td><b>" +
q_("Ctrl+Alt & mouse wheel").toHtmlEscaped() + "</b>
</td></tr>";
htmlText += "<tr><td>" + q_("Time scrolling: years").toHtmlEscaped()
+ "</td><td><b>" +
q_("Ctrl+Alt+Shift & mouse wheel").toHtmlEscaped() +
"</b></td></tr>";
// select object // select object
htmlText += "<tr><td>" + q_("Select object").toHtmlEscaped() + "</td >"; htmlText += "<tr><td>" + q_("Select object").toHtmlEscaped() + "</td >";
htmlText += "<td><b>" + q_("Left click").toHtmlEscaped() + "</b></td ></tr>\n"; htmlText += "<td><b>" + q_("Left click").toHtmlEscaped() + "</b></td ></tr>\n";
// clear selection // clear selection
htmlText += "<tr>"; htmlText += "<tr><td>";
htmlText += q_("Clear selection").toHtmlEscaped() + "</td>";
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
htmlText += "<td rowspan='2'>"; htmlText += "<td><b>" + q_("Ctrl & left click").toHtmlEscaped() + "< /b></td></tr>\n";
#else #else
htmlText += "<td>";
#endif
htmlText += q_("Clear selection").toHtmlEscaped() + "</td>";
htmlText += "<td><b>" + q_("Right click").toHtmlEscaped() + "</b></t d></tr>\n"; htmlText += "<td><b>" + q_("Right click").toHtmlEscaped() + "</b></t d></tr>\n";
#ifdef Q_OS_MAC
htmlText += "<tr><td><b>" + q_("CTRL + Left click").toHtmlEscaped()
+ "</b></td></tr>\n";
//htmlText += "<td>" + E("Clear selection") + "</td>";
#endif #endif
// add custom marker
htmlText += "<tr><td>" + q_("Add custom marker").toHtmlEscaped() + "
</td>";
htmlText += "<td><b>" + q_("Shift & left click").toHtmlEscaped() + "
</b></td></tr>\n";
// delete custom markers
htmlText += "<tr><td>" + q_("Delete all custom markers").toHtmlEscap
ed() + "</td>";
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 keys. Further actions may be available via the \"%1\" button.") q_("Below are listed only the actions with assigned 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())
skipping to change at line 203 skipping to change at line 216
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";
} }
} }
// edit shortcuts htmlText += "<tr></tr><tr><td><b><u>" + q_("Text User Interface (TUI
// htmlText += "<tr><td><b>" + Qt::escape(q_("F7")) + "</b></td>"; )") +
// htmlText += "<td>" + Qt::escape(q_("Show and edit all keyboard short ":</u></b></td></tr>\n";
cuts")) + "</td></tr>\n"; htmlText += "<tr><td>" + q_("Activate TUI") + "</td>";
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.
QRegExp a_rx = QRegExp("[{]([^{]*)[}]"); QRegExp a_rx = QRegExp("[{]([^{]*)[}]");
// WARNING! Section titles are re-used above! // WARNING! Section titles are re-used above!
htmlText += "<h2 id=\"links\">" + q_("Further Reading").toHtmlEscape d() + "</h2>\n"; htmlText += "<h2 id=\"links\">" + q_("Further Reading").toHtmlEscape d() + "</h2>\n";
htmlText += q_("The following links are external web links, and will launch your web browser:\n").toHtmlEscaped(); htmlText += q_("The following links are external web links, and will launch your web browser:\n").toHtmlEscaped();
htmlText += "<p><a href=\"http://stellarium.org/wiki/index.php/Categ ory:User%27s_Guide\">" + q_("The Stellarium User Guide").toHtmlEscaped() + "</a>"; htmlText += "<p><a href=\"http://stellarium.org/wiki/index.php/Categ ory:User%27s_Guide\">" + q_("The Stellarium User Guide").toHtmlEscaped() + "</a>";
 End of changes. 8 change blocks. 
14 lines changed or deleted 41 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/