Start of bringing back missing forms/dialogs

[architektonas] / src / mainapp / main.cpp

diff --git a/src/mainapp/main.cpp b/src/mainapp/main.cpp
index 3c0a154addb8199b70feae5b6beafe8c445d8580..558465c7e0de30b4992aed95ee96c3d518dfcbaf 100644 (file)
--- a/src/mainapp/main.cpp
+++ b/src/mainapp/main.cpp
@@ -145,7 +145,8 @@ int main(int argc, char * argv[])
 //     QPixmap * pixmap = new QPixmap(qPixmapFromMimeSource(QC_CUSTOM_SPLASH));
 //# else
 ////   QPixmap * pixmap = new QPixmap(":/res/splash.xpm");
-       QPixmap * pixmap = new QPixmap(":/res/splash_qcad.xpm");
+//     QPixmap * pixmap = new QPixmap(":/res/splash_qcad.xpm");
+       QPixmap * pixmap = new QPixmap(":/res/splash.png");
 //# endif
 
 /*
@@ -366,7 +367,7 @@ QStringList handleArgs(int argc, char * argv[])
        if (machine.isEmpty() == false && input.isEmpty() == false && output.isEmpty() == false)
        {
                RS_FilterCAM fc;
-               RS_Graphic gr;
+               Drawing gr;
                RS_FILEIO->fileImport(gr, input, RS2::FormatUnknown);
                RS_CamDialog dlg(gr, NULL);
                dlg.activateMachineGenerator(machine);