LocationDialog.cpp   LocationDialog.cpp 
skipping to change at line 22 skipping to change at line 22
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA.
*/ */
#include "Dialog.hpp" #include "Dialog.hpp"
#include "LocationDialog.hpp" #include "LocationDialog.hpp"
#include "StelMainGraphicsView.hpp"
#include "StelLocationMgr.hpp" #include "StelLocationMgr.hpp"
#include "ui_locationDialogGui.h" #include "ui_locationDialogGui.h"
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelCore.hpp" #include "StelCore.hpp"
#include "StelNavigator.hpp" #include "StelNavigator.hpp"
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "SolarSystem.hpp" #include "SolarSystem.hpp"
#include "Planet.hpp" #include "Planet.hpp"
#include "StelFileMgr.hpp" #include "StelFileMgr.hpp"
#include "StelLocaleMgr.hpp" #include "StelLocaleMgr.hpp"
#include "StelGui.hpp" #include "StelGui.hpp"
#include "StelGuiItems.hpp"
#include <QSettings> #include <QSettings>
#include <QDebug> #include <QDebug>
#include <QFrame> #include <QFrame>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include <QTimer> #include <QTimer>
#include <QStringListModel> #include <QStringListModel>
LocationDialog::LocationDialog() : isEditingNew(false) LocationDialog::LocationDialog() : isEditingNew(false)
{ {
ui = new Ui_locationDialogForm; ui = new Ui_locationDialogForm;
skipping to change at line 215 skipping to change at line 216
return; return;
QPixmap pixmap; QPixmap pixmap;
QString path; QString path;
// Try to set the proper planet map image // Try to set the proper planet map image
if (loc.planetName=="Earth") if (loc.planetName=="Earth")
{ {
// Special case for earth, we don't want to see the clouds // Special case for earth, we don't want to see the clouds
try try
{ {
path = StelApp::getInstance().getFileMgr().findFile( "data/gui/world.png"); path = StelFileMgr::findFile("data/gui/world.png");
} }
catch (std::runtime_error& e) catch (std::runtime_error& e)
{ {
qWarning() << "ERROR - could not find planet map for " << loc.planetName << e.what(); qWarning() << "ERROR - could not find planet map for " << loc.planetName << e.what();
return; return;
} }
pixmap = QPixmap(path); pixmap = QPixmap(path);
} }
else else
{ {
SolarSystem* ssm = GETSTELMODULE(SolarSystem); SolarSystem* ssm = GETSTELMODULE(SolarSystem);
Planet* p = ssm->searchByEnglishName(loc.planetName); PlanetP p = ssm->searchByEnglishName(loc.planetName);
if (p) if (p)
{ {
try try
{ {
path = StelApp::getInstance().getFileMgr().f indFile("textures/"+p->getTextMapName()); path = StelFileMgr::findFile("textures/"+p-> getTextMapName());
} }
catch (std::runtime_error& e) catch (std::runtime_error& e)
{ {
qWarning() << "ERROR - could not find planet map for " << loc.planetName << e.what(); qWarning() << "ERROR - could not find planet map for " << loc.planetName << e.what();
return; return;
} }
pixmap = QPixmap(path); pixmap = QPixmap(path);
} }
} }
if (StelApp::getInstance().getVisionModeNight()) if (StelApp::getInstance().getVisionModeNight())
{ {
ui->mapLabel->setPixmap(StelGui::makeRed(pixmap)); ui->mapLabel->setPixmap(StelButton::makeRed(pixmap));
} }
else else
{ {
ui->mapLabel->setPixmap(pixmap); ui->mapLabel->setPixmap(pixmap);
} }
// For caching // For caching
lastPlanet = loc.planetName; lastPlanet = loc.planetName;
lastVisionMode = StelApp::getInstance().getVisionModeNight(); lastVisionMode = StelApp::getInstance().getVisionModeNight();
} }
 End of changes. 6 change blocks. 
5 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/