ConfigureDSOColorsDialog.cpp   ConfigureDSOColorsDialog.cpp 
skipping to change at line 33 skipping to change at line 33
#include "StelLocaleMgr.hpp" #include "StelLocaleMgr.hpp"
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "StelTranslator.hpp" #include "StelTranslator.hpp"
#include "StelUtils.hpp" #include "StelUtils.hpp"
#include "ConfigureDSOColorsDialog.hpp" #include "ConfigureDSOColorsDialog.hpp"
#include "ui_dsoColorsDialog.h" #include "ui_dsoColorsDialog.h"
#include <QSettings> #include <QSettings>
#include <QColorDialog> #include <QColorDialog>
ConfigureDSOColorsDialog::ConfigureDSOColorsDialog() ConfigureDSOColorsDialog::ConfigureDSOColorsDialog() : StelDialog("Configur eDSOColorsDialog")
{ {
dialogName = "ConfigureDSOColorsDialog";
ui = new Ui_ConfigureDSOColorsDialogForm; ui = new Ui_ConfigureDSOColorsDialogForm;
} }
ConfigureDSOColorsDialog::~ConfigureDSOColorsDialog() ConfigureDSOColorsDialog::~ConfigureDSOColorsDialog()
{ {
delete ui; delete ui;
} }
void ConfigureDSOColorsDialog::retranslate() void ConfigureDSOColorsDialog::retranslate()
{ {
skipping to change at line 153 skipping to change at line 152
{ {
vColor = Vec3f(c.redF(), c.greenF(), c.blueF()); vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
GETSTELMODULE(NebulaMgr)->setLabelsColor(vColor); GETSTELMODULE(NebulaMgr)->setLabelsColor(vColor);
StelApp::getInstance().getSettings()->setValue("color/dso_la bel_color", StelUtils::vec3fToStr(vColor)); StelApp::getInstance().getSettings()->setValue("color/dso_la bel_color", StelUtils::vec3fToStr(vColor));
ui->colorDSOLabels->setStyleSheet("QToolButton { background- color:" + c.name() + "; }"); ui->colorDSOLabels->setStyleSheet("QToolButton { background- color:" + c.name() + "; }");
} }
} }
void ConfigureDSOColorsDialog::askDSOMarkersColor() void ConfigureDSOColorsDialog::askDSOMarkersColor()
{ {
Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP roperty("NebulaMgr.cirlesColor")->getValue().value<Vec3f>(); Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP roperty("NebulaMgr.circlesColor")->getValue().value<Vec3f>();
QColor color(0,0,0); QColor color(0,0,0);
color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]); color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOMarker s->toolTip())); QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorDSOMarker s->toolTip()));
if (c.isValid()) if (c.isValid())
{ {
vColor = Vec3f(c.redF(), c.greenF(), c.blueF()); vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
GETSTELMODULE(NebulaMgr)->setCirclesColor(vColor); GETSTELMODULE(NebulaMgr)->setCirclesColor(vColor);
StelApp::getInstance().getSettings()->setValue("color/dso_ci rcle_color", StelUtils::vec3fToStr(vColor)); StelApp::getInstance().getSettings()->setValue("color/dso_ci rcle_color", StelUtils::vec3fToStr(vColor));
ui->colorDSOMarkers->setStyleSheet("QToolButton { background -color:" + c.name() + "; }"); ui->colorDSOMarkers->setStyleSheet("QToolButton { background -color:" + c.name() + "; }");
} }
 End of changes. 3 change blocks. 
3 lines changed or deleted 2 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/