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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	resources/resources.qrc
This commit is contained in:
sshumakov3
2020-11-16 00:34:47 +03:00
parent 48b209d10e 3226ff2ae1
commit 684980c6da
4 changed files with 243 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/Font Awesome 5 Pro-Regular-400.otf Normal file
View File

Binary file not shown.

7
src/noggit/ui/FramelessWindow.hpp
View File

@@ -25,15 +25,16 @@ namespace noggit::ui
titleBarWidget->windowTitle->setText(window->windowTitle());
titleBarWidget->iconButton->setAccessibleName("titlebar_icon");
titleBarWidget->iconButton->setMinimumWidth(32);
titleBarWidget->minimizeButton->setIcon(font_awesome_icon(font_awesome::windowminimize));
titleBarWidget->minimizeButton->setIconSize(QSize(14, 14));
titleBarWidget->minimizeButton->setIconSize(QSize(16, 16));
titleBarWidget->minimizeButton->setAccessibleName("titlebar_minimize");
titleBarWidget->maximizeButton->setIcon(font_awesome_icon(font_awesome::windowrestore));
titleBarWidget->maximizeButton->setIcon(font_awesome_icon(font_awesome::windowmaximize));
titleBarWidget->maximizeButton->setAccessibleName("titlebar_maximize");
titleBarWidget->maximizeButton->setIconSize(QSize(14, 14));
titleBarWidget->closeButton->setIcon(font_awesome_icon(font_awesome::times));
titleBarWidget->closeButton->setAccessibleName("titlebar_close");
titleBarWidget->closeButton->setIconSize(QSize(16, 16));
titleBarWidget->closeButton->setIconSize(QSize(18, 18));
QObject::connect(titleBarWidget->closeButton,
&QPushButton::clicked,

22
src/noggit/ui/TitleBar.ui
View File

@@ -31,10 +31,16 @@
</property>
<item>
<widget class="QLabel" name="iconButton">
<property name="minimumSize">
<size>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>26</width>
<height>26</height>
<width>28</width>
<height>28</height>
</size>
</property>
<property name="styleSheet">
@@ -109,8 +115,8 @@
</property>
<property name="iconSize">
<size>
<width>45</width>
<height>30</height>
<width>32</width>
<height>32</height>
</size>
</property>
</widget>
@@ -151,8 +157,8 @@
</property>
<property name="iconSize">
<size>
<width>45</width>
<height>30</height>
<width>32</width>
<height>32</height>
</size>
</property>
</widget>
@@ -192,8 +198,8 @@
</property>
<property name="iconSize">
<size>
<width>45</width>
<height>30</height>
<width>32</width>
<height>32</height>
</size>
</property>
</widget>

450
src/noggit/ui/texture_palette_small.cpp
View File

@@ -1,225 +1,225 @@
// This file is part of Noggit3, licensed under GNU General Public License (version 3).
#include <noggit/ui/texture_palette_small.hpp>
#include <noggit/ui/font_awesome.hpp>
#include <noggit/ui/TexturingGUI.h>
#include <noggit/ui/CurrentTexture.h>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QListWidget>
#include <QtWidgets/QListWidgetItem>
#include <QtWidgets/QApplication>
#include <QtGui/QDropEvent>
#include <QtGui/QMouseEvent>
#include <QtGui/QDragEnterEvent>
#include <QtGui/QDrag>
#include <QMimeData>
#include <unordered_set>
#include <string>
#include <algorithm>
namespace noggit
{
namespace ui
{
PaletteList::PaletteList(QWidget* parent) : QListWidget(parent)
{
setIconSize(QSize(100, 100));
setViewMode(QListWidget::IconMode);
setFlow(QListWidget::LeftToRight);
setWrapping(false);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setSelectionMode(QAbstractItemView::SingleSelection);
setAcceptDrops(false);
}
void PaletteList::mousePressEvent(QMouseEvent* event)
{
if (event->button() == Qt::LeftButton)
_start_pos = event->pos();
QListWidget::mousePressEvent(event);
}
void PaletteList::mouseMoveEvent(QMouseEvent* event)
{
QListWidget::mouseMoveEvent(event);
if (!(event->buttons() & Qt::LeftButton))
return;
if ((event->pos() - _start_pos).manhattanLength()
< QApplication::startDragDistance())
return;
const QList<QListWidgetItem*> selected_items = selectedItems();
for (auto item : selected_items)
{
QMimeData* mimeData = new QMimeData;
mimeData->setText("tileset/" + item->toolTip());
QDrag* drag = new QDrag(this);
drag->setMimeData(mimeData);
drag->setPixmap(item->icon().pixmap(100, 100));
drag->exec();
return; // we assume only one item can be selected
}
}
texture_palette_small::texture_palette_small (QWidget* parent)
: widget(parent)
, layout(new ::QGridLayout(this)
)
{
setWindowTitle("Quick Access Texture Palette");
setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint);
setMinimumSize(100, 100);
setAcceptDrops(true);
_texture_paths = std::unordered_set<std::string>();
_texture_list = new PaletteList(this);
layout->addWidget(_texture_list, 0, 0);
connect(_texture_list, &QListWidget::itemClicked
, this
, [=](QListWidgetItem* item)
{
emit selected("tileset/" + item->toolTip().toStdString());
}
);
QVBoxLayout* button_layout = new QVBoxLayout(this);
_add_button = new QPushButton(this);
_add_button->setIcon(font_awesome_icon(font_awesome::plus));
button_layout->addWidget(_add_button);
connect(_add_button, &QAbstractButton::clicked, this, &texture_palette_small::addTexture);
_remove_button = new QPushButton(this);
_remove_button->setIcon(font_awesome_icon(font_awesome::timescircle));
button_layout->addWidget(_remove_button);
connect(_remove_button, &QAbstractButton::clicked, this, &texture_palette_small::removeSelectedTexture);
layout->addLayout(button_layout, 0, 1);
updateWidget();
}
void texture_palette_small::addTexture()
{
if (_texture_paths.size() > 12)
return;
std::string filename;
if (noggit::ui::selected_texture::get())
filename = noggit::ui::selected_texture::get().get()->filename;
else
filename = "tileset\\generic\\black.blp";
addTextureByFilename(filename);
}
void texture_palette_small::addTextureByFilename(const std::string& filename)
{
if (_texture_paths.size() > 12)
return;
QString display_name = QString(filename.c_str()).remove("tileset/");
for (auto path : _texture_paths)
if (path == display_name.toStdString())
return;
_texture_paths.emplace(display_name.toStdString());
QListWidgetItem* list_item = new QListWidgetItem(_texture_list);
list_item->setIcon(*BLPRenderer::getInstance().render_blp_to_pixmap(filename, _texture_list->iconSize().width(), _texture_list->iconSize().height()));
list_item->setToolTip(display_name);
list_item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled);
updateWidget();
_texture_list->addItem(list_item);
if (_texture_paths.size() == 12)
_add_button->setDisabled(true);
}
void texture_palette_small::removeTexture(QString filename)
{
filename.remove("tileset/");
QList<QListWidgetItem*> tilesets = _texture_list->findItems(filename, Qt::MatchExactly);
for (auto tileset : tilesets)
if (tileset->toolTip() == filename)
{
_texture_paths.erase(filename.toStdString());
_texture_list->removeItemWidget(tileset);
_add_button->setDisabled(false);
delete tileset;
updateWidget();
return;
}
}
void texture_palette_small::removeSelectedTexture()
{
QList<QListWidgetItem*> selected_items = _texture_list->selectedItems();
for (auto item : selected_items)
{
for (auto path : _texture_paths)
if (path == item->toolTip().toStdString())
{
_texture_paths.erase(path);
_texture_list->removeItemWidget(item);
_add_button->setDisabled(false);
delete item;
updateWidget();
return;
}
}
}
void texture_palette_small::updateWidget()
{
setFixedSize(QSize(std::max(static_cast<size_t>(170 * 3), 65 + (106 * _texture_paths.size())), 132));
}
void texture_palette_small::dragEnterEvent(QDragEnterEvent* event)
{
if (event->mimeData()->hasText()
&& _texture_paths.size() < 12
&& (_texture_paths.find(event->mimeData()->text().remove("tileset/").toStdString()) == _texture_paths.end())
)
event->accept();
}
void texture_palette_small::dropEvent(QDropEvent* event)
{
addTextureByFilename(event->mimeData()->text().toStdString());
event->accept();
}
}
}
// This file is part of Noggit3, licensed under GNU General Public License (version 3).
#include <noggit/ui/texture_palette_small.hpp>
#include <noggit/ui/font_awesome.hpp>
#include <noggit/ui/TexturingGUI.h>
#include <noggit/ui/CurrentTexture.h>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QListWidget>
#include <QtWidgets/QListWidgetItem>
#include <QtWidgets/QApplication>
#include <QtGui/QDropEvent>
#include <QtGui/QMouseEvent>
#include <QtGui/QDragEnterEvent>
#include <QtGui/QDrag>
#include <QMimeData>
#include <unordered_set>
#include <string>
#include <algorithm>
namespace noggit
{
namespace ui
{
PaletteList::PaletteList(QWidget* parent) : QListWidget(parent)
{
setIconSize(QSize(100, 100));
setViewMode(QListWidget::IconMode);
setFlow(QListWidget::LeftToRight);
setWrapping(false);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setSelectionMode(QAbstractItemView::SingleSelection);
setAcceptDrops(false);
}
void PaletteList::mousePressEvent(QMouseEvent* event)
{
if (event->button() == Qt::LeftButton)
_start_pos = event->pos();
QListWidget::mousePressEvent(event);
}
void PaletteList::mouseMoveEvent(QMouseEvent* event)
{
QListWidget::mouseMoveEvent(event);
if (!(event->buttons() & Qt::LeftButton))
return;
if ((event->pos() - _start_pos).manhattanLength()
< QApplication::startDragDistance())
return;
const QList<QListWidgetItem*> selected_items = selectedItems();
for (auto item : selected_items)
{
QMimeData* mimeData = new QMimeData;
mimeData->setText("tileset/" + item->toolTip());
QDrag* drag = new QDrag(this);
drag->setMimeData(mimeData);
drag->setPixmap(item->icon().pixmap(100, 100));
drag->exec();
return; // we assume only one item can be selected
}
}
texture_palette_small::texture_palette_small (QWidget* parent)
: widget(parent)
, layout(new ::QGridLayout(this)
)
{
setWindowTitle("Quick Access Texture Palette");
setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint);
setMinimumSize(100, 100);
setAcceptDrops(true);
_texture_paths = std::unordered_set<std::string>();
_texture_list = new PaletteList(this);
layout->addWidget(_texture_list, 0, 0);
connect(_texture_list, &QListWidget::itemClicked
, this
, [=](QListWidgetItem* item)
{
emit selected("tileset/" + item->toolTip().toStdString());
}
);
QVBoxLayout* button_layout = new QVBoxLayout(this);
_add_button = new QPushButton(this);
_add_button->setIcon(font_awesome_icon(font_awesome::plus));
button_layout->addWidget(_add_button);
connect(_add_button, &QAbstractButton::clicked, this, &texture_palette_small::addTexture);
_remove_button = new QPushButton(this);
_remove_button->setIcon(font_awesome_icon(font_awesome::times));
button_layout->addWidget(_remove_button);
connect(_remove_button, &QAbstractButton::clicked, this, &texture_palette_small::removeSelectedTexture);
layout->addLayout(button_layout, 0, 1);
updateWidget();
}
void texture_palette_small::addTexture()
{
if (_texture_paths.size() > 12)
return;
std::string filename;
if (noggit::ui::selected_texture::get())
filename = noggit::ui::selected_texture::get().get()->filename;
else
filename = "tileset\\generic\\black.blp";
addTextureByFilename(filename);
}
void texture_palette_small::addTextureByFilename(const std::string& filename)
{
if (_texture_paths.size() > 12)
return;
QString display_name = QString(filename.c_str()).remove("tileset/");
for (auto path : _texture_paths)
if (path == display_name.toStdString())
return;
_texture_paths.emplace(display_name.toStdString());
QListWidgetItem* list_item = new QListWidgetItem(_texture_list);
list_item->setIcon(*BLPRenderer::getInstance().render_blp_to_pixmap(filename, _texture_list->iconSize().width(), _texture_list->iconSize().height()));
list_item->setToolTip(display_name);
list_item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled);
updateWidget();
_texture_list->addItem(list_item);
if (_texture_paths.size() == 12)
_add_button->setDisabled(true);
}
void texture_palette_small::removeTexture(QString filename)
{
filename.remove("tileset/");
QList<QListWidgetItem*> tilesets = _texture_list->findItems(filename, Qt::MatchExactly);
for (auto tileset : tilesets)
if (tileset->toolTip() == filename)
{
_texture_paths.erase(filename.toStdString());
_texture_list->removeItemWidget(tileset);
_add_button->setDisabled(false);
delete tileset;
updateWidget();
return;
}
}
void texture_palette_small::removeSelectedTexture()
{
QList<QListWidgetItem*> selected_items = _texture_list->selectedItems();
for (auto item : selected_items)
{
for (auto path : _texture_paths)
if (path == item->toolTip().toStdString())
{
_texture_paths.erase(path);
_texture_list->removeItemWidget(item);
_add_button->setDisabled(false);
delete item;
updateWidget();
return;
}
}
}
void texture_palette_small::updateWidget()
{
setFixedSize(QSize(std::max(static_cast<size_t>(170 * 3), 65 + (106 * _texture_paths.size())), 132));
}
void texture_palette_small::dragEnterEvent(QDragEnterEvent* event)
{
if (event->mimeData()->hasText()
&& _texture_paths.size() < 12
&& (_texture_paths.find(event->mimeData()->text().remove("tileset/").toStdString()) == _texture_paths.end())
)
event->accept();
}
void texture_palette_small::dropEvent(QDropEvent* event)
{
addTextureByFilename(event->mimeData()->text().toStdString());
event->accept();
}
}
}