OcularDialog.cpp   OcularDialog.cpp 
skipping to change at line 384 skipping to change at line 384
ui->ocularName->setValidator(validatorName); ui->ocularName->setValidator(validatorName);
ui->telescopeName->setValidator(validatorName); ui->telescopeName->setValidator(validatorName);
ui->lensName->setValidator(validatorName); ui->lensName->setValidator(validatorName);
// The key bindings // The key bindings
QString bindingString = Oculars::appSettings()->value("bindings/togg le_oculars", "Ctrl+O").toString(); QString bindingString = Oculars::appSettings()->value("bindings/togg le_oculars", "Ctrl+O").toString();
ui->togglePluginLineEdit->setText(bindingString); ui->togglePluginLineEdit->setText(bindingString);
bindingString = Oculars::appSettings()->value("bindings/popup_naviga tor", "Alt+O").toString(); bindingString = Oculars::appSettings()->value("bindings/popup_naviga tor", "Alt+O").toString();
ui->togglePopupNavigatorWindowLineEdit->setText(bindingString); ui->togglePopupNavigatorWindowLineEdit->setText(bindingString);
connect(ui->togglePluginLineEdit, SIGNAL(textEdited(const QString&)) , connect(ui->togglePluginLineEdit, SIGNAL(textEdited(const QString&)) ,
this, SLOT(keyBindingTogglePluginCha nged(const QString&))); this, SLOT(keyBindingTogglePluginChanged(const QString&)));
connect(ui->togglePopupNavigatorWindowLineEdit, SIGNAL(textEdited(co nst QString&)), connect(ui->togglePopupNavigatorWindowLineEdit, SIGNAL(textEdited(co nst QString&)),
this, SLOT(keyBindingPopupNavigatorC onfigChanged(const QString&))); this, SLOT(keyBindingPopupNavigatorConfigChanged(const QStri ng&)));
initAboutText(); initAboutText();
connect(ui->togglePluginLineEdit, SIGNAL(textEdited(QString)), connect(ui->togglePluginLineEdit, SIGNAL(textEdited(QString)),
this, SLOT(initAboutText())); this, SLOT(initAboutText()));
connect(ui->togglePopupNavigatorWindowLineEdit, SIGNAL(textEdited(QS tring)), connect(ui->togglePopupNavigatorWindowLineEdit, SIGNAL(textEdited(QS tring)),
this, SLOT(initAboutText())); this, SLOT(initAboutText()));
connect(ui->pushButtonMoveOcularUp, SIGNAL(pressed()), connect(ui->pushButtonMoveOcularUp, SIGNAL(pressed()),
this, SLOT(moveUpSelectedOcular())); this, SLOT(moveUpSelectedOcular()));
connect(ui->pushButtonMoveOcularDown, SIGNAL(pressed()), connect(ui->pushButtonMoveOcularDown, SIGNAL(pressed()),
this, SLOT(moveDownSelectedOcular()) ); this, SLOT(moveDownSelectedOcular()));
connect(ui->pushButtonMoveSensorUp, SIGNAL(pressed()), connect(ui->pushButtonMoveSensorUp, SIGNAL(pressed()),
this, SLOT(moveUpSelectedSensor())); this, SLOT(moveUpSelectedSensor()));
connect(ui->pushButtonMoveSensorDown, SIGNAL(pressed()), connect(ui->pushButtonMoveSensorDown, SIGNAL(pressed()),
this, SLOT(moveDownSelectedSensor()) ); this, SLOT(moveDownSelectedSensor()));
connect(ui->pushButtonMoveTelescopeUp, SIGNAL(pressed()), connect(ui->pushButtonMoveTelescopeUp, SIGNAL(pressed()),
this, SLOT(moveUpSelectedTelescope() )); this, SLOT(moveUpSelectedTelescope()));
connect(ui->pushButtonMoveTelescopeDown, SIGNAL(pressed()), connect(ui->pushButtonMoveTelescopeDown, SIGNAL(pressed()),
this, SLOT(moveDownSelectedTelescope ())); this, SLOT(moveDownSelectedTelescope()));
connect(ui->pushButtonMoveLensUp, SIGNAL(pressed()), connect(ui->pushButtonMoveLensUp, SIGNAL(pressed()),
this, SLOT(moveUpSelectedLens())); this, SLOT(moveUpSelectedLens()));
connect(ui->pushButtonMoveLensDown, SIGNAL(pressed()), connect(ui->pushButtonMoveLensDown, SIGNAL(pressed()),
this, SLOT(moveDownSelectedLens())); this, SLOT(moveDownSelectedLens()));
// The CCD mapper // The CCD mapper
ccdMapper = new QDataWidgetMapper(); ccdMapper = new QDataWidgetMapper();
ccdMapper->setModel(ccdTableModel); ccdMapper->setModel(ccdTableModel);
ccdMapper->setSubmitPolicy(QDataWidgetMapper::AutoSubmit); ccdMapper->setSubmitPolicy(QDataWidgetMapper::AutoSubmit);
ccdMapper->addMapping(ui->ccdName, 0); ccdMapper->addMapping(ui->ccdName, 0);
ccdMapper->addMapping(ui->ccdChipY, 1); ccdMapper->addMapping(ui->ccdChipY, 1);
ccdMapper->addMapping(ui->ccdChipX, 2); ccdMapper->addMapping(ui->ccdChipX, 2);
ccdMapper->addMapping(ui->ccdPixelY, 3); ccdMapper->addMapping(ui->ccdPixelY, 3);
ccdMapper->addMapping(ui->ccdPixelX, 4); ccdMapper->addMapping(ui->ccdPixelX, 4);
ccdMapper->addMapping(ui->ccdResX, 5); ccdMapper->addMapping(ui->ccdResX, 5);
ccdMapper->addMapping(ui->ccdResY, 6); ccdMapper->addMapping(ui->ccdResY, 6);
ccdMapper->addMapping(ui->ccdRotAngle, 7);
ccdMapper->addMapping(ui->OAG_checkBox, 8);
ccdMapper->addMapping(ui->OAGPrismH, 9);
ccdMapper->addMapping(ui->OAGPrismW, 10);
ccdMapper->addMapping(ui->OAGDist, 11);
ccdMapper->addMapping(ui->OAGPrismPA, 12);
ccdMapper->toFirst(); ccdMapper->toFirst();
connect(ui->ccdListView->selectionModel() , SIGNAL(currentRowChanged (QModelIndex, QModelIndex)), connect(ui->ccdListView->selectionModel() , SIGNAL(currentRowChanged (QModelIndex, QModelIndex)),
ccdMapper, SLOT(setCurrentModelIndex ccdMapper, SLOT(setCurrentModelIndex(QModelIndex)));
(QModelIndex))); connect(ui->ccdRotAngle, SIGNAL(editingFinished()), this, SLOT(selec
tedCCDRotationAngleChanged()));
ui->ccdListView->setSelectionBehavior(QAbstractItemView::SelectRows)
;
ui->ccdListView->setCurrentIndex(ccdTableModel->index(0, 1)); ui->ccdListView->setCurrentIndex(ccdTableModel->index(0, 1));
// The ocular mapper // The ocular mapper
ocularMapper = new QDataWidgetMapper(); ocularMapper = new QDataWidgetMapper();
ocularMapper->setModel(ocularTableModel); ocularMapper->setModel(ocularTableModel);
ocularMapper->setSubmitPolicy(QDataWidgetMapper::AutoSubmit); ocularMapper->setSubmitPolicy(QDataWidgetMapper::AutoSubmit);
ocularMapper->addMapping(ui->ocularName, 0); ocularMapper->addMapping(ui->ocularName, 0);
ocularMapper->addMapping(ui->ocularAFov, 1); ocularMapper->addMapping(ui->ocularAFov, 1);
ocularMapper->addMapping(ui->ocularFL, 2); ocularMapper->addMapping(ui->ocularFL, 2);
ocularMapper->addMapping(ui->ocularFieldStop, 3); ocularMapper->addMapping(ui->ocularFieldStop, 3);
ocularMapper->addMapping(ui->binocularsCheckBox, 4, "checked"); ocularMapper->addMapping(ui->binocularsCheckBox, 4, "checked");
ocularMapper->addMapping(ui->permanentCrosshairCheckBox, 5, "checked "); ocularMapper->addMapping(ui->permanentCrosshairCheckBox, 5, "checked ");
ocularMapper->toFirst(); ocularMapper->toFirst();
connect(ui->ocularListView->selectionModel() , SIGNAL(currentRowChan ged(QModelIndex, QModelIndex)), connect(ui->ocularListView->selectionModel() , SIGNAL(currentRowChan ged(QModelIndex, QModelIndex)),
ocularMapper, SLOT(setCurrentModelIn ocularMapper, SLOT(setCurrentModelIndex(QModelIndex)));
dex(QModelIndex))); ui->ocularListView->setSelectionBehavior(QAbstractItemView::SelectRo
ws);
ui->ocularListView->setCurrentIndex(ocularTableModel->index(0, 1)); ui->ocularListView->setCurrentIndex(ocularTableModel->index(0, 1));
// The lens mapper // The lens mapper
lensMapper = new QDataWidgetMapper(); lensMapper = new QDataWidgetMapper();
lensMapper->setModel(lensTableModel); lensMapper->setModel(lensTableModel);
lensMapper->setSubmitPolicy(QDataWidgetMapper::AutoSubmit); lensMapper->setSubmitPolicy(QDataWidgetMapper::AutoSubmit);
lensMapper->addMapping(ui->lensName, 0); lensMapper->addMapping(ui->lensName, 0);
lensMapper->addMapping(ui->lensMultipler, 1); lensMapper->addMapping(ui->lensMultipler, 1);
lensMapper->toFirst(); lensMapper->toFirst();
connect(ui->lensListView->selectionModel(), SIGNAL(currentRowChanged (QModelIndex, QModelIndex)), connect(ui->lensListView->selectionModel(), SIGNAL(currentRowChanged (QModelIndex, QModelIndex)),
lensMapper, SLOT(setCurrentModelIndex(QModelIndex))) lensMapper, SLOT(setCurrentModelIndex(QModelIndex)));
; ui->lensListView->setSelectionBehavior(QAbstractItemView::SelectRows
);
ui->lensListView->setCurrentIndex(lensTableModel->index(0, 1)); ui->lensListView->setCurrentIndex(lensTableModel->index(0, 1));
// The telescope mapper // The telescope mapper
telescopeMapper = new QDataWidgetMapper(); telescopeMapper = new QDataWidgetMapper();
telescopeMapper->setModel(telescopeTableModel); telescopeMapper->setModel(telescopeTableModel);
telescopeMapper->setSubmitPolicy(QDataWidgetMapper::AutoSubmit); telescopeMapper->setSubmitPolicy(QDataWidgetMapper::AutoSubmit);
telescopeMapper->addMapping(ui->telescopeName, 0); telescopeMapper->addMapping(ui->telescopeName, 0);
telescopeMapper->addMapping(ui->telescopeDiameter, 1); telescopeMapper->addMapping(ui->telescopeDiameter, 1);
telescopeMapper->addMapping(ui->telescopeFL, 2); telescopeMapper->addMapping(ui->telescopeFL, 2);
telescopeMapper->addMapping(ui->telescopeHFlip, 3, "checked"); telescopeMapper->addMapping(ui->telescopeHFlip, 3, "checked");
telescopeMapper->addMapping(ui->telescopeVFlip, 4, "checked"); telescopeMapper->addMapping(ui->telescopeVFlip, 4, "checked");
telescopeMapper->addMapping(ui->telescopeEQ, 5, "checked");
ocularMapper->toFirst(); ocularMapper->toFirst();
connect(ui->telescopeListView->selectionModel() , SIGNAL(currentRowC hanged(QModelIndex, QModelIndex)), connect(ui->telescopeListView->selectionModel() , SIGNAL(currentRowC hanged(QModelIndex, QModelIndex)),
telescopeMapper, SLOT(setCurrentMode telescopeMapper, SLOT(setCurrentModelIndex(QModelIndex)));
lIndex(QModelIndex))); ui->telescopeListView->setSelectionBehavior(QAbstractItemView::Selec
tRows);
ui->telescopeListView->setCurrentIndex(telescopeTableModel->index(0, 1)); ui->telescopeListView->setCurrentIndex(telescopeTableModel->index(0, 1));
connect(ui->binocularsCheckBox, SIGNAL(toggled(bool)), this, SLOT(se tLabelsDescriptionText(bool))); connect(ui->binocularsCheckBox, SIGNAL(toggled(bool)), this, SLOT(se tLabelsDescriptionText(bool)));
// set the initial state // set the initial state
QSettings *settings = Oculars::appSettings(); QSettings *settings = Oculars::appSettings();
if (settings->value("require_selection_to_zoom", 1.0).toBool()) { if (settings->value("require_selection_to_zoom", 1.0).toBool()) {
ui->requireSelectionCheckBox->setCheckState(Qt::Checked); ui->requireSelectionCheckBox->setCheckState(Qt::Checked);
} }
if (settings->value("use_max_exit_circle", 0.0).toBool()) { if (settings->value("use_max_exit_circle", 0.0).toBool()) {
skipping to change at line 501 skipping to change at line 513
} }
if (settings->value("use_ccd_flip", true).toBool()) if (settings->value("use_ccd_flip", true).toBool())
{ {
ui->checkBoxUseFlipForCCD->setChecked(true); ui->checkBoxUseFlipForCCD->setChecked(true);
} }
//Initialize the style //Initialize the style
updateStyle(); updateStyle();
} }
void OcularDialog::selectedCCDRotationAngleChanged()
{
emit(plugin->selectedCCDChanged());
}
void OcularDialog::setLabelsDescriptionText(bool state) void OcularDialog::setLabelsDescriptionText(bool state)
{ {
if (state) if (state)
{ {
// TRANSLATORS: tFOV for binoculars (tFOV = True Field of Vi ew) // TRANSLATORS: tFOV for binoculars (tFOV = True Field of Vi ew)
ui->labelFOV->setText(q_("tFOV:")); ui->labelFOV->setText(q_("tFOV:"));
// TRANSLATORS: Magnification factor for binoculars // TRANSLATORS: Magnification factor for binoculars
ui->labelFL->setText(q_("Magnification factor:")); ui->labelFL->setText(q_("Magnification factor:"));
} }
else else
skipping to change at line 525 skipping to change at line 542
} }
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_("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 d>Bogdan Marinov<br />Pawel Stolowski (" + q_("Barlow lens feature") + ")<b r />Alexander Wolf</td></tr>"; html += "<tr><td><strong>" + q_("Contributors") + ":</strong></td><t d>Bogdan Marinov<br />Pawel Stolowski (" + q_("Barlow lens feature") + ")<b r />Alexander Wolf<br />Rumen G. Bogdanovski &lt;rumen@skyarchive.org&gt;</ td></tr>";
html += "</table>"; html += "</table>";
//Overview //Overview
html += "<h2>" + q_("Overview") + "</h2>"; html += "<h2>" + q_("Overview") + "</h2>";
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. This is intended to show you a better comparison of what one eyep iece/telescope combination will be like as compared to another. The same e yepiece in two different telescopes of differing focal length will produce two different exit circles, changing the view someone. The trade-off of th is is that, with the image scaled, a good deal of the screen can be wasted. Therefore I recommend that you leave it off, unless you feel you have a n eed of it.") + "</p>"; html += "<p>" + q_("You can choose to scale the image you see on the screen. This is intended to show you a better comparison of what one eyep iece/telescope combination will be like as compared to another. The same e yepiece in two different telescopes of differing focal length will produce two different exit circles, changing the view someone. The trade-off of th is is that, with the image scaled, a good deal of the screen can be wasted. Therefore I recommend that you leave it off, unless you feel you have a n eed 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>";
 End of changes. 20 change blocks. 
21 lines changed or deleted 39 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/