From: Shamus Hammons <jlhamm@acm.org>
Date: Mon, 15 Jul 2013 15:52:46 +0000 (-0500)
Subject: Added main window state saving.
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=architektonas;a=commitdiff_plain;h=d549bfdc8c872b966b9d787c00e5e8027366093c

Added main window state saving.
---

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index ef42ca2..3bbbade 100644
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -64,6 +64,9 @@ ApplicationWindow::ApplicationWindow(): settings("Underground Software", "Archit
 //	BlockWidget * bw = new BlockWidget;
 //	dock2->setWidget(bw);
 	addDockWidget(Qt::RightDockWidgetArea, dock2);
+	// Needed for saveState()
+	dock1->setObjectName("Layers");
+	dock2->setObjectName("Blocks");
 
 	//	Create status bar
 	zoomIndicator = new QLabel("Grid: 12.0\" Zoom: 12.5%");
@@ -610,13 +613,16 @@ void ApplicationWindow::CreateMenus(void)
 void ApplicationWindow::CreateToolbars(void)
 {
 	QToolBar * toolbar = addToolBar(tr("File"));
+	toolbar->setObjectName("File");	// Needed for saveState()
 	toolbar->addAction(exitAct);
 
 	toolbar = addToolBar(tr("View"));
+	toolbar->setObjectName("View");
 	toolbar->addAction(zoomInAct);
 	toolbar->addAction(zoomOutAct);
 
 	toolbar = addToolBar(tr("Edit"));
+	toolbar->setObjectName("Edit");
 	toolbar->addAction(snapToGridAct);
 	toolbar->addAction(groupAct);
 	toolbar->addAction(fixAngleAct);
@@ -640,6 +646,7 @@ void ApplicationWindow::ReadSettings(void)
 	snapToGridAct->setChecked(settings.value("snapToGrid", true).toBool());
 	resize(size);
 	move(pos);
+	restoreState(settings.value("windowState").toByteArray());
 //	pos = settings.value("charWndPos", QPoint(0, 0)).toPoint();
 //	size = settings.value("charWndSize", QSize(200, 200)).toSize();
 //	((TTEdit *)qApp)->charWnd->resize(size);
@@ -651,6 +658,7 @@ void ApplicationWindow::WriteSettings(void)
 {
 	settings.setValue("pos", pos());
 	settings.setValue("size", size());
+	settings.setValue("windowState", saveState());
 	settings.setValue("useAntialiasing", drawing->useAntialiasing);
 	settings.setValue("snapToGrid", snapToGridAct->isChecked());
 //	settings.setValue("charWndPos", ((TTEdit *)qApp)->charWnd->pos());
diff --git a/src/layerwidget.cpp b/src/layerwidget.cpp
index 4a98037..6561256 100644
--- a/src/layerwidget.cpp
+++ b/src/layerwidget.cpp
@@ -17,11 +17,11 @@
 
 LayerWidget::LayerWidget(void): QWidget()
 {
-	LayerItemWidget * liw1 = new LayerItemWidget("Background");
-	LayerItemWidget * liw2 = new LayerItemWidget("Guidelines");
-	LayerItemWidget * liw3 = new LayerItemWidget("Floor #1");
-	LayerItemWidget * liw4 = new LayerItemWidget("Mechanical");
-	LayerItemWidget * liw5 = new LayerItemWidget("List Widget");
+	LayerItemWidget * liw1 = new LayerItemWidget("Guidelines");
+	LayerItemWidget * liw2 = new LayerItemWidget("Floor #1");
+	LayerItemWidget * liw3 = new LayerItemWidget("Mechanical");
+	LayerItemWidget * liw4 = new LayerItemWidget("List Widget");
+	LayerItemWidget * liw5 = new LayerItemWidget("Background");
 
 	QListWidget * qlw = new QListWidget;
 	QListWidgetItem * qli1 = new QListWidgetItem(qlw);
@@ -37,10 +37,17 @@ LayerWidget::LayerWidget(void): QWidget()
 
 	QPushButton * pb1 = new QPushButton("+");
 	QPushButton * pb2 = new QPushButton("-");
+	QPushButton * pb3 = new QPushButton("Edit");
+	QPushButton * pb4 = new QPushButton("^");
+	QPushButton * pb5 = new QPushButton("v");
 
 	QHBoxLayout * hbox1 = new QHBoxLayout;
 	hbox1->addWidget(pb1);
 	hbox1->addWidget(pb2);
+	hbox1->addWidget(pb3);
+	hbox1->addWidget(pb4);
+	hbox1->addWidget(pb5);
+	hbox1->addStretch();
 
 	QVBoxLayout * mainLayout = new QVBoxLayout;
 	mainLayout->addWidget(qlw);