SkyGui.cpp   SkyGui.cpp 
skipping to change at line 35 skipping to change at line 35
#include "StelCore.hpp" #include "StelCore.hpp"
#include "StelMainView.hpp" #include "StelMainView.hpp"
#include <QGraphicsView> #include <QGraphicsView>
#include <QDebug> #include <QDebug>
#include <QTimeLine> #include <QTimeLine>
#include <QGraphicsSceneMouseEvent> #include <QGraphicsSceneMouseEvent>
#include <QSettings> #include <QSettings>
#include <QTextDocument> #include <QTextDocument>
InfoPanel::InfoPanel(QGraphicsItem* parent) : QGraphicsTextItem("", parent) , InfoPanel::InfoPanel(QGraphicsItem* parent) : QGraphicsTextItem("", parent) ,
infoPixmap(NULL) infoPixmap(Q_NULLPTR)
{ {
QSettings* conf = StelApp::getInstance().getSettings(); QSettings* conf = StelApp::getInstance().getSettings();
Q_ASSERT(conf); Q_ASSERT(conf);
QString objectInfo = conf->value("gui/selected_object_info", "all"). toString(); QString objectInfo = conf->value("gui/selected_object_info", "all"). toString();
if (objectInfo == "all") if (objectInfo == "all")
{ {
infoTextFilters = StelObject::InfoStringGroup(StelObject::Al lInfo); infoTextFilters = StelObject::InfoStringGroup(StelObject::Al lInfo);
} }
else if (objectInfo == "short") else if (objectInfo == "short")
{ {
skipping to change at line 109 skipping to change at line 109
} }
if (qApp->property("text_texture")==true) // CLI option -t given? if (qApp->property("text_texture")==true) // CLI option -t given?
infoPixmap=new QGraphicsPixmapItem(this); infoPixmap=new QGraphicsPixmapItem(this);
} }
InfoPanel::~InfoPanel() InfoPanel::~InfoPanel()
{ {
if (infoPixmap) if (infoPixmap)
{ {
delete infoPixmap; delete infoPixmap;
infoPixmap=NULL; infoPixmap=Q_NULLPTR;
} }
} }
// A hackish fix for broken OpenGL font situations like RasPi2 VC4 as of 20 16-03-26. // A hackish fix for broken OpenGL font situations like RasPi2 VC4 as of 20 16-03-26.
// strList is the text-only representation of InfoPanel.toPlainText(), pre- split into a stringlist. // strList is the text-only representation of InfoPanel.toPlainText(), pre- split into a stringlist.
// It is assumed: The h2 element (1-2 lines) has been broken into 1-2 lines and a line "ENDHEAD", rest follows line-by-line. // It is assumed: The h2 element (1-2 lines) has been broken into 1-2 lines and a line "ENDHEAD", rest follows line-by-line.
// The header lines are shown in bold large font, the rest in normal size. // The header lines are shown in bold large font, the rest in normal size.
// There is no bold or other font mark-up, but that should be acceptable. // There is no bold or other font mark-up, but that should be acceptable.
QPixmap getInfoPixmap(const QStringList& strList, QFont font, QColor color) QPixmap getInfoPixmap(const QStringList& strList, QFont font, QColor color)
{ {
skipping to change at line 210 skipping to change at line 210
} }
const QString InfoPanel::getSelectedText(void) const QString InfoPanel::getSelectedText(void)
{ {
return toPlainText(); return toPlainText();
} }
SkyGui::SkyGui(QGraphicsItem * parent) SkyGui::SkyGui(QGraphicsItem * parent)
: QGraphicsWidget(parent) : QGraphicsWidget(parent)
, lastButtonbarWidth(0) , lastButtonbarWidth(0)
, btHorizAutoHide(NULL) , btHorizAutoHide(Q_NULLPTR)
, btVertAutoHide(NULL) , btVertAutoHide(Q_NULLPTR)
, autoHidebts(NULL) , autoHidebts(Q_NULLPTR)
, autoHideHorizontalButtonBar(true) , autoHideHorizontalButtonBar(true)
, autoHideVerticalButtonBar(true) , autoHideVerticalButtonBar(true)
, stelGui(NULL) , stelGui(Q_NULLPTR)
{ {
setObjectName("StelSkyGui"); setObjectName("StelSkyGui");
// Construct the Windows buttons bar // Construct the Windows buttons bar
winBar = new LeftStelBar(this); winBar = new LeftStelBar(this);
// Construct the bottom buttons bar // Construct the bottom buttons bar
buttonBar = new BottomStelBar(this, buttonBar = new BottomStelBar(this,
QPixmap(":/graphicGui/btbg-left.png"), QPixmap(":/graphicGui/btbg-left.png"),
QPixmap(":/graphicGui/btbg-right.png") , QPixmap(":/graphicGui/btbg-right.png") ,
QPixmap(":/graphicGui/btbg-middle.png" ), QPixmap(":/graphicGui/btbg-middle.png" ),
 End of changes. 4 change blocks. 
6 lines changed or deleted 6 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/