StelMainWindow.cpp   StelMainWindow.cpp 
skipping to change at line 37 skipping to change at line 37
#include <QSettings> #include <QSettings>
#include <QResizeEvent> #include <QResizeEvent>
#include <QIcon> #include <QIcon>
#include <QDebug> #include <QDebug>
#include <QCoreApplication> #include <QCoreApplication>
#include <QApplication> #include <QApplication>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QGLWidget> #include <QGLWidget>
#ifdef BUILD_FOR_MAEMO
#include <QtGui/QX11Info>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#endif
// Initialize static variables // Initialize static variables
StelMainWindow* StelMainWindow::singleton = NULL; StelMainWindow* StelMainWindow::singleton = NULL;
StelMainWindow::StelMainWindow() : QMainWindow(NULL) StelMainWindow::StelMainWindow() : QMainWindow(NULL)
{ {
// Can't create 2 StelMainWindow instances // Can't create 2 StelMainWindow instances
Q_ASSERT(!singleton); Q_ASSERT(!singleton);
singleton = this; singleton = this;
setAttribute(Qt::WA_NoSystemBackground); setAttribute(Qt::WA_NoSystemBackground);
setWindowIcon(QIcon(":/mainWindow/icon.bmp")); setWindowIcon(QIcon(":/mainWindow/icon.bmp"));
initTitleI18n(); initTitleI18n();
mainGraphicsView = new StelMainGraphicsView(this); mainGraphicsView = new StelMainGraphicsView(this);
setCentralWidget(mainGraphicsView); setCentralWidget(mainGraphicsView);
#ifdef BUILD_FOR_MAEMO
if (!winId())
{
qWarning("Can't grab keys unless we have a window id");
return;
}
unsigned long val = 1;
Atom atom = XInternAtom(QX11Info::display(), "_HILDON_ZOOM_KEY_ATOM"
, False);
if (!atom)
{
qWarning("Unable to obtain _HILDON_ZOOM_KEY_ATOM. This only
works on a Maemo 5 device!");
}
else
{
XChangeProperty (QX11Info::display(), winId(), atom, XA_INTE
GER, 32,
PropModeReplace, reinterpret_cast<unsigned char *>(&
val), 1);
}
#endif
} }
// Update the translated title // Update the translated title
void StelMainWindow::initTitleI18n() void StelMainWindow::initTitleI18n()
{ {
QString appNameI18n = q_("Stellarium %1").arg(StelUtils::getApplicat ionVersion()); QString appNameI18n = q_("Stellarium %1").arg(StelUtils::getApplicat ionVersion());
setWindowTitle(appNameI18n); setWindowTitle(appNameI18n);
} }
void StelMainWindow::init(QSettings* conf) void StelMainWindow::init(QSettings* conf)
 End of changes. 2 change blocks. 
0 lines changed or deleted 29 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/