Implemented variable substitution in simple print jobs.

2019-03-24 17:49:41 -04:00
parent dedbe07312
commit 37f0a8890d
34 changed files with 524 additions and 193 deletions
@@ -208,7 +208,10 @@ namespace glabels
 			// Drawing operations
 			/////////////////////////////////
 		public:
-			void draw( QPainter* painter, bool inEditor = true, merge::Record* record = nullptr ) const;
+			void draw( QPainter*      painter,
+			           bool           inEditor,
+			           merge::Record* record,
+			           Variables*     variables ) const;

 		
 			/////////////////////////////////