X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmainapp%2Fapplicationwindow.cpp;h=42c90ccc72190f1325e2832dd608fe06b5a61449;hb=e5a77a32dbe17d9534d3099f1fd3fdacba199516;hp=e91576fcfeb078a2e4a75823032e8651a75bb338;hpb=3b479913b79032e514ce8c74ba915c6c91ab0f15;p=architektonas diff --git a/src/mainapp/applicationwindow.cpp b/src/mainapp/applicationwindow.cpp index e91576f..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 // @@ -17,9 +19,9 @@ #include "applicationwindow.h" #include -#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" @@ -48,6 +50,7 @@ #include "qg_colorbox.h" #include "qg_filedialog.h" #include "qg_pentoolbar.h" +#include "recentfiles.h" #include "cadtoolbar.h" #include "cadtoolbarmain.h" #include "coordinatewidget.h" @@ -55,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; @@ -88,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); @@ -251,12 +256,12 @@ void ApplicationWindow::slotInsertBlock(const QString & name) statusBar()->showMessage(tr("Inserting block '%1'").arg(name), 2000); - RS_GraphicView * graphicView = getGraphicView(); + GraphicView * graphicView = getGraphicView(); RS_Document * document = getDocument(); - if (graphicView != NULL && document != NULL) + if (graphicView && document) { - RS_ActionLibraryInsert * action = new RS_ActionLibraryInsert(*document, *graphicView); + ActionLibraryInsert * action = new ActionLibraryInsert(*document, *graphicView); action->setFile(name); graphicView->setCurrentAction(action); } @@ -358,7 +363,6 @@ void ApplicationWindow::initMDI() void ApplicationWindow::initActions() { RS_DEBUG->print("ApplicationWindow::initActions()"); - CreateQtActions(this); // // File actions: @@ -1262,7 +1266,7 @@ void ApplicationWindow::initMenuBar() // menuBar()->insertItem(tr("De&bugging"), testMenu); menuBar()->addMenu(testMenu); - recentFiles = new QG_RecentFiles(this, fileMenu); + recentFiles = new RecentFiles(this, fileMenu); } /** @@ -1544,49 +1548,18 @@ void ApplicationWindow::initView() } }*/ -#warning "!!! ApplicationWindow::updateRecentFilesMenu() is DEPRECATED !!!" -/** - * Updates the recent file list in the file menu. - */ -void ApplicationWindow::updateRecentFilesMenu() -{ - RS_DEBUG->print("ApplicationWindow::updateRecentFilesMenu()"); - RS_DEBUG->print("Updating recent file menu..."); - -#if 0 - for(int i=0; igetNumber(); ++i) - { - QString label = QString("&%1 %2").arg(i + 1).arg(recentFiles->get(i)); - - if (fileMenu->findItem(i)) - { - RS_DEBUG->print("Changeing item %d", i); - fileMenu->changeItem(i, label); - } - else if (i < int(recentFiles->count())) - { - RS_DEBUG->print("Adding item %d", i); - fileMenu->insertItem(label, this, SLOT(slotFileOpenRecent(int)), 0, i); - } - } -#else -//#warning "!!! Need to fix ApplicationWindow::updateRecentFilesMenu() !!!" - recentFiles->UpdateGUI(); -#endif -} - /** * Goes back to the previous menu or one step in the current action. */ void ApplicationWindow::slotBack() { - RS_GraphicView * graphicView = getGraphicView(); + GraphicView * graphicView = getGraphicView(); - if (graphicView != NULL) + if (graphicView) graphicView->back(); else { - if (cadToolBar != NULL) + if (cadToolBar) cadToolBar->showToolBar(RS2::ToolBarMain); } } @@ -1596,15 +1569,15 @@ void ApplicationWindow::slotBack() */ void ApplicationWindow::slotEnter() { - if (commandWidget == NULL || !commandWidget->checkFocus()) + if (!commandWidget || !commandWidget->checkFocus()) { - if (cadToolBar != NULL) + if (cadToolBar) cadToolBar->forceNext(); else { - RS_GraphicView * graphicView = getGraphicView(); + GraphicView * graphicView = getGraphicView(); - if (graphicView != NULL) + if (graphicView) graphicView->enter(); } } @@ -1657,7 +1630,7 @@ void ApplicationWindow::slotWindowActivated(QMdiSubWindow * /*w*/) if (m) RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "ApplicationWindow::slotWindowActivated m->getDoc=%08X", m->getDocument()); - if (m != NULL && m->getDocument() != NULL) + if (m && m->getDocument()) { //m->setWindowState(WindowMaximized); @@ -1930,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 @@ -1939,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); @@ -2624,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(); } @@ -2748,7 +2725,7 @@ void ApplicationWindow::slotViewDraft(bool toggle) */ void ApplicationWindow::redrawAll() { - if (workspace != NULL) + if (workspace) { QList windows = workspace->subWindowList(); @@ -2756,11 +2733,11 @@ void ApplicationWindow::redrawAll() { MDIWindow * m = (MDIWindow *)windows.at(i); - if (m != NULL) + if (m) { QG_GraphicView * gv = m->getGraphicView(); - if (gv != NULL) + if (gv) gv->redraw(); } } @@ -2772,7 +2749,7 @@ void ApplicationWindow::redrawAll() */ void ApplicationWindow::updateGrids() { - if (workspace != NULL) + if (workspace) { QList windows = workspace->subWindowList(); @@ -2780,11 +2757,11 @@ void ApplicationWindow::updateGrids() { MDIWindow * m = (MDIWindow *)windows.at(i); - if (m != NULL) + if (m) { QG_GraphicView * gv = m->getGraphicView(); - if (gv != NULL) + if (gv) gv->updateGrid(); } } @@ -2924,11 +2901,11 @@ void ApplicationWindow::slotOptionsGeneral() { MDIWindow * m = (MDIWindow *)windows.at(i); - if (m != NULL) + if (m) { QG_GraphicView * gv = m->getGraphicView(); - if (gv != NULL) + if (gv) { gv->setBackground(color); gv->setGridColor(gridColor); @@ -3367,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) { @@ -3508,9 +3485,9 @@ void ApplicationWindow::slotTestInsertBlock() ins->update(); graphic->addEntity(ins); - RS_GraphicView * v = getGraphicView(); + GraphicView * v = getGraphicView(); - if (v != NULL) + if (v) v->redraw(); } } @@ -3650,7 +3627,7 @@ void ApplicationWindow::slotTestInsertEllipse() } */ - RS_GraphicView * v = getGraphicView(); + GraphicView * v = getGraphicView(); if (v != NULL) v->redraw(); @@ -3752,7 +3729,7 @@ void ApplicationWindow::slotTestInsertText() RS2::SolidLine)); graphic->addEntity(s); - RS_GraphicView* v = getGraphicView(); + GraphicView* v = getGraphicView(); if (v!=NULL) { v->redraw(); } @@ -3902,7 +3879,7 @@ void ApplicationWindow::slotTestMath01() // Vector(6.0,cos(x_0)-sin(x_0)*(6.0-x_0)))); - RS_GraphicView* v = getGraphicView(); + GraphicView* v = getGraphicView(); if (v!=NULL) { v->redraw(); } @@ -3994,6 +3971,7 @@ bool ApplicationWindow::queryExit(bool force) */ void ApplicationWindow::keyPressEvent(QKeyEvent * e) { +#warning "!!! keyPressEvent(): Do we need this anymore? !!!" // timer static QTime ts = QTime(); static QString firstKey = ""; @@ -4007,13 +3985,12 @@ void ApplicationWindow::keyPressEvent(QKeyEvent * e) case Qt::Key_Alt: case Qt::Key_CapsLock: { -// Q3MainWindow::keyPressEvent(e); QMainWindow::keyPressEvent(e); // forward to actions: - RS_GraphicView * graphicView = getGraphicView(); + GraphicView * graphicView = getGraphicView(); - if (graphicView != NULL) + if (graphicView) graphicView->keyPressEvent(e); e->accept(); @@ -4101,9 +4078,9 @@ void ApplicationWindow::keyReleaseEvent(QKeyEvent * e) QMainWindow::keyReleaseEvent(e); // forward to actions: - RS_GraphicView * graphicView = getGraphicView(); + GraphicView * graphicView = getGraphicView(); - if (graphicView != NULL) + if (graphicView) graphicView->keyReleaseEvent(e); e->accept(); @@ -4139,7 +4116,7 @@ MDIWindow * ApplicationWindow::getMDIWindow() { RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "ApplicationWindow::getMDIWindow: workspace=%08X", workspace); - if (workspace != NULL) + if (workspace) { RS_DEBUG->print("ApplicationWindow::getMDIWindow: activeSubWindow=%08X", workspace->activeSubWindow()); return (MDIWindow *)workspace->activeSubWindow(); @@ -4155,14 +4132,11 @@ MDIWindow * ApplicationWindow::getMDIWindow() * @return Pointer to the graphic view of the currently active document * window or NULL if no window is available. */ -/*virtual*/ RS_GraphicView * ApplicationWindow::getGraphicView() +/*virtual*/ GraphicView * ApplicationWindow::getGraphicView() { MDIWindow * m = getMDIWindow(); - if (m != NULL) - return m->getGraphicView(); - - return NULL; + return (m ? m->getGraphicView() : NULL); } /** @@ -4175,10 +4149,7 @@ MDIWindow * ApplicationWindow::getMDIWindow() { MDIWindow * m = getMDIWindow(); - if (m != NULL) - return m->getDocument(); - - return NULL; + return (m ? m->getDocument() : NULL); } /** @@ -4189,7 +4160,7 @@ MDIWindow * ApplicationWindow::getMDIWindow() { slotFileNew(doc); - if (fileName != QString::null && getDocument() != NULL) + if (fileName != QString::null && getDocument()) getDocument()->setFilename(fileName); }