StelMainView.hpp   StelMainView.hpp 
skipping to change at line 159 skipping to change at line 159
//! Notify that an event was handled by the program and therefore th e //! Notify that an event was handled by the program and therefore th e
//! FPS should be maximized for a couple of seconds. //! FPS should be maximized for a couple of seconds.
void thereWasAnEvent(); void thereWasAnEvent();
//! Determines if we should render as fast as possible, //! Determines if we should render as fast as possible,
//! or limit the FPS. This depends on the time the last user event //! or limit the FPS. This depends on the time the last user event
//! happened. //! happened.
bool needsMaxFPS() const; bool needsMaxFPS() const;
//! Set the state of the flag of usage background for GUI buttons
void setFlagUseButtonsBackground(bool b) { flagUseButtonsBackground=
b; }
//! Get the state of the flag of usage background for GUI buttons
bool getFlagUseButtonsBackground() { return flagUseButtonsBackground
; }
protected: protected:
//! Hack to determine current monitor pixel ratio //! Hack to determine current monitor pixel ratio
//! @todo Find a better way to handle this //! @todo Find a better way to handle this
virtual void moveEvent(QMoveEvent* event) Q_DECL_OVERRIDE; virtual void moveEvent(QMoveEvent* event) Q_DECL_OVERRIDE;
//! Handle window closed event, calling StelApp::quit() //! Handle window closed event, calling StelApp::quit()
virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE; virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE;
//! Handle window resized events, and change the size of the underly ing //! Handle window resized events, and change the size of the underly ing
//! QGraphicsScene to be the same //! QGraphicsScene to be the same
virtual void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE; virtual void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE;
signals: signals:
//! emitted when saveScreenShot is requested with saveScreenShot(). //! emitted when saveScreenShot is requested with saveScreenShot().
//! doScreenshot() does the actual work (it has to do it in the main //! doScreenshot() does the actual work (it has to do it in the main
//! thread, where as saveScreenShot() might get called from another one. //! thread, where as saveScreenShot() might get called from another one.
//! //!
//! @remark FS: is threaded access here even a possibility anymore, or a remnant of older code? //! @remark FS: is threaded access here even a possibility anymore, or a remnant of older code?
void screenshotRequested(void); void screenshotRequested(void);
void fullScreenChanged(bool b); void fullScreenChanged(bool b);
//! Emitted when the "Reload shaders" action is perfomed
//! Interested objects should subscribe to this signal and reload th
eir shaders
//! when this is emitted
void reloadShadersRequested();
void updateIconsRequested();
private slots: private slots:
// Do the actual screenshot generation in the main thread with this method. // Do the actual screenshot generation in the main thread with this method.
void doScreenshot(void); void doScreenshot(void);
void minFPSUpdate(); void minFPSUpdate();
#ifdef OPENGL_DEBUG_LOGGING #ifdef OPENGL_DEBUG_LOGGING
void logGLMessage(const QOpenGLDebugMessage& debugMessage); void logGLMessage(const QOpenGLDebugMessage& debugMessage);
void contextDestroyed(); void contextDestroyed();
#endif #endif
void updateNightModeProperty(bool b); void updateNightModeProperty(bool b);
void reloadShaders();
private: private:
//! The graphics scene notifies us when a draw finished, so that we can queue the next one //! The graphics scene notifies us when a draw finished, so that we can queue the next one
void drawEnded(); void drawEnded();
//! Returns the desired OpenGL format settings, //! Returns the desired OpenGL format settings,
//! on desktop this corresponds to a GL 2.1 context, //! on desktop this corresponds to a GL 2.1 context,
//! with 32bit RGBA buffer and 24/8 depth/stencil buffer //! with 32bit RGBA buffer and 24/8 depth/stencil buffer
QSurfaceFormat getDesiredGLFormat() const; QSurfaceFormat getDesiredGLFormat() const;
//! provide extended OpenGL diagnostics in logfile. //! provide extended OpenGL diagnostics in logfile.
void dumpOpenGLdiagnostics() const; void dumpOpenGLdiagnostics() const;
//! Startup diagnostics, providing test for various circumstances of bad OS/OpenGL driver combinations //! Startup diagnostics, providing test for various circumstances of bad OS/OpenGL driver combinations
skipping to change at line 230 skipping to change at line 244
bool flagInvertScreenShotColors; bool flagInvertScreenShotColors;
bool flagOverwriteScreenshots; //! if set to true, screenshot is nam ed exactly screenShotPrefix.png and overwrites existing file bool flagOverwriteScreenshots; //! if set to true, screenshot is nam ed exactly screenShotPrefix.png and overwrites existing file
QString screenShotPrefix; QString screenShotPrefix;
QString screenShotDir; QString screenShotDir;
// Number of second before the mouse cursor disappears // Number of second before the mouse cursor disappears
float cursorTimeout; float cursorTimeout;
bool flagCursorTimeout; bool flagCursorTimeout;
bool flagUseButtonsBackground;
double lastEventTimeSec; double lastEventTimeSec;
//! The minimum desired frame rate in frame per second. //! The minimum desired frame rate in frame per second.
float minfps; float minfps;
//! The maximum desired frame rate in frame per second. //! The maximum desired frame rate in frame per second.
float maxfps; float maxfps;
QTimer* minFpsTimer; QTimer* minFpsTimer;
#ifdef OPENGL_DEBUG_LOGGING #ifdef OPENGL_DEBUG_LOGGING
QOpenGLDebugLogger* glLogger; QOpenGLDebugLogger* glLogger;
 End of changes. 4 change blocks. 
0 lines changed or deleted 19 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/