ConfigurationDialog.hpp   ConfigurationDialog.hpp 
skipping to change at line 24 skipping to change at line 24
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#ifndef _CONFIGURATIONDIALOG_HPP_ #ifndef _CONFIGURATIONDIALOG_HPP_
#define _CONFIGURATIONDIALOG_HPP_ #define _CONFIGURATIONDIALOG_HPP_
#include <QObject> #include <QObject>
#include <QProgressBar>
#include <QNetworkReply> #include <QNetworkReply>
#include <QFile> #include <QFile>
#include "StelDialog.hpp" #include "StelDialog.hpp"
class Ui_configurationDialogForm; class Ui_configurationDialogForm;
class QSettings; class QSettings;
class QDataStream; class QDataStream;
class QNetworkAccessManager; class QNetworkAccessManager;
class QListWidgetItem; class QListWidgetItem;
class StelGui; class StelGui;
class CustomDeltaTEquationDialog; class CustomDeltaTEquationDialog;
class ConfigurationDialog : public StelDialog class ConfigurationDialog : public StelDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
ConfigurationDialog(StelGui* agui); ConfigurationDialog(StelGui* agui, QObject* parent);
virtual ~ConfigurationDialog(); virtual ~ConfigurationDialog();
//! Notify that the application style changed //! Notify that the application style changed
void styleChanged(); void styleChanged();
public slots: public slots:
void retranslate(); void retranslate();
void updateIconsColor();
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_configurationDialogForm* ui; Ui_configurationDialogForm* ui;
private: private:
//! Contains the parsed content of the starsConfig.json file //! Contains the parsed content of the starsConfig.json file
QVariantMap nextStarCatalogToDownload; QVariantMap nextStarCatalogToDownload;
//! Reset the content of the "Star catalog updates" box. //! Reset the content of the "Star catalog updates" box.
skipping to change at line 75 skipping to change at line 73
//! True if a star catalog download is in progress. //! True if a star catalog download is in progress.
bool isDownloadingStarCatalog; bool isDownloadingStarCatalog;
//! Value set by resetStarCatalogControls(). //! Value set by resetStarCatalogControls().
int nextStarCatalogToDownloadIndex; int nextStarCatalogToDownloadIndex;
//! Value set by resetStarCatalogControls(). //! Value set by resetStarCatalogControls().
int starCatalogsCount; int starCatalogsCount;
//! True when at least one star catalog has been downloaded successf ully this session //! True when at least one star catalog has been downloaded successf ully this session
bool hasDownloadedStarCatalog; bool hasDownloadedStarCatalog;
QNetworkReply* starCatalogDownloadReply; QNetworkReply* starCatalogDownloadReply;
QFile* currentDownloadFile; QFile* currentDownloadFile;
QProgressBar* progressBar; class StelProgressController* progressBar;
private slots: private slots:
void setNoSelectedInfo(); void setNoSelectedInfo();
void setAllSelectedInfo(); void setAllSelectedInfo();
void setBriefSelectedInfo(); void setBriefSelectedInfo();
//! Set the selected object info fields from the "Displayed Fields" boxes. //! Set the selected object info fields from the "Displayed Fields" boxes.
//! Called when any of the boxes has been clicked. Sets the //! Called when any of the boxes has been clicked. Sets the
//! "selected info" mode to "Custom". //! "selected info" mode to "Custom".
void setSelectedInfoFromCheckBoxes(); void setSelectedInfoFromCheckBoxes();
void updateCurrentLanguage();
void selectLanguage(const QString& languageCode); void selectLanguage(const QString& languageCode);
void setStartupTimeMode(); void setStartupTimeMode();
//! Show/bring to foreground the shortcut editor window. //! Show/bring to foreground the shortcut editor window.
void showShortcutsWindow(); void showShortcutsWindow();
void setDiskViewport(bool); void setDiskViewport(bool);
void setSphericMirror(bool); void setSphericMirror(bool);
void cursorTimeOutChanged(); void cursorTimeOutChanged();
void cursorTimeOutChanged(double) {cursorTimeOutChanged();} void cursorTimeOutChanged(double) {cursorTimeOutChanged();}
void newStarCatalogData(); void newStarCatalogData();
skipping to change at line 120 skipping to change at line 119
//! Save the current viewing option including landscape, location an d sky culture //! Save the current viewing option including landscape, location an d sky culture
//! This doesn't include the current viewing direction, time and FOV since those //! This doesn't include the current viewing direction, time and FOV since those
//! have specific controls //! have specific controls
void saveCurrentViewOptions(); void saveCurrentViewOptions();
//! Reset all stellarium options. //! Reset all stellarium options.
//! This basically replaces the config.ini by the default one //! This basically replaces the config.ini by the default one
void setDefaultViewOptions(); void setDefaultViewOptions();
void populatePluginsList(); void populatePluginsList();
void pluginsSelectionChanged(const QString&); void pluginsSelectionChanged(QListWidgetItem *item, QListWidgetItem *previousItem);
void pluginConfigureCurrentSelection(); void pluginConfigureCurrentSelection();
void loadAtStartupChanged(int); void loadAtStartupChanged(int);
void setUpdatesFlag(bool b);
void populateDeltaTAlgorithmsList(); void populateDeltaTAlgorithmsList();
void setDeltaTAlgorithm(int algorithmID); void setDeltaTAlgorithm(int algorithmID);
void setDeltaTAlgorithmDescription(); void setDeltaTAlgorithmDescription();
void showCustomDeltaTEquationDialog(); void showCustomDeltaTEquationDialog();
#ifndef DISABLE_SCRIPTING #ifndef DISABLE_SCRIPTING
//! The selection of script in the script list has changed //! The selection of script in the script list has changed
//! Updates the script information panel //! Updates the script information panel
void scriptSelectionChanged(const QString& s); void scriptSelectionChanged(const QString& s);
 End of changes. 7 change blocks. 
5 lines changed or deleted 6 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/