TextUserInterface.cpp   TextUserInterface.cpp 
skipping to change at line 174 skipping to change at line 174
m1_2->setNextNode(m1_3); m1_2->setNextNode(m1_3);
m1_3->setNextNode(m1_4); m1_3->setNextNode(m1_4);
m1_4->setNextNode(m1_1); m1_4->setNextNode(m1_1);
m1_1->loopToTheLast(); m1_1->loopToTheLast();
m1->setChildNode(m1_1); m1->setChildNode(m1_1);
TuiNode* m2 = new TuiNode(N_("Date and Time"), NULL, m1); TuiNode* m2 = new TuiNode(N_("Date and Time"), NULL, m1);
m1->setNextNode(m2); m1->setNextNode(m2);
TuiNode* m2_1 = new TuiNodeDateTime(N_("Current date/time"), TuiNode* m2_1 = new TuiNodeDateTime(N_("Current date/time"),
core, core,
SLOT(setJDay(double)), SLOT(setJD(double)),
core->getJDay(), core->getJD(),
m2); m2);
TuiNode* m2_2 = new TuiNode(N_("Set time zone"), m2, m2_1); TuiNode* m2_2 = new TuiNode(N_("Set time zone"), m2, m2_1);
TuiNode* m2_3 = new TuiNode(N_("Day keys"), m2, m2_2); TuiNode* m2_3 = new TuiNode(N_("Day keys"), m2, m2_2);
TuiNode* m2_4 = new TuiNodeDateTime(N_("Startup date/time preset"), TuiNode* m2_4 = new TuiNodeDateTime(N_("Startup date/time preset"),
core, core,
SLOT(setPresetSkyTime(double)), SLOT(setPresetSkyTime(double)),
core->getPresetSkyTime(), core->getPresetSkyTime(),
m2, m2_3); m2, m2_3);
QStringList startupModes; QStringList startupModes;
// TRANSLATORS: The current system time is used at startup // TRANSLATORS: The current system time is used at startup
skipping to change at line 358 skipping to change at line 358
m5, m5_14); m5, m5_14);
NebulaMgr* nebulaMgr = GETSTELMODULE(NebulaMgr); NebulaMgr* nebulaMgr = GETSTELMODULE(NebulaMgr);
TuiNode* m5_16 = new TuiNodeColor(N_("Nebula names"), TuiNode* m5_16 = new TuiNodeColor(N_("Nebula names"),
nebulaMgr, SLOT(setLabelsColor(Vec3 f)), nebulaMgr, SLOT(setLabelsColor(Vec3 f)),
nebulaMgr->getLabelsColor(), nebulaMgr->getLabelsColor(),
m5, m5_15); m5, m5_15);
TuiNode* m5_17 = new TuiNodeColor(N_("Nebula hints"), TuiNode* m5_17 = new TuiNodeColor(N_("Nebula hints"),
nebulaMgr, SLOT(setCirclesColor(Ve c3f)), nebulaMgr, SLOT(setCirclesColor(Ve c3f)),
nebulaMgr->getCirclesColor(), nebulaMgr->getCirclesColor(),
m5, m5_16); m5, m5_16);
TuiNode* m5_18 = new TuiNodeColor(N_("Horizon line"), TuiNode* m5_18 = new TuiNodeColor(N_("Galaxy hints"),
nebulaMgr, SLOT(setGalaxyColor(Vec
3f)),
nebulaMgr->getGalaxyColor(),
m5, m5_17);
TuiNode* m5_19 = new TuiNodeColor(N_("Bright nebulae hints"),
nebulaMgr, SLOT(setBrightNebulaCol
or(Vec3f)),
nebulaMgr->getBrightNebulaColor(),
m5, m5_18);
TuiNode* m5_20 = new TuiNodeColor(N_("Dark nebulae hints"),
nebulaMgr, SLOT(setDarkNebulaColor
(Vec3f)),
nebulaMgr->getDarkNebulaColor(),
m5, m5_19);
TuiNode* m5_21 = new TuiNodeColor(N_("Clusters hints"),
nebulaMgr, SLOT(setClusterColor(Ve
c3f)),
nebulaMgr->getClusterColor(),
m5, m5_20);
TuiNode* m5_22 = new TuiNodeColor(N_("Horizon line"),
gridLinesMgr, gridLinesMgr,
SLOT(setColorHorizonLine(Vec3f)), SLOT(setColorHorizonLine(Vec3f)),
gridLinesMgr->getColorHorizonLine() , gridLinesMgr->getColorHorizonLine() ,
m5, m5_17); m5, m5_21);
TuiNode* m5_19 = new TuiNodeColor(N_("Galactic grid"), TuiNode* m5_23 = new TuiNodeColor(N_("Galactic grid"),
gridLinesMgr, gridLinesMgr,
SLOT(setColorGalacticGrid(Vec3f)), SLOT(setColorGalacticGrid(Vec3f)),
gridLinesMgr->getColorGalacticGrid( ), gridLinesMgr->getColorGalacticGrid( ),
m5, m5_18); m5, m5_22);
TuiNode* m5_20 = new TuiNodeColor(N_("Galactic equator line"), TuiNode* m5_24 = new TuiNodeColor(N_("Galactic equator line"),
gridLinesMgr, gridLinesMgr,
SLOT(setColorGalacticEquatorLine(Ve c3f)), SLOT(setColorGalacticEquatorLine(Ve c3f)),
gridLinesMgr->getColorGalacticEquat orLine(), gridLinesMgr->getColorGalacticEquat orLine(),
m5, m5_19); m5, m5_23);
TuiNode* m5_21 = new TuiNodeColor(N_("Opposition/conjunction longitu TuiNode* m5_25 = new TuiNodeColor(N_("Opposition/conjunction longitu
de line"), de line"),
gridLinesMgr, gridLinesMgr,
SLOT(setColorLongitudeLine(Vec3f)), SLOT(setColorLongitudeLine(Vec3f)),
gridLinesMgr->getColorLongitudeLine (), gridLinesMgr->getColorLongitudeLine (),
m5, m5_20); m5, m5_24);
m5_1->setNextNode(m5_2); m5_1->setNextNode(m5_2);
m5_2->setNextNode(m5_3); m5_2->setNextNode(m5_3);
m5_3->setNextNode(m5_4); m5_3->setNextNode(m5_4);
m5_4->setNextNode(m5_5); m5_4->setNextNode(m5_5);
m5_5->setNextNode(m5_6); m5_5->setNextNode(m5_6);
m5_6->setNextNode(m5_7); m5_6->setNextNode(m5_7);
m5_7->setNextNode(m5_8); m5_7->setNextNode(m5_8);
m5_8->setNextNode(m5_9); m5_8->setNextNode(m5_9);
m5_9->setNextNode(m5_10); m5_9->setNextNode(m5_10);
skipping to change at line 399 skipping to change at line 415
m5_11->setNextNode(m5_12); m5_11->setNextNode(m5_12);
m5_12->setNextNode(m5_13); m5_12->setNextNode(m5_13);
m5_13->setNextNode(m5_14); m5_13->setNextNode(m5_14);
m5_14->setNextNode(m5_15); m5_14->setNextNode(m5_15);
m5_15->setNextNode(m5_16); m5_15->setNextNode(m5_16);
m5_16->setNextNode(m5_17); m5_16->setNextNode(m5_17);
m5_17->setNextNode(m5_18); m5_17->setNextNode(m5_18);
m5_18->setNextNode(m5_19); m5_18->setNextNode(m5_19);
m5_19->setNextNode(m5_20); m5_19->setNextNode(m5_20);
m5_20->setNextNode(m5_21); m5_20->setNextNode(m5_21);
m5_21->setNextNode(m5_1); m5_21->setNextNode(m5_22);
m5_22->setNextNode(m5_23);
m5_23->setNextNode(m5_24);
m5_24->setNextNode(m5_25);
m5_25->setNextNode(m5_1);
m5_1->loopToTheLast(); m5_1->loopToTheLast();
m5->setChildNode(m5_1); m5->setChildNode(m5_1);
TuiNode* m6 = new TuiNode(N_("Effects"), NULL, m5); TuiNode* m6 = new TuiNode(N_("Effects"), NULL, m5);
m5->setNextNode(m6); m5->setNextNode(m6);
TuiNode* m6_1 = new TuiNodeInt(N_("Light pollution:"), TuiNode* m6_1 = new TuiNodeInt(N_("Light pollution:"),
this, this,
SLOT(setBortleScale(int)), SLOT(setBortleScale(int)),
3, 1, 9, 1, 3, 1, 9, 1,
m6); m6);
skipping to change at line 583 skipping to change at line 603
} }
StelPainter painter(core->getProjection(StelCore::FrameJ2000 )); StelPainter painter(core->getProjection(StelCore::FrameJ2000 ));
painter.setFont(font); painter.setFont(font);
painter.setColor(color[0],color[1],color[2]); painter.setColor(color[0],color[1],color[2]);
painter.drawText(text_x, text_y, tuiText, 0, 0, 0, !tuiGravi tyUi); painter.drawText(text_x, text_y, tuiText, 0, 0, 0, !tuiGravi tyUi);
} }
if (tuiDateTime) if (tuiDateTime)
{ {
double jd = core->getJDay(); double jd = core->getJD();
int text_x = x + xVc*2/3, text_y = y + pixOffset; int text_x = x + xVc*2/3, text_y = y + pixOffset;
QString newDate = StelApp::getInstance().getLocaleMgr().getP rintableDateLocal(jd) + " " QString newDate = StelApp::getInstance().getLocaleMgr().getP rintableDateLocal(jd) + " "
+StelApp::getInstance().getLocaleMgr().getPrintableT imeLocal(jd); +StelApp::getInstance().getLocaleMgr().getPrintableT imeLocal(jd);
if (fovMaskDisk) { if (fovMaskDisk) {
text_x = xVc + fovOffsetY - pixOffset; text_x = xVc + fovOffsetY - pixOffset;
text_y = yVc - fovOffsetX + pixOffset; text_y = yVc - fovOffsetX + pixOffset;
} }
 End of changes. 8 change blocks. 
13 lines changed or deleted 37 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/