ConfigurationDialog.hpp   ConfigurationDialog.hpp 
skipping to change at line 17 skipping to change at line 17
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA. * 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 <QProgressBar>
#include <QNetworkReply> #include <QNetworkReply>
#include <QFile> #include <QFile>
#include "StelDialog.hpp" #include "StelDialog.hpp"
skipping to change at line 46 skipping to change at line 46
class ConfigurationDialog : public StelDialog class ConfigurationDialog : public StelDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
ConfigurationDialog(StelGui* agui); ConfigurationDialog(StelGui* agui);
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 languageChanged(); void retranslate();
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;
//! Set the content of the "Star catalog updates" box //! Reset the content of the "Star catalog updates" box.
void refreshStarCatalogButton(); //! Should be called only during initialization or
//! after a download is complete.
void resetStarCatalogControls();
//! Re-translate the contents of the "Star calalogs" box.
//! Update the strings according to the state.
void updateStarCatalogControlsText();
//! True if a star catalog download is in progress.
bool isDownloadingStarCatalog;
//! Value set by resetStarCatalogControls().
int nextStarCatalogToDownloadIndex;
//! Value set by resetStarCatalogControls().
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; QProgressBar* progressBar;
private slots: private slots:
void setNoSelectedInfo(void); void setNoSelectedInfo(void);
void setAllSelectedInfo(void); void setAllSelectedInfo(void);
void setBriefSelectedInfo(void); void setBriefSelectedInfo(void);
void languageChanged(const QString& languageCode); void selectLanguage(const QString& languageCode);
void setStartupTimeMode(); void setStartupTimeMode();
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();
void downloadStars(); void downloadStars();
void cancelDownload(); void cancelDownload();
void downloadFinished(); void downloadFinished();
skipping to change at line 104 skipping to change at line 115
//! 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(const QString&);
void pluginConfigureCurrentSelection(); void pluginConfigureCurrentSelection();
void loadAtStartupChanged(int); void loadAtStartupChanged(int);
#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);
//! Run the currently selected script from the script list. //! Run the currently selected script from the script list.
void runScriptClicked(); void runScriptClicked();
//! Stop the currently running script. //! Stop the currently running script.
void stopScriptClicked(); void stopScriptClicked();
void aScriptIsRunning(); void aScriptIsRunning();
void aScriptHasStopped(); void aScriptHasStopped();
void populateScriptsList(); void populateScriptsList();
#endif
void setFixedDateTimeToCurrent(); void setFixedDateTimeToCurrent();
void changePage(QListWidgetItem *current, QListWidgetItem *previous) ; void changePage(QListWidgetItem *current, QListWidgetItem *previous) ;
private: private:
StelGui* gui; StelGui* gui;
int savedProjectionType; int savedProjectionType;
}; };
 End of changes. 6 change blocks. 
5 lines changed or deleted 18 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/