Added skeletal MergePropertyEditor.

2015-09-13 15:49:41 -04:00
parent b12f4a2478
commit 1f4330ff6e
6 changed files with 265 additions and 8 deletions
@@ -38,6 +38,7 @@ namespace glabels
 	class LabelModel;
 	class View;
 	class ObjectEditor;
+	class MergePropertyEditor;
 	class PrintView;


@@ -197,12 +198,13 @@ namespace glabels
 		QToolBar* fileToolBar;
 		QToolBar* editorToolBar;

-		QTabWidget*   mNotebook;
-		LabelModel*   mModel;
-		QScrollArea*  mViewScrollArea;
-		View*         mView;
-		ObjectEditor* mObjectEditor;
-		PrintView*    mPrintView;
+		QTabWidget*          mNotebook;
+		LabelModel*          mModel;
+		QScrollArea*         mViewScrollArea;
+		View*                mView;
+		ObjectEditor*        mObjectEditor;
+		MergePropertyEditor* mMergePropertyEditor;
+		PrintView*           mPrintView;

 		QLabel*   zoomInfoLabel;
 		QLabel*   cursorInfoLabel;