X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fglobal.cpp;h=a60fe8c3c5fe083f5ccf4762f8c6f16ee62b4e00;hb=3c890e51a9763ffcee49e15753453a7da248272b;hp=e408a5deb2eb7ac53e9a469c3ee39fc0ee095535;hpb=acd27aa62a4c78b6aeee523e3145a8aa53f4bcde;p=architektonas

diff --git a/src/global.cpp b/src/global.cpp
index e408a5d..a60fe8c 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -21,13 +21,16 @@ bool Global::snapToGrid = true;
 bool Global::ignoreClicks = false;
 bool Global::dontMove = false;
 bool Global::selectionInProgress = false;
-QRectF Global::selection;
+Rect Global::selection;
 
 int Global::tool = TTNone;
 int Global::toolState = TSNone;
+bool Global::toolSuppressCrosshair = false;
+double Global::parallelDist = 1.0;
+int Global::parallelNum = 1;
+int Global::parallelBU = BUInch;
 
 double Global::gridSpacing;
-int Global::currentLayer = 0;
 Point Global::snapPoint;
 bool Global::snapPointIsValid = false;
 uint32_t Global::objectID = 1;
@@ -42,6 +45,7 @@ float Global::penWidth = 1.0;
 int Global::penStyle = 1;
 uint32_t Global::penColor = 0x000000;
 bool Global::penStamp = false;
+bool Global::penDropper = false;
 
 Point Global::intersectPoint[16]; // Overkill, yes
 double Global::intersectParam[16]; // Ditto
@@ -50,6 +54,6 @@ int Global::numIntersectParams = 0;
 
 int Global::activeLayer = 0;
 int Global::numLayers = 1;
-std::vector<bool> Global::layerHidden;
-std::vector<bool> Global::layerLocked;
-
+BVector Global::layerHidden;
+BVector Global::layerLocked;
+SVector Global::layerName;