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

fixing naming

Browse Source
This commit is contained in:
Alister
2021-12-25 18:11:44 +00:00
parent c76b8c2463
commit 57618d3858
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/noggit/application/ApplicationEntry.cpp
View File

@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
auto noggit = Noggit::Application::NoggitApplication::instance();
noggit->Initalize(argc, argv);
auto projectSelectionPage = std::make_unique<Noggit::Ui::Windows::noggitRedProjectPage>(noggit);
auto projectSelectionPage = std::make_unique<Noggit::Ui::Windows::NoggitProjectSelectionWindow>(noggit);
projectSelectionPage->show();
return qApplication.exec();

6
src/noggit/application/NoggitApplication.hpp
View File

@@ -10,7 +10,7 @@
#include <noggit/application/Configuration/NoggitApplicationConfiguration.hpp>
#include <noggit/application/Configuration/NoggitApplicationConfigurationReader.hpp>
#include <noggit/application/Configuration/NoggitApplicationConfigurationWriter.hpp>
#include <noggit/ui/windows/projectSelection/noggitredprojectpage.h>
#include <noggit/ui/windows/projectSelection/NoggitProjectSelectionWindow.h>
#include <memory>
#include <string>
#include <vector>
@@ -31,7 +31,7 @@
namespace Noggit::Ui::Windows
{
class noggitRedProjectPage;
class NoggitProjectSelectionWindow;
}
namespace Noggit::Application {
@@ -55,7 +55,7 @@ namespace Noggit::Application {
NoggitApplication() = default;
std::shared_ptr<Noggit::Application::NoggitApplicationConfiguration> _applicationConfiguration;
std::unique_ptr<Noggit::Ui::Windows::noggitRedProjectPage> projectSelectionPage;
std::unique_ptr<Noggit::Ui::Windows::NoggitProjectSelectionWindow> projectSelectionPage;
std::shared_ptr<BlizzardArchive::ClientData> _client_data;
};

8
src/noggit/ui/windows/projectSelection/noggitredprojectpage.cpp → src/noggit/ui/windows/projectSelection/NoggitProjectSelectionWindow.cpp
View File

@@ -1,4 +1,4 @@
#include <noggit/ui/windows/projectSelection/noggitredprojectpage.h>
#include <noggit/ui/windows/projectSelection/NoggitProjectSelectionWindow.h>
#include <noggit/ui/windows/projectSelection/components/ExistingProjectEnumerationComponent.hpp>
#include <noggit/ui/windows/projectSelection/components/CreateProjectComponent.hpp>
#include "ui_noggit-red-project-page.h"
@@ -10,9 +10,9 @@
namespace Noggit::Ui::Windows
{
noggitRedProjectPage::noggitRedProjectPage(Noggit::Application::NoggitApplication* noggitApplication, QWidget* parent)
NoggitProjectSelectionWindow::NoggitProjectSelectionWindow(Noggit::Application::NoggitApplication* noggitApplication, QWidget* parent)
: QMainWindow(parent)
, ui(new ::Ui::noggitRedProjectPage),
, ui(new ::Ui::NoggitProjectSelectionWindow),
_noggitApplication(noggitApplication)
{
setWindowFlags(Qt::Window | Qt::MSWindowsFixedSizeDialogHint);
@@ -57,7 +57,7 @@ namespace Noggit::Ui::Windows
);
}
noggitRedProjectPage::~noggitRedProjectPage()
NoggitProjectSelectionWindow::~NoggitProjectSelectionWindow()
{
delete ui;
}

10
src/noggit/ui/windows/projectSelection/noggitredprojectpage.h → src/noggit/ui/windows/projectSelection/NoggitProjectSelectionWindow.h
View File

@@ -12,7 +12,7 @@
#include <noggit/ui/windows/projectCreation/projectcreationdialog.h>
QT_BEGIN_NAMESPACE
namespace Ui { class noggitRedProjectPage; }
namespace Ui { class NoggitProjectSelectionWindow; }
QT_END_NAMESPACE
namespace Noggit::Ui::Component
@@ -29,19 +29,19 @@ namespace Noggit::Application
namespace Noggit::Ui::Windows
{
class noggitRedProjectPage : public QMainWindow
class NoggitProjectSelectionWindow : public QMainWindow
{
Q_OBJECT
friend Component::ExistingProjectEnumerationComponent;
friend Component::CreateProjectComponent;
friend Component::LoadProjectComponent;
public:
noggitRedProjectPage(Noggit::Application::NoggitApplication* noggitApplication, QWidget* parent = nullptr);
~noggitRedProjectPage();
NoggitProjectSelectionWindow(Noggit::Application::NoggitApplication* noggitApplication, QWidget* parent = nullptr);
~NoggitProjectSelectionWindow();
private:
Noggit::Application::NoggitApplication* _noggitApplication;
::Ui::noggitRedProjectPage* ui;
::Ui::NoggitProjectSelectionWindow* ui;
Noggit::Ui::settings* _settings;
std::unique_ptr<Noggit::Ui::main_window> projectSelectionPage;

4
src/noggit/ui/windows/projectSelection/noggit-red-project-page.ui → src/noggit/ui/windows/projectSelection/NoggitProjectSelectionWindow.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>noggitRedProjectPage</class>
<widget class="QMainWindow" name="noggitRedProjectPage">
<class>NoggitProjectSelectionWindow</class>
<widget class="QMainWindow" name="NoggitProjectSelectionWindow">
<property name="windowModality">
<enum>Qt::NonModal</enum>
</property>

6
src/noggit/ui/windows/projectSelection/components/CreateProjectComponent.hpp
View File

@@ -2,15 +2,15 @@
#define NOGGIT_COMPONENT_CREATE_PROJECT_HPP
#include <noggit/project/ApplicationProject.h>
#include <noggit/ui/windows/projectSelection/noggitredprojectpage.h>
#include <noggit/ui/windows/projectSelection/NoggitProjectSelectionWindow.h>
namespace Noggit::Ui::Component
{
class CreateProjectComponent
{
friend Windows::noggitRedProjectPage;
friend Windows::NoggitProjectSelectionWindow;
public:
void CreateProject(Noggit::Ui::Windows::noggitRedProjectPage* parent, ProjectInformation& projectInformation)
void CreateProject(Noggit::Ui::Windows::NoggitProjectSelectionWindow* parent, ProjectInformation& projectInformation)
{
auto applicationConfiguration = parent->_noggitApplication->GetConfiguration();
auto applicationProjectsFolderPath = std::filesystem::path(applicationConfiguration->ApplicationProjectPath);

6
src/noggit/ui/windows/projectSelection/components/ExistingProjectEnumerationComponent.hpp
View File

@@ -3,16 +3,16 @@
#include <noggit/project/ApplicationProject.h>
#include <noggit/ui/windows/projectSelection/widgets/ProjectListItem.hpp>
#include <noggit/ui/windows/projectSelection/noggitredprojectpage.h>
#include <noggit/ui/windows/projectSelection/NoggitProjectSelectionWindow.h>
#include "ui_noggit-red-project-page.h"
namespace Noggit::Ui::Component
{
class ExistingProjectEnumerationComponent
{
friend Windows::noggitRedProjectPage;
friend Windows::NoggitProjectSelectionWindow;
public:
void BuildExistingProjectList(Noggit::Ui::Windows::noggitRedProjectPage* parent)
void BuildExistingProjectList(Noggit::Ui::Windows::NoggitProjectSelectionWindow* parent)
{
parent->ui->listView->clear();

6
src/noggit/ui/windows/projectSelection/components/LoadProjectComponent.hpp
View File

@@ -2,15 +2,15 @@
#define NOGGIT_COMPONENT_LOAD_PROJECT_HPP
#include <noggit/project/ApplicationProject.h>
#include <noggit/ui/windows/projectSelection/noggitredprojectpage.h>
#include <noggit/ui/windows/projectSelection/NoggitProjectSelectionWindow.h>
namespace Noggit::Ui::Component
{
class LoadProjectComponent
{
friend Windows::noggitRedProjectPage;
friend Windows::NoggitProjectSelectionWindow;
public:
std::shared_ptr<Project::NoggitProject> LoadProject(Noggit::Ui::Windows::noggitRedProjectPage* parent)
std::shared_ptr<Project::NoggitProject> LoadProject(Noggit::Ui::Windows::NoggitProjectSelectionWindow* parent)
{
QModelIndex index = parent->ui->listView->currentIndex();
auto applicationConfiguration = parent->_noggitApplication->GetConfiguration();