Icon improvements.

22 files changed, 291 insertions, 242 deletions

diff --git a/Editor.qml b/Editor.qml
index bdd2156..bb3b53c 100644
--- a/Editor.qml
+++ b/Editor.qml
@@ -5,8 +5,8 @@ Rectangle
 	enum Tool
 	{
 		Select = 1,
-		Line = 11,
-		Polyline = 12,
+		LineSingle = 11,
+		LinePoly = 12,
 		RectangleCenter = 21,
 		RectangleCorner = 22,
 		CircleCenter = 31,
@@ -48,8 +48,8 @@ Rectangle
 
 		onPositionChanged:
 		{
-			mousex = Math.round((mouse.x - canvas.x) / scalexy / snap) * snap - max
-			mousey = max - Math.round((mouse.y - canvas.y) / scalexy / snap) * snap
+			mousex = Math.round((mouse.x - canvas.x) / scalexy / snapgrid) * snapgrid - max
+			mousey = max - Math.round((mouse.y - canvas.y) / scalexy / snapgrid) * snapgrid
 
 			if ( mouse.x < canvas.x )
 				mousex = -max
@@ -66,7 +66,7 @@ Rectangle
 
 		onPressed:
 		{
-			if ( tool === Editor.Tool.Polyline )
+			if ( tool === Editor.Tool.LinePoly )
 			{
 				startx = endx
 				starty = endy
@@ -153,7 +153,7 @@ Rectangle
 
 		function paintsymbol(context)
 		{
-			context.lineWidth = 1.2
+			context.lineWidth = linewidth
 
 			var previous = Qt.point(0, 0)
 			var index, count = manager.getItemCount()
@@ -166,7 +166,7 @@ Rectangle
 				{
 					previous = position
 				}
-				else if ( operation === Editor.Operation.Line )
+				else if ( operation === Editor.Operation.LineSingle )
 				{
 					paintline(context, previous, position)
 					previous = position
@@ -200,7 +200,7 @@ Rectangle
 				var end = Qt.point(mousex, mousey)
 				if ( tool > 10 && tool < 20 )	// line
 				{
-					if ( tool === Editor.Tool.Line )
+					if ( tool === Editor.Tool.LineSingle )
 						paintline(context, start, end)
 					else if ( tool === Editor.Tool.Polyline )
 					{
@@ -219,7 +219,7 @@ Rectangle
 					else if ( tool === Editor.Tool.RectangleCorner ) { }
 					context.rect((cornerx + max) * scalexy, (max - cornery) * scalexy,
 						deltax * scalexy, deltay * scalexy)
-					if ( fill )
+					if ( fillitem )
 						context.fill()
 					else
 						context.stroke()
@@ -254,7 +254,7 @@ Rectangle
 					if ( radius )
 					{
 						var center = Qt.point(centerx, centery)
-						paintcircle(context, center, radius, fill)
+						paintcircle(context, center, radius, fillitem)
 					}
 				}
 				else if ( tool > 40 && tool < 50 )	// text
diff --git a/README.md b/README.md
index 5bffef4..ff95cea 100644
--- a/README.md
+++ b/README.md
@@ -8,4 +8,5 @@ krita:
 	icons:
 		48x48
 		transparent
-		line width 5pxkrita
+		line width: 6px
+		brush: basic-1
diff --git a/Separator.qml b/Separator.qml
new file mode 100644
index 0000000..2ac4832
--- /dev/null
+++ b/Separator.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.9
+import QtQuick.Controls 1.4
+
+ToolButton
+{
+	implicitWidth: 8
+}
diff --git a/Tool.qml b/Tool.qml
new file mode 100644
index 0000000..138766a
--- /dev/null
+++ b/Tool.qml
@@ -0,0 +1,20 @@
+import QtQuick 2.9
+import QtQuick.Controls 1.4
+
+ToolButton
+{
+	property int tool
+	property string image
+
+	implicitHeight: 32
+	implicitWidth: 32
+	Image
+	{
+		source: image
+		anchors { fill: parent; margins: 4 }
+	}
+	onClicked:
+	{
+		window.tool = tool
+	}
+}
diff --git a/image/br_down_icon&48.png b/image/br_down_icon&48.png
new file mode 100644
index 0000000..cda9e0c
--- /dev/null
+++ b/image/br_down_icon&48.png
diff --git a/image/br_up_icon&48.png b/image/br_up_icon&48.png
new file mode 100644
index 0000000..31fecf0
--- /dev/null
+++ b/image/br_up_icon&48.png
diff --git a/image/circle_center.png b/image/circle_center.png
index 39cb2c9..317d12e 100644
--- a/image/circle_center.png
+++ b/image/circle_center.png
diff --git a/image/circle_corner.png b/image/circle_corner.png
index 04d59e8..243707c 100644
--- a/image/circle_corner.png
+++ b/image/circle_corner.png
diff --git a/image/circle_horizontal.png b/image/circle_horizontal.png
index a417b63..9ff2c15 100644
--- a/image/circle_horizontal.png
+++ b/image/circle_horizontal.png
diff --git a/image/circle_vertical.png b/image/circle_vertical.png
index ac872a2..38b6be8 100644
--- a/image/circle_vertical.png
+++ b/image/circle_vertical.png
diff --git a/image/delete.png b/image/delete.png
new file mode 100644
index 0000000..ee301af
--- /dev/null
+++ b/image/delete.png
diff --git a/image/folder_open_icon&48.png b/image/folder_open_icon&48.png
new file mode 100644
index 0000000..7cdc921
--- /dev/null
+++ b/image/folder_open_icon&48.png
diff --git a/image/line_poly.png b/image/line_poly.png
index ca26d19..14c85a9 100644
--- a/image/line_poly.png
+++ b/image/line_poly.png
diff --git a/image/line_single.png b/image/line_single.png
index 73ea15a..dbebfc0 100644
--- a/image/line_single.png
+++ b/image/line_single.png
diff --git a/image/rectangle_center.png b/image/rectangle_center.png
index 4fb055a..8f1010f 100644
--- a/image/rectangle_center.png
+++ b/image/rectangle_center.png
diff --git a/image/rectangle_corner.png b/image/rectangle_corner.png
index 004ceaa..80d6faa 100644
--- a/image/rectangle_corner.png
+++ b/image/rectangle_corner.png
diff --git a/image/save_icon&48.png b/image/save_icon&48.png
new file mode 100644
index 0000000..838358e
--- /dev/null
+++ b/image/save_icon&48.png
diff --git a/image/text.png b/image/text.png
new file mode 100644
index 0000000..8589db5
--- /dev/null
+++ b/image/text.png
diff --git a/main.qml b/main.qml
index 990c0be..8b0a5fe 100644
--- a/main.qml
+++ b/main.qml
@@ -7,9 +7,10 @@ ApplicationWindow
 	property int mousex: 0
 	property int mousey: 0
 
-	property bool fill: false
-	property int align: 1
-	property int snap: 1
+	property bool fillitem: false
+	property int alignment: 1
+	property real linewidth: 1.2
+	property int snapgrid: 1
 	property int tool: 0
 
 	id: window
@@ -135,32 +136,39 @@ ApplicationWindow
 			{
 				text: qsTr("Line")	//%%
 				checkable : true
-				checked: (tool === Editor.Tool.Line)
-				onTriggered: { tool = Editor.Tool.Line }
+				checked: (tool === Editor.Tool.LineSingle)
+				onTriggered: { tool = Editor.Tool.LineSingle }
 			}
 			MenuItem
 			{
 				text: qsTr("Polyline")	//%%
 				checkable : true
-				checked: (tool === Editor.Tool.Polyline)
-				onTriggered: { tool = Editor.Tool.Polyline }
+				checked: (tool === Editor.Tool.LinePoly)
+				onTriggered: { tool = Editor.Tool.LinePoly }
 			}
 			MenuSeparator { }
 			MenuItem
 			{
+				text: qsTr("Rectangle Corner")	//%%
+				checkable : true
+				checked: (tool === Editor.Tool.RectangleCorner)
+				onTriggered: { tool = Editor.Tool.RectangleCorner }
+			}
+			MenuItem
+			{
 				text: qsTr("Rectangle Center")	//%%
 				checkable : true
 				checked: (tool === Editor.Tool.RectangleCenter)
 				onTriggered: { tool = Editor.Tool.RectangleCenter }
 			}
+			MenuSeparator { }
 			MenuItem
 			{
-				text: qsTr("Rectangle Corners")	//%%
+				text: qsTr("Circle Corner")	//%%
 				checkable : true
-				checked: (tool === Editor.Tool.RectangleCorner)
-				onTriggered: { tool = Editor.Tool.RectangleCorner }
+				checked: (tool === Editor.Tool.CircleCorner)
+				onTriggered: { tool = Editor.Tool.CircleCorner }
 			}
-			MenuSeparator { }
 			MenuItem
 			{
 				text: qsTr("Circle Center")	//%%
@@ -182,13 +190,6 @@ ApplicationWindow
 				checked: (tool === Editor.Tool.CircleVertical)
 				onTriggered: { tool = Editor.Tool.CircleVertical }
 			}
-			MenuItem
-			{
-				text: qsTr("Circle Corners")	//%%
-				checkable : true
-				checked: (tool === Editor.Tool.CircleCorner)
-				onTriggered: { tool = Editor.Tool.CircleCorner }
-			}
 			MenuSeparator { }
 			MenuItem
 			{
@@ -239,206 +240,209 @@ ApplicationWindow
 
 	toolBar: ToolBar
 	{
-		RowLayout
+		Column
 		{
-			ToolButton
-			{
-				width: 32; height: 32
-				Image
-				{
-					source: "image/clipboard_cut_icon&48.png"
-					anchors.fill: parent
-				}
-				onClicked:
-				{
+			RowLayout
+			{
+				height: 32
+				ToolButton
+				{
+					implicitHeight: 32; implicitWidth: 32
+					Image
+					{
+						source: "image/folder_open_icon&48.png"
+						anchors { fill: parent; margins: 4 }
+					}
+					onClicked:
+					{
 
-				}
-			}
-			ToolButton
-			{
-				width: 32; height: 32
-				Image
-				{
-					source: "image/clipboard_copy_icon&48.png"
-					anchors.fill: parent
-				}
-				onClicked:
-				{
+					}
+				}
+				ToolButton
+				{
+					implicitHeight: 32; implicitWidth: 32
+					Image
+					{
+						source: "image/save_icon&48.png"
+						anchors { fill: parent; margins: 4 }
+					}
+					onClicked:
+					{
 
-				}
-			}
-			ToolButton
-			{
-				width: 32; height: 32
-				Image
-				{
-					source: "image/clipboard_past_icon&48.png"
-					anchors.fill: parent
-				}
-				onClicked:
-				{
-
-				}
-			}
-			ToolButton { implicitWidth: 8 }
-			ToolButton
-			{
-				width: 32; height: 32
-				Image
-				{
-					source: "image/line_single.png"
-					anchors.fill: parent
-				}
-				onClicked:
-				{
-
-				}
-			}
-			ToolButton
-			{
-				width: 32; height: 32
-				Image
-				{
-					source: "image/line_poly.png"
-					anchors.fill: parent
-				}
-				onClicked:
-				{
-
-				}
-			}
-			ToolButton { implicitWidth: 8 }
-			ToolButton
-			{
-				width: 32; height: 32
-				Image
-				{
-					source: "image/rectangle_corner.png"
-					anchors.fill: parent
-				}
-				onClicked:
-				{
+					}
+				}
+				ToolButton { implicitWidth: 8 }
+				ToolButton
+				{
+					implicitHeight: 32; implicitWidth: 32
+					Image
+					{
+						source: "image/clipboard_cut_icon&48.png"
+						anchors { fill: parent; margins: 4 }
+					}
+					onClicked:
+					{
 
-				}
-			}
-			ToolButton
-			{
-				width: 32; height: 32
-				Image
-				{
-					source: "image/rectangle_center.png"
-					anchors.fill: parent
-				}
-				onClicked:
-				{
+					}
+				}
+				ToolButton
+				{
+					implicitHeight: 32; implicitWidth: 32
+					Image
+					{
+						source: "image/clipboard_copy_icon&48.png"
+						anchors { fill: parent; margins: 4 }
+					}
+					onClicked:
+					{
 
-				}
-			}
-			ToolButton { implicitWidth: 8 }
-			ToolButton
-			{
-				width: 32; height: 32
-				tooltip: qsTr("Circle Corners")	//%%
-				Image
-				{
-					source: "image/circle_corner.png"
-					anchors.fill: parent
-				}
-				onClicked:
-				{
+					}
+				}
+				ToolButton
+				{
+					implicitHeight: 32; implicitWidth: 32
+					Image
+					{
+						source: "image/clipboard_past_icon&48.png"
+						anchors { fill: parent; margins: 4 }
+					}
+					onClicked:
+					{
 
-				}
-			}
-			ToolButton
-			{
-				width: 32; height: 32
-				Image
-				{
-					source: "image/circle_center.png"
-					anchors.fill: parent
-				}
-				onClicked:
-				{
+					}
+				}
+				ToolButton
+				{
+					implicitHeight: 32; implicitWidth: 32
+					Image
+					{
+						source: "image/br_up_icon&48.png"
+						anchors { fill: parent; margins: 4 }
+					}
+					onClicked:
+					{
 
-				}
-			}
-			ToolButton
-			{
-				width: 32; height: 32
-				Image
-				{
-					source: "image/circle_horizontal.png"
-					anchors.fill: parent
-				}
-				onClicked:
-				{
+					}
+				}
+				ToolButton
+				{
+					implicitHeight: 32; implicitWidth: 32
+					Image
+					{
+						source: "image/br_down_icon&48.png"
+						anchors { fill: parent; margins: 4 }
+					}
+					onClicked:
+					{
 
-				}
-			}
-			ToolButton
-			{
-				width: 32; height: 32
-				Image
-				{
-					source: "image/circle_vertical.png"
-					anchors.fill: parent
-				}
-				onClicked:
-				{
+					}
+				}
+				ToolButton
+				{
+					implicitHeight: 32; implicitWidth: 32
+					Image
+					{
+						source: "image/delete.png"
+						anchors { fill: parent; margins: 4 }
+					}
+					onClicked:
+					{
 
-				}
-			}
-			Item { Layout.fillWidth: true }
-			CheckBox
-			{
-				id: fillcheck
-				checked: fill
-				text: qsTr("Fill")	//%%
-				onClicked: { fill = !fill }
-			}
-			Item { Layout.fillWidth: true }
-			Label { text: qsTr("Alignment") }	//%%
-			ComboBox
-			{
-				id: alignlist
-				model: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
-				onCurrentIndexChanged:
-				{
+					}
+				}
+				Separator { }
+				Tool { tool: Editor.Tool.LineSingle; image: "image/line_single.png" }
+				Tool { tool: Editor.Tool.LinePoly; image: "image/line_poly.png" }
+				Separator { }
+				Tool { tool: Editor.Tool.RectangleCorner; image: "image/rectangle_corner.png" }
+				Tool { tool: Editor.Tool.RectangleCenter; image: "image/rectangle_center.png" }
+				Separator { }
+				Tool { tool: Editor.Tool.CircleCorner; image: "image/circle_corner.png" }
+				Tool { tool: Editor.Tool.CircleCenter; image: "image/circle_center.png" }
+				Tool { tool: Editor.Tool.CircleHorizontal; image: "image/circle_horizontal.png" }
+				Tool { tool: Editor.Tool.CircleVertical; image: "image/circle_vertical.png" }
+				Separator { }
+				Tool { tool: Editor.Tool.Text; image: "image/text.png" }
+			}
+			RowLayout
+			{
+				height: 32
+				Item { Layout.fillWidth: true }
+				CheckBox
+				{
+					id: fillcheck
+					checked: fillitem
+					text: qsTr("Fill")	//%%
+					onClicked: { fillitem = !fillitem }
+				}
+				Separator { }
+				Label { text: qsTr("Snap") }	//%%
+				ComboBox
+				{
+					id: snaplist
+					model: [ 1, 2, 5, 10 ]
+					onCurrentIndexChanged:
+					{
+						if ( currentIndex == 0 ) { snapgrid = 1 }
+						else if ( currentIndex == 1 ) { snapgrid = 2 }
+						else if ( currentIndex == 2 ) { snapgrid = 5 }
+						else if ( currentIndex == 3 ) { snapgrid = 10 }
+					}
+					function setSnap()
+					{
+						if ( snapgrid == 1 ) { currentIndex = 0 }
+						else if ( snapgrid == 2 ) { currentIndex = 1 }
+						else if ( snapgrid == 10 ) { currentIndex = 3 }
+						else { currentIndex = 2 }	// default 5
+					}
+				}
+				Separator { }
+				Label { text: qsTr("Line width") }	//%%
+				ComboBox
+				{
+					id: widthlist
+					model: [ 1, 2 ]
 /*
-					if ( currentIndex == 0 ) { snap = 1 }
-					else if ( currentIndex == 1 ) { snap = 2 }
-					else if ( currentIndex == 2 ) { snap = 5 }
-					else if ( currentIndex == 3 ) { snap = 10 }
+					onCurrentIndexChanged:
+					{
+						if ( currentIndex == 0 ) { snap = 1 }
+						else if ( currentIndex == 1 ) { snap = 2 }
+						else if ( currentIndex == 2 ) { snap = 5 }
+						else if ( currentIndex == 3 ) { snap = 10 }
+					}
+					function setSnap()
+					{
+						if ( snap == 1 ) { currentIndex = 0 }
+						else if ( snap == 2 ) { currentIndex = 1 }
+						else if ( snap == 10 ) { currentIndex = 3 }
+						else { currentIndex = 2 }	// default 5
+					}
 */
 				}
-				function setAlign()
+				Separator { }
+				Label { text: qsTr("Alignment") }	//%%
+				ComboBox
 				{
+					id: alignlist
+					model: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+					onCurrentIndexChanged:
+					{
 /*
-					if ( snap == 1 ) { currentIndex = 0 }
-					else if ( snap == 2 ) { currentIndex = 1 }
-					else if ( snap == 10 ) { currentIndex = 3 }
-					else { currentIndex = 2 }	// default 5
+						if ( currentIndex == 0 ) { snap = 1 }
+						else if ( currentIndex == 1 ) { snap = 2 }
+						else if ( currentIndex == 2 ) { snap = 5 }
+						else if ( currentIndex == 3 ) { snap = 10 }
 */
-				}
-			}
-			Label { text: qsTr("Snap") }	//%%
-			ComboBox
-			{
-				id: snaplist
-				model: [ 1, 2, 5, 10 ]
-				onCurrentIndexChanged:
-				{
-					if ( currentIndex == 0 ) { snap = 1 }
-					else if ( currentIndex == 1 ) { snap = 2 }
-					else if ( currentIndex == 2 ) { snap = 5 }
-					else if ( currentIndex == 3 ) { snap = 10 }
-				}
-				function setSnap()
-				{
-					if ( snap == 1 ) { currentIndex = 0 }
-					else if ( snap == 2 ) { currentIndex = 1 }
-					else if ( snap == 10 ) { currentIndex = 3 }
-					else { currentIndex = 2 }	// default 5
+					}
+					function setAlign()
+					{
+/*
+						if ( snap == 1 ) { currentIndex = 0 }
+						else if ( snap == 2 ) { currentIndex = 1 }
+						else if ( snap == 10 ) { currentIndex = 3 }
+						else { currentIndex = 2 }	// default 5
+*/
+					}
 				}
 			}
 		}
@@ -463,9 +467,10 @@ ApplicationWindow
 	onWidthChanged: { manager.setGeometry(Qt.point(x, y), Qt.size(width, height)) }
 	onHeightChanged: { manager.setGeometry(Qt.point(x, y), Qt.size(width, height)) }
 
-	onFillChanged: { manager.setFill(fill); }
-	onAlignChanged: { manager.setAlign(align); }
-	onSnapChanged: { manager.setSnap(snap); }
+	onFillitemChanged: { manager.setFillItem(fillitem); }
+	onAlignmentChanged: { manager.setAlignment(alignment); }
+	onLinewidthChanged: { manager.setLineWidth(linewidth * 10); }
+	onSnapgridChanged: { manager.setSnapGrid(snapgrid); }
 	onToolChanged: { manager.setTool(tool); }
 
 	Component.onCompleted:
@@ -475,9 +480,10 @@ ApplicationWindow
 		width = manager.getWindowSize().width
 		height = manager.getWindowSize().height
 
-		fill = manager.getFill()
-		align = manager.getAlign()
-		snap = manager.getSnap()
+		fillitem = manager.getFillItem()
+		alignment = manager.getAlignment()
+		linewidth = manager.getLineWidth() / 10
+		snapgrid = manager.getSnapGrid()
 		tool = manager.getTool()
 
 		alignlist.setAlign()
diff --git a/qml.qrc b/qml.qrc
index 253ab56..657071b 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -1,6 +1,7 @@
 <RCC>
     <qresource prefix="/">
         <file>main.qml</file>
+        <file>Tool.qml</file>
         <file>Editor.qml</file>
         <file>image/rectangle_center.png</file>
         <file>image/rectangle_corner.png</file>
@@ -13,5 +14,12 @@
         <file>image/clipboard_copy_icon&amp;48.png</file>
         <file>image/clipboard_cut_icon&amp;48.png</file>
         <file>image/clipboard_past_icon&amp;48.png</file>
+        <file>image/folder_open_icon&amp;48.png</file>
+        <file>image/save_icon&amp;48.png</file>
+        <file>image/br_down_icon&amp;48.png</file>
+        <file>image/br_up_icon&amp;48.png</file>
+        <file>image/text.png</file>
+        <file>image/delete.png</file>
+        <file>Separator.qml</file>
     </qresource>
 </RCC>
diff --git a/symedit.cpp b/symedit.cpp
index e41ec10..763f6bf 100644
--- a/symedit.cpp
+++ b/symedit.cpp
@@ -8,7 +8,7 @@
 //	settings functions
 //
 //! Constructor.
-SymEditSettings::SymEditSettings() : Fill(false), Align(9), Snap(5), Tool(1)
+SymEditSettings::SymEditSettings() : FillItem(false), Alignment(9), LineWidth(1), SnapGrid(5), Tool(1)
 {
 
 }
@@ -23,9 +23,10 @@ void SymEditSettings::Load()
 	Size.setWidth(settings.value("window/width", 500).toInt());
 	Size.setHeight(settings.value("window/height", 500).toInt());
 
-	Fill = settings.value("editor/fill", false).toBool();
-	Align = settings.value("editor/align", 9).toInt();
-	Snap = settings.value("editor/snap", 5).toInt();
+	FillItem = settings.value("editor/fill", false).toBool();
+	Alignment = settings.value("editor/align", 9).toInt();
+	LineWidth = settings.value("editor/width", 1).toInt();
+	SnapGrid = settings.value("editor/snap", 5).toInt();
 	Tool = settings.value("editor/tool", 1).toInt();
 }
 
@@ -39,9 +40,10 @@ void SymEditSettings::Save() const
 	settings.setValue("window/width", Size.width());
 	settings.setValue("window/height", Size.height());
 
-	settings.setValue("editor/fill", Fill);
-	settings.setValue("editor/align", Align);
-	settings.setValue("editor/snap", Snap);
+	settings.setValue("editor/fill", FillItem);
+	settings.setValue("editor/align", Alignment);
+	settings.setValue("editor/width", LineWidth);
+	settings.setValue("editor/snap", SnapGrid);
 	settings.setValue("editor/tool", Tool);
 }
 
@@ -102,9 +104,10 @@ QSize SymEditManager::getWindowSize() const
 /*!
 	\param value		Setting value.
 */
-void SymEditManager::setFill(bool value) { Settings.Fill = value; }
-void SymEditManager::setAlign(int value) { Settings.Align = value; }
-void SymEditManager::setSnap(int value) { Settings.Snap = value; }
+void SymEditManager::setFillItem(bool value) { Settings.FillItem = value; }
+void SymEditManager::setAlignment(int value) { Settings.Alignment = value; }
+void SymEditManager::setLineWidth(int value) { Settings.LineWidth = value; }
+void SymEditManager::setSnapGrid(int value) { Settings.SnapGrid = value; }
 void SymEditManager::setTool(int value) { Settings.Tool = value; }
 //@}
 
@@ -113,9 +116,10 @@ void SymEditManager::setTool(int value) { Settings.Tool = value; }
 /*!
 	\return				Setting value.
 */
-bool SymEditManager::getFill() const { return Settings.Fill; }
-int SymEditManager::getAlign() const { return Settings.Align; }
-int SymEditManager::getSnap() const { return Settings.Snap; }
+bool SymEditManager::getFillItem() const { return Settings.FillItem; }
+int SymEditManager::getAlignment() const { return Settings.Alignment; }
+int SymEditManager::getLineWidth() const { return Settings.LineWidth; }
+int SymEditManager::getSnapGrid() const { return Settings.SnapGrid; }
 int SymEditManager::getTool() const { return Settings.Tool; }
 //@}
 
diff --git a/symedit.h b/symedit.h
index 248bbc7..40c421d 100644
--- a/symedit.h
+++ b/symedit.h
@@ -23,9 +23,10 @@ private:
 	QPoint Position;						//!< Window position.
 	QSize Size;								//!< Window size.
 
-	bool Fill;								//!< Fill object.
-	int Align;								//!< Text alignment.
-	int Snap;								//!< Snap granularity.
+	bool FillItem;							//!< Fill object.
+	int Alignment;							//!< Text alignment.
+	int LineWidth;							//!< Line width.
+	int SnapGrid;							//!< Snap granularity.
 	int Tool;								//!< Current tool.
 };
 
@@ -46,15 +47,17 @@ public:
 	Q_INVOKABLE QPoint getWindowPos() const;
 	Q_INVOKABLE QSize getWindowSize() const;
 
-	Q_INVOKABLE void setFill(bool fill);
-	Q_INVOKABLE void setAlign(int align);
-	Q_INVOKABLE void setSnap(int snap);
+	Q_INVOKABLE void setFillItem(bool fill);
+	Q_INVOKABLE void setAlignment(int align);
+	Q_INVOKABLE void setLineWidth(int align);
+	Q_INVOKABLE void setSnapGrid(int snap);
 	Q_INVOKABLE void setTool(int tool);
 
-	Q_INVOKABLE bool getFill() const;
-	Q_INVOKABLE int getAlign() const;
+	Q_INVOKABLE bool getFillItem() const;
+	Q_INVOKABLE int getAlignment() const;
+	Q_INVOKABLE int getLineWidth() const;
+	Q_INVOKABLE int getSnapGrid() const;
 	Q_INVOKABLE int getTool() const;
-	Q_INVOKABLE int getSnap() const;
 
 	Q_INVOKABLE QString getSymbol() const;