Merge branch 'develop'

Author: psycha0s

CMakeLists.txt

@@ -53,8 +53,8 @@ set(CMAKE_MODULE_PATH
 )
 
 # Configure the VST SDK path
-set(VSTSDK_PATH ${PROJECT_SOURCE_DIR}/vstsdk2.4 CACHE PATH
-	"Path to the Steinberg VST 2.4 SDK")
+set(VSTSDK_PATH ${PROJECT_SOURCE_DIR}/VST3\ SDK CACHE PATH
+	"Path to the Steinberg VST Audio Plugins SDK")
 
 message(STATUS "VSTSDK_PATH is set to " ${VSTSDK_PATH})
 
@@ -63,7 +63,7 @@ find_path(VSTSDK_INCLUDE_DIR NAMES aeffect.h aeffectx.h
 
 if(NOT VSTSDK_INCLUDE_DIR)
 	message(FATAL_ERROR "VST SDK is not found. You should set the VSTSDK_PATH variable "
-			"to te location where your copy the VST SDK ")
+			"to the directory, where your copy of the VST SDK is located.")
 endif()
 
 message(STATUS "VST SDK headers are found in ${VSTSDK_INCLUDE_DIR}")

src/manager/forms/linkdialog.cpp

@@ -36,9 +36,7 @@ void LinkDialog::setItem(LinkItem* item)
 	item_ = item;
 
 	if(item) {
-		nameEdit_->setText(item->name());
 		locationEdit_->setText(item->location());
-		targetEdit_->setText(item->target());
 
 		int index = prefixCombo_->findText(item->prefix());
 		prefixCombo_->setCurrentIndex(index);
@@ -48,6 +46,9 @@ void LinkDialog::setItem(LinkItem* item)
 
 		index = static_cast<int>(item->logLevel()) + 1;
 		logLevelCombo_->setCurrentIndex(index);
+
+		nameEdit_->setText(item->name());
+		targetEdit_->setText(item->target());
 	}
 	else {
 		nameEdit_->clear();
@@ -178,7 +179,11 @@ void LinkDialog::browsePlugin()
 	}
 
 	if(dialog.exec()) {
-		int length = prefixInfo.absoluteFilePath().length() + 1; // Take '/' into account
+		QString prefixPath = prefixInfo.absoluteFilePath();
+		int length = prefixPath.length();
+		if(!prefixPath.endsWith('/'))
+			length++;
+
 		targetEdit_->setText(dialog.selectedPath().mid(length));
 
 		QString name = dialog.selectedName();

src/manager/forms/loaderdialog.cpp

@@ -4,6 +4,7 @@
 #include <QGridLayout>
 #include <QIcon>
 #include <QLabel>
+#include <QMessageBox>
 #include "core/application.h"
 #include "forms/filedialog.h"
 #include "models/loadersmodel.h"
@@ -99,16 +100,28 @@ void LoaderDialog::setItem(LoaderItem* item)
 
 void LoaderDialog::accept()
 {
+	QString name = nameEdit_->text();
+	QString message = QString("The loader with name '%1' is already exist.").arg(name);
+
 	if(!item_) {
 		if(!qApp->loaders()->createLoader(nameEdit_->text(), pathEdit_->text())) {
-			// TODO messagebox
+			QMessageBox::critical(this, "Error", message);
 			return;
 		}
 	}
-	else {
+	else if(name != item_->name()) {
+		Storage::Loader loader = qApp->storage()->loader(name.toStdString());
+		if(!loader.isNull()) {
+			QMessageBox::critical(this, "Error", message);
+			return;
+		}
+
 		item_->setName(nameEdit_->text());
 		item_->setPath(pathEdit_->text());
 	}
+	else {
+		item_->setPath(pathEdit_->text());
+	}
 
 	QDialog::accept();
 }

src/manager/forms/prefixdialog.cpp

@@ -4,14 +4,16 @@
 #include <QGridLayout>
 #include <QIcon>
 #include <QLabel>
+#include <QMessageBox>
 #include "core/application.h"
 #include "forms/filedialog.h"
 #include "models/prefixesmodel.h"
 #include "widgets/lineedit.h"
 
 
 PrefixDialog::PrefixDialog(QWidget* parent) :
-	QDialog(parent)
+	QDialog(parent),
+	item_(nullptr)
 {
 	setupUi();
 }
@@ -77,35 +79,50 @@ void PrefixDialog::browseForWinePrefix()
 }
 
 
-QString PrefixDialog::name() const
+PrefixItem* PrefixDialog::item() const
 {
-	return nameEdit_->text();
+	return item_;
 }
 
 
-void PrefixDialog::setName(const QString& name)
+void PrefixDialog::setItem(PrefixItem* item)
 {
-	nameEdit_->setText(name);
-}
-
+	item_ = item;
 
-QString PrefixDialog::path() const
-{
-	return pathEdit_->text();
-}
-
-
-void PrefixDialog::setPath(const QString& path)
-{
-	pathEdit_->setText(path);
+	if(item_) {
+		nameEdit_->setText(item->name());
+		pathEdit_->setText(item->path());
+	}
+	else {
+		nameEdit_->clear();
+		pathEdit_->clear();
+	}
 }
 
 
 void PrefixDialog::accept()
 {
-	if(!qApp->prefixes()->createPrefix(nameEdit_->text(), pathEdit_->text())) {
-		// TODO messagebox
-		return;
+	QString name = nameEdit_->text();
+	QString message = QString("The prefix with name '%1' is already exist.").arg(name);
+
+	if(!item_) {
+		if(!qApp->prefixes()->createPrefix(nameEdit_->text(), pathEdit_->text())) {
+			QMessageBox::critical(this, "Error", message);
+			return;
+		}
+	}
+	else if(name != item_->name()) {
+		Storage::Prefix prefix = qApp->storage()->prefix(name.toStdString());
+		if(!prefix.isNull()) {
+			QMessageBox::critical(this, "Error", message);
+			return;
+		}
+
+		item_->setName(nameEdit_->text());
+		item_->setPath(pathEdit_->text());
+	}
+	else {
+		item_->setPath(pathEdit_->text());
 	}
 
 	QDialog::accept();

src/manager/forms/prefixdialog.h

@@ -6,24 +6,22 @@
 
 class QDialogButtonBox;
 class LineEdit;
+class PrefixItem;
 
 
 class PrefixDialog : public QDialog {
 	Q_OBJECT
 public:
 	PrefixDialog(QWidget* parent = nullptr);
 
-	QString name() const;
-	void setName(const QString& name);
-
-	QString path() const;
-	void setPath(const QString& path);
-
+	PrefixItem* item() const;
+	void setItem(PrefixItem* item);
 
 private:
 	LineEdit* nameEdit_;
 	LineEdit* pathEdit_;
 	QDialogButtonBox* buttons_;
+	PrefixItem* item_;
 
 	void setupUi();
 

src/manager/forms/settingsdialog.cpp

@@ -247,13 +247,8 @@ void SettingsDialog::editPrefix()
 	}
 
 	PrefixDialog dialog;
-	dialog.setName(item->name());
-	dialog.setPath(item->path());
-
-	if(dialog.exec()) {
-		item->setName(dialog.name());
-		item->setPath(dialog.path());
-	}
+	dialog.setItem(item);
+	dialog.exec();
 }
 
 

src/manager/models/directorymodel.cpp

@@ -6,7 +6,8 @@
 
 
 DirectoryItem::DirectoryItem(const QFileInfo& info) :
-	info_(info)
+	info_(info),
+	type_(getType())
 {
 }
 
@@ -56,6 +57,34 @@ QString DirectoryItem::humanReadableSize() const
 }
 
 
+QString DirectoryItem::type() const
+{
+	return type_;
+}
+
+
+QString DirectoryItem::getType() const
+{
+	if(info_.isRoot())
+		return "Drive";
+
+	if(info_.isFile()) {
+		if(!info_.suffix().isEmpty())
+			return QString("%1 File").arg(info_.suffix());
+
+		return "File";
+	}
+
+	if(info_.isDir())
+		return "Folder";
+
+	if(info_.isSymLink())
+		return "Shortcut";
+
+	return "Unknown";
+}
+
+
 DirectoryModel::DirectoryModel(QObject* parent) :
 	GenericTreeModel<DirectoryItem>(new DirectoryItem(), parent),
 	filters_(QDir::AllEntries),
@@ -85,12 +114,14 @@ QVariant DirectoryModel::data(const QModelIndex& index, int role) const
 				return item->name();
 			}
 			else if(column == 1) {
-				if(!item->isDirectory())
+				if(!item->isDirectory()) {
 					return item->humanReadableSize();
+				}
+
+				return "<DIR>";
 			}
 			else if(column == 2) {
-			}
-			else if(column == 3) {
+				return item->type();
 			}
 		}
 		else if(role == Qt::DecorationRole && index.column() == 0) {

src/manager/models/directorymodel.h

@@ -19,9 +19,13 @@ class DirectoryItem : public GenericTreeItem<DirectoryItem> {
 	i64 size() const;
 
 	QString humanReadableSize() const;
+	QString type() const;
 
 private:
 	QFileInfo info_;
+	QString type_;
+
+	QString getType() const;
 };