Mercurial > ldforge / changeset

--- a/CMakeLists.txt	Fri Mar 23 16:14:04 2018 +0200
+++ b/CMakeLists.txt	Fri Mar 23 17:13:35 2018 +0200
@@ -14,6 +14,7 @@
 find_package (Qt5Core REQUIRED)
 find_package (Qt5OpenGL REQUIRED)
 find_package (Qt5Network REQUIRED)
+
 set (CMAKE_AUTOMOC ON)
 
 find_package (OpenGL REQUIRED)
@@ -42,7 +43,6 @@
 	src/headerhistorymodel.cpp
 	src/hierarchyelement.cpp
 	src/lddocument.cpp
-	src/ldpaths.cpp
 	src/librariesmodel.cpp
 	src/main.cpp
 	src/mainwindow.cpp
@@ -114,7 +114,6 @@
 	src/hierarchyelement.h
 	src/lddocument.h
 	src/ldobjectiterator.h
-	src/ldpaths.h
 	src/librariesmodel.h
 	src/macros.h
 	src/main.h

--- a/src/colors.cpp	Fri Mar 23 16:14:04 2018 +0200
+++ b/src/colors.cpp	Fri Mar 23 17:13:35 2018 +0200
@@ -19,7 +19,7 @@
 #include <QDir>
 #include <QMessageBox>
 #include "colors.h"
-#include "ldpaths.h"
+#include "main.h"
 
 ColorData* LDColor::colorData = nullptr;
 const LDColor LDColor::nullColor = -1;

--- a/src/ldpaths.cpp	Fri Mar 23 16:14:04 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-/*
- *  LDForge: LDraw parts authoring CAD
- *  Copyright (C) 2013 - 2017 Teemu Piippo
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QDir>
-#include "ldpaths.h"
-#include "mainwindow.h"
-#include "dialogs/ldrawpathdialog.h"
-
-LDPaths::LDPaths (Configuration *config, QObject* parent) :
-	QObject(parent),
-	m_config(config),
-	m_dialog(nullptr) {}
-
-/*
-void LDPaths::checkPaths()
-{
-	QString pathconfig = m_config->lDrawPath();
-
-	if (not configurePaths (pathconfig))
-	{
-		m_dialog = new LDrawPathDialog (pathconfig, false);
-		connect(m_dialog, &LDrawPathDialog::pathChanged, this, &LDPaths::configurePaths);
-
-		if (m_dialog->exec() != QDialog::Accepted)
-			exit(1);
-		else
-			m_config->setLDrawPath(m_dialog->path());
-	}
-}
-*/
-
-bool LDPaths::isValid (const QDir& dir) const
-{
-	if (dir.exists())
-	{
-		if (dir.isReadable())
-		{
-			QStringList mustHave = { "LDConfig.ldr", "parts", "p" };
-			QStringList contents = dir.entryList (mustHave);
-	
-			if (countof(contents) == countof(mustHave))
-				m_error = "";
-			else
-				m_error = "That is not an LDraw directory! It must<br />have LDConfig.ldr, parts/ and p/.";
-		}
-		else
-			m_error = "That directory cannot be read.";
-	}
-	else
-		m_error = "That directory does not exist.";
-	
-	return m_error.isEmpty();
-}
-
-
-bool LDPaths::configurePaths (QString path)
-{
-	QDir dir (path);
-	bool ok = isValid (dir);
-
-	if (ok)
-	{
-		baseDir() = dir;
-		ldConfigPath() = format ("%1" DIRSLASH "LDConfig.ldr", path);
-		partsDir() = QDir (path + DIRSLASH "parts");
-		primitivesDir() = QDir (path + DIRSLASH "p");
-	}
-
-	if (m_dialog)
-		m_dialog->setStatusText (m_error.isEmpty() ? "OK" : m_error, ok);
-
-	return ok;
-}
-
-
-QString& LDPaths::ldConfigPath()
-{
-	static QString value;
-	return value;
-}
-
-
-QDir& LDPaths::primitivesDir()
-{
-	static QDir value;
-	return value;
-}
-
-
-QDir& LDPaths::partsDir()
-{
-	static QDir value;
-	return value;
-}
-
-
-QDir& LDPaths::baseDir()
-{
-	static QDir value;
-	return value;
-}

--- a/src/ldpaths.h	Fri Mar 23 16:14:04 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- *  LDForge: LDraw parts authoring CAD
- *  Copyright (C) 2013 - 2017 Teemu Piippo
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#include "main.h"
-
-class QDir;
-class Configuration;
-
-class LDPaths : public QObject
-{
-	Q_OBJECT
-
-public:
-	LDPaths(Configuration* config, QObject* parent = nullptr);
-	// void checkPaths();
-	bool isValid (const class QDir& path) const;
-
-	static QDir& baseDir();
-	static QString& ldConfigPath();
-	static QDir& primitivesDir();
-	static QDir& partsDir();
-
-public slots:
-	bool configurePaths (QString path);
-
-private:
-	Configuration* m_config;
-	mutable QString m_error;
-	class LDrawPathDialog* m_dialog;
-};

--- a/src/main.cpp	Fri Mar 23 16:14:04 2018 +0200
+++ b/src/main.cpp	Fri Mar 23 17:13:35 2018 +0200
@@ -18,7 +18,6 @@
 
 #include <QApplication>
 #include "crashCatcher.h"
-#include "ldpaths.h"
 #include "documentmanager.h"
 #include "mainwindow.h"
 #include "generics/reverse.h"
@@ -37,11 +36,6 @@
 
 	static Configuration configObject;
 	config = &configObject;
-	/*
-	LDPaths* paths = new LDPaths(&configObject);
-	paths->checkPaths();
-	paths->deleteLater();
-	*/
 
 	initializeCrashHandler();
 	LDColor::initColors();

--- a/src/primitives.cpp	Fri Mar 23 16:14:04 2018 +0200
+++ b/src/primitives.cpp	Fri Mar 23 17:13:35 2018 +0200
@@ -23,7 +23,6 @@
 #include "primitives.h"
 #include "miscallenous.h"
 #include "colors.h"
-#include "ldpaths.h"
 #include "documentmanager.h"
 #include "linetypes/comment.h"
 #include "linetypes/conditionaledge.h"