SkyGui.cpp   SkyGui.cpp 
skipping to change at line 21 skipping to change at line 21
* 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., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#include "SkyGui.hpp" #include "SkyGui.hpp"
#include "StelObjectMgr.hpp"
#include "StelGuiItems.hpp" #include "StelGuiItems.hpp"
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelGui.hpp" #include "StelGui.hpp"
#include "StelCore.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)
{ {
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")
{
infoTextFilters = StelObject::InfoStringGroup(StelObject::Sh ortInfo); infoTextFilters = StelObject::InfoStringGroup(StelObject::Sh ortInfo);
}
else if (objectInfo == "none") else if (objectInfo == "none")
{
infoTextFilters = StelObject::InfoStringGroup(0); infoTextFilters = StelObject::InfoStringGroup(0);
}
else if (objectInfo == "custom")
{
infoTextFilters = StelObject::InfoStringGroup(StelApp::getIn
stance().getStelObjectMgr().getCustomInfoString());
}
else else
{ {
qWarning() << "config.ini option gui/selected_object_info is invalid, using \"all\""; qWarning() << "config.ini option gui/selected_object_info is invalid, using \"all\"";
infoTextFilters = StelObject::InfoStringGroup(StelObject::Al lInfo); infoTextFilters = StelObject::InfoStringGroup(StelObject::Al lInfo);
} }
} }
void InfoPanel::setTextFromObjects(const QList<StelObjectP>& selected) void InfoPanel::setTextFromObjects(const QList<StelObjectP>& selected)
{ {
if (selected.isEmpty()) if (selected.isEmpty())
 End of changes. 8 change blocks. 
0 lines changed or deleted 13 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/