Commit 5b598d93 authored by Matt Edman's avatar Matt Edman
Browse files

Try out a different image file (same map) for the network map. This one is 

hopefully a little bit clearer when zoomed in and, as a bonus, is smaller.
Also, don't let people zoom in quite as far, since it does no good and just
makes you sad looking at the map. The constants for the distance between the
top/bottom,left/right of the map and the image edges might need tweaking, too.
Oh, the excitement.


svn:r1137
parent 64ff65b4

src/gui/network/tormapwidget.cpp

+4 −4
Changes for src/gui/network/tormapwidget.cpp: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <cmath>

#include "tormapwidget.h"



#define IMG_WORLD_MAP   ":/images/map/world-map.png"

#define IMG_WORLD_MAP   ":/images/map/world-map.jpg"



/** QPens to use for drawing different map elements */

#define PEN_ROUTER        QPen(QColor("#ff030d"), 1.0)
@@ -35,11 +35,11 @@ 
#define PEN_SELECTED      QPen(Qt::green, 2.0)



/** Size of the map image */

#define IMG_WIDTH       1000

#define IMG_HEIGHT      507

#define IMG_WIDTH       3604

#define IMG_HEIGHT      1828



/** Border between the edge of the image and the actual map */

#define MAP_TOP         2

#define MAP_TOP         0

#define MAP_BOTTOM      2

#define MAP_RIGHT       5

#define MAP_LEFT        5

src/gui/network/zimageview.cpp

+3 −3
Changes for src/gui/network/zimageview.cpp: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ ZImageView::ZImageView(QWidget *parent) 
  /* Initialize members */

  _zoom = 0.0;

  _mouseDown = false;

  _maxZoomFactor = 8.0;

  _maxZoomFactor = 1.0;

  _padding = 60;



  setCursor(QCursor(Qt::CrossCursor));
@@ -299,14 +299,14 @@ ZImageView::zoom(float pct) 
void

ZImageView::zoomIn()

{

  zoom(_zoom + .05);

  zoom(_zoom + .1);

}



/** Zooms away from the image by 5% */

void

ZImageView::zoomOut()

{

  zoom(_zoom - .05);

  zoom(_zoom - .1);

}



/** Responds to the user pressing a mouse button. */

src/gui/res/map/world-map.jpg

0 → 100644
+819 KiB
Loading image diff...

src/gui/res/map/world-map.png

deleted100644 → 0
−907 KiB
Loading image diff...

src/gui/res/vidalia_common.qrc

+1 −1
Changes for src/gui/res/vidalia_common.qrc: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -79,6 +79,6 @@ 
        <file>flags/zh-cn.png</file>

    </qresource>

    <qresource prefix="/images">

        <file>map/world-map.png</file>

        <file>map/world-map.jpg</file>

    </qresource>

</RCC>