natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor

Browse Source 
-disabling window resize
-removing unused components
-moving widget into its own folder
This commit is contained in:
Alister
2021-12-25 14:55:42 +00:00
parent 238830a5f9
commit b0b0392187
4 changed files with 136 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/noggit/ui/windows/projectSelection/noggitredprojectpage.cpp
View File

@@ -1,5 +1,4 @@
#include <noggit/ui/windows/projectSelection/noggitredprojectpage.h>
#include "ui_noggit-red-project-page.h"
#include <filesystem>
#include <qstringlistmodel.h>
@@ -13,15 +12,15 @@ namespace Noggit::Ui::Windows
, ui(new ::Ui::noggitRedProjectPage),
_noggitApplication(noggitApplication)
{
setWindowFlags(Qt::Window | Qt::MSWindowsFixedSizeDialogHint);
ui->setupUi(this);
_settings = new Noggit::Ui::settings(this);
_existingProjectEnumerationComponent = std::make_unique<Noggit::Ui::Component::ExistingProjectEnumerationComponent>();
auto applicationConfiguration = _noggitApplication->GetConfiguration();
auto applicationProjectsFolderPath = std::filesystem::path(applicationConfiguration->ApplicationProjectPath);
auto existingProjects = _existingProjectEnumerationComponent->EnumerateExistingProjects(applicationProjectsFolderPath);
BuildExistingProjectList();
QObject::connect(ui->button_create_new_project, &QPushButton::clicked
@@ -38,8 +37,6 @@ namespace Noggit::Ui::Windows
applicationProjectService.CreateProject(projectPath, projectReference.GameClientPath, projectReference.GameClientVersion, projectReference.ProjectName);
}
auto existingProjects = _existingProjectEnumerationComponent->EnumerateExistingProjects(applicationProjectsFolderPath);
BuildExistingProjectList();
}
);
@@ -47,6 +44,7 @@ namespace Noggit::Ui::Windows
QObject::connect(ui->button_open_existing_project, &QPushButton::clicked
, [=]
{
_settings->show();
return;
}
);
@@ -64,6 +62,7 @@ namespace Noggit::Ui::Windows
Noggit::Application::NoggitApplication::instance()->clientData(_selectedProject->ClientData);
close();
projectSelectionPage = std::make_unique<Noggit::Ui::main_window>(_noggitApplication->GetConfiguration(), _selectedProject);
projectSelectionPage->showMaximized();
}
@@ -86,13 +85,13 @@ namespace Noggit::Ui::Windows
auto projectReader = Noggit::Project::ApplicationProjectReader();
auto project = projectReader.ReadProject(dirEntry);
auto projectData = ProjectListItemData();
auto projectData = Noggit::Ui::Component::ProjectListItemData();
projectData.ProjectVersion = project.ProjectVersion;
projectData.ProjectDirectory = QString::fromStdString(dirEntry.path().generic_string());
projectData.ProjectName = QString::fromStdString(project.ProjectName);
projectData.ProjectLastEdited = QDateTime::currentDateTime().date().toString();
auto projectListItem = new ProjectListItem(projectData, ui->listView);
auto projectListItem = new Noggit::Ui::Component::ProjectListItem(projectData, ui->listView);
item->setData(Qt::UserRole, QVariant(projectData.ProjectName));
item->setSizeHint(projectListItem->minimumSizeHint());

115
src/noggit/ui/windows/projectSelection/noggitredprojectpage.h
View File

