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

changing variable names

Browse Source
This commit is contained in:
Alister
2021-12-29 13:35:28 +00:00
parent 8bdc22a089
commit eae095f23c
3 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/noggit/ui/windows/noggitWindow/widgets/MapListItem.cpp
View File

@@ -28,26 +28,29 @@ namespace Noggit::Ui::Widget
if (data.ExpansionId == 8)
icon = QIcon(":/icon-shadow");
project_version_icon = new QLabel("", parent);
project_version_icon->setPixmap(icon.pixmap(QSize(32, 32)));
project_version_icon->setGeometry(0, 0, 32, 32);
project_version_icon->setObjectName("project-icon-label");
project_version_icon->setStyleSheet("QLabel#project-icon-label { font-size: 12px; padding: 0px;}");
map_icon = new QLabel("", parent);
map_icon->setPixmap(icon.pixmap(QSize(32, 32)));
map_icon->setGeometry(0, 0, 32, 32);
map_icon->setObjectName("project-icon-label");
map_icon->setStyleSheet("QLabel#project-icon-label { font-size: 12px; padding: 0px;}");
auto projectName = toCamelCase(QString(data.MapName));
project_name_label = new QLabel(projectName, parent);
project_name_label->setGeometry(32, 0, 300, 20);
project_name_label->setObjectName("project-title-label");
project_name_label->setStyleSheet("QLabel#project-title-label { font-size: 12px; }");
map_name = new QLabel(projectName, parent);
map_name->setGeometry(32, 0, 300, 20);
map_name->setObjectName("project-title-label");
map_name->setStyleSheet("QLabel#project-title-label { font-size: 12px; }");
project_directory_label = new QLabel(QString::number(data.MapId), parent);
project_directory_label->setGeometry(32, 15, 300, 20);
project_directory_label->setObjectName("project-information");
project_directory_label->setStyleSheet("QLabel#project-information { font-size: 10px; }");
map_id = new QLabel(QString::number(data.MapId), parent);
map_id->setGeometry(32, 15, 300, 20);
map_id->setObjectName("project-information");
map_id->setStyleSheet("QLabel#project-information { font-size: 10px; }");
auto directoryEffect = new QGraphicsOpacityEffect(this);
directoryEffect->setOpacity(0.5);
map_id->setGraphicsEffect(directoryEffect);
map_id->setAutoFillBackground(true);
auto instanceType = QString("Unknown");
if (data.MapTypeId == 0)
instanceType = QString("Continent");
@@ -62,20 +65,17 @@ namespace Noggit::Ui::Widget
if (data.MapTypeId == 5)
instanceType = QString("Scenario");
project_directory_label->setGraphicsEffect(directoryEffect);
project_directory_label->setAutoFillBackground(true);
project_last_edited_label = new QLabel( instanceType,this);
project_last_edited_label->setGeometry(150, 15, 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; }");
map_instance_type = new QLabel( instanceType,this);
map_instance_type->setGeometry(150, 15, 125, 20);
map_instance_type->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
map_instance_type->setObjectName("project-information");
map_instance_type->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);
map_instance_type->setGraphicsEffect(lastEditedEffect);
map_instance_type->setAutoFillBackground(true);
if(data.Pinned)
{
@@ -98,10 +98,10 @@ namespace Noggit::Ui::Widget
setContextMenuPolicy(Qt::CustomContextMenu);
layout.addWidget(project_version_icon);
layout.addWidget(project_name_label);
layout.addWidget(project_directory_label);
layout.addWidget(project_last_edited_label);
layout.addWidget(map_icon);
layout.addWidget(map_name);
layout.addWidget(map_id);
layout.addWidget(map_instance_type);
setLayout(layout.layout());
}

9
src/noggit/ui/windows/noggitWindow/widgets/MapListItem.hpp
View File

@@ -24,11 +24,10 @@ namespace Noggit::Ui::Widget
{
Q_OBJECT
private:
QLabel* project_version_icon;
QLabel* project_name_label;
QLabel* project_directory_label;
QLabel* project_version_label;
QLabel* project_last_edited_label;
QLabel* map_icon;
QLabel* map_name;
QLabel* map_id;
QLabel* map_instance_type;
QLabel* map_pinned_label;
int _maxWidth;
public:

2
src/noggit/ui/windows/projectSelection/NoggitProjectSelectionWindow.cpp
View File

@@ -69,7 +69,7 @@ namespace Noggit::Ui::Windows
QMessageBox prompt;
prompt.setWindowIcon(QIcon(":/icon"));
prompt.setWindowTitle("Delete Project");
prompt.setIcon(QMessageBox::Critical);
prompt.setIcon(QMessageBox::Warning);
prompt.setWindowFlags(Qt::WindowStaysOnTopHint);
prompt.setText("Deleting project will remove all saved data.");
prompt.addButton("Accept", QMessageBox::AcceptRole);