Initial skeletal object editor.

2015-08-17 15:55:39 -04:00
parent 6e69991a15
commit 50aeefde5e
11 changed files with 1412 additions and 23 deletions
@@ -33,6 +33,7 @@

 #include "libglabels/Db.h"
 #include "View.h"
+#include "ObjectEditor.h"
 #include "LabelModel.h"
 #include "LabelModelBoxObject.h"
 #include "Icons.h"
@@ -54,8 +55,17 @@ namespace glabels
 	///
 	MainWindow::MainWindow()
 	{
+		QWidget* editorPage = new QWidget;
+
 		mView = new View();
-		setCentralWidget( mView );
+		mObjectEditor = new ObjectEditor();
+
+		QHBoxLayout* editorLayout = new QHBoxLayout;
+		editorLayout->addWidget( mView );
+		editorLayout->addWidget( mObjectEditor );
+		editorPage->setLayout( editorLayout );
+		
+		setCentralWidget( editorPage );
 		mModel = 0;

 		createActions();