Added new bigger and "better" zoom buttons

diff --git a/images.qrc b/images.qrc
index f3a3b46..9186ac0 100644 (file)
--- a/images.qrc
+++ b/images.qrc
@@ -8,5 +8,7 @@
         <file>res/images/list_small.png</file>
         <file>res/images/reload_icon.png</file>
         <file>res/images/sendPosition_icon.png</file>
+        <file>res/images/zoom_in.png</file>
+        <file>res/images/zoom_out.png</file>
     </qresource>
 </RCC>

diff --git a/src/map/mapcommon.h b/src/map/mapcommon.h
index 6435843..22f78f0 100644 (file)
--- a/src/map/mapcommon.h
+++ b/src/map/mapcommon.h
@@ -39,7 +39,7 @@ static const int MAP_ZOOM_PANEL_POSITION_X = 10; ///< Horizontal position of zoo
 static const int MAP_ZOOM_PANEL_POSITION_Y = 10; ///< Vertical position of zoom panel
 static const int MAP_ZOOM_PANEL_LEVEL = MIN_MAP_SCENE_NORMAL_LEVEL
                                         + MAX_MAP_ZOOM_LEVEL + 2; ///< Zepth of zoom panel (Z-axis)
-static const int MAP_ZOOM_PANEL_BUTTON_SIZE = 48; ///< Size of a zoom panel button
+static const int MAP_ZOOM_PANEL_BUTTON_SIZE = 74; ///< Size of a zoom panel button
 
 const qreal MAX_LATITUDE = 85.05112877980659237802;  ///< Maximum latitude value
 const qreal MIN_LATITUDE = -MAX_LATITUDE; ///< Minimum latitude value

diff --git a/src/map/mapfetcher.cpp b/src/map/mapfetcher.cpp
index 5818906..731a123 100644 (file)
--- a/src/map/mapfetcher.cpp
+++ b/src/map/mapfetcher.cpp
@@ -75,11 +75,7 @@ bool MapFetcher::loadImageFromCache(const QUrl &url)
 
         QNetworkCacheMetaData metaData = cache->metaData(url);
 
-<<<<<<< HEAD:src/map/mapfetcher.cpp
-        if (metaData.expirationDate().isValid()) {
-=======
         if ((metaData.expirationDate().isValid()) && (url.isValid())) {
->>>>>>> master:src/map/mapfetcher.cpp
 
             if (metaData.expirationDate() < QDateTime::currentDateTime()) {
                 cache->remove(url);
@@ -87,11 +83,7 @@ bool MapFetcher::loadImageFromCache(const QUrl &url)
             }
         }
 
-<<<<<<< HEAD:src/map/mapfetcher.cpp
-        QIODevice *cacheImage = m_manager->cache()->data(url);
-=======
         QIODevice *cacheImage = cache->data(url);
->>>>>>> master:src/map/mapfetcher.cpp
 
         if (cacheImage) {
             QImage image;

diff --git a/src/map/mapzoompanel.cpp b/src/map/mapzoompanel.cpp
index 361f7d4..62a6cd7 100644 (file)
--- a/src/map/mapzoompanel.cpp
+++ b/src/map/mapzoompanel.cpp
@@ -31,8 +31,8 @@ MapZoomPanel::MapZoomPanel(QGraphicsItem *parent, int x, int y) : QGraphicsItem(
     m_width = MAP_ZOOM_PANEL_BUTTON_SIZE;
     m_height = MAP_ZOOM_PANEL_BUTTON_SIZE * 2;
 
-    m_zoomInBtn = new MapButton(":/resources/zoom_in.png");
-    m_zoomOutBtn = new MapButton(":/resources/zoom_out.png");
+    m_zoomInBtn = new MapButton(":/res/images/zoom_in.png");
+    m_zoomOutBtn = new MapButton(":/res/images/zoom_out.png");
 
     setFlag(QGraphicsItem::ItemIgnoresTransformations);
     setZValue(static_cast<qreal>(MAP_ZOOM_PANEL_LEVEL));

diff --git a/src/resources/zoom_in.png b/src/resources/zoom_in.png
deleted file mode 100644 (file)
index c2a84fc..0000000
Binary files a/src/resources/zoom_in.png and /dev/null differ

diff --git a/src/resources/zoom_out.png b/src/resources/zoom_out.png
deleted file mode 100644 (file)
index ba6ffbc..0000000
Binary files a/src/resources/zoom_out.png and /dev/null differ