OcularDialog.cpp   OcularDialog.cpp 
skipping to change at line 163 skipping to change at line 163
} }
void OcularDialog::insertNewOcular() void OcularDialog::insertNewOcular()
{ {
ocularTableModel->insertRows(ocularTableModel->rowCount(), 1); ocularTableModel->insertRows(ocularTableModel->rowCount(), 1);
ui->ocularListView->setCurrentIndex(ocularTableModel->index(ocularTa bleModel->rowCount() - 1, 1)); ui->ocularListView->setCurrentIndex(ocularTableModel->index(ocularTa bleModel->rowCount() - 1, 1));
} }
void OcularDialog::insertNewTelescope() void OcularDialog::insertNewTelescope()
{ {
telescopeTableModel->insertRows(ccdTableModel->rowCount(), 1); telescopeTableModel->insertRows(telescopeTableModel->rowCount(), 1);
ui->telescopeListView->setCurrentIndex(telescopeTableModel->index(te lescopeTableModel->rowCount() - 1, 1)); ui->telescopeListView->setCurrentIndex(telescopeTableModel->index(te lescopeTableModel->rowCount() - 1, 1));
} }
void OcularDialog::moveUpSelectedSensor() void OcularDialog::moveUpSelectedSensor()
{ {
int index = ui->ccdListView->currentIndex().row(); int index = ui->ccdListView->currentIndex().row();
if (index > 0) if (index > 0)
{ {
ccdTableModel->moveRowUp(index); ccdTableModel->moveRowUp(index);
plugin->updateLists(); plugin->updateLists();
skipping to change at line 296 skipping to change at line 296
connect(&StelApp::getInstance(), SIGNAL(languageChanged()), connect(&StelApp::getInstance(), SIGNAL(languageChanged()),
this, SLOT(retranslate())); this, SLOT(retranslate()));
ui->ccdListView->setModel(ccdTableModel); ui->ccdListView->setModel(ccdTableModel);
ui->ocularListView->setModel(ocularTableModel); ui->ocularListView->setModel(ocularTableModel);
ui->telescopeListView->setModel(telescopeTableModel); ui->telescopeListView->setModel(telescopeTableModel);
//Now the rest of the actions. //Now the rest of the actions.
connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())) ; connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())) ;
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->checkBoxControlPanel, SIGNAL(clicked(bool)), connect(ui->checkBoxControlPanel, SIGNAL(clicked(bool)), plugin, SLO
plugin, SLOT(enableGuiPanel(bool))); T(enableGuiPanel(bool)));
connect(ui->checkBoxDecimalDegrees, SIGNAL(clicked(bool)), plugin, S
LOT(setFlagDecimalDegrees(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->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()));
// Validators // Validators
skipping to change at line 407 skipping to change at line 407
if (Oculars::appSettings()->value("require_selection_to_zoom", 1.0). toBool()) { if (Oculars::appSettings()->value("require_selection_to_zoom", 1.0). toBool()) {
ui->requireSelectionCheckBox->setCheckState(Qt::Checked); ui->requireSelectionCheckBox->setCheckState(Qt::Checked);
} }
if (Oculars::appSettings()->value("use_max_exit_circle", 0.0).toBool ()) { if (Oculars::appSettings()->value("use_max_exit_circle", 0.0).toBool ()) {
ui->scaleImageCircleCheckBox->setCheckState(Qt::Checked); ui->scaleImageCircleCheckBox->setCheckState(Qt::Checked);
} }
if (Oculars::appSettings()->value("enable_control_panel", false).toB ool()) if (Oculars::appSettings()->value("enable_control_panel", false).toB ool())
{ {
ui->checkBoxControlPanel->setChecked(true); ui->checkBoxControlPanel->setChecked(true);
} }
if (Oculars::appSettings()->value("use_decimal_degrees", false).toBo
ol())
{
ui->checkBoxDecimalDegrees->setChecked(true);
}
//Initialize the style //Initialize the style
updateStyle(); updateStyle();
} }
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 += "<h1>Oculars plug-in</h1>"; html += "<h2>" + q_("Oculars Plug-in") + "</h2><table width=\"90%\">
";
//Authors html += "<tr width=\"30%\"><td><strong>" + q_("Version") + ":</stron
QString authors = "Authors: <a href=\"mailto:treaves@silverfieldstec g></td><td>" + OCULARS_PLUGIN_VERSION + "</td></tr>";
h.com\">Timothy Reaves</a>, Bogdan Marinov"; html += "<tr><td><strong>" + q_("Authors") + ":</strong></td><td>Tim
html += "<h3>" + authors + "</h3>"; othy Reaves &lt;treaves@silverfieldstech.com&gt;<br />Bogdan Marinov</td></
tr>";
html += "</table>";
//Overview //Overview
html += "<h2>Overview</h2>"; html += "<h2>" + q_("Overview") + "</h2>";
html += "<p>This plugin is intended to simulate what you would see t html += "<p>" + q_("This plugin is intended to simulate what you wou
hrough an eyepiece. This configuration dialog can be used to add, modify, ld see through an eyepiece. This configuration dialog can be used to add,
or delete eyepieces and telescopes, as well as CCD Sensors. Your first tim modify, or delete eyepieces and telescopes, as well as CCD Sensors. Your f
e running the app will populate some samples to get your started.</p>"; irst time running the app will populate some samples to get your started.")
html += "<p>You can choose to scale the image you see on the screen. + "</p>";
This is intended to show you a better comparison of what one eyepiece/tel html += "<p>" + q_("You can choose to scale the image you see on the
escope combination will be like as compared to another. The same eyepiece screen. This is intended to show you a better comparison of what one eyep
in two different telescopes of differing focal length will produce two diff iece/telescope combination will be like as compared to another. The same e
erent exit circles, changing the view someone. The trade-off of this is th yepiece in two different telescopes of differing focal length will produce
at, with the image scaled, a good deal of the screen can be wasted. Theref two different exit circles, changing the view someone. The trade-off of th
or I recommend that you leave it off, unless you feel you have a need of it is is that, with the image scaled, a good deal of the screen can be wasted.
.</p>"; Therefore I recommend that you leave it off, unless you feel you have a n
html += "<p>You can toggle a crosshair in the view. Ideally, I want eed of it.") + "</p>";
ed this to be aligned to North. I've been unable to do so. So currently i html += "<p>" + q_("You can toggle a crosshair in the view. Ideally
t aligns to the top of the screen.</p>"; , I wanted this to be aligned to North. I've been unable to do so. So cur
html += QString("<p>You can toggle a Telrad finder; this can only be rently it aligns to the top of the screen.") + "</p>";
done when you have not turned on the Ocular view. This feature draws thre html += "<p>" + QString(q_("You can toggle a Telrad finder; this can
e concentric circles of 0.5%1, 2.0%1, and 4.0%1, helping you see what you w only be done when you have not turned on the Ocular view. This feature dr
ould expect to see with the naked eye through the Telrad (or similar) finde aws three concentric circles of 0.5%1, 2.0%1, and 4.0%1, helping you see wh
r.</p>").arg(QChar(0x00B0)); at you would expect to see with the naked eye through the Telrad (or simila
html += "<p>If you find any issues, please let me know. Enjoy!</p>" r) finder.")).arg(QChar(0x00B0)) + "</p>";
; html += "<p>" + q_("If you find any issues, please let me know. Enj
oy!") + "</p>";
//Keys //Keys
html += "<h2>Hot Keys</h2>"; html += "<h2>" + q_("Hot Keys") + "</h2>";
html += "<p>The plug-in's key bindings can be edited in the General html += "<p>" + q_("The plug-in's key bindings can be edited in the
Tab.</p>"; General Tab.") + "</p>";
StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui( )); StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui( ));
Q_ASSERT(gui); Q_ASSERT(gui);
QAction* actionOcular = gui->getGuiActions("actionShow_Ocular"); QAction* actionOcular = gui->getGuiActions("actionShow_Ocular");
Q_ASSERT(actionOcular); Q_ASSERT(actionOcular);
QAction* actionMenu = gui->getGuiActions("actionShow_Ocular_Menu"); QAction* actionMenu = gui->getGuiActions("actionShow_Ocular_Menu");
Q_ASSERT(actionMenu); Q_ASSERT(actionMenu);
QKeySequence ocularShortcut = actionOcular->shortcut(); QKeySequence ocularShortcut = actionOcular->shortcut();
QString ocularString = ocularShortcut.toString(QKeySequence::NativeT ext); QString ocularString = ocularShortcut.toString(QKeySequence::NativeT ext);
ocularString = Qt::escape(ocularString); ocularString = Qt::escape(ocularString);
if (ocularString.isEmpty()) if (ocularString.isEmpty())
ocularString = "[no key defined]"; ocularString = q_("[no key defined]");
QKeySequence menuShortcut = actionMenu->shortcut(); QKeySequence menuShortcut = actionMenu->shortcut();
QString menuString = menuShortcut.toString(QKeySequence::NativeText) ; QString menuString = menuShortcut.toString(QKeySequence::NativeText) ;
menuString = Qt::escape(menuString); menuString = Qt::escape(menuString);
if (menuString.isEmpty()) if (menuString.isEmpty())
menuString = "[no key defined]"; menuString = q_("[no key defined]");
html += "<ul>"; html += "<ul>";
html += "<li>"; html += "<li>";
html += QString("<strong>%1:</strong> Switches on/off the ocular ove rlay.").arg(ocularString); html += QString("<strong>%1:</strong> %2").arg(ocularString).arg(q_( "Switches on/off the ocular overlay."));
html += "</li>"; html += "</li>";
html += "<li>"; html += "<li>";
html += QString("<strong>%1:</strong> Opens the pop-up navigation me nu.").arg(menuString); html += QString("<strong>%1:</strong> %2").arg(menuString).arg(q_("O pens the pop-up navigation menu."));
html += "</li>"; html += "</li>";
html += "</ul>"; html += "</ul>";
html += "</body></html>"; html += "</body></html>";
QString htmlStyleSheet(gui->getStelStyle().htmlStyleSheet);
ui->textBrowser->document()->setDefaultStyleSheet(htmlStyleSheet);
ui->textBrowser->setHtml(html); ui->textBrowser->setHtml(html);
} }
 End of changes. 12 change blocks. 
39 lines changed or deleted 53 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/