OcularDialog.cpp   OcularDialog.cpp 
skipping to change at line 331 skipping to change at line 331
connect(ui->scaleImageCircleCheckBox, SIGNAL(stateChanged(int)), thi s, SLOT(scaleImageCircleStateChanged(int))); connect(ui->scaleImageCircleCheckBox, SIGNAL(stateChanged(int)), thi s, SLOT(scaleImageCircleStateChanged(int)));
connect(ui->requireSelectionCheckBox, SIGNAL(stateChanged(int)), thi s, SLOT(requireSelectionStateChanged(int))); connect(ui->requireSelectionCheckBox, SIGNAL(stateChanged(int)), thi s, SLOT(requireSelectionStateChanged(int)));
connect(ui->limitStellarMagnitudeCheckBox, SIGNAL(clicked(bool)), pl ugin, SLOT(setFlagLimitMagnitude(bool))); connect(ui->limitStellarMagnitudeCheckBox, SIGNAL(clicked(bool)), pl ugin, SLOT(setFlagLimitMagnitude(bool)));
connect(ui->semiTransparencyCheckBox, SIGNAL(clicked(bool)), plugin, SLOT(setFlagUseSemiTransparency(bool))); connect(ui->semiTransparencyCheckBox, SIGNAL(clicked(bool)), plugin, SLOT(setFlagUseSemiTransparency(bool)));
connect(ui->hideGridsLinesCheckBox, SIGNAL(clicked(bool)), plugin, S LOT(setFlagHideGridsLines(bool))); connect(ui->hideGridsLinesCheckBox, SIGNAL(clicked(bool)), plugin, S LOT(setFlagHideGridsLines(bool)));
connect(ui->checkBoxControlPanel, SIGNAL(clicked(bool)), plugin, SLO T(enableGuiPanel(bool))); connect(ui->checkBoxControlPanel, SIGNAL(clicked(bool)), plugin, SLO T(enableGuiPanel(bool)));
connect(ui->checkBoxDecimalDegrees, SIGNAL(clicked(bool)), plugin, S LOT(setFlagDecimalDegrees(bool))); connect(ui->checkBoxDecimalDegrees, SIGNAL(clicked(bool)), plugin, S LOT(setFlagDecimalDegrees(bool)));
connect(ui->checkBoxInitialFOV, SIGNAL(clicked(bool)), plugin, SLOT( setFlagInitFovUsage(bool))); connect(ui->checkBoxInitialFOV, SIGNAL(clicked(bool)), plugin, SLOT( setFlagInitFovUsage(bool)));
connect(ui->checkBoxInitialDirection, SIGNAL(clicked(bool)), plugin, SLOT(setFlagInitDirectionUsage(bool))); connect(ui->checkBoxInitialDirection, SIGNAL(clicked(bool)), plugin, SLOT(setFlagInitDirectionUsage(bool)));
connect(ui->checkBoxTypeOfMount, SIGNAL(clicked(bool)), plugin, SLOT (setFlagAutosetMountForCCD(bool))); connect(ui->checkBoxTypeOfMount, SIGNAL(clicked(bool)), plugin, SLOT (setFlagAutosetMountForCCD(bool)));
connect(ui->checkBoxResolutionCriterion, SIGNAL(clicked(bool)), plug in, SLOT(setFlagShowResolutionCriterions(bool)));
// The add & delete buttons // The add & delete buttons
connect(ui->addCCD, SIGNAL(clicked()), this, SLOT(insertNewCCD())); connect(ui->addCCD, SIGNAL(clicked()), this, SLOT(insertNewCCD()));
connect(ui->deleteCCD, SIGNAL(clicked()), this, SLOT(deleteSelectedC CD())); connect(ui->deleteCCD, SIGNAL(clicked()), this, SLOT(deleteSelectedC CD()));
connect(ui->addOcular, SIGNAL(clicked()), this, SLOT(insertNewOcular ())); connect(ui->addOcular, SIGNAL(clicked()), this, SLOT(insertNewOcular ()));
connect(ui->deleteOcular, SIGNAL(clicked()), this, SLOT(deleteSelect edOcular())); connect(ui->deleteOcular, SIGNAL(clicked()), this, SLOT(deleteSelect edOcular()));
connect(ui->addLens, SIGNAL(clicked()), this, SLOT(insertNewLens())) ; connect(ui->addLens, SIGNAL(clicked()), this, SLOT(insertNewLens())) ;
connect(ui->deleteLens, SIGNAL(clicked()), this, SLOT(deleteSelected Lens())); connect(ui->deleteLens, SIGNAL(clicked()), this, SLOT(deleteSelected Lens()));
connect(ui->addTelescope, SIGNAL(clicked()), this, SLOT(insertNewTel escope())); connect(ui->addTelescope, SIGNAL(clicked()), this, SLOT(insertNewTel escope()));
connect(ui->deleteTelescope, SIGNAL(clicked()), this, SLOT(deleteSel ectedTelescope())); connect(ui->deleteTelescope, SIGNAL(clicked()), this, SLOT(deleteSel ectedTelescope()));
skipping to change at line 477 skipping to change at line 478
ui->checkBoxInitialDirection->setChecked(true); ui->checkBoxInitialDirection->setChecked(true);
} }
if (settings->value("use_semi_transparency", true).toBool()) if (settings->value("use_semi_transparency", true).toBool())
{ {
ui->semiTransparencyCheckBox->setChecked(true); ui->semiTransparencyCheckBox->setChecked(true);
} }
if (settings->value("hide_grids_and_lines", true).toBool()) if (settings->value("hide_grids_and_lines", true).toBool())
{ {
ui->hideGridsLinesCheckBox->setChecked(true); ui->hideGridsLinesCheckBox->setChecked(true);
} }
if (settings->value("show_resolution_criterions", true).toBool())
{
ui->checkBoxResolutionCriterion->setChecked(true);
}
} }
void OcularDialog::selectedCCDRotationAngleChanged() void OcularDialog::selectedCCDRotationAngleChanged()
{ {
if (plugin->getEnableCCD()) if (plugin->getEnableCCD())
emit(plugin->selectedCCDChanged()); emit(plugin->selectedCCDChanged());
} }
void OcularDialog::setLabelsDescriptionText(bool state) void OcularDialog::setLabelsDescriptionText(bool state)
{ {
skipping to change at line 510 skipping to change at line 515
} }
} }
void OcularDialog::initAboutText() void OcularDialog::initAboutText()
{ {
//BM: Most of the text for now is the original contents of the About widget. //BM: Most of the text for now is the original contents of the About widget.
QString html = "<html><head><title></title></head><body>"; QString html = "<html><head><title></title></head><body>";
html += "<h2>" + q_("Oculars Plug-in") + "</h2><table width=\"90%\"> "; html += "<h2>" + q_("Oculars Plug-in") + "</h2><table width=\"90%\"> ";
html += "<tr width=\"30%\"><td><strong>" + q_("Version") + ":</stron g></td><td>" + OCULARS_PLUGIN_VERSION + "</td></tr>"; html += "<tr width=\"30%\"><td><strong>" + q_("Version") + ":</stron g></td><td>" + OCULARS_PLUGIN_VERSION + "</td></tr>";
html += "<tr><td><strong>" + q_("License") + ":</strong></td><td>" + OCULARS_PLUGIN_LICENSE + "</td></tr>";
html += "<tr><td><strong>" + q_("Author") + ":</strong></td><td>Timo thy Reaves &lt;treaves@silverfieldstech.com&gt;</td></tr>"; html += "<tr><td><strong>" + q_("Author") + ":</strong></td><td>Timo thy Reaves &lt;treaves@silverfieldstech.com&gt;</td></tr>";
html += "<tr><td><strong>" + q_("Contributors") + ":</strong></td><t html += "<tr><td rowspan=5><strong>" + q_("Contributors") + ":</stro
d>Bogdan Marinov<br />Pawel Stolowski (" + q_("Barlow lens feature") + ")<b ng></td><td>Bogdan Marinov</td></tr>";
r />Alexander Wolf<br />Rumen G. Bogdanovski &lt;rumen@skyarchive.org&gt;</ html += "<tr><td>Pawel Stolowski (" + q_("Barlow lens feature") + ")
td></tr>"; </td></tr>";
html += "<tr><td>Alexander Wolf</td></tr>";
html += "<tr><td>Rumen G. Bogdanovski &lt;rumen@skyarchive.org&gt;</
td></tr>";
html += "<tr><td>Georg Zotti</td></tr>";
html += "</table>"; html += "</table>";
//Overview //Overview
html += "<h2>" + q_("Overview") + "</h2>"; html += "<h3>" + q_("Overview") + "</h3>";
html += "<p>" + q_("This plugin is intended to simulate what you wou ld see through an eyepiece. This configuration dialog can be used to add, modify, or delete eyepieces and telescopes, as well as CCD Sensors. Your f irst time running the app will populate some samples to get your started.") + "</p>"; html += "<p>" + q_("This plugin is intended to simulate what you wou ld see through an eyepiece. This configuration dialog can be used to add, modify, or delete eyepieces and telescopes, as well as CCD Sensors. Your f irst time running the app will populate some samples to get your started.") + "</p>";
html += "<p>" + q_("You can choose to scale the image you see on the screen.") + " "; html += "<p>" + q_("You can choose to scale the image you see on the screen.") + " ";
html += q_("This is intended to show you a better comparison of what one eyepiece/telescope combination will be like when compared to a nother.") + " "; html += q_("This is intended to show you a better comparison of what one eyepiece/telescope combination will be like when compared to a nother.") + " ";
html += q_("The same eyepiece in two different telescopes of differing focal length will produce two different exit pupils, changing th e view somewhat.") + " "; html += q_("The same eyepiece in two different telescopes of differing focal length will produce two different exit pupils, changing th e view somewhat.") + " ";
html += q_("The trade-off of this is that, with the image sc aled, a large part of the screen can be wasted.") + " "; html += q_("The trade-off of this is that, with the image sc aled, a large part of the screen can be wasted.") + " ";
html += q_("Therefore I recommend that you leave it off, unl ess you feel you have a need of it.") + "</p>"; html += q_("Therefore I recommend that you leave it off, unl ess you feel you have a need of it.") + "</p>";
html += "<p>" + q_("You can toggle a crosshair in the view. Ideally , I wanted this to be aligned to North. I've been unable to do so. So cur rently it aligns to the top of the screen.") + "</p>"; html += "<p>" + q_("You can toggle a crosshair in the view. Ideally , I wanted this to be aligned to North. I've been unable to do so. So cur rently it aligns to the top of the screen.") + "</p>";
html += "<p>" + QString(q_("You can toggle a Telrad finder; this can only be done when you have not turned on the Ocular view. This feature dr aws three concentric circles of 0.5%1, 2.0%1, and 4.0%1, helping you see wh at you would expect to see with the naked eye through the Telrad (or simila r) finder.")).arg(QChar(0x00B0)) + "</p>"; html += "<p>" + QString(q_("You can toggle a Telrad finder; this can only be done when you have not turned on the Ocular view. This feature dr aws three concentric circles of 0.5%1, 2.0%1, and 4.0%1, helping you see wh at you would expect to see with the naked eye through the Telrad (or simila r) finder.")).arg(QChar(0x00B0)) + "</p>";
html += "<p>" + q_("If you find any issues, please let me know. Enj oy!") + "</p>"; html += "<p>" + q_("If you find any issues, please let me know. Enj oy!") + "</p>";
//Keys //Keys
html += "<h2>" + q_("Hot Keys") + "</h2>"; html += "<h3>" + q_("Hot Keys") + "</h3>";
html += "<p>" + q_("The plug-in's key bindings can be edited in the Keyboard shortcuts editor (F7).") + "</p>"; html += "<p>" + q_("The plug-in's key bindings can be edited in the Keyboard shortcuts editor (F7).") + "</p>";
StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui( )); StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui( ));
Q_ASSERT(gui); Q_ASSERT(gui);
StelActionMgr* actionMgr = StelApp::getInstance().getStelActionManag er(); StelActionMgr* actionMgr = StelApp::getInstance().getStelActionManag er();
Q_ASSERT(actionMgr); Q_ASSERT(actionMgr);
StelAction* actionOcular = actionMgr->findAction("actionShow_Ocular" ); StelAction* actionOcular = actionMgr->findAction("actionShow_Ocular" );
Q_ASSERT(actionOcular); Q_ASSERT(actionOcular);
StelAction* actionMenu = actionMgr->findAction("actionShow_Ocular_Me nu"); StelAction* actionMenu = actionMgr->findAction("actionShow_Ocular_Me nu");
Q_ASSERT(actionMenu); Q_ASSERT(actionMenu);
skipping to change at line 568 skipping to change at line 578
html += "<li>"; html += "<li>";
html += QString("<strong>%1:</strong> %2").arg("Alt+M").arg(q_("Rota te reticle pattern of the eyepiece clockwise.")); html += QString("<strong>%1:</strong> %2").arg("Alt+M").arg(q_("Rota te reticle pattern of the eyepiece clockwise."));
html += "</li>"; html += "</li>";
html += "<li>"; html += "<li>";
html += QString("<strong>%1:</strong> %2").arg("Shift+Alt+M").arg(q_ ("Rotate reticle pattern of the eyepiece сounterclockwise.")); html += QString("<strong>%1:</strong> %2").arg("Shift+Alt+M").arg(q_ ("Rotate reticle pattern of the eyepiece сounterclockwise."));
html += "</li>"; html += "</li>";
html += "</ul>"; html += "</ul>";
html += "</body></html>";
html += "<h3>" + q_("Links") + "</h3>";
html += "<p>" + QString(q_("Support is provided via the Launchpad we
bsite. Be sure to put \"%1\" in the subject when posting.")).arg("Oculars
plugin") + "</p>";
html += "<p><ul>";
// TRANSLATORS: The numbers contain the opening and closing tag of a
n HTML link
html += "<li>" + QString(q_("If you have a question, you can %1get a
n answer here%2").arg("<a href=\"https://answers.launchpad.net/stellarium\"
>")).arg("</a>") + "</li>";
// TRANSLATORS: The numbers contain the opening and closing tag of a
n HTML link
html += "<li>" + QString(q_("Bug reports can be made %1here%2.")).ar
g("<a href=\"https://bugs.launchpad.net/stellarium\">").arg("</a>") + "</li
>";
// TRANSLATORS: The numbers contain the opening and closing tag of a
n HTML link
html += "<li>" + q_("If you would like to make a feature request, yo
u can create a bug report, and set the severity to \"wishlist\".") + "</li>
";
// TRANSLATORS: The numbers contain the opening and closing tag of a
n HTML link
html += "<li>" + q_("If you want to read full information about this
plugin, its history and format of the catalog, you can %1get info here%2."
).arg("<a href=\"http://stellarium.org/wiki/index.php/Oculars_plugin\">").a
rg("</a>") + "</li>";
html += "</ul></p></body></html>";
QString htmlStyleSheet(gui->getStelStyle().htmlStyleSheet); QString htmlStyleSheet(gui->getStelStyle().htmlStyleSheet);
ui->textBrowser->document()->setDefaultStyleSheet(htmlStyleSheet); ui->textBrowser->document()->setDefaultStyleSheet(htmlStyleSheet);
ui->textBrowser->setHtml(html); ui->textBrowser->setHtml(html);
} }
 End of changes. 7 change blocks. 
7 lines changed or deleted 44 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/