Fixed hatch dialog, added snap/preview to circle tools.

[architektonas] / src / widgets / filedialog.cpp

diff --git a/src/widgets/filedialog.cpp b/src/widgets/filedialog.cpp
index 0ee35ddf6843dfb685fc752d51f1ea2ef88024c7..78c8a2452de41d22513bee7977dcd8478cba3dd9 100644 (file)
--- a/src/widgets/filedialog.cpp
+++ b/src/widgets/filedialog.cpp
@@ -19,7 +19,7 @@
 #include "drawing.h"
 #include "qg_graphicview.h"
 #include "settings.h"
-#include "rs_system.h"
+#include "system.h"
 
 /**
  * Shows a dialog for choosing a file name. Saving the file is up to
@@ -31,11 +31,11 @@
  * @return File name with path and extension to determine the file type
  *         or an empty string if the dialog was cancelled.
  */
-QString QG_FileDialog::getSaveFileName(QWidget * parent, RS2::FormatType * type)
+QString FileDialog::getSaveFileName(QWidget * parent, RS2::FormatType * type)
 {
        // read default settings:
        settings.beginGroup("Paths");
-       QString defDir = settings.value("/Save", RS_SYSTEM->getHomeDir()).toString();
+       QString defDir = settings.value("/Save", SYSTEM->getHomeDir()).toString();
        QString defFilter = settings.value("/SaveFilter", "Drawing Exchange DXF 2000 (*.dxf)").toString();
        //QString defFilter = "Drawing Exchange (*.dxf)";
        settings.endGroup();
@@ -153,28 +153,28 @@ QString QG_FileDialog::getSaveFileName(QWidget * parent, RS2::FormatType * type)
  * @return File name with path and extension to determine the file type
  *         or an empty string if the dialog was cancelled.
  */
-QString QG_FileDialog::getOpenFileName(QWidget * parent, RS2::FormatType * type)
+QString FileDialog::getOpenFileName(QWidget * parent, RS2::FormatType * type)
 {
-       RS_DEBUG->print("QG_FileDialog::getOpenFileName");
+       DEBUG->print("FileDialog::getOpenFileName");
 
        // read default settings:
        settings.beginGroup("/Paths");
-       QString defDir = settings.value("/Open", RS_SYSTEM->getHomeDir()).toString();
+       QString defDir = settings.value("/Open", SYSTEM->getHomeDir()).toString();
        //QString defFilter = RS_SETTINGS->readEntry("/OpenFilter",
        //                      "Drawing Exchange (*.dxf *.DXF)");
        QString defFilter = "Drawing Exchange (*.dxf *.DXF)";
        settings.endGroup();
 
-       RS_DEBUG->print("defDir: %s", defDir.toLatin1().data());
-       RS_DEBUG->print("defFilter: %s", defFilter.toLatin1().data());
+       DEBUG->print("defDir: %s", defDir.toLatin1().data());
+       DEBUG->print("defFilter: %s", defFilter.toLatin1().data());
 
        QString fDxf(QObject::tr("Drawing Exchange %1").arg("(*.dxf *.DXF)"));
        QString fDxf1(QObject::tr("QCad 1.x file %1").arg("(*.dxf *.DXF)"));
        QString fCxf(QObject::tr("Font %1").arg("(*.cxf)"));
 
-       RS_DEBUG->print("fDxf: %s", fDxf.toLatin1().data());
-       RS_DEBUG->print("fDxf1: %s", fDxf1.toLatin1().data());
-       RS_DEBUG->print("fCxf: %s", fCxf.toLatin1().data());
+       DEBUG->print("fDxf: %s", fDxf.toLatin1().data());
+       DEBUG->print("fDxf1: %s", fDxf1.toLatin1().data());
+       DEBUG->print("fCxf: %s", fCxf.toLatin1().data());
 
        QString fn = "";
        bool cancel = false;
@@ -206,7 +206,7 @@ QString QG_FileDialog::getOpenFileName(QWidget * parent, RS2::FormatType * type)
        QG_GraphicView * prev = new QG_GraphicView(parent);
        prev->setContainer(gr);
        prev->setBorders(1, 1, 1, 1);
-#warning "!!! QG_FileDialog: Commented out Qt3 previews !!!"
+#warning "!!! FileDialog: Commented out Qt3 previews !!!"
 //     fileDlg->setContentsPreviewEnabled(true);
 //     fileDlg->setContentsPreview(prev, prev);
 
@@ -251,8 +251,8 @@ QString QG_FileDialog::getOpenFileName(QWidget * parent, RS2::FormatType * type)
                settings.endGroup();
        }
 
-       RS_DEBUG->print("QG_FileDialog::getOpenFileName: fileName: %s", fn.toLatin1().data());
-       RS_DEBUG->print("QG_FileDialog::getOpenFileName: OK");
+       DEBUG->print("FileDialog::getOpenFileName: fileName: %s", fn.toLatin1().data());
+       DEBUG->print("FileDialog::getOpenFileName: OK");
 
        delete prev;
        delete gr;