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

diff --git a/src/mainapp/applicationwindow.cpp b/src/mainapp/applicationwindow.cpp
index 7e3e989..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"
@@ -259,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);
 	}
@@ -1901,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
@@ -1910,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);
@@ -2595,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();
 				}
@@ -3338,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) {