StelApp.hpp   StelApp.hpp 
skipping to change at line 34 skipping to change at line 34
#include <QString> #include <QString>
#include <QObject> #include <QObject>
// Predeclaration of some classes // Predeclaration of some classes
class StelCore; class StelCore;
class StelTextureMgr; class StelTextureMgr;
class StelObjectMgr; class StelObjectMgr;
class StelLocaleMgr; class StelLocaleMgr;
class StelModuleMgr; class StelModuleMgr;
class StelSkyCultureMgr; class StelSkyCultureMgr;
class StelViewportEffect;
class QOpenGLFramebufferObject;
class QSettings; class QSettings;
class QNetworkAccessManager; class QNetworkAccessManager;
class QNetworkReply; class QNetworkReply;
class QTime; class QTime;
class QTimer; class QTimer;
class StelLocationMgr; class StelLocationMgr;
class StelSkyLayerMgr; class StelSkyLayerMgr;
class StelAudioMgr; class StelAudioMgr;
class StelVideoMgr; class StelVideoMgr;
class StelGuiBase; class StelGuiBase;
skipping to change at line 167 skipping to change at line 169
//! Usually this value is 1, but for a mac with retina screen this w ill be value 2. //! Usually this value is 1, but for a mac with retina screen this w ill be value 2.
float getDevicePixelsPerPixel() const {return devicePixelsPerPixel;} float getDevicePixelsPerPixel() const {return devicePixelsPerPixel;}
void setDevicePixelsPerPixel(float dppp); void setDevicePixelsPerPixel(float dppp);
//! Get the scaling ratio to apply on all display elements, like GUI , text etc.. //! Get the scaling ratio to apply on all display elements, like GUI , text etc..
//! When this ratio is 1, all pixel sizes used in Stellarium will lo ok OK on a regular //! When this ratio is 1, all pixel sizes used in Stellarium will lo ok OK on a regular
//! computer screen with 96 pixel per inch (reference for tuning siz es). //! computer screen with 96 pixel per inch (reference for tuning siz es).
float getGlobalScalingRatio() const {return globalScalingRatio;} float getGlobalScalingRatio() const {return globalScalingRatio;}
void setGlobalScalingRatio(float r) {globalScalingRatio=r;} void setGlobalScalingRatio(float r) {globalScalingRatio=r;}
//! Get the size of font
int getBaseFontSize() const { return baseFontSize; }
void setBaseFontSize(int s) { baseFontSize=s; }
//! Get the GUI instance implementing the abstract GUI interface. //! Get the GUI instance implementing the abstract GUI interface.
StelGuiBase* getGui() const {return stelGui;} StelGuiBase* getGui() const {return stelGui;}
//! Tell the StelApp instance which GUI si currently being used. //! Tell the StelApp instance which GUI si currently being used.
//! The caller is responsible for destroying the GUI. //! The caller is responsible for destroying the GUI.
void setGui(StelGuiBase* b) {stelGui=b;} void setGui(StelGuiBase* b) {stelGui=b;}
#ifndef DISABLE_SCRIPTING #ifndef DISABLE_SCRIPTING
//! Get the script API proxy (for signal handling) //! Get the script API proxy (for signal handling)
StelMainScriptAPIProxy* getMainScriptAPIProxy() {return scriptAPIPro xy;} StelMainScriptAPIProxy* getMainScriptAPIProxy() {return scriptAPIPro xy;}
//! Get the script manager //! Get the script manager
skipping to change at line 189 skipping to change at line 195
static void initStatic(); static void initStatic();
static void deinitStatic(); static void deinitStatic();
//! Add a progression indicator to the GUI (if applicable). //! Add a progression indicator to the GUI (if applicable).
//! @return a controller which can be used to indicate the current s tatus. //! @return a controller which can be used to indicate the current s tatus.
//! The StelApp instance remains the owner of the controller. //! The StelApp instance remains the owner of the controller.
StelProgressController* addProgressBar(); StelProgressController* addProgressBar();
void removeProgressBar(StelProgressController* p); void removeProgressBar(StelProgressController* p);
//! Define the type of viewport effect to use
//! @param effectName must be one of 'none', 'framebufferOnly', 'sph
ericMirrorDistorter'
void setViewportEffect(const QString& effectName);
//! Get the type of viewport effect currently used
QString getViewportEffect() const;
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Scriptable methods // Scriptable methods
public slots: public slots:
//! Set flag for activating night vision mode. //! Set flag for activating night vision mode.
void setVisionModeNight(bool); void setVisionModeNight(bool);
//! Get flag for activating night vision mode. //! Get flag for activating night vision mode.
bool getVisionModeNight() const {return flagNightVision;} bool getVisionModeNight() const {return flagNightVision;}
//! Get the current number of frame per second. //! Get the current number of frame per second.
skipping to change at line 231 skipping to change at line 243
//! Called just before we exit Qt mainloop. //! Called just before we exit Qt mainloop.
void aboutToQuit(); void aboutToQuit();
private: private:
//! Handle mouse clics. //! Handle mouse clics.
void handleClick(class QMouseEvent* event); void handleClick(class QMouseEvent* event);
//! Handle mouse wheel. //! Handle mouse wheel.
void handleWheel(class QWheelEvent* event); void handleWheel(class QWheelEvent* event);
//! Handle mouse move. //! Handle mouse move.
void handleMove(int x, int y, Qt::MouseButtons b); void handleMove(float x, float y, Qt::MouseButtons b);
//! Handle key press and release. //! Handle key press and release.
void handleKeys(class QKeyEvent* event); void handleKeys(class QKeyEvent* event);
//! Handle pinch on multi touch devices. //! Handle pinch on multi touch devices.
void handlePinch(qreal scale, bool started); void handlePinch(qreal scale, bool started);
void initScriptMgr(QSettings* conf); void initScriptMgr(QSettings* conf);
void prepareRenderBuffer();
void applyRenderBuffer();
// The StelApp singleton // The StelApp singleton
static StelApp* singleton; static StelApp* singleton;
// The associated StelCore instance // The associated StelCore instance
StelCore* core; StelCore* core;
// Module manager for the application // Module manager for the application
StelModuleMgr* moduleMgr; StelModuleMgr* moduleMgr;
// Locale manager for the application // Locale manager for the application
skipping to change at line 333 skipping to change at line 348
int nbDownloadedFiles; int nbDownloadedFiles;
//! Store the summed size of all downloaded files in bytes. //! Store the summed size of all downloaded files in bytes.
qint64 totalDownloadedSize; qint64 totalDownloadedSize;
//! Store the number of downloaded files read from the cache for sta tistics. //! Store the number of downloaded files read from the cache for sta tistics.
int nbUsedCache; int nbUsedCache;
//! Store the summed size of all downloaded files read from the cach e in bytes. //! Store the summed size of all downloaded files read from the cach e in bytes.
qint64 totalUsedCacheSize; qint64 totalUsedCacheSize;
QList<StelProgressController*> progressControllers; QList<StelProgressController*> progressControllers;
int baseFontSize;
// Framebuffer object used for viewport effects.
QOpenGLFramebufferObject* renderBuffer;
StelViewportEffect* viewportEffect;
}; };
#endif // _STELAPP_HPP_ #endif // _STELAPP_HPP_
 End of changes. 6 change blocks. 
1 lines changed or deleted 24 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/