OcularDialog.hpp   OcularDialog.hpp 
skipping to change at line 30 skipping to change at line 30
#ifndef _OCULARDIALOG_HPP_ #ifndef _OCULARDIALOG_HPP_
#define _OCULARDIALOG_HPP_ #define _OCULARDIALOG_HPP_
#include <QObject> #include <QObject>
#include "CCD.hpp" #include "CCD.hpp"
#include "Ocular.hpp" #include "Ocular.hpp"
#include "PropertyBasedTableModel.hpp" #include "PropertyBasedTableModel.hpp"
#include "StelDialog.hpp" #include "StelDialog.hpp"
#include "StelStyle.hpp" #include "StelStyle.hpp"
#include "Telescope.hpp" #include "Telescope.hpp"
#include "Lens.hpp"
class Ui_ocularDialogForm; class Ui_ocularDialogForm;
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QDataWidgetMapper; class QDataWidgetMapper;
class QDoubleValidator; class QDoubleValidator;
class QIntValidator; class QIntValidator;
class QRegExpValidator; class QRegExpValidator;
class QModelIndex; class QModelIndex;
class QStandardItemModel; class QStandardItemModel;
QT_END_NAMESPACE QT_END_NAMESPACE
class Oculars; class Oculars;
class OcularDialog : public StelDialog class OcularDialog : public StelDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
OcularDialog(Oculars* plugin, QList<CCD *>* ccds, QList<Ocular *>* o culars, QList<Telescope *>* telescopes); OcularDialog(Oculars* plugin, QList<CCD *>* ccds, QList<Ocular *>* o culars, QList<Telescope *>* telescopes, QList<Lens *>* lense);
virtual ~OcularDialog(); virtual ~OcularDialog();
//! Notify that the application style changed //! Notify that the application style changed
void styleChanged(); void styleChanged();
void updateStyle(); void updateStyle();
public slots: public slots:
void closeWindow(); void closeWindow();
void deleteSelectedCCD(); void deleteSelectedCCD();
void deleteSelectedOcular(); void deleteSelectedOcular();
void deleteSelectedTelescope(); void deleteSelectedTelescope();
void deleteSelectedLens();
void insertNewCCD(); void insertNewCCD();
void insertNewOcular(); void insertNewOcular();
void insertNewTelescope(); void insertNewTelescope();
void insertNewLens();
void moveUpSelectedSensor(); void moveUpSelectedSensor();
void moveUpSelectedOcular(); void moveUpSelectedOcular();
void moveUpSelectedTelescope(); void moveUpSelectedTelescope();
void moveUpSelectedLens();
void moveDownSelectedSensor(); void moveDownSelectedSensor();
void moveDownSelectedOcular(); void moveDownSelectedOcular();
void moveDownSelectedTelescope(); void moveDownSelectedTelescope();
void moveDownSelectedLens();
void retranslate(); void retranslate();
signals: signals:
void requireSelectionChanged(bool state); void requireSelectionChanged(bool state);
void scaleImageCircleChanged(bool state); void scaleImageCircleChanged(bool state);
protected: protected:
//! Initialize the dialog widgets and connect the signals/slots //! Initialize the dialog widgets and connect the signals/slots
virtual void createDialogContent(); virtual void createDialogContent();
Ui_ocularDialogForm* ui; Ui_ocularDialogForm* ui;
skipping to change at line 90 skipping to change at line 95
private slots: private slots:
void keyBindingTogglePluginChanged(const QString& newString); void keyBindingTogglePluginChanged(const QString& newString);
void keyBindingPopupNavigatorConfigChanged(const QString& newString) ; void keyBindingPopupNavigatorConfigChanged(const QString& newString) ;
void initAboutText(); void initAboutText();
void requireSelectionStateChanged(int state); void requireSelectionStateChanged(int state);
void scaleImageCircleStateChanged(int state); void scaleImageCircleStateChanged(int state);
private: private:
Oculars* plugin; Oculars* plugin;
QDataWidgetMapper* ccdMapper; QDataWidgetMapper* ccdMapper;
QList<CCD *>* ccds; QList<CCD *>* ccds;
PropertyBasedTableModel* ccdTableModel; PropertyBasedTableModel* ccdTableModel;
QDataWidgetMapper* ocularMapper; QDataWidgetMapper* ocularMapper;
QList<Ocular *>* oculars; QList<Ocular *>* oculars;
PropertyBasedTableModel* ocularTableModel; PropertyBasedTableModel* ocularTableModel;
QDataWidgetMapper* telescopeMapper; QDataWidgetMapper* telescopeMapper;
QList<Telescope *>* telescopes; QList<Telescope *>* telescopes;
PropertyBasedTableModel* telescopeTableModel; PropertyBasedTableModel* telescopeTableModel;
QDoubleValidator* validatorOcularAFOV; QDataWidgetMapper* lensMapper;
QDoubleValidator* validatorOcularEFL; QList<Lens *>* lense;
QDoubleValidator* validatorTelescopeDi PropertyBasedTableModel* lensTableModel;
ameter; QDoubleValidator* validatorOcularAFOV;
QDoubleValidator* validatorTelescopeFL QDoubleValidator* validatorOcularEFL;
; QDoubleValidator* validatorTelescopeDiameter;
QRegExpValidator* validatorName; QDoubleValidator* validatorTelescopeFL;
QIntValidator* validatorPositiveInt QDoubleValidator* validatorLensMultipler;
; QRegExpValidator* validatorName;
QDoubleValidator* validatorPositiveDou QIntValidator* validatorPositiveInt;
ble; QDoubleValidator* validatorPositiveDouble;
}; };
#endif // _OCULARDIALOG_HPP_ #endif // _OCULARDIALOG_HPP_
 End of changes. 10 change blocks. 
18 lines changed or deleted 23 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/