OcularDialog.cpp   OcularDialog.cpp 
skipping to change at line 53 skipping to change at line 53
QList<Ocular *>* oculars, QList<Ocular *>* oculars,
QList<Telescope *>* telescopes, QList<Telescope *>* telescopes,
QList<Lens *> *lense) QList<Lens *> *lense)
: plugin(pluginPtr) : plugin(pluginPtr)
, ccdMapper(NULL) , ccdMapper(NULL)
, ocularMapper(NULL) , ocularMapper(NULL)
, telescopeMapper(NULL) , telescopeMapper(NULL)
, lensMapper(NULL) , lensMapper(NULL)
{ {
ui = new Ui_ocularDialogForm; ui = new Ui_ocularDialogForm;
dialogName = "Oculars";
this->ccds = ccds; this->ccds = ccds;
ccdTableModel = new PropertyBasedTableModel(this); ccdTableModel = new PropertyBasedTableModel(this);
CCD* ccdModel = CCD::ccdModel(); CCD* ccdModel = CCD::ccdModel();
ccdTableModel->init(reinterpret_cast<QList<QObject *>* >(ccds), ccdTableModel->init(reinterpret_cast<QList<QObject *>* >(ccds),
ccdModel, ccdModel,
ccdModel->propertyMap()); ccdModel->propertyMap());
this->oculars = oculars; this->oculars = oculars;
ocularTableModel = new PropertyBasedTableModel(this); ocularTableModel = new PropertyBasedTableModel(this);
Ocular* ocularModel = Ocular::ocularModel(); Ocular* ocularModel = Ocular::ocularModel();
ocularTableModel->init(reinterpret_cast<QList<QObject *>* >(oculars) , ocularTableModel->init(reinterpret_cast<QList<QObject *>* >(oculars) ,
skipping to change at line 104 skipping to change at line 105
/* ********************************************************************* */ /* ********************************************************************* */
#if 0 #if 0
#pragma mark - #pragma mark -
#pragma mark StelModule Methods #pragma mark StelModule Methods
#endif #endif
/* ********************************************************************* */ /* ********************************************************************* */
void OcularDialog::retranslate() void OcularDialog::retranslate()
{ {
if (dialog) { if (dialog) {
ui->retranslateUi(dialog); ui->retranslateUi(dialog);
initAboutText();
} }
} }
void OcularDialog::styleChanged() void OcularDialog::styleChanged()
{ {
// Nothing for now // Nothing for now
} }
void OcularDialog::updateStyle() void OcularDialog::updateStyle()
{ {
skipping to change at line 354 skipping to change at line 356
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
//Kinetic scrolling for tablet pc and pc //Kinetic scrolling for tablet pc and pc
QList<QWidget *> addscroll; QList<QWidget *> addscroll;
addscroll << ui->textBrowser << ui->telescopeListView << ui->ccdList View << ui->ocularListView << ui->lensListView; addscroll << ui->textBrowser << ui->telescopeListView << ui->ccdList View << ui->ocularListView << ui->lensListView;
installKineticScrolling(addscroll); installKineticScrolling(addscroll);
#endif #endif
//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->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMove dTo(QPoint)));
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->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->checkBoxUseFlipForCCD, SIGNAL(clicked(bool)), plugin, SL OT(setFlagUseFlipForCCD(bool))); connect(ui->checkBoxUseFlipForCCD, SIGNAL(clicked(bool)), plugin, SL OT(setFlagUseFlipForCCD(bool)));
// The add & delete buttons // The add & delete buttons
skipping to change at line 554 skipping to change at line 557
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<br />Rumen G. Bogdanovski &lt;rumen@skyarchive.org&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<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 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 screen.") + " ";
iece/telescope combination will be like as compared to another. The same e html += q_("This is intended to show you a better comparison
yepiece in two different telescopes of differing focal length will produce of what one eyepiece/telescope combination will be like when compared to a
two different exit circles, changing the view someone. The trade-off of th nother.") + " ";
is is that, with the image scaled, a good deal of the screen can be wasted. html += q_("The same eyepiece in two different telescopes of
Therefore I recommend that you leave it off, unless you feel you have a n differing focal length will produce two different exit pupils, changing th
eed of it.") + "</p>"; 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_("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 += "<h2>" + q_("Hot Keys") + "</h2>";
html += "<p>" + q_("The plug-in's key bindings can be edited in the General Tab.") + "</p>"; html += "<p>" + q_("The plug-in's key bindings can be edited in the 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);
 End of changes. 4 change blocks. 
8 lines changed or deleted 15 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/