OcularDialog.cpp   OcularDialog.cpp 
skipping to change at line 287 skipping to change at line 287
plugin->updateLists(); plugin->updateLists();
} }
} }
/* ********************************************************************* */ /* ********************************************************************* */
#if 0 #if 0
#pragma mark - #pragma mark -
#pragma mark Private Slot Methods #pragma mark Private Slot Methods
#endif #endif
/* ********************************************************************* */ /* ********************************************************************* */
void OcularDialog::keyBindingTogglePluginChanged(const QString& newString)
{
Oculars::appSettings()->setValue("bindings/toggle_oculars", newStrin
g);
StelActionMgr* actionMgr = StelApp::getInstance().getStelActionManag
er();
StelAction* action = actionMgr->findAction("actionShow_Ocular");
if (action != NULL) {
action->setShortcut(newString.trimmed());
}
}
void OcularDialog::keyBindingPopupNavigatorConfigChanged(const QString& new
String)
{
Oculars::appSettings()->setValue("bindings/popup_navigator", newStri
ng);
StelActionMgr* actionMgr = StelApp::getInstance().getStelActionManag
er();
StelAction* action = actionMgr->findAction("actionShow_Ocular_Menu")
;
if (action != NULL) {
action->setShortcut(newString.trimmed());
}
}
void OcularDialog::requireSelectionStateChanged(int state) void OcularDialog::requireSelectionStateChanged(int state)
{ {
bool requireSelection = (state == Qt::Checked); bool requireSelection = (state == Qt::Checked);
bool requireSelectionToZoom = Oculars::appSettings()->value("require _selection_to_zoom", 1.0).toBool(); bool requireSelectionToZoom = Oculars::appSettings()->value("require _selection_to_zoom", 1.0).toBool();
if (requireSelection != requireSelectionToZoom) if (requireSelection != requireSelectionToZoom)
{ {
Oculars::appSettings()->setValue("require_selection_to_zoom" , requireSelection); Oculars::appSettings()->setValue("require_selection_to_zoom" , requireSelection);
Oculars::appSettings()->sync(); Oculars::appSettings()->sync();
emit(requireSelectionChanged(requireSelection)); emit(requireSelectionChanged(requireSelection));
} }
skipping to change at line 361 skipping to change at line 341
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->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->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->checkBoxUseFlipForCCD, SIGNAL(clicked(bool)), plugin, SL OT(setFlagUseFlipForCCD(bool))); connect(ui->checkBoxTypeOfMount, SIGNAL(clicked(bool)), plugin, SLOT (setFlagAutosetMountForCCD(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()));
// Validators // Validators
ui->ccdName->setValidator(validatorName); ui->ccdName->setValidator(validatorName);
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
QString bindingString = Oculars::appSettings()->value("bindings/togg
le_oculars", "Ctrl+O").toString();
ui->togglePluginLineEdit->setText(bindingString);
bindingString = Oculars::appSettings()->value("bindings/popup_naviga
tor", "Alt+O").toString();
ui->togglePopupNavigatorWindowLineEdit->setText(bindingString);
connect(ui->togglePluginLineEdit, SIGNAL(textEdited(const QString&))
,
this, SLOT(keyBindingTogglePluginChanged(const QString&)));
connect(ui->togglePopupNavigatorWindowLineEdit, SIGNAL(textEdited(co
nst QString&)),
this, SLOT(keyBindingPopupNavigatorConfigChanged(const QStri
ng&)));
initAboutText(); initAboutText();
connect(ui->togglePluginLineEdit, SIGNAL(textEdited(QString)),
this, SLOT(initAboutText()));
connect(ui->togglePopupNavigatorWindowLineEdit, SIGNAL(textEdited(QS
tring)),
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()),
skipping to change at line 508 skipping to change at line 475
ui->checkBoxControlPanel->setChecked(true); ui->checkBoxControlPanel->setChecked(true);
} }
if (settings->value("use_decimal_degrees", false).toBool()) if (settings->value("use_decimal_degrees", false).toBool())
{ {
ui->checkBoxDecimalDegrees->setChecked(true); ui->checkBoxDecimalDegrees->setChecked(true);
} }
if (settings->value("use_initial_fov", false).toBool()) if (settings->value("use_initial_fov", false).toBool())
{ {
ui->checkBoxInitialFOV->setChecked(true); ui->checkBoxInitialFOV->setChecked(true);
} }
if (settings->value("use_ccd_flip", true).toBool())
{
ui->checkBoxUseFlipForCCD->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())
{
ui->hideGridsLinesCheckBox->setChecked(true);
}
//Initialize the style //Initialize the style
updateStyle(); updateStyle();
} }
void OcularDialog::selectedCCDRotationAngleChanged() void OcularDialog::selectedCCDRotationAngleChanged()
{ {
emit(plugin->selectedCCDChanged()); 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:"));
ui->labelFS->setText(q_("Diameter:"));
} }
else else
{ {
ui->labelFOV->setText(q_("aFOV:")); ui->labelFOV->setText(q_("aFOV:"));
ui->labelFL->setText(q_("Focal length:")); ui->labelFL->setText(q_("Focal length:"));
ui->labelFS->setText(q_("Field stop:"));
} }
} }
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>";
 End of changes. 9 change blocks. 
51 lines changed or deleted 8 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/