OcularDialog.cpp   OcularDialog.cpp 
skipping to change at line 310 skipping to change at line 310
QAction* action = gui->getGuiAction("actionShow_Ocular_Menu"); QAction* action = gui->getGuiAction("actionShow_Ocular_Menu");
if (action != NULL) { if (action != NULL) {
action->setShortcut(QKeySequence(newString.trimmed())); action->setShortcut(QKeySequence(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));
} }
} }
void OcularDialog::scaleImageCircleStateChanged(int state) void OcularDialog::scaleImageCircleStateChanged(int state)
{ {
bool shouldScale = (state == Qt::Checked); bool shouldScale = (state == Qt::Checked);
bool useMaxImageCircle = Oculars::appSettings()->value("use_max_exit _circle",01.0).toBool(); bool useMaxImageCircle = Oculars::appSettings()->value("use_max_exit _circle",01.0).toBool();
if (shouldScale != useMaxImageCircle) { if (shouldScale != useMaxImageCircle)
{
Oculars::appSettings()->setValue("use_max_exit_circle", shou ldScale); Oculars::appSettings()->setValue("use_max_exit_circle", shou ldScale);
Oculars::appSettings()->sync(); Oculars::appSettings()->sync();
emit(scaleImageCircleChanged(shouldScale)); emit(scaleImageCircleChanged(shouldScale));
} }
} }
/* ********************************************************************* */ /* ********************************************************************* */
#if 0 #if 0
#pragma mark - #pragma mark -
#pragma mark Protected Methods #pragma mark Protected Methods
skipping to change at line 348 skipping to change at line 350
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);
ui->lensListView->setModel(lensTableModel); ui->lensListView->setModel(lensTableModel);
//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->limitStellarMagnitudeCheckBox, SIGNAL(clicked(bool)), pl ugin, SLOT(setFlagLimitMagnitude(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)));
// 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()));
skipping to change at line 474 skipping to change at line 477
telescopeMapper, SLOT(setCurrentMode lIndex(QModelIndex))); telescopeMapper, SLOT(setCurrentMode lIndex(QModelIndex)));
ui->telescopeListView->setCurrentIndex(telescopeTableModel->index(0, 1)); ui->telescopeListView->setCurrentIndex(telescopeTableModel->index(0, 1));
// set the initial state // set the initial state
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("limit_stellar_magnitude", true).t
oBool()) {
ui->limitStellarMagnitudeCheckBox->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()) if (Oculars::appSettings()->value("use_decimal_degrees", false).toBo ol())
{ {
ui->checkBoxDecimalDegrees->setChecked(true); ui->checkBoxDecimalDegrees->setChecked(true);
} }
//Initialize the style //Initialize the style
 End of changes. 5 change blocks. 
3 lines changed or deleted 11 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/