@@ -10,7 +10,7 @@
#include <noggit/application/NoggitApplication.hpp>
#include <noggit/ui/windows/mainWindow/main_window.hpp>
#include <noggit/ui/windows/projectCreation/projectcreationdialog.h>
#include <noggit/ui/windows/projectSelection/components/_projectSelectionComponent.hpp>
#include <noggit/ui/windows/projectSelection/widgets/ProjectListItem.hpp>
QT_BEGIN_NAMESPACE
namespace Ui { class noggitRedProjectPage; }
@@ -20,114 +20,8 @@ namespace Noggit::Application {
class NoggitApplication;
}
namespace Noggit::Ui::Windows
{
struct ProjectListItemData
{
QString ProjectName;
QString ProjectDirectory;
QString ProjectLastEdited;
Project::ProjectVersion ProjectVersion;
};
class ProjectListItem : public QWidget
{
Q_OBJECT
private:
QLabel* project_version_icon;
QLabel* project_name_label;
QLabel* project_directory_label;
QLabel* project_version_label;
QLabel* project_last_edited_label;
public:
ProjectListItem(const ProjectListItemData& data, QWidget* parent = nullptr) : QWidget(parent)
{
auto layout = QGridLayout();
QIcon icon;
if(data.ProjectVersion == Project::ProjectVersion::WOTLK)
icon = QIcon(":/icon-wrath");
if (data.ProjectVersion == Project::ProjectVersion::SL)
icon = QIcon(":/icon-shadow");
project_version_icon = new QLabel("", parent);
project_version_icon->setPixmap(icon.pixmap(QSize(48, 48)));
project_version_icon->setGeometry(0, 5, 64, 48);
auto projectName = toCamelCase(QString(data.ProjectName));
project_name_label = new QLabel(projectName, parent);
project_name_label->setGeometry(45, 5, 125, 20);
project_name_label->setObjectName("project-title-label");
project_name_label->setStyleSheet("QLabel#project-title-label { font-size: 15px; }");
project_directory_label = new QLabel(data.ProjectDirectory, parent);
project_directory_label->setGeometry(48, 20, 125, 20);
project_directory_label->setObjectName("project-information");
project_directory_label->setStyleSheet("QLabel#project-information { font-size: 10px; }");
auto directoryEffect = new QGraphicsOpacityEffect(this);
directoryEffect->setOpacity(0.5);
project_directory_label->setGraphicsEffect(directoryEffect);
project_directory_label->setAutoFillBackground(true);
QString version;
if (data.ProjectVersion == Project::ProjectVersion::WOTLK)
version = "Wrath Of The Lich King";
if (data.ProjectVersion == Project::ProjectVersion::SL)
version = "Shadowlands";
project_version_label = new QLabel(version, parent);
project_version_label->setGeometry(48, 35, 125, 20);
project_version_label->setObjectName("project-information");
project_version_label->setStyleSheet("QLabel#project-information { font-size: 10px; }");
auto versionEffect = new QGraphicsOpacityEffect(this);
versionEffect->setOpacity(0.5);
project_version_label->setGraphicsEffect(versionEffect);
project_version_label->setAutoFillBackground(true);
auto width = parent->sizeHint().width();
project_last_edited_label = new QLabel(data.ProjectLastEdited, parent);
project_last_edited_label->setGeometry(width, 35, 125, 20);
project_last_edited_label->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
project_last_edited_label->setObjectName("project-information");
project_last_edited_label->setStyleSheet("QLabel#project-information { font-size: 10px; }");
auto lastEditedEffect = new QGraphicsOpacityEffect(this);
lastEditedEffect->setOpacity(0.5);
project_last_edited_label->setGraphicsEffect(lastEditedEffect);
project_last_edited_label->setAutoFillBackground(true);
layout.addWidget(project_version_icon);
layout.addWidget(project_name_label);
layout.addWidget(project_directory_label);
layout.addWidget(project_version_label);
layout.addWidget(project_last_edited_label);
setLayout(layout.layout());
}
QSize minimumSizeHint() const override
{
return QSize(125, 55);
}
QString toCamelCase(const QString& s)
{
QStringList parts = s.split(' ', QString::SkipEmptyParts);
for (int i = 0; i < parts.size(); ++i)
parts[i].replace(0, 1, parts[i][0].toUpper());
return parts.join(" ");
}
};
class noggitRedProjectPage : public QMainWindow
{
Q_OBJECT
@@ -139,13 +33,10 @@ namespace Noggit::Ui::Windows
private:
Noggit::Application::NoggitApplication* _noggitApplication;
::Ui::noggitRedProjectPage* ui;
std::unique_ptr<Ui::Component::ExistingProjectEnumerationComponent> _existingProjectEnumerationComponent;
std::shared_ptr<Noggit::Project::NoggitProject> _selectedProject;
Noggit::Ui::settings* _settings;
std::unique_ptr<Noggit::Ui::main_window> projectSelectionPage;
std::shared_ptr<Noggit::Project::NoggitProject> _selectedProject;
std::unique_ptr<Noggit::Ui::main_window> projectSelectionPage;
void BuildExistingProjectList();
};

87
src/noggit/ui/windows/projectSelection/widgets/ProjectListItem .cpp Normal file
View File

@@ -0,0 +1,87 @@
#include <noggit/ui/windows/projectSelection/widgets/ProjectListItem.hpp>
namespace Noggit::Ui::Component
{
ProjectListItem::ProjectListItem(const ProjectListItemData& data, QWidget* parent = nullptr) : QWidget(parent)
{
auto layout = QGridLayout();
QIcon icon;
if (data.ProjectVersion == Project::ProjectVersion::WOTLK)
icon = QIcon(":/icon-wrath");
if (data.ProjectVersion == Project::ProjectVersion::SL)
icon = QIcon(":/icon-shadow");
project_version_icon = new QLabel("", parent);
project_version_icon->setPixmap(icon.pixmap(QSize(48, 48)));
project_version_icon->setGeometry(0, 5, 64, 48);
auto projectName = toCamelCase(QString(data.ProjectName));
project_name_label = new QLabel(projectName, parent);
project_name_label->setGeometry(45, 5, 125, 20);
project_name_label->setObjectName("project-title-label");
project_name_label->setStyleSheet("QLabel#project-title-label { font-size: 15px; }");
project_directory_label = new QLabel(data.ProjectDirectory, parent);
project_directory_label->setGeometry(48, 20, 125, 20);
project_directory_label->setObjectName("project-information");
project_directory_label->setStyleSheet("QLabel#project-information { font-size: 10px; }");
auto directoryEffect = new QGraphicsOpacityEffect(this);
directoryEffect->setOpacity(0.5);
project_directory_label->setGraphicsEffect(directoryEffect);
project_directory_label->setAutoFillBackground(true);
QString version;
if (data.ProjectVersion == Project::ProjectVersion::WOTLK)
version = "Wrath Of The Lich King";
if (data.ProjectVersion == Project::ProjectVersion::SL)
version = "Shadowlands";
project_version_label = new QLabel(version, parent);
project_version_label->setGeometry(48, 35, 125, 20);
project_version_label->setObjectName("project-information");
project_version_label->setStyleSheet("QLabel#project-information { font-size: 10px; }");
auto versionEffect = new QGraphicsOpacityEffect(this);
versionEffect->setOpacity(0.5);
project_version_label->setGraphicsEffect(versionEffect);
project_version_label->setAutoFillBackground(true);
auto width = parent->sizeHint().width();
project_last_edited_label = new QLabel(data.ProjectLastEdited, parent);
project_last_edited_label->setGeometry(width, 35, 125, 20);
project_last_edited_label->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
project_last_edited_label->setObjectName("project-information");
project_last_edited_label->setStyleSheet("QLabel#project-information { font-size: 10px; }");
auto lastEditedEffect = new QGraphicsOpacityEffect(this);
lastEditedEffect->setOpacity(0.5);
project_last_edited_label->setGraphicsEffect(lastEditedEffect);
project_last_edited_label->setAutoFillBackground(true);
layout.addWidget(project_version_icon);
layout.addWidget(project_name_label);
layout.addWidget(project_directory_label);
layout.addWidget(project_version_label);
layout.addWidget(project_last_edited_label);
setLayout(layout.layout());
}
QSize ProjectListItem::minimumSizeHint() const
{
return QSize(125, 55);
}
QString ProjectListItem::toCamelCase(const QString& s)
{
QStringList parts = s.split(' ', QString::SkipEmptyParts);
for (int i = 0; i < parts.size(); ++i)
parts[i].replace(0, 1, parts[i][0].toUpper());
return parts.join(" ");
}
}

39
src/noggit/ui/windows/projectSelection/widgets/ProjectListItem.hpp Normal file
View File

@@ -0,0 +1,39 @@
#ifndef NOGGIT_COMPONENT_PROJECT_LIST_ITEM_HPP
#define NOGGIT_COMPONENT_PROJECT_LIST_ITEM_HPP
#include <QMenuBar>
#include <QAction>
#include <qgraphicseffect.h>
#include <QString>
#include <QWidget>
#include <noggit/application/NoggitApplication.hpp>
#include <noggit/ui/windows/mainWindow/main_window.hpp>
namespace Noggit::Ui::Component
{
struct ProjectListItemData
{
QString ProjectName;
QString ProjectDirectory;
QString ProjectLastEdited;
Project::ProjectVersion ProjectVersion;
};
class ProjectListItem : public QWidget
{
Q_OBJECT
private:
QLabel* project_version_icon;
QLabel* project_name_label;
QLabel* project_directory_label;
QLabel* project_version_label;
QLabel* project_last_edited_label;
public:
ProjectListItem(const ProjectListItemData& data, QWidget* parent);
QSize minimumSizeHint() const override;
private:
QString toCamelCase(const QString& s);
};
}
#endif //NOGGIT_COMPONENT_PROJECT_LIST_ITEM_HPP