StelMainGraphicsView.cpp   StelMainGraphicsView.cpp 
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.
*/ */
#include "StelMainGraphicsView.hpp" #include "StelMainGraphicsView.hpp"
#include "StelAppGraphicsWidget.hpp" #include "StelAppGraphicsWidget.hpp"
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelCore.hpp" #include "StelCore.hpp"
#include "StelFileMgr.hpp" #include "StelFileMgr.hpp"
#include "StelProjector.hpp" #include "StelProjector.hpp"
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "StelPainter.hpp" #include "StelPainter.hpp"
skipping to change at line 108 skipping to change at line 108
#endif #endif
#ifdef USE_STATIC_PLUGIN_TIMEZONECONFIGURATION #ifdef USE_STATIC_PLUGIN_TIMEZONECONFIGURATION
Q_IMPORT_PLUGIN(TimeZoneConfiguration) Q_IMPORT_PLUGIN(TimeZoneConfiguration)
#endif #endif
#ifdef USE_STATIC_PLUGIN_SUPERNOVAE #ifdef USE_STATIC_PLUGIN_SUPERNOVAE
Q_IMPORT_PLUGIN(Supernovae) Q_IMPORT_PLUGIN(Supernovae)
#endif #endif
#ifdef USE_STATIC_PLUGIN_QUASARS
Q_IMPORT_PLUGIN(Quasars)
#endif
#ifdef USE_STATIC_PLUGIN_PULSARS
Q_IMPORT_PLUGIN(Pulsars)
#endif
// Initialize static variables // Initialize static variables
StelMainGraphicsView* StelMainGraphicsView::singleton = NULL; StelMainGraphicsView* StelMainGraphicsView::singleton = NULL;
class StelQGLWidget : public QGLWidget class StelQGLWidget : public QGLWidget
{ {
public: public:
StelQGLWidget(QGLContext* ctx, QWidget* parent) : QGLWidget(ctx, par ent) StelQGLWidget(QGLContext* ctx, QWidget* parent) : QGLWidget(ctx, par ent)
{ {
setAttribute(Qt::WA_PaintOnScreen); setAttribute(Qt::WA_PaintOnScreen);
setAttribute(Qt::WA_NoSystemBackground); setAttribute(Qt::WA_NoSystemBackground);
skipping to change at line 277 skipping to change at line 285
StelApp::getInstance().setGui(gui); StelApp::getInstance().setGui(gui);
gui->init(backItem, mainSkyItem); gui->init(backItem, mainSkyItem);
StelApp::getInstance().initPlugIns(); StelApp::getInstance().initPlugIns();
// Force refreshing of button bars if plugins modified the GUI, e.g. added buttons. // Force refreshing of button bars if plugins modified the GUI, e.g. added buttons.
gui->forceRefreshGui(); gui->forceRefreshGui();
#ifndef DISABLE_SCRIPTING #ifndef DISABLE_SCRIPTING
QString startupScript; QString startupScript;
if (qApp->property("onetime_startup_script").isValid()) if (qApp->property("onetime_startup_script").isValid())
qApp->property("onetime_startup_script").toString(); startupScript = qApp->property("onetime_startup_script").toS tring();
else else
startupScript = conf->value("scripts/startup_script", "start up.ssc").toString(); startupScript = conf->value("scripts/startup_script", "start up.ssc").toString();
scriptMgr->runScript(startupScript);
// Use a queued slot call to start the script only once the main qAp
p event loop is running...
QMetaObject::invokeMethod(scriptMgr,
"runScript",
Qt::QueuedConnection,
Q_ARG(QString, startupScript));
#endif #endif
QThread::currentThread()->setPriority(QThread::HighestPriority); QThread::currentThread()->setPriority(QThread::HighestPriority);
StelPainter::setQPainter(NULL); StelPainter::setQPainter(NULL);
startMainLoop(); startMainLoop();
} }
void StelMainGraphicsView::thereWasAnEvent() void StelMainGraphicsView::thereWasAnEvent()
{ {
lastEventTimeSec = StelApp::getTotalRunTime(); lastEventTimeSec = StelApp::getTotalRunTime();
 End of changes. 4 change blocks. 
3 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/