X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=8c114c8d045c43723dbdd81d7e492a4d89f770e3;hb=d00cd5f46252ca0fb3df6e8191dc75f8991b2aa2;hp=47f8149634a40942d86940167bb6afbd7b1eed86;hpb=fce575a51ba1f26418869c20e63b9f388e118ab6;p=architektonas

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index 47f8149..8c114c8 100644
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -31,6 +31,7 @@
 #include <QPrintPreviewDialog>
 #include "about.h"
 #include "blockwidget.h"
+#include "commandprocessor.h"
 #include "consolewidget.h"
 #include "drawingview.h"
 #include "fileio.h"
@@ -80,7 +81,7 @@ ApplicationWindow::ApplicationWindow():
 	dock3->setWidget(ow);
 	addDockWidget(Qt::RightDockWidgetArea, dock3);
 	QDockWidget * dock4 = new QDockWidget(tr("Command"), this);
-	ConsoleWidget * cw = new ConsoleWidget;
+	cw = new ConsoleWidget;
 	dock4->setWidget(cw);
 	addDockWidget(Qt::BottomDockWidgetArea, dock4);
 
@@ -108,6 +109,8 @@ ApplicationWindow::ApplicationWindow():
 
 	connect(drawing, SIGNAL(ObjectHovered(Object *)), ow, SLOT(ShowInfo(Object *)));
 	connect(drawing, SIGNAL(NeedZoomUpdate()), this, SLOT(UpdateZoom()));
+
+	connect(cw->cmdProc, SIGNAL(UpdateNeeded()), this, SLOT(UpdateFromCommand()));
 }
 
 void ApplicationWindow::closeEvent(QCloseEvent * event)
@@ -153,7 +156,8 @@ void ApplicationWindow::FileNew(void)
 	drawing->dirty = false;
 	drawing->update();
 	documentName.clear();
-	setWindowTitle("Architektonas - Untitled");
+//	setWindowTitle("Architektonas - Untitled");
+	setWindowFilePath(documentName);
 	statusBar()->showMessage(tr("New drawing is ready."));
 }
 
@@ -361,6 +365,12 @@ void ApplicationWindow::MoveToLayer(void)
 	drawing->update();
 }
 
+void ApplicationWindow::UpdateFromCommand(void)
+{
+	cw->SetToolPrompt();
+	drawing->update();
+}
+
 void ApplicationWindow::SnapToGridTool(void)
 {
 	Global::snapToGrid = snapToGridAct->isChecked();
@@ -433,6 +443,7 @@ void ApplicationWindow::ParallelTool(void)
 {
 	ClearUIToolStatesExcept(parallelAct);
 	SetInternalToolStates();
+	Global::toolSuppressCrosshair = true;
 }
 
 void ApplicationWindow::TriangulateTool(void)
@@ -539,7 +550,7 @@ void ApplicationWindow::ClearUIToolStatesExcept(QAction * exception)
 	QAction * actionList[] = {
 		addArcAct, addLineAct, addCircleAct, addDimensionAct, addPolygonAct,
 		addSplineAct, deleteAct, rotateAct, mirrorAct, trimAct,
-		triangulateAct, 0
+		triangulateAct, parallelAct, 0
 	};
 
 	for(int i=0; actionList[i]!=0; i++)
@@ -585,6 +596,7 @@ void ApplicationWindow::SetInternalToolStates(void)
 	else
 		Global::tool = TTNone;
 
+	cw->SetToolPrompt();//cw->cmdline);
 	drawing->update();
 }
 
@@ -907,7 +919,7 @@ void ApplicationWindow::CreateActions(void)
 	trimAct = CreateAction(tr("&Trim"), tr("Trim"), tr("Trim extraneous lines from selected objects."), QIcon(":/res/trim-tool.png"), QKeySequence("t,r"), true);
 	connect(trimAct, SIGNAL(triggered()), this, SLOT(TrimTool()));
 
-	parallelAct = CreateAction(tr("&Parallel"), tr("Parallel"), tr("Create copies of objects parallel to the original."), QIcon(":/res/parallel-tool.png"), QKeySequence("p,a"), true);
+	parallelAct = CreateAction(tr("&Parallel"), tr("Parallel"), tr("Create copies of objects parallel to the original."), QIcon(":/res/parallel-tool.png"), QKeySequence("p,l"), true);
 	connect(parallelAct, SIGNAL(triggered()), this, SLOT(ParallelTool()));
 
 	triangulateAct = CreateAction(tr("&Triangulate"), tr("Triangulate"), tr("Make triangles from selected lines, preserving their lengths."), QIcon(":/res/triangulate-tool.png"), QKeySequence("t,g"), true);
@@ -1095,9 +1107,6 @@ void ApplicationWindow::CreateToolbars(void)
 	toolbar->setObjectName(tr("Pen"));
 	toolbar->addWidget(pw);
 	connect(drawing, SIGNAL(ObjectSelected(Object *)), pw, SLOT(SetFields(Object *)));
-	connect(pw, SIGNAL(WidthSelected(float)), drawing, SLOT(HandlePenWidth(float)));
-	connect(pw, SIGNAL(StyleSelected(int)), drawing, SLOT(HandlePenStyle(int)));
-	connect(pw, SIGNAL(ColorSelected(uint32_t)), drawing, SLOT(HandlePenColor(uint32_t)));
 	connect(pw->tbStamp, SIGNAL(triggered(QAction *)), drawing, SLOT(HandlePenStamp(QAction *)));
 	connect(pw->tbDropper, SIGNAL(triggered(QAction *)), drawing, SLOT(HandlePenDropper(QAction *)));
 }