Satellites.cpp   Satellites.cpp 
skipping to change at line 129 skipping to change at line 129
satellitesJsonPath = StelFileMgr::findFile("modules/Satellit es", (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable)) + "/satellites.json"; satellitesJsonPath = StelFileMgr::findFile("modules/Satellit es", (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable)) + "/satellites.json";
// Load and find resources used in the plugin // Load and find resources used in the plugin
texPointer = StelApp::getInstance().getTextureManager().crea teTexture("textures/pointeur5.png"); texPointer = StelApp::getInstance().getTextureManager().crea teTexture("textures/pointeur5.png");
Satellite::hintTexture = StelApp::getInstance().getTextureMa nager().createTexture(":/satellites/hint.png"); Satellite::hintTexture = StelApp::getInstance().getTextureMa nager().createTexture(":/satellites/hint.png");
// key bindings and other actions // key bindings and other actions
// TRANSLATORS: Title of a group of key bindings in the Help window // TRANSLATORS: Title of a group of key bindings in the Help window
QString groupName = N_("Plugin Key Bindings"); QString groupName = N_("Plugin Key Bindings");
StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance() .getGui()); StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance() .getGui());
gui->addGuiActions("actionShow_Satellite_ConfigDialog", N_(" Satellites configuration window"), "Alt+Z", groupName, true); gui->addGuiActions("actionShow_Satellite_ConfigDialog_Global ", N_("Satellites configuration window"), "Alt+Z", groupName, true, false, true);
gui->addGuiActions("actionShow_Satellite_Hints", N_("Satelli te hints"), "Ctrl+Z", groupName, true, false); gui->addGuiActions("actionShow_Satellite_Hints", N_("Satelli te hints"), "Ctrl+Z", groupName, true, false);
gui->getGuiActions("actionShow_Satellite_Hints")->setChecked (getFlagHints()); gui->getGuiActions("actionShow_Satellite_Hints")->setChecked (getFlagHints());
gui->addGuiActions("actionShow_Satellite_Labels", N_("Satell ite labels"), "Shift+Z", groupName, true, false); gui->addGuiActions("actionShow_Satellite_Labels", N_("Satell ite labels"), "Shift+Z", groupName, true, false);
gui->getGuiActions("actionShow_Satellite_Labels")->setChecke d(Satellite::showLabels); gui->getGuiActions("actionShow_Satellite_Labels")->setChecke d(Satellite::showLabels);
// Gui toolbar button // Gui toolbar button
pxmapGlow = new QPixmap(":/graphicGui/glow32x32.png"); pxmapGlow = new QPixmap(":/graphicGui/glow32x32.png");
pxmapOnIcon = new QPixmap(":/satellites/bt_satellites_on.png "); pxmapOnIcon = new QPixmap(":/satellites/bt_satellites_on.png ");
pxmapOffIcon = new QPixmap(":/satellites/bt_satellites_off.p ng"); pxmapOffIcon = new QPixmap(":/satellites/bt_satellites_off.p ng");
toolbarButton = new StelButton(NULL, *pxmapOnIcon, *pxmapOff Icon, *pxmapGlow, gui->getGuiActions("actionShow_Satellite_Hints")); toolbarButton = new StelButton(NULL, *pxmapOnIcon, *pxmapOff Icon, *pxmapGlow, gui->getGuiActions("actionShow_Satellite_Hints"));
gui->getButtonBar()->addButton(toolbarButton, "065-pluginsGr oup"); gui->getButtonBar()->addButton(toolbarButton, "065-pluginsGr oup");
connect(gui->getGuiActions("actionShow_Satellite_ConfigDialo connect(gui->getGuiActions("actionShow_Satellite_ConfigDialo
g"), SIGNAL(toggled(bool)), configDialog, SLOT(setVisible(bool))); g_Global"), SIGNAL(toggled(bool)), configDialog, SLOT(setVisible(bool)));
connect(configDialog, SIGNAL(visibleChanged(bool)), gui->get connect(configDialog, SIGNAL(visibleChanged(bool)), gui->get
GuiActions("actionShow_Satellite_ConfigDialog"), SLOT(setChecked(bool))); GuiActions("actionShow_Satellite_ConfigDialog_Global"), SLOT(setChecked(boo
l)));
connect(gui->getGuiActions("actionShow_Satellite_Hints"), SI GNAL(toggled(bool)), this, SLOT(setFlagHints(bool))); connect(gui->getGuiActions("actionShow_Satellite_Hints"), SI GNAL(toggled(bool)), this, SLOT(setFlagHints(bool)));
connect(gui->getGuiActions("actionShow_Satellite_Labels"), S IGNAL(toggled(bool)), this, SLOT(setFlagLabels(bool))); connect(gui->getGuiActions("actionShow_Satellite_Labels"), S IGNAL(toggled(bool)), this, SLOT(setFlagLabels(bool)));
} }
catch (std::runtime_error &e) catch (std::runtime_error &e)
{ {
qWarning() << "Satellites::init error: " << e.what(); qWarning() << "Satellites::init error: " << e.what();
return; return;
} }
skipping to change at line 374 skipping to change at line 374
if (result.size()>maxNbItem) result.erase(result.begin()+maxNbItem, result.end()); if (result.size()>maxNbItem) result.erase(result.begin()+maxNbItem, result.end());
return result; return result;
} }
bool Satellites::configureGui(bool show) bool Satellites::configureGui(bool show)
{ {
if (show) if (show)
{ {
StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance() .getGui()); StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance() .getGui());
gui->getGuiActions("actionShow_Satellite_ConfigDialog")->set Checked(true); gui->getGuiActions("actionShow_Satellite_ConfigDialog_Global ")->setChecked(true);
} }
return true; return true;
} }
void Satellites::restoreDefaults(void) void Satellites::restoreDefaults(void)
{ {
restoreDefaultConfigIni(); restoreDefaultConfigIni();
restoreDefaultJsonFile(); restoreDefaultJsonFile();
readJsonFile(); readJsonFile();
 End of changes. 3 change blocks. 
6 lines changed or deleted 7 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/