X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmainapp%2Fapplicationwindow.cpp;h=42c90ccc72190f1325e2832dd608fe06b5a61449;hb=e5a77a32dbe17d9534d3099f1fd3fdacba199516;hp=a0cb9716f692ba6e7b93d507f5852e674542e883;hpb=52b41ea9bcb03acb96393b36fe29f27ca0163565;p=architektonas

diff --git a/src/mainapp/applicationwindow.cpp b/src/mainapp/applicationwindow.cpp
index a0cb971..42c90cc 100644
--- a/src/mainapp/applicationwindow.cpp
+++ b/src/mainapp/applicationwindow.cpp
@@ -3,7 +3,9 @@
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // Extensively rewritten and refactored by James L. Hammons
-// (C) 2010 Underground Software
+// Portions copyright (C) 2001-2003 RibbonSoft
+// Copyright (C) 2010 Underground Software
+// See the README and GPLv2 files for licensing and warranty information
 //
 // JLH = James L. Hammons <jlhamm@acm.org>
 //
@@ -17,9 +19,9 @@
 #include "applicationwindow.h"
 
 #include <fstream>
-#include "rs_actiondrawlinefree.h"
-#include "rs_actionlibraryinsert.h"
-#include "rs_actionprintpreview.h"
+#include "actiondrawlinefree.h"
+#include "actionlibraryinsert.h"
+#include "actionprintpreview.h"
 #include "rs_creation.h"
 #include "rs_dialogfactory.h"
 #include "rs_dimaligned.h"
@@ -30,7 +32,7 @@
 #include "rs_hatch.h"
 #include "rs_insert.h"
 #include "rs_image.h"
-#include "paintintf.h"
+#include "paintinterface.h"
 #include "rs_script.h"
 #include "rs_scriptlist.h"
 #include "settings.h"
@@ -56,10 +58,11 @@
 #include "mousewidget.h"
 #include "selectionwidget.h"
 
-#include "mdiwindow.h"
-#include "qc_dialogfactory.h"
 #include "createqtactions.h"
+#include "qc_dialogfactory.h"
+#include "qg_graphicview.h"
 #include "main.h"
+#include "mdiwindow.h"
 
 ApplicationWindow * ApplicationWindow::appWindow = NULL;
 
@@ -89,6 +92,7 @@ ApplicationWindow::ApplicationWindow():
 //	setIcon(qPixmapFromMimeSource(QC_APP_ICON));
 //	setWindowIcon(qPixmapFromMimeSource(QC_APP_ICON));
 	setWindowIcon(QIcon(":/res/" QC_APP_ICON));
+	CreateQtActions(this);
 
 	RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating action handler");
 	actionHandler = new QG_ActionHandler(this);
@@ -257,7 +261,7 @@ void ApplicationWindow::slotInsertBlock(const QString & name)
 
 	if (graphicView && document)
 	{
-		RS_ActionLibraryInsert * action = new RS_ActionLibraryInsert(*document, *graphicView);
+		ActionLibraryInsert * action = new ActionLibraryInsert(*document, *graphicView);
 		action->setFile(name);
 		graphicView->setCurrentAction(action);
 	}
@@ -359,7 +363,6 @@ void ApplicationWindow::initMDI()
 void ApplicationWindow::initActions()
 {
 	RS_DEBUG->print("ApplicationWindow::initActions()");
-	CreateQtActions(this);
 
 	//
 	// File actions:
@@ -1900,6 +1903,7 @@ MDIWindow * ApplicationWindow::slotFileNew(RS_Document * doc)
 	RS_DEBUG->print("  adding listeners");
 	Drawing * graphic = w->getDocument()->getGraphic();
 
+#if 0
 	if (graphic != NULL)
 	{
 		// Link the graphic's layer list to the pen tool bar
@@ -1909,6 +1913,7 @@ MDIWindow * ApplicationWindow::slotFileNew(RS_Document * doc)
 		// Link the block list to the block widget
 		graphic->addBlockListListener(blockWidget);
 	}
+#endif
 
 	// Link the dialog factory to the mouse widget:
 	QG_DIALOGFACTORY->setMouseWidget(mouseWidget);
@@ -2594,20 +2599,22 @@ void ApplicationWindow::slotFilePrintPreview(bool on)
 				w->setWindowIcon(QIcon(":/res/document.png"));
 				w->getGraphicView()->setPrintPreview(true);
 				w->getGraphicView()->setBackground(RS_Color(255, 255, 255));
-				w->getGraphicView()->setDefaultAction(new RS_ActionPrintPreview(*w->getDocument(), *w->getGraphicView()));
+				w->getGraphicView()->setDefaultAction(new ActionPrintPreview(*w->getDocument(), *w->getGraphicView()));
 
 				// only graphics offer block lists, blocks don't
 				RS_DEBUG->print("  adding listeners");
 				Drawing * graphic = w->getDocument()->getGraphic();
 
-				if (graphic != NULL)
+				if (graphic)
 				{
+#if 0
 					// Link the layer list to the pen tool bar
 					graphic->addLayerListListener(penToolBar);
 					// Link the layer list to the layer widget
 					graphic->addLayerListListener(layerWidget);
 					// Link the block list to the block widget
 					graphic->addBlockListListener(blockWidget);
+#endif
 					// Center by default:
 					graphic->centerToPage();
 				}
@@ -3337,8 +3344,8 @@ void ApplicationWindow::slotTestDrawFreehand()
     //Drawing* g = document->getMarking();
     /*
 
-       RS_ActionDrawLineFree* action =
-          new RS_ActionDrawLineFree(*document->getGraphic(),
+       ActionDrawLineFree* action =
+          new ActionDrawLineFree(*document->getGraphic(),
                                     *graphicView);
 
        for (int i=0; i<100; ++i) {