From 2cf269599707d7ffd4929222cc61841e4b0aec4f Mon Sep 17 00:00:00 2001 From: Niels Date: Fri, 18 Feb 2011 08:32:27 +0100 Subject: [PATCH] rename map icons --- icons/{atm.png => amenity-atm.png} | Bin icons/{bank.png => amenity-bank.png} | Bin icons/{cinema.png => amenity-cinema.png} | Bin ...rinking_water.png => amenity-drinking_water.png} | Bin icons/{fuel.png => amenity-fuel.png} | Bin icons/{hospital.png => amenity-hospital.png} | Bin icons/{parking.png => amenity-parking.png} | Bin icons/{pharmacy.png => amenity-pharmacy.png} | Bin icons/{telephone.png => amenity-telephone.png} | Bin icons/{toilets.png => amenity-toilets.png} | Bin icons/{bus_stop.png => highway-bus_stop.png} | Bin .../{speed_camera.png => highway-speed_camera.png} | Bin icons/{hostel.png => tourism-hostel.png} | Bin icons/{hotel.png => tourism-hotel.png} | Bin icons/{museum.png => tourism-museum.png} | Bin icons/{recycling.png => tourism-recycling.png} | Bin icons/{viewpoint.png => tourism-viewpoint.png} | Bin poilayer.cpp | 2 +- 18 files changed, 1 insertion(+), 1 deletion(-) rename icons/{atm.png => amenity-atm.png} (100%) rename icons/{bank.png => amenity-bank.png} (100%) rename icons/{cinema.png => amenity-cinema.png} (100%) rename icons/{drinking_water.png => amenity-drinking_water.png} (100%) rename icons/{fuel.png => amenity-fuel.png} (100%) rename icons/{hospital.png => amenity-hospital.png} (100%) rename icons/{parking.png => amenity-parking.png} (100%) rename icons/{pharmacy.png => amenity-pharmacy.png} (100%) rename icons/{telephone.png => amenity-telephone.png} (100%) rename icons/{toilets.png => amenity-toilets.png} (100%) rename icons/{bus_stop.png => highway-bus_stop.png} (100%) rename icons/{speed_camera.png => highway-speed_camera.png} (100%) rename icons/{hostel.png => tourism-hostel.png} (100%) rename icons/{hotel.png => tourism-hotel.png} (100%) rename icons/{museum.png => tourism-museum.png} (100%) rename icons/{recycling.png => tourism-recycling.png} (100%) rename icons/{viewpoint.png => tourism-viewpoint.png} (100%) diff --git a/icons/atm.png b/icons/amenity-atm.png similarity index 100% rename from icons/atm.png rename to icons/amenity-atm.png diff --git a/icons/bank.png b/icons/amenity-bank.png similarity index 100% rename from icons/bank.png rename to icons/amenity-bank.png diff --git a/icons/cinema.png b/icons/amenity-cinema.png similarity index 100% rename from icons/cinema.png rename to icons/amenity-cinema.png diff --git a/icons/drinking_water.png b/icons/amenity-drinking_water.png similarity index 100% rename from icons/drinking_water.png rename to icons/amenity-drinking_water.png diff --git a/icons/fuel.png b/icons/amenity-fuel.png similarity index 100% rename from icons/fuel.png rename to icons/amenity-fuel.png diff --git a/icons/hospital.png b/icons/amenity-hospital.png similarity index 100% rename from icons/hospital.png rename to icons/amenity-hospital.png diff --git a/icons/parking.png b/icons/amenity-parking.png similarity index 100% rename from icons/parking.png rename to icons/amenity-parking.png diff --git a/icons/pharmacy.png b/icons/amenity-pharmacy.png similarity index 100% rename from icons/pharmacy.png rename to icons/amenity-pharmacy.png diff --git a/icons/telephone.png b/icons/amenity-telephone.png similarity index 100% rename from icons/telephone.png rename to icons/amenity-telephone.png diff --git a/icons/toilets.png b/icons/amenity-toilets.png similarity index 100% rename from icons/toilets.png rename to icons/amenity-toilets.png diff --git a/icons/bus_stop.png b/icons/highway-bus_stop.png similarity index 100% rename from icons/bus_stop.png rename to icons/highway-bus_stop.png diff --git a/icons/speed_camera.png b/icons/highway-speed_camera.png similarity index 100% rename from icons/speed_camera.png rename to icons/highway-speed_camera.png diff --git a/icons/hostel.png b/icons/tourism-hostel.png similarity index 100% rename from icons/hostel.png rename to icons/tourism-hostel.png diff --git a/icons/hotel.png b/icons/tourism-hotel.png similarity index 100% rename from icons/hotel.png rename to icons/tourism-hotel.png diff --git a/icons/museum.png b/icons/tourism-museum.png similarity index 100% rename from icons/museum.png rename to icons/tourism-museum.png diff --git a/icons/recycling.png b/icons/tourism-recycling.png similarity index 100% rename from icons/recycling.png rename to icons/tourism-recycling.png diff --git a/icons/viewpoint.png b/icons/tourism-viewpoint.png similarity index 100% rename from icons/viewpoint.png rename to icons/tourism-viewpoint.png diff --git a/poilayer.cpp b/poilayer.cpp index 9991e88..b0e7e6c 100644 --- a/poilayer.cpp +++ b/poilayer.cpp @@ -93,7 +93,7 @@ void PoiLayer::load(const QString &filename) foreach (const QString &c, categories) { QString t = tags.value(c, ""); if (!t.isEmpty()) { - QString icon = m_iconPath+"/"+t+".png"; + QString icon = m_iconPath+"/"+c+"-"+t+".png"; if (QFile::exists(icon)) { if (!m_iconCache.contains(t)) { m_iconCache.insert(t, new QPixmap(icon));