From 10ab403e6ea164e44f68574e12e04f2eebb65381 Mon Sep 17 00:00:00 2001 From: Skarn Date: Mon, 13 Dec 2021 13:10:03 +0300 Subject: [PATCH] start renaming files --- resources/themes/Dark/editing_theme.qss | 8 +- resources/themes/Dark/theme.qss | 12 +- .../src/abstract_widget_list.cpp | 10 +- src/noggit/MapView.cpp | 22 +- src/noggit/MapView.h | 8 +- src/noggit/ui/{checkbox.hpp => Checkbox.hpp} | 4 +- src/noggit/ui/ClickableLabel.cpp | 16 + ...clickable_label.hpp => ClickableLabel.hpp} | 4 +- src/noggit/ui/CurrentTexture.cpp | 6 +- src/noggit/ui/CurrentTexture.h | 4 +- .../ui/{font_awesome.cpp => FontAwesome.cpp} | 20 +- .../ui/{font_awesome.hpp => FontAwesome.hpp} | 23 +- .../ui/{font_noggit.cpp => FontNoggit.cpp} | 22 +- .../ui/{font_noggit.hpp => FontNoggit.hpp} | 24 +- src/noggit/ui/FramelessWindow.hpp | 8 +- src/noggit/ui/Help.cpp | 248 +++--- src/noggit/ui/Help.h | 4 +- src/noggit/ui/MinimapCreator.cpp | 26 +- src/noggit/ui/ObjectEditor.cpp | 14 +- .../ui/{shader_tool.cpp => ShaderTool.cpp} | 48 +- .../ui/{shader_tool.hpp => ShaderTool.hpp} | 4 +- .../ui/{terrain_tool.cpp => TerrainTool.cpp} | 838 +++++++++--------- .../ui/{terrain_tool.hpp => TerrainTool.hpp} | 4 +- src/noggit/ui/TexturePicker.cpp | 10 +- src/noggit/ui/Toolbar.cpp | 30 +- src/noggit/ui/Toolbar.h | 4 +- src/noggit/ui/Water.cpp | 6 +- src/noggit/ui/Water.h | 2 +- src/noggit/ui/clickable_label.cpp | 16 - src/noggit/ui/main_window.cpp | 2 +- src/noggit/ui/object_palette.cpp | 6 +- src/noggit/ui/texture_palette_small.cpp | 6 +- src/noggit/ui/texturing_tool.cpp | 4 +- src/noggit/ui/texturing_tool.hpp | 2 +- .../ActionHistoryNavigator.cpp | 2 +- .../ui/tools/AssetBrowser/Ui/AssetBrowser.cpp | 14 +- src/noggit/ui/tools/BrushStack/BrushStack.cpp | 8 +- .../ui/tools/BrushStack/BrushStackItem.cpp | 98 +- .../ui/tools/BrushStack/BrushStackItem.hpp | 8 +- .../Ui/MapCreationWizard.cpp | 6 +- .../Nodes/DataTypes/GenericData.hpp | 2 +- .../Nodes/Widgets/ProcedureSelector.cpp | 4 +- .../ui/tools/NodeEditor/Ui/NodeEditor.cpp | 18 +- .../ui/tools/PresetEditor/Ui/PresetEditor.cpp | 14 +- .../ui/tools/UiCommon/ExtendedSlider.cpp | 8 +- .../ui/tools/UiCommon/ImageMaskSelector.cpp | 4 +- .../ui/tools/UiCommon/ImageMaskSelector.ui | 6 +- .../ui/tools/UiCommon/expanderwidget.cpp | 6 +- .../ui/tools/ViewToolbar/Ui/ViewToolbar.cpp | 34 +- .../ui/tools/ViewToolbar/Ui/ViewToolbar.hpp | 4 +- 50 files changed, 851 insertions(+), 850 deletions(-) rename src/noggit/ui/{checkbox.hpp => Checkbox.hpp} (90%) create mode 100644 src/noggit/ui/ClickableLabel.cpp rename src/noggit/ui/{clickable_label.hpp => ClickableLabel.hpp} (78%) rename src/noggit/ui/{font_awesome.cpp => FontAwesome.cpp} (76%) rename src/noggit/ui/{font_awesome.hpp => FontAwesome.hpp} (98%) rename src/noggit/ui/{font_noggit.cpp => FontNoggit.cpp} (71%) rename src/noggit/ui/{font_noggit.hpp => FontNoggit.hpp} (83%) rename src/noggit/ui/{shader_tool.cpp => ShaderTool.cpp} (89%) rename src/noggit/ui/{shader_tool.hpp => ShaderTool.hpp} (96%) rename src/noggit/ui/{terrain_tool.cpp => TerrainTool.cpp} (88%) rename src/noggit/ui/{terrain_tool.hpp => TerrainTool.hpp} (96%) delete mode 100644 src/noggit/ui/clickable_label.cpp diff --git a/resources/themes/Dark/editing_theme.qss b/resources/themes/Dark/editing_theme.qss index 0378df78..d54401c9 100644 --- a/resources/themes/Dark/editing_theme.qss +++ b/resources/themes/Dark/editing_theme.qss @@ -779,16 +779,16 @@ QPushButton[accessibleName="titlebar_close"]:pressed{ background-color: $half_dark; } -QWidget[accessibleName="font_noggit_button_style"]{ +QWidget[accessibleName="FontNoggitButtonStyle"]{ color: $highlight; } -QWidget[accessibleName="font_noggit_button_style"]:disabled{ +QWidget[accessibleName="FontNoggitButtonStyle"]:disabled{ color: $text; } -QWidget[accessibleName="font_awesome_button_style"]{ +QWidget[accessibleName="FontAwesomeButtonStyle"]{ color: $highlight; } -QWidget[accessibleName="font_awesome_button_style"]:disabled{ +QWidget[accessibleName="FontAwesomeButtonStyle"]:disabled{ color: $text; } QWidget[accessibleName="main_menu_minimap_holder"]{ diff --git a/resources/themes/Dark/theme.qss b/resources/themes/Dark/theme.qss index 177b9e20..111b2a98 100644 --- a/resources/themes/Dark/theme.qss +++ b/resources/themes/Dark/theme.qss @@ -732,12 +732,12 @@ color_widgets--ColorWheel { -noggit--ui--PaletteList::item:selected:active { +Noggit-Ui--PaletteList::item:selected:active { border: 1px solid #5281b9; background: transparent; color: #d7d7d7; } -noggit--ui--TextureList::item:selected { +Noggit-Ui--TextureList::item:selected { border: 1px solid #5281b9; background: transparent; color: #d7d7d7; @@ -809,16 +809,16 @@ QPushButton[accessibleName="titlebar_close"]:pressed{ background-color: #1f2023; } -QWidget[accessibleName="font_noggit_button_style"]{ +QWidget[accessibleName="FontNoggitButtonStyle"]{ color: #5281b9; } -QWidget[accessibleName="font_noggit_button_style"]:disabled{ +QWidget[accessibleName="FontNoggitButtonStyle"]:disabled{ color: #d7d7d7; } -QWidget[accessibleName="font_awesome_button_style"]{ +QWidget[accessibleName="FontAwesomeButtonStyle"]{ color: #5281b9; } -QWidget[accessibleName="font_awesome_button_style"]:disabled{ +QWidget[accessibleName="FontAwesomeButtonStyle"]:disabled{ color: #d7d7d7; } QWidget[accessibleName="main_menu_minimap_holder"]{ diff --git a/src/external/qt-color-widgets/src/abstract_widget_list.cpp b/src/external/qt-color-widgets/src/abstract_widget_list.cpp index 9590fcc0..36461d9a 100644 --- a/src/external/qt-color-widgets/src/abstract_widget_list.cpp +++ b/src/external/qt-color-widgets/src/abstract_widget_list.cpp @@ -20,7 +20,7 @@ * */ #include "qt-color-widgets/abstract_widget_list.hpp" -#include <../../noggit/ui/font_awesome.hpp> +#include <../../noggit/ui/FontAwesome.hpp> #include #include #include @@ -64,7 +64,7 @@ AbstractWidgetList::AbstractWidgetList(QWidget *parent) : p->table->verticalHeader()->hide(); p->table->setShowGrid(false); - QPushButton* add_button = new QPushButton(Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::plus), + QPushButton* add_button = new QPushButton(Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::plus), tr("Add Color")); verticalLayout->addWidget(add_button); @@ -116,9 +116,9 @@ void AbstractWidgetList::appendWidget(QWidget *w) int row = count(); p->table->insertRow(row); - QWidget* b_up = create_button(w,&p->mapper_up, Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::chevronup),tr(""), tr("Move Up")); - QWidget* b_down = create_button(w,&p->mapper_down, Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::chevrondown),tr(""), tr("Move Down")); - QWidget* b_remove = create_button(w,&p->mapper_remove, Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::times),tr(""), tr("Remove")); + QWidget* b_up = create_button(w, &p->mapper_up, Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::chevronup), tr(""), tr("Move Up")); + QWidget* b_down = create_button(w, &p->mapper_down, Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::chevrondown), tr(""), tr("Move Down")); + QWidget* b_remove = create_button(w, &p->mapper_remove, Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::times), tr(""), tr("Remove")); QPalette pal = b_up->palette(); pal.setColor(QPalette::Window, Qt::black); diff --git a/src/noggit/MapView.cpp b/src/noggit/MapView.cpp index e66d36fd..e09d633f 100644 --- a/src/noggit/MapView.cpp +++ b/src/noggit/MapView.cpp @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -54,7 +54,7 @@ #include #include -#include +#include #include "revision.h" @@ -410,11 +410,11 @@ void MapView::setupViewportOverlay() _overlay_widget->setMouseTracking(true); _overlay_widget->setGeometry(0,0, width(), height()); - _viewport_overlay_ui->gizmoVisibleButton->setIcon(Noggit::Ui::font_noggit_icon(Noggit::Ui::font_noggit::icons::GIZMO_VISIBILITY)); - _viewport_overlay_ui->gizmoModeButton->setIcon(Noggit::Ui::font_noggit_icon(Noggit::Ui::font_noggit::icons::GIZMO_LOCAL)); - _viewport_overlay_ui->gizmoRotateButton->setIcon(Noggit::Ui::font_noggit_icon(Noggit::Ui::font_noggit::icons::GIZMO_ROTATE)); - _viewport_overlay_ui->gizmoScaleButton->setIcon(Noggit::Ui::font_noggit_icon(Noggit::Ui::font_noggit::icons::GIZMO_SCALE)); - _viewport_overlay_ui->gizmoTranslateButton->setIcon(Noggit::Ui::font_noggit_icon(Noggit::Ui::font_noggit::icons::GIZMO_TRANSLATE)); + _viewport_overlay_ui->gizmoVisibleButton->setIcon(Noggit::Ui::FontNoggitIcon(Noggit::Ui::FontNoggit::Icons::GIZMO_VISIBILITY)); + _viewport_overlay_ui->gizmoModeButton->setIcon(Noggit::Ui::FontNoggitIcon(Noggit::Ui::FontNoggit::Icons::GIZMO_LOCAL)); + _viewport_overlay_ui->gizmoRotateButton->setIcon(Noggit::Ui::FontNoggitIcon(Noggit::Ui::FontNoggit::Icons::GIZMO_ROTATE)); + _viewport_overlay_ui->gizmoScaleButton->setIcon(Noggit::Ui::FontNoggitIcon(Noggit::Ui::FontNoggit::Icons::GIZMO_SCALE)); + _viewport_overlay_ui->gizmoTranslateButton->setIcon(Noggit::Ui::FontNoggitIcon(Noggit::Ui::FontNoggit::Icons::GIZMO_TRANSLATE)); connect(this, &MapView::resized ,[this]() @@ -475,11 +475,11 @@ void MapView::setupViewportOverlay() void MapView::setupRaiseLowerUi() { - terrainTool = new Noggit::Ui::terrain_tool(this, this); + terrainTool = new Noggit::Ui::TerrainTool(this, this); _tool_panel_dock->registerTool("Raise | Lower", terrainTool); connect(terrainTool - , &Noggit::Ui::terrain_tool::updateVertices + , &Noggit::Ui::TerrainTool::updateVertices , [this](int vertex_mode, math::degrees const& angle, math::degrees const& orientation) { makeCurrent(); @@ -762,7 +762,7 @@ void MapView::setupWaterEditorUi() } void MapView::setupVertexPainterUi() { - shaderTool = new Noggit::Ui::shader_tool(this, this); + shaderTool = new Noggit::Ui::ShaderTool(this, this); _tool_panel_dock->registerTool("Vertex Painter", shaderTool); } diff --git a/src/noggit/MapView.h b/src/noggit/MapView.h index 12a89720..02e3fe19 100644 --- a/src/noggit/MapView.h +++ b/src/noggit/MapView.h @@ -71,8 +71,8 @@ namespace Noggit class flatten_blur_tool; class help; class minimap_widget; - class shader_tool; - class terrain_tool; + class ShaderTool; + class TerrainTool; class texture_picker; class texturing_tool; class toolbar; @@ -365,8 +365,8 @@ private: Noggit::Ui::water* guiWater; Noggit::Ui::object_editor* objectEditor; Noggit::Ui::flatten_blur_tool* flattenTool; - Noggit::Ui::terrain_tool* terrainTool; - Noggit::Ui::shader_tool* shaderTool; + Noggit::Ui::TerrainTool* terrainTool; + Noggit::Ui::ShaderTool* shaderTool; Noggit::Ui::texturing_tool* texturingTool; Noggit::Ui::hole_tool* holeTool; Noggit::Ui::MinimapCreator* minimapTool; diff --git a/src/noggit/ui/checkbox.hpp b/src/noggit/ui/Checkbox.hpp similarity index 90% rename from src/noggit/ui/checkbox.hpp rename to src/noggit/ui/Checkbox.hpp index 02dee6d9..561c0b56 100644 --- a/src/noggit/ui/checkbox.hpp +++ b/src/noggit/ui/Checkbox.hpp @@ -10,10 +10,10 @@ namespace Noggit { namespace Ui { - class checkbox : public QCheckBox + class CheckBox : public QCheckBox { public: - checkbox ( QString label + CheckBox ( QString label , bool_toggle_property* prop , QWidget* parent = nullptr ) diff --git a/src/noggit/ui/ClickableLabel.cpp b/src/noggit/ui/ClickableLabel.cpp new file mode 100644 index 00000000..5b06e97b --- /dev/null +++ b/src/noggit/ui/ClickableLabel.cpp @@ -0,0 +1,16 @@ +// This file is part of Noggit3, licensed under GNU General Public License (version 3). + +#include + +namespace Noggit +{ + namespace Ui + { + ClickableLabel::ClickableLabel(QWidget * parent) : QLabel(parent){} + + void ClickableLabel::mouseReleaseEvent (QMouseEvent*) + { + emit clicked(); + } + } +} diff --git a/src/noggit/ui/clickable_label.hpp b/src/noggit/ui/ClickableLabel.hpp similarity index 78% rename from src/noggit/ui/clickable_label.hpp rename to src/noggit/ui/ClickableLabel.hpp index 3bfb826b..b44b906a 100644 --- a/src/noggit/ui/clickable_label.hpp +++ b/src/noggit/ui/ClickableLabel.hpp @@ -8,12 +8,12 @@ namespace Noggit { namespace Ui { - class clickable_label : public QLabel + class ClickableLabel : public QLabel { Q_OBJECT public: - clickable_label(QWidget* parent=nullptr); + ClickableLabel(QWidget* parent=nullptr); signals: void clicked(); diff --git a/src/noggit/ui/CurrentTexture.cpp b/src/noggit/ui/CurrentTexture.cpp index 47bf195b..102980a2 100644 --- a/src/noggit/ui/CurrentTexture.cpp +++ b/src/noggit/ui/CurrentTexture.cpp @@ -17,7 +17,7 @@ namespace Noggit namespace Ui { current_texture::current_texture(bool accept_drop, QWidget* parent) - : clickable_label (parent) + : ClickableLabel (parent) , _filename("tileset\\generic\\black.blp") , _need_update(true) { @@ -69,12 +69,12 @@ namespace Noggit _start_pos = event->pos(); } - clickable_label::mousePressEvent(event); + ClickableLabel::mousePressEvent(event); } void current_texture::mouseMoveEvent(QMouseEvent* event) { - clickable_label::mouseMoveEvent(event); + ClickableLabel::mouseMoveEvent(event); if (!(event->buttons() & Qt::LeftButton)) { diff --git a/src/noggit/ui/CurrentTexture.h b/src/noggit/ui/CurrentTexture.h index c687f44c..16b87b42 100644 --- a/src/noggit/ui/CurrentTexture.h +++ b/src/noggit/ui/CurrentTexture.h @@ -3,7 +3,7 @@ #pragma once #include -#include +#include #include #include @@ -21,7 +21,7 @@ namespace Noggit { class texture_swapper; - class current_texture : public clickable_label + class current_texture : public ClickableLabel { Q_OBJECT private: diff --git a/src/noggit/ui/font_awesome.cpp b/src/noggit/ui/FontAwesome.cpp similarity index 76% rename from src/noggit/ui/font_awesome.cpp rename to src/noggit/ui/FontAwesome.cpp index 211a6424..08ee7c1d 100644 --- a/src/noggit/ui/font_awesome.cpp +++ b/src/noggit/ui/FontAwesome.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include namespace Noggit @@ -15,17 +15,17 @@ namespace Noggit namespace Ui { - font_awesome_icon_engine::font_awesome_icon_engine (const QString& text) + FontAwesomeIconEngine::FontAwesomeIconEngine (const QString& text) : QIconEngine() ,_text (text) {} - font_awesome_icon_engine* font_awesome_icon_engine::clone() const + FontAwesomeIconEngine* FontAwesomeIconEngine::clone() const { - return new font_awesome_icon_engine(_text); + return new FontAwesomeIconEngine(_text); } - void font_awesome_icon_engine::paint ( QPainter* painter + void FontAwesomeIconEngine::paint ( QPainter* painter , QRect const& rect , QIcon::Mode mode , QIcon::State state @@ -33,7 +33,7 @@ namespace Noggit { painter->save(); { - auto temp_btn = new font_awesome_button_style(); + auto temp_btn = new FontAwesomeButtonStyle(); temp_btn->ensurePolished(); @@ -75,7 +75,7 @@ namespace Noggit painter->restore(); } - QPixmap font_awesome_icon_engine::pixmap ( QSize const& size + QPixmap FontAwesomeIconEngine::pixmap ( QSize const& size , QIcon::Mode mode , QIcon::State state ) @@ -90,10 +90,10 @@ namespace Noggit } - std::map font_awesome_icon_engine::_fonts = {}; + std::map FontAwesomeIconEngine::_fonts = {}; - font_awesome_icon::font_awesome_icon (font_awesome::icons const& icon) - : QIcon (new font_awesome_icon_engine (QString (QChar (icon)))) + FontAwesomeIcon::FontAwesomeIcon (FontAwesome::Icons const& icon) + : QIcon (new FontAwesomeIconEngine (QString (QChar (icon)))) {} diff --git a/src/noggit/ui/font_awesome.hpp b/src/noggit/ui/FontAwesome.hpp similarity index 98% rename from src/noggit/ui/font_awesome.hpp rename to src/noggit/ui/FontAwesome.hpp index baef7e94..b1d4af69 100644 --- a/src/noggit/ui/font_awesome.hpp +++ b/src/noggit/ui/FontAwesome.hpp @@ -10,9 +10,9 @@ namespace Noggit { namespace Ui { - struct font_awesome + struct FontAwesome { - enum icons + enum Icons { ad = 0xf641, addressbook = 0xf2b9, @@ -973,28 +973,29 @@ namespace Noggit }; }; - class font_awesome_button_style : public QWidget + class FontAwesomeButtonStyle : public QWidget { public: - font_awesome_button_style(QWidget* parent = nullptr) : QWidget(parent) { setAccessibleName("font_noggit_button_style");}; + FontAwesomeButtonStyle(QWidget* parent = nullptr) : QWidget(parent) { setAccessibleName("FontNoggitButtonStyle");}; }; - class font_awesome_icon : public QIcon + class FontAwesomeIcon : public QIcon { public: - font_awesome_icon (font_awesome::icons const&); + FontAwesomeIcon (FontAwesome::Icons const&); }; - class font_awesome_icon_engine : public QIconEngine + class FontAwesomeIconEngine : public QIconEngine { public: - font_awesome_icon_engine(const QString& text); + FontAwesomeIconEngine(const QString& text); - virtual font_awesome_icon_engine* clone() const override; + [[nodiscard]] + FontAwesomeIconEngine* clone() const override; - virtual void paint(QPainter* painter, QRect const& rect, QIcon::Mode mode, QIcon::State state) override; + void paint(QPainter* painter, QRect const& rect, QIcon::Mode mode, QIcon::State state) override; - virtual QPixmap pixmap(QSize const& size, QIcon::Mode mode, QIcon::State state) override; + QPixmap pixmap(QSize const& size, QIcon::Mode mode, QIcon::State state) override; private: diff --git a/src/noggit/ui/font_noggit.cpp b/src/noggit/ui/FontNoggit.cpp similarity index 71% rename from src/noggit/ui/font_noggit.cpp rename to src/noggit/ui/FontNoggit.cpp index e083bb85..ed06fe15 100644 --- a/src/noggit/ui/font_noggit.cpp +++ b/src/noggit/ui/FontNoggit.cpp @@ -6,8 +6,8 @@ #include #include -#include -#include +#include +#include #include namespace Noggit @@ -15,17 +15,17 @@ namespace Noggit namespace Ui { - font_noggit_icon_engine::font_noggit_icon_engine(const QString& text) - : font_awesome_icon_engine(text) + FontNoggitIconEngine::FontNoggitIconEngine(const QString& text) + : FontAwesomeIconEngine(text) , _text(text) {} - font_noggit_icon_engine* font_noggit_icon_engine::clone() const + FontNoggitIconEngine* FontNoggitIconEngine::clone() const { - return new font_noggit_icon_engine(_text); + return new FontNoggitIconEngine(_text); } - void font_noggit_icon_engine::paint(QPainter* painter + void FontNoggitIconEngine::paint(QPainter* painter , QRect const& rect , QIcon::Mode mode , QIcon::State state @@ -33,7 +33,7 @@ namespace Noggit { painter->save(); { - auto temp_btn = new font_noggit_button_style(); + auto temp_btn = new FontNoggitButtonStyle(); temp_btn->ensurePolished(); @@ -75,10 +75,10 @@ namespace Noggit painter->restore(); } - std::map font_noggit_icon_engine::_fonts = {}; + std::map FontNoggitIconEngine::_fonts = {}; - font_noggit_icon::font_noggit_icon(font_noggit::icons const& icon) - : QIcon(new font_noggit_icon_engine(QString(QChar(icon)))) + FontNoggitIcon::FontNoggitIcon(FontNoggit::Icons const& icon) + : QIcon(new FontNoggitIconEngine(QString(QChar(icon)))) {} } diff --git a/src/noggit/ui/font_noggit.hpp b/src/noggit/ui/FontNoggit.hpp similarity index 83% rename from src/noggit/ui/font_noggit.hpp rename to src/noggit/ui/FontNoggit.hpp index c153fdad..12d6f17f 100644 --- a/src/noggit/ui/font_noggit.hpp +++ b/src/noggit/ui/FontNoggit.hpp @@ -2,7 +2,7 @@ #pragma once -#include +#include #include @@ -11,9 +11,9 @@ namespace Noggit { namespace Ui { - struct font_noggit + struct FontNoggit { - enum icons + enum Icons { rmb = 0xf868, lmb = 0xf864, @@ -126,26 +126,26 @@ namespace Noggit }; }; - class font_noggit_button_style : public QWidget + class FontNoggitButtonStyle : public QWidget { public: - font_noggit_button_style(QWidget* parent = nullptr) : QWidget(parent) { setAccessibleName("font_noggit_button_style"); }; + FontNoggitButtonStyle(QWidget* parent = nullptr) : QWidget(parent) { setAccessibleName("FontNoggitButtonStyle"); }; }; - class font_noggit_icon : public QIcon + class FontNoggitIcon : public QIcon { public: - font_noggit_icon(font_noggit::icons const&); + FontNoggitIcon(FontNoggit::Icons const&); }; - class font_noggit_icon_engine : public font_awesome_icon_engine - { + class FontNoggitIconEngine : public FontAwesomeIconEngine { public: - font_noggit_icon_engine(const QString& text); + FontNoggitIconEngine(const QString& text); - virtual font_noggit_icon_engine* clone() const override; + [[nodiscard]] + FontNoggitIconEngine* clone() const override; - virtual void paint(QPainter* painter, QRect const& rect, QIcon::Mode mode, QIcon::State state) override; + void paint(QPainter* painter, QRect const& rect, QIcon::Mode mode, QIcon::State state) override; private: diff --git a/src/noggit/ui/FramelessWindow.hpp b/src/noggit/ui/FramelessWindow.hpp index 9fbbd025..3d7e8f44 100644 --- a/src/noggit/ui/FramelessWindow.hpp +++ b/src/noggit/ui/FramelessWindow.hpp @@ -2,7 +2,7 @@ #define NOGGIT_FRAMELESSWINDOW_HPP #include -#include +#include #include #include @@ -26,13 +26,13 @@ namespace Noggit::Ui titleBarWidget->iconButton->setAccessibleName("titlebar_icon"); titleBarWidget->iconButton->setMinimumWidth(32); - titleBarWidget->minimizeButton->setIcon(font_awesome_icon(font_awesome::windowminimize)); + titleBarWidget->minimizeButton->setIcon(FontAwesomeIcon(FontAwesome::windowminimize)); titleBarWidget->minimizeButton->setIconSize(QSize(16, 16)); titleBarWidget->minimizeButton->setAccessibleName("titlebar_minimize"); - titleBarWidget->maximizeButton->setIcon(font_awesome_icon(font_awesome::windowmaximize)); + titleBarWidget->maximizeButton->setIcon(FontAwesomeIcon(FontAwesome::windowmaximize)); titleBarWidget->maximizeButton->setAccessibleName("titlebar_maximize"); titleBarWidget->maximizeButton->setIconSize(QSize(14, 14)); - titleBarWidget->closeButton->setIcon(font_awesome_icon(font_awesome::times)); + titleBarWidget->closeButton->setIcon(FontAwesomeIcon(FontAwesome::times)); titleBarWidget->closeButton->setAccessibleName("titlebar_close"); titleBarWidget->closeButton->setIconSize(QSize(18, 18)); diff --git a/src/noggit/ui/Help.cpp b/src/noggit/ui/Help.cpp index b3f4ec9e..47e1fd0a 100644 --- a/src/noggit/ui/Help.cpp +++ b/src/noggit/ui/Help.cpp @@ -1,7 +1,7 @@ // This file is part of Noggit3, licensed under GNU General Public License (version 3). #include -#include +#include #include #include @@ -50,20 +50,20 @@ namespace Noggit label->setStyleSheet(header_style); basic_controls_layout->addRow(label); - generate_hotkey_row({font_noggit::rmb_drag}, "\aRotate camera", basic_controls_layout); - generate_hotkey_row({font_noggit::lmb}, "\aSelect chunk or object", basic_controls_layout); - generate_hotkey_row({font_noggit::i}, "\aInvert mouse up and down", basic_controls_layout); - generate_hotkey_row({font_noggit::q, font_noggit::e}, "\a,\aMove up and down", basic_controls_layout); - generate_hotkey_row({font_noggit::w, font_noggit::a , font_noggit::s , font_noggit::d}, "\a\a\a\aMove left, right, forward, backwards", basic_controls_layout); - generate_hotkey_row({font_noggit::home}, "\aMove position to the cursor", basic_controls_layout); - generate_hotkey_row({font_noggit::m}, "\aShow map", basic_controls_layout); - generate_hotkey_row({font_noggit::u}, "\a2D texture editor", basic_controls_layout); - generate_hotkey_row({font_noggit::ctrl, font_noggit::f1}, "\a+\aThis help", basic_controls_layout); - generate_hotkey_row({font_noggit::shift, font_noggit::j}, "\a+\aReload an adt under the camera", basic_controls_layout); - generate_hotkey_row({font_noggit::shift, font_noggit::r}, "\a+\aTurn camera 180 degrees", basic_controls_layout); - generate_hotkey_row({font_noggit::shift}, "\a+ 1, 2, 3 or 4 Set a predefined camera speed", basic_controls_layout); - generate_hotkey_row({font_noggit::alt, font_noggit::f4}, "\a+\aExit to main menu", basic_controls_layout); - generate_hotkey_row({font_noggit::l}, "\aToggle top view (hint: it's faster to use with graphic tablet stylus buttons)", basic_controls_layout); + generate_hotkey_row({FontNoggit::rmb_drag}, "\aRotate camera", basic_controls_layout); + generate_hotkey_row({FontNoggit::lmb}, "\aSelect chunk or object", basic_controls_layout); + generate_hotkey_row({FontNoggit::i}, "\aInvert mouse up and down", basic_controls_layout); + generate_hotkey_row({FontNoggit::q, FontNoggit::e}, "\a,\aMove up and down", basic_controls_layout); + generate_hotkey_row({FontNoggit::w, FontNoggit::a , FontNoggit::s , FontNoggit::d}, "\a\a\a\aMove left, right, forward, backwards", basic_controls_layout); + generate_hotkey_row({FontNoggit::home}, "\aMove position to the cursor", basic_controls_layout); + generate_hotkey_row({FontNoggit::m}, "\aShow map", basic_controls_layout); + generate_hotkey_row({FontNoggit::u}, "\a2D texture editor", basic_controls_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::f1}, "\a+\aThis help", basic_controls_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::j}, "\a+\aReload an adt under the camera", basic_controls_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::r}, "\a+\aTurn camera 180 degrees", basic_controls_layout); + generate_hotkey_row({FontNoggit::shift}, "\a+ 1, 2, 3 or 4 Set a predefined camera speed", basic_controls_layout); + generate_hotkey_row({FontNoggit::alt, FontNoggit::f4}, "\a+\aExit to main menu", basic_controls_layout); + generate_hotkey_row({FontNoggit::l}, "\aToggle top view (hint: it's faster to use with graphic tablet stylus buttons)", basic_controls_layout); generate_hotkey_row({}, "", basic_controls_layout); // padding auto toggles_layout(new QFormLayout(this)); @@ -73,17 +73,17 @@ namespace Noggit label_toggle->setStyleSheet(header_style); toggles_layout->addRow(label_toggle); - generate_hotkey_row({font_noggit::f1}, "\aToggle M2s", toggles_layout); - generate_hotkey_row({font_noggit::f2}, "\aToggle WMO doodads set", toggles_layout); - generate_hotkey_row({font_noggit::f3}, "\aToggle ground", toggles_layout); - generate_hotkey_row({font_noggit::f4}, "\aToggle water", toggles_layout); - generate_hotkey_row({font_noggit::f6}, "\aToggle WMOs", toggles_layout); - generate_hotkey_row({font_noggit::f7}, "\aToggle chunk (red) and ADT (green) lines", toggles_layout); - generate_hotkey_row({font_noggit::f8}, "\aToggle detailed window", toggles_layout); - generate_hotkey_row({font_noggit::f9}, "\aToggle map contour", toggles_layout); - generate_hotkey_row({font_noggit::f10}, "\aToggle wireframe", toggles_layout); - generate_hotkey_row({font_noggit::f11}, "\aToggle model animations", toggles_layout); - generate_hotkey_row({font_noggit::f12}, "\aToggle fog", toggles_layout); + generate_hotkey_row({FontNoggit::f1}, "\aToggle M2s", toggles_layout); + generate_hotkey_row({FontNoggit::f2}, "\aToggle WMO doodads set", toggles_layout); + generate_hotkey_row({FontNoggit::f3}, "\aToggle ground", toggles_layout); + generate_hotkey_row({FontNoggit::f4}, "\aToggle water", toggles_layout); + generate_hotkey_row({FontNoggit::f6}, "\aToggle WMOs", toggles_layout); + generate_hotkey_row({FontNoggit::f7}, "\aToggle chunk (red) and ADT (green) lines", toggles_layout); + generate_hotkey_row({FontNoggit::f8}, "\aToggle detailed window", toggles_layout); + generate_hotkey_row({FontNoggit::f9}, "\aToggle map contour", toggles_layout); + generate_hotkey_row({FontNoggit::f10}, "\aToggle wireframe", toggles_layout); + generate_hotkey_row({FontNoggit::f11}, "\aToggle model animations", toggles_layout); + generate_hotkey_row({FontNoggit::f12}, "\aToggle fog", toggles_layout); generate_hotkey_row({}, "1 - 9 Select the editing modes", toggles_layout); auto files_layout(new QFormLayout(this)); @@ -93,11 +93,11 @@ namespace Noggit label_files->setStyleSheet(header_style); files_layout->addRow(label_files); - generate_hotkey_row({font_noggit::f5}, "\aSave bookmark", files_layout); - generate_hotkey_row({font_noggit::ctrl, font_noggit::s}, "\a+\a Save all changed ADT tiles", files_layout); - generate_hotkey_row({font_noggit::ctrl, font_noggit::shift, font_noggit::s}, "\a+\a+\aSave ADT tile at camera position", files_layout); - generate_hotkey_row({font_noggit::ctrl, font_noggit::shift, font_noggit::a}, "\a+\a+\aSave all loaded ADT tiles", files_layout); - generate_hotkey_row({font_noggit::g}, "\aSave port commands to ports.txt", files_layout); + generate_hotkey_row({FontNoggit::f5}, "\aSave bookmark", files_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::s}, "\a+\a Save all changed ADT tiles", files_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::shift, FontNoggit::s}, "\a+\a+\aSave ADT tile at camera position", files_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::shift, FontNoggit::a}, "\a+\a+\aSave all loaded ADT tiles", files_layout); + generate_hotkey_row({FontNoggit::g}, "\aSave port commands to ports.txt", files_layout); auto adjust_layout(new QFormLayout(this)); base_layout->addLayout(adjust_layout, 1, 1); @@ -106,10 +106,10 @@ namespace Noggit label_adjust->setStyleSheet(header_style); adjust_layout->addRow(label_adjust); - generate_hotkey_row({font_noggit::o, font_noggit::p}, "\aor\aSlower / Faster movement", adjust_layout); - generate_hotkey_row({font_noggit::b, font_noggit::n}, "\aor\aSlower / Faster time", adjust_layout); - generate_hotkey_row({font_noggit::j}, "\aPause time", adjust_layout); - generate_hotkey_row({font_noggit::shift, font_noggit::plus, font_noggit::minus}, "\a+\aor\aFog distance when no model is selected", adjust_layout); + generate_hotkey_row({FontNoggit::o, FontNoggit::p}, "\aor\aSlower / Faster movement", adjust_layout); + generate_hotkey_row({FontNoggit::b, FontNoggit::n}, "\aor\aSlower / Faster time", adjust_layout); + generate_hotkey_row({FontNoggit::j}, "\aPause time", adjust_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::plus, FontNoggit::minus}, "\a+\aor\aFog distance when no model is selected", adjust_layout); auto flag_widget (new QWidget (this)); auto flag_layout (new QFormLayout (flag_widget)); @@ -118,24 +118,24 @@ namespace Noggit holes_label->setStyleSheet(header_style); flag_layout->addRow(holes_label); - generate_hotkey_row({font_noggit::shift, font_noggit::lmb}, "\a+\aFog distance when no model is selected", flag_layout); - generate_hotkey_row({font_noggit::ctrl, font_noggit::lmb}, "\a+\aAdd hole", flag_layout); - generate_hotkey_row({font_noggit::t}, "\aRemove all holes on ADT", flag_layout); - generate_hotkey_row({font_noggit::alt, font_noggit::t}, "\a+\aRemove all ground on ADT", flag_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::lmb}, "\a+\aFog distance when no model is selected", flag_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::lmb}, "\a+\aAdd hole", flag_layout); + generate_hotkey_row({FontNoggit::t}, "\aRemove all holes on ADT", flag_layout); + generate_hotkey_row({FontNoggit::alt, FontNoggit::t}, "\a+\aRemove all ground on ADT", flag_layout); auto impass_flags_label = new QLabel("Impassible Flags:"); impass_flags_label->setStyleSheet(header_style); flag_layout->addRow(impass_flags_label); - generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aPaint flag", flag_layout); - generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\aClear flag", flag_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::lmb }, "\a+\aPaint flag", flag_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::lmb }, "\a+\aClear flag", flag_layout); auto areaid_label = new QLabel("AreaID Flags:"); areaid_label->setStyleSheet(header_style); flag_layout->addRow(areaid_label); - generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\aPick existing AreaID", flag_layout); - generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aPaint selected AreaID", flag_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::lmb }, "\a+\aPick existing AreaID", flag_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::lmb }, "\a+\aPaint selected AreaID", flag_layout); auto ground_widget (new QWidget (this)); @@ -148,31 +148,31 @@ namespace Noggit ground_label->setStyleSheet(header_style); ground_column1_layout->addRow(ground_label); - generate_hotkey_row({ font_noggit::shift, font_noggit::f1 }, "\a+\aToggle ground edit mode", ground_column1_layout); - generate_hotkey_row({ font_noggit::alt, font_noggit::lmb_drag }, "\a+\aChange brush size", ground_column1_layout); - generate_hotkey_row({ font_noggit::space, font_noggit::lmb_drag }, "\a+\aChange speed", ground_column1_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::f1 }, "\a+\aToggle ground edit mode", ground_column1_layout); + generate_hotkey_row({FontNoggit::alt, FontNoggit::lmb_drag }, "\a+\aChange brush size", ground_column1_layout); + generate_hotkey_row({FontNoggit::space, FontNoggit::lmb_drag }, "\a+\aChange speed", ground_column1_layout); auto raise_label = new QLabel("Raise / Lower tool:"); raise_label->setStyleSheet(header_style); ground_column1_layout->addRow(raise_label); - generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aRaise terrain", ground_column1_layout); - generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\aLower terrain", ground_column1_layout); - generate_hotkey_row({ font_noggit::y }, "\aSwitch to next type", ground_column1_layout); - generate_hotkey_row({ font_noggit::alt, font_noggit::rmb_drag }, "\a+\aChange inner radius", ground_column1_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::lmb }, "\a+\aRaise terrain", ground_column1_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::lmb }, "\a+\aLower terrain", ground_column1_layout); + generate_hotkey_row({FontNoggit::y }, "\aSwitch to next type", ground_column1_layout); + generate_hotkey_row({FontNoggit::alt, FontNoggit::rmb_drag }, "\a+\aChange inner radius", ground_column1_layout); auto raise_label_vm = new QLabel("Raise / Lower tool (vertex mode):"); raise_label_vm->setStyleSheet(header_style); ground_column1_layout->addRow(raise_label_vm); - generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aSelect vertices", ground_column1_layout); - generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\aDeselect vertices", ground_column1_layout); - generate_hotkey_row({ font_noggit::c }, "\aClear selection", ground_column1_layout); - generate_hotkey_row({ font_noggit::space, font_noggit::f }, "\a+\aFlatten vertices", ground_column1_layout); - generate_hotkey_row({ font_noggit::space, font_noggit::rmb_drag }, "\a+\aOrient vertices toward the mouse cursor", ground_column1_layout); - generate_hotkey_row({ font_noggit::shift, font_noggit::rmb_drag }, "\a+\aChange vertices height", ground_column1_layout); - generate_hotkey_row({ font_noggit::shift, font_noggit::mmb }, "\a+\aChange angle", ground_column1_layout); - generate_hotkey_row({ font_noggit::alt, font_noggit::mmb }, "\a+\aChange orientation", ground_column1_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::lmb }, "\a+\aSelect vertices", ground_column1_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::lmb }, "\a+\aDeselect vertices", ground_column1_layout); + generate_hotkey_row({FontNoggit::c }, "\aClear selection", ground_column1_layout); + generate_hotkey_row({FontNoggit::space, FontNoggit::f }, "\a+\aFlatten vertices", ground_column1_layout); + generate_hotkey_row({FontNoggit::space, FontNoggit::rmb_drag }, "\a+\aOrient vertices toward the mouse cursor", ground_column1_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::rmb_drag }, "\a+\aChange vertices height", ground_column1_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::mmb }, "\a+\aChange angle", ground_column1_layout); + generate_hotkey_row({FontNoggit::alt, FontNoggit::mmb }, "\a+\aChange orientation", ground_column1_layout); auto ground_column2_layout(new QFormLayout(this)); ground_layout->addLayout(ground_column2_layout, 0, 1); @@ -181,16 +181,16 @@ namespace Noggit flatten_label->setStyleSheet(header_style); ground_column2_layout->addRow(flatten_label); - generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aFlatten terrain", ground_column2_layout); - generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\aBlur terrain", ground_column2_layout); - generate_hotkey_row({ font_noggit::t }, "\aToggle flatten angle", ground_column2_layout); - generate_hotkey_row({ font_noggit::space, font_noggit::t }, "\a+\aToggle flatten type", ground_column2_layout); - generate_hotkey_row({ font_noggit::shift, font_noggit::mmb }, "\a+\aChange angle", ground_column2_layout); - generate_hotkey_row({ font_noggit::alt, font_noggit::mmb }, "\a+\aChange orientation", ground_column2_layout); - generate_hotkey_row({ font_noggit::y }, "\aSwitch to next type", ground_column2_layout); - generate_hotkey_row({ font_noggit::f }, "\aSet relative point", ground_column2_layout); - generate_hotkey_row({ font_noggit::space, font_noggit::f }, "\a+\aToggle flatten relative mode", ground_column2_layout); - generate_hotkey_row({ font_noggit::space, font_noggit::mmb }, "\a+\aChange height", ground_column2_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::lmb }, "\a+\aFlatten terrain", ground_column2_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::lmb }, "\a+\aBlur terrain", ground_column2_layout); + generate_hotkey_row({FontNoggit::t }, "\aToggle flatten angle", ground_column2_layout); + generate_hotkey_row({FontNoggit::space, FontNoggit::t }, "\a+\aToggle flatten type", ground_column2_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::mmb }, "\a+\aChange angle", ground_column2_layout); + generate_hotkey_row({FontNoggit::alt, FontNoggit::mmb }, "\a+\aChange orientation", ground_column2_layout); + generate_hotkey_row({FontNoggit::y }, "\aSwitch to next type", ground_column2_layout); + generate_hotkey_row({FontNoggit::f }, "\aSet relative point", ground_column2_layout); + generate_hotkey_row({FontNoggit::space, FontNoggit::f }, "\a+\aToggle flatten relative mode", ground_column2_layout); + generate_hotkey_row({FontNoggit::space, FontNoggit::mmb }, "\a+\aChange height", ground_column2_layout); auto texture_widget (new QWidget (this)); @@ -200,37 +200,37 @@ namespace Noggit common_controls_label->setStyleSheet(header_style); texture_layout->addRow(common_controls_label); - generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\aOpen texture picker for the chunk", texture_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::lmb }, "\a+\aOpen texture picker for the chunk", texture_layout); auto paint_label = new QLabel("Paint:"); paint_label->setStyleSheet(header_style); texture_layout->addRow(paint_label); - generate_hotkey_row({ font_noggit::ctrl, font_noggit::shift, font_noggit::alt, font_noggit::lmb }, "\a+\a+\a+\aOpen texture picker for the chunk", texture_layout); - generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aDraw texture or fills if chunk is empty", texture_layout); - generate_hotkey_row({ font_noggit::alt, font_noggit::lmb_drag }, "\a+\aChange radius", texture_layout); - generate_hotkey_row({ font_noggit::alt, font_noggit::rmb_drag }, "\a+\aChange hardness", texture_layout); - generate_hotkey_row({ font_noggit::space, font_noggit::lmb_drag }, "\a+\aChange pressure", texture_layout); - generate_hotkey_row({ font_noggit::space, font_noggit::mmb }, "\a+\aChange strength (gradient)", texture_layout); - generate_hotkey_row({ font_noggit::space, font_noggit::r }, "\a+\aToggle min and max strength (gradient)", texture_layout); - generate_hotkey_row({ font_noggit::t }, "\aToggle spray brush", texture_layout); - generate_hotkey_row({ font_noggit::alt, font_noggit::mmb }, "\a+\aChange spray radius", texture_layout); - generate_hotkey_row({ font_noggit::shift, font_noggit::mmb }, "\a+\aChange spray pressure", texture_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::shift, FontNoggit::alt, FontNoggit::lmb }, "\a+\a+\a+\aOpen texture picker for the chunk", texture_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::lmb }, "\a+\aDraw texture or fills if chunk is empty", texture_layout); + generate_hotkey_row({FontNoggit::alt, FontNoggit::lmb_drag }, "\a+\aChange radius", texture_layout); + generate_hotkey_row({FontNoggit::alt, FontNoggit::rmb_drag }, "\a+\aChange hardness", texture_layout); + generate_hotkey_row({FontNoggit::space, FontNoggit::lmb_drag }, "\a+\aChange pressure", texture_layout); + generate_hotkey_row({FontNoggit::space, FontNoggit::mmb }, "\a+\aChange strength (gradient)", texture_layout); + generate_hotkey_row({FontNoggit::space, FontNoggit::r }, "\a+\aToggle min and max strength (gradient)", texture_layout); + generate_hotkey_row({FontNoggit::t }, "\aToggle spray brush", texture_layout); + generate_hotkey_row({FontNoggit::alt, FontNoggit::mmb }, "\a+\aChange spray radius", texture_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::mmb }, "\a+\aChange spray pressure", texture_layout); auto swapper_label = new QLabel("Swap:"); swapper_label->setStyleSheet(header_style); texture_layout->addRow(swapper_label); - generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aSwap texture", texture_layout); - generate_hotkey_row({ font_noggit::alt, font_noggit::lmb_drag }, "\a+\aChange radius", texture_layout); - generate_hotkey_row({ font_noggit::t }, "\aToggle brush swapper", texture_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::lmb }, "\a+\aSwap texture", texture_layout); + generate_hotkey_row({FontNoggit::alt, FontNoggit::lmb_drag }, "\a+\aChange radius", texture_layout); + generate_hotkey_row({FontNoggit::t }, "\aToggle brush swapper", texture_layout); auto anim_label = new QLabel("Anim:"); anim_label->setStyleSheet(header_style); texture_layout->addRow(anim_label); - generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aUpdate animation", texture_layout); - generate_hotkey_row({ font_noggit::t }, "\aSwitch between add/remove animation mode", texture_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::lmb }, "\a+\aUpdate animation", texture_layout); + generate_hotkey_row({FontNoggit::t }, "\aSwitch between add/remove animation mode", texture_layout); auto water_widget (new QWidget (this)); @@ -240,15 +240,15 @@ namespace Noggit water_label->setStyleSheet(header_style); water_layout->addRow(water_label); - generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aAdd liquid", water_layout); - generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\aRemove liquid", water_layout); - generate_hotkey_row({ font_noggit::alt, font_noggit::lmb_drag }, "\a+\aChange brush size", water_layout); - generate_hotkey_row({ font_noggit::t }, "\aToggle angled mode", water_layout); - generate_hotkey_row({ font_noggit::alt, font_noggit::mmb }, "\a+\aChange orientation", water_layout); - generate_hotkey_row({ font_noggit::shift, font_noggit::mmb }, "\a+\aChange angle", water_layout); - generate_hotkey_row({ font_noggit::f }, "\aSet lock position to cursor position", water_layout); - generate_hotkey_row({ font_noggit::space, font_noggit::f }, "\a+\aToggle lock mode", water_layout); - generate_hotkey_row({ font_noggit::space, font_noggit::mmb }, "\a+\aChange height", water_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::lmb }, "\a+\aAdd liquid", water_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::lmb }, "\a+\aRemove liquid", water_layout); + generate_hotkey_row({FontNoggit::alt, FontNoggit::lmb_drag }, "\a+\aChange brush size", water_layout); + generate_hotkey_row({FontNoggit::t }, "\aToggle angled mode", water_layout); + generate_hotkey_row({FontNoggit::alt, FontNoggit::mmb }, "\a+\aChange orientation", water_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::mmb }, "\a+\aChange angle", water_layout); + generate_hotkey_row({FontNoggit::f }, "\aSet lock position to cursor position", water_layout); + generate_hotkey_row({FontNoggit::space, FontNoggit::f }, "\a+\aToggle lock mode", water_layout); + generate_hotkey_row({FontNoggit::space, FontNoggit::mmb }, "\a+\aChange height", water_layout); auto object_widget (new QWidget (this)); @@ -258,39 +258,39 @@ namespace Noggit object_label->setStyleSheet(header_style); object_layout->addRow(object_label); - generate_hotkey_row({ font_noggit::mmb }, "\aMove object", object_layout); - generate_hotkey_row({ font_noggit::alt, font_noggit::mmb }, "\a+\aScale M2", object_layout); - generate_hotkey_row({ font_noggit::shift, font_noggit::ctrl, font_noggit::alt, font_noggit::lmb }, "\aor\aor\a+\aRotate object", object_layout); - generate_hotkey_row({ font_noggit::ctrl }, "\a+ 0 - 9 Change doodadset of selected WMO", object_layout); - generate_hotkey_row({ font_noggit::ctrl, font_noggit::r }, "\a+\aReset rotation", object_layout); - generate_hotkey_row({ font_noggit::h }, "\aToggle selected model/wmo visibility", object_layout); - generate_hotkey_row({ font_noggit::space, font_noggit::h }, "\a+\a - Hide/Show hidden model/wmo", object_layout); - generate_hotkey_row({ font_noggit::shift, font_noggit::h }, "\a+\a - Clear hidden model/wmo list", object_layout); - generate_hotkey_row({ font_noggit::page_down }, "\aSet object to ground level", object_layout); - generate_hotkey_row({ font_noggit::ctrl, font_noggit::c }, "\a+\aCopy object to clipboard", object_layout); - generate_hotkey_row({ font_noggit::ctrl, font_noggit::v }, "\a+\aPaste object on mouse position", object_layout); - generate_hotkey_row({ font_noggit::ctrl, font_noggit::b }, "\a+\aDuplicate selected object to mouse position", object_layout); - generate_hotkey_row({ font_noggit::shift, font_noggit::v }, "\a+\aImport last M2 from WMV", object_layout); - generate_hotkey_row({ font_noggit::alt, font_noggit::v }, "\a+\aImport last WMO from WMV", object_layout); - generate_hotkey_row({ font_noggit::t }, "\aSwitch between paste modes", object_layout); - generate_hotkey_row({ font_noggit::f }, "\aMove selection to cursor position", object_layout); - generate_hotkey_row({ font_noggit::minus, font_noggit::plus }, "\aor\aScale M2", object_layout); - generate_hotkey_row({ font_noggit::num }, "\a 7 or 9 Rotate object", object_layout); - generate_hotkey_row({ font_noggit::num }, "\a 4 or 8 or 6 or 2 Vertical position", object_layout); - generate_hotkey_row({ font_noggit::num }, "\a 1 or 3 Move up/down", object_layout); - generate_hotkey_row({ font_noggit::shift }, "Holding \a 1 / 3 Double speed", object_layout); - generate_hotkey_row({ font_noggit::ctrl }, "Holding \a 1 / 3 Triple speed", object_layout); - generate_hotkey_row({ font_noggit::shift, font_noggit::ctrl }, "Holding \a and \a Half speed", object_layout); + generate_hotkey_row({FontNoggit::mmb }, "\aMove object", object_layout); + generate_hotkey_row({FontNoggit::alt, FontNoggit::mmb }, "\a+\aScale M2", object_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::ctrl, FontNoggit::alt, FontNoggit::lmb }, "\aor\aor\a+\aRotate object", object_layout); + generate_hotkey_row({FontNoggit::ctrl }, "\a+ 0 - 9 Change doodadset of selected WMO", object_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::r }, "\a+\aReset rotation", object_layout); + generate_hotkey_row({FontNoggit::h }, "\aToggle selected model/wmo visibility", object_layout); + generate_hotkey_row({FontNoggit::space, FontNoggit::h }, "\a+\a - Hide/Show hidden model/wmo", object_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::h }, "\a+\a - Clear hidden model/wmo list", object_layout); + generate_hotkey_row({FontNoggit::page_down }, "\aSet object to ground level", object_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::c }, "\a+\aCopy object to clipboard", object_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::v }, "\a+\aPaste object on mouse position", object_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::b }, "\a+\aDuplicate selected object to mouse position", object_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::v }, "\a+\aImport last M2 from WMV", object_layout); + generate_hotkey_row({FontNoggit::alt, FontNoggit::v }, "\a+\aImport last WMO from WMV", object_layout); + generate_hotkey_row({FontNoggit::t }, "\aSwitch between paste modes", object_layout); + generate_hotkey_row({FontNoggit::f }, "\aMove selection to cursor position", object_layout); + generate_hotkey_row({FontNoggit::minus, FontNoggit::plus }, "\aor\aScale M2", object_layout); + generate_hotkey_row({FontNoggit::num }, "\a 7 or 9 Rotate object", object_layout); + generate_hotkey_row({FontNoggit::num }, "\a 4 or 8 or 6 or 2 Vertical position", object_layout); + generate_hotkey_row({FontNoggit::num }, "\a 1 or 3 Move up/down", object_layout); + generate_hotkey_row({FontNoggit::shift }, "Holding \a 1 / 3 Double speed", object_layout); + generate_hotkey_row({FontNoggit::ctrl }, "Holding \a 1 / 3 Triple speed", object_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::ctrl }, "Holding \a and \a Half speed", object_layout); auto shader_widget (new QWidget (this)); auto shader_layout (new QFormLayout (shader_widget)); - generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aAdd shader", shader_layout); - generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\aRemove shader", shader_layout); - generate_hotkey_row({ font_noggit::alt, font_noggit::lmb_drag }, "\a+\aChange brush size", shader_layout); - generate_hotkey_row({ font_noggit::space, font_noggit::lmb_drag }, "\a+\aChange speed", shader_layout); - generate_hotkey_row({ font_noggit::mmb }, "\aPick shader color from the ground", shader_layout); - generate_hotkey_row({ font_noggit::plus }, "\aAdd current color to palette", shader_layout); + generate_hotkey_row({FontNoggit::shift, FontNoggit::lmb }, "\a+\aAdd shader", shader_layout); + generate_hotkey_row({FontNoggit::ctrl, FontNoggit::lmb }, "\a+\aRemove shader", shader_layout); + generate_hotkey_row({FontNoggit::alt, FontNoggit::lmb_drag }, "\a+\aChange brush size", shader_layout); + generate_hotkey_row({FontNoggit::space, FontNoggit::lmb_drag }, "\a+\aChange speed", shader_layout); + generate_hotkey_row({FontNoggit::mmb }, "\aPick shader color from the ground", shader_layout); + generate_hotkey_row({FontNoggit::plus }, "\aAdd current color to palette", shader_layout); layout->addWidget(tabs); tabs->addTab(base_widget, "Basic"); @@ -303,7 +303,7 @@ namespace Noggit } - void help::generate_hotkey_row(std::initializer_list&& hotkeys, const char* description, QFormLayout* layout) + void help::generate_hotkey_row(std::initializer_list&& hotkeys, const char* description, QFormLayout* layout) { auto row_layout = new QHBoxLayout(this); @@ -321,7 +321,7 @@ namespace Noggit } auto label = new QLabel(this); - QIcon hotkey_icon = font_noggit_icon(*icon++); + QIcon hotkey_icon = FontNoggitIcon(*icon++); label->setPixmap(hotkey_icon.pixmap(22, 22)); row_layout->addWidget(label); diff --git a/src/noggit/ui/Help.h b/src/noggit/ui/Help.h index 159f0b2f..72edabc7 100644 --- a/src/noggit/ui/Help.h +++ b/src/noggit/ui/Help.h @@ -3,7 +3,7 @@ #pragma once #include -#include +#include class QFormLayout; @@ -17,7 +17,7 @@ namespace Noggit help(QWidget* parent = nullptr); private: - inline void generate_hotkey_row(std::initializer_list&& hotkeys, const char* description, QFormLayout* layout); + inline void generate_hotkey_row(std::initializer_list&& hotkeys, const char* description, QFormLayout* layout); }; } } diff --git a/src/noggit/ui/MinimapCreator.cpp b/src/noggit/ui/MinimapCreator.cpp index 63d288a3..edab39f9 100644 --- a/src/noggit/ui/MinimapCreator.cpp +++ b/src/noggit/ui/MinimapCreator.cpp @@ -1,7 +1,7 @@ // This file is part of Noggit3, licensed under GNU General Public License (version 3). #include "MinimapCreator.hpp" -#include "font_awesome.hpp" +#include "FontAwesome.hpp" #include #include @@ -164,15 +164,15 @@ namespace Noggit m2_include_box_layout->addRow(m2_include_box_layout_btns); auto add_btn = new QPushButton("Add", m2_include_widget); - add_btn->setIcon(font_awesome_icon(font_awesome::plus)); + add_btn->setIcon(FontAwesomeIcon(FontAwesome::plus)); m2_include_box_layout_btns->addWidget(add_btn); auto remove_btn = new QPushButton("Remove", m2_include_widget); - remove_btn->setIcon(font_awesome_icon(font_awesome::times)); + remove_btn->setIcon(FontAwesomeIcon(FontAwesome::times)); m2_include_box_layout_btns->addWidget(remove_btn); auto clear_btn = new QPushButton("Clear all", m2_include_widget); - clear_btn->setIcon(font_awesome_icon(font_awesome::trashalt)); + clear_btn->setIcon(FontAwesomeIcon(FontAwesome::trashalt)); m2_include_box_layout_btns->addWidget(clear_btn); // M2 instance include tab @@ -197,15 +197,15 @@ namespace Noggit m2_instance_include_box_layout->addRow(m2_instance_include_box_layout_btns); auto add_btn_m2i = new QPushButton("Add", m2_instance_include_widget); - add_btn_m2i->setIcon(font_awesome_icon(font_awesome::plus)); + add_btn_m2i->setIcon(FontAwesomeIcon(FontAwesome::plus)); m2_instance_include_box_layout_btns->addWidget(add_btn_m2i); auto remove_btn_m2i = new QPushButton("Remove", m2_instance_include_widget); - remove_btn_m2i->setIcon(font_awesome_icon(font_awesome::times)); + remove_btn_m2i->setIcon(FontAwesomeIcon(FontAwesome::times)); m2_instance_include_box_layout_btns->addWidget(remove_btn_m2i); auto clear_btn_m2i = new QPushButton("Clear all", m2_instance_include_widget); - clear_btn_m2i->setIcon(font_awesome_icon(font_awesome::trashalt)); + clear_btn_m2i->setIcon(FontAwesomeIcon(FontAwesome::trashalt)); m2_instance_include_box_layout_btns->addWidget(clear_btn_m2i); // WMO model exclude tab @@ -230,15 +230,15 @@ namespace Noggit wmo_exclude_box_layout->addRow(wmo_exclude_box_layout_btns); auto add_btn_wmo = new QPushButton("Add", wmo_exclude_widget); - add_btn_wmo->setIcon(font_awesome_icon(font_awesome::plus)); + add_btn_wmo->setIcon(FontAwesomeIcon(FontAwesome::plus)); wmo_exclude_box_layout_btns->addWidget(add_btn_wmo); auto remove_btn_wmo = new QPushButton("Remove", wmo_exclude_widget); - remove_btn_wmo->setIcon(font_awesome_icon(font_awesome::times)); + remove_btn_wmo->setIcon(FontAwesomeIcon(FontAwesome::times)); wmo_exclude_box_layout_btns->addWidget(remove_btn_wmo); auto clear_btn_wmo = new QPushButton("Clear all", wmo_exclude_widget); - clear_btn_wmo->setIcon(font_awesome_icon(font_awesome::trashalt)); + clear_btn_wmo->setIcon(FontAwesomeIcon(FontAwesome::trashalt)); wmo_exclude_box_layout_btns->addWidget(clear_btn_wmo); // WMO instance exclude tab @@ -263,15 +263,15 @@ namespace Noggit wmo_instance_exclude_box_layout->addRow(wmo_instance_exclude_box_layout_btns); auto add_btn_wmo_i = new QPushButton("Add", wmo_instance_exclude_widget); - add_btn_wmo_i->setIcon(font_awesome_icon(font_awesome::plus)); + add_btn_wmo_i->setIcon(FontAwesomeIcon(FontAwesome::plus)); wmo_instance_exclude_box_layout_btns->addWidget(add_btn_wmo_i); auto remove_btn_wmo_i = new QPushButton("Remove", wmo_instance_exclude_widget); - remove_btn_wmo_i->setIcon(font_awesome_icon(font_awesome::times)); + remove_btn_wmo_i->setIcon(FontAwesomeIcon(FontAwesome::times)); wmo_instance_exclude_box_layout_btns->addWidget(remove_btn_wmo_i); auto clear_btn_wmo_i = new QPushButton("Clear all", wmo_instance_exclude_widget); - clear_btn_wmo_i->setIcon(font_awesome_icon(font_awesome::trashalt)); + clear_btn_wmo_i->setIcon(FontAwesomeIcon(FontAwesome::trashalt)); wmo_instance_exclude_box_layout_btns->addWidget(clear_btn_wmo_i); // Lighting diff --git a/src/noggit/ui/ObjectEditor.cpp b/src/noggit/ui/ObjectEditor.cpp index 55a84598..b86a236d 100644 --- a/src/noggit/ui/ObjectEditor.cpp +++ b/src/noggit/ui/ObjectEditor.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include @@ -174,26 +174,26 @@ namespace Noggit auto object_movement_layout = new QFormLayout (object_movement_box); // single model selection - auto object_movement_cb ( new checkbox ( "Mouse move follow\ncursor on the ground" + auto object_movement_cb ( new CheckBox ( "Mouse move follow\ncursor on the ground" , move_model_to_cursor_position , this ) ); - auto object_rotateground_cb(new checkbox("Rotate following cursor" + auto object_rotateground_cb(new CheckBox("Rotate following cursor" , rotate_along_ground , this ) ); - auto object_rotategroundsmooth_cb(new checkbox("Smooth follow rotation" + auto object_rotategroundsmooth_cb(new CheckBox("Smooth follow rotation" , rotate_along_ground_smooth , this ) ); - auto object_rotategroundrandom_cb(new checkbox("Random rot/tilt/scale\n on rotate" + auto object_rotategroundrandom_cb(new CheckBox("Random rot/tilt/scale\n on rotate" , rotate_along_ground_random , this ) @@ -208,13 +208,13 @@ namespace Noggit auto multi_select_movement_box(new QGroupBox("Multi Selection Movement", this)); auto multi_select_movement_layout = new QFormLayout(multi_select_movement_box); - auto multi_select_movement_cb ( new checkbox( "Mouse move snap\nmodels to the ground" + auto multi_select_movement_cb ( new CheckBox( "Mouse move snap\nmodels to the ground" , snap_multi_selection_to_ground , this ) ); - auto object_median_pivot_point (new checkbox ("Rotate around pivot point" + auto object_median_pivot_point (new CheckBox ("Rotate around pivot point" , use_median_pivot_point , this ) diff --git a/src/noggit/ui/shader_tool.cpp b/src/noggit/ui/ShaderTool.cpp similarity index 89% rename from src/noggit/ui/shader_tool.cpp rename to src/noggit/ui/ShaderTool.cpp index e7a6416e..74ced429 100644 --- a/src/noggit/ui/shader_tool.cpp +++ b/src/noggit/ui/ShaderTool.cpp @@ -2,9 +2,9 @@ #include #include -#include +#include #include -#include +#include #include #include @@ -27,7 +27,7 @@ namespace Noggit { namespace Ui { - shader_tool::shader_tool(MapView* map_view, QWidget* parent) + ShaderTool::ShaderTool(MapView* map_view, QWidget* parent) : QWidget(parent) , _map_view(map_view) , _color(1.f, 1.f, 1.f, 1.f) @@ -108,9 +108,9 @@ namespace Noggit layout->addRow(info_label); - QObject::connect(_slide_saturation, &color_widgets::GradientSlider::valueChanged, this, &shader_tool::set_hsv); - QObject::connect(_slide_value, &color_widgets::GradientSlider::valueChanged, this, &shader_tool::set_hsv); - QObject::connect(_slide_hue, &color_widgets::HueSlider::valueChanged, this, &shader_tool::set_hsv); + QObject::connect(_slide_saturation, &color_widgets::GradientSlider::valueChanged, this, &ShaderTool::set_hsv); + QObject::connect(_slide_value, &color_widgets::GradientSlider::valueChanged, this, &ShaderTool::set_hsv); + QObject::connect(_slide_hue, &color_widgets::HueSlider::valueChanged, this, &ShaderTool::set_hsv); QObject::connect(_slide_saturation, SIGNAL(valueChanged(int)), _spin_saturation, SLOT(setValue(int))); QObject::connect(_slide_value, SIGNAL(valueChanged(int)), _spin_value, SLOT(setValue(int))); @@ -120,8 +120,8 @@ namespace Noggit QObject::connect(_spin_hue, SIGNAL(valueChanged(int)), _slide_hue, SLOT(setValue(int))); QObject::connect(_spin_value, SIGNAL(valueChanged(int)), _slide_value, SLOT(setValue(int))); - QObject::connect(color_wheel, &color_widgets::ColorWheel::colorSelected, this, &shader_tool::update_color_widgets); - QObject::connect(color_picker, &color_widgets::ColorSelector::colorChanged, this, &shader_tool::update_color_widgets); + QObject::connect(color_wheel, &color_widgets::ColorWheel::colorSelected, this, &ShaderTool::update_color_widgets); + QObject::connect(color_picker, &color_widgets::ColorSelector::colorChanged, this, &ShaderTool::update_color_widgets); connect ( _color_palette, &color_widgets::ColorListWidget::color_added @@ -152,15 +152,15 @@ namespace Noggit }); - connect (_image_mask_group, &Noggit::Ui::Tools::ImageMaskSelector::rotationUpdated, this, &shader_tool::updateMaskImage); - connect (_radius_slider, &Noggit::Ui::Tools::UiCommon::ExtendedSlider::valueChanged, this, &shader_tool::updateMaskImage); - connect(_image_mask_group, &Noggit::Ui::Tools::ImageMaskSelector::pixmapUpdated, this, &shader_tool::updateMaskImage); + connect (_image_mask_group, &Noggit::Ui::Tools::ImageMaskSelector::rotationUpdated, this, &ShaderTool::updateMaskImage); + connect (_radius_slider, &Noggit::Ui::Tools::UiCommon::ExtendedSlider::valueChanged, this, &ShaderTool::updateMaskImage); + connect(_image_mask_group, &Noggit::Ui::Tools::ImageMaskSelector::pixmapUpdated, this, &ShaderTool::updateMaskImage); setMinimumWidth(250); setMaximumWidth(250); } - void shader_tool::changeShader + void ShaderTool::changeShader (World* world, glm::vec3 const& pos, float dt, bool add) { if (!_image_mask_group->isEnabled()) @@ -174,27 +174,27 @@ namespace Noggit } - void shader_tool::changeRadius(float change) + void ShaderTool::changeRadius(float change) { _radius_slider->setValue (_radius_slider->value() + change); } - void shader_tool::setRadius(float radius) + void ShaderTool::setRadius(float radius) { _radius_slider->setValue(radius); } - void shader_tool::changeSpeed(float change) + void ShaderTool::changeSpeed(float change) { _speed_slider->setValue(_speed_slider->value() + change); } - void shader_tool::setSpeed(float speed) + void ShaderTool::setSpeed(float speed) { _speed_slider->setValue(speed); } - void shader_tool::pickColor(World* world, glm::vec3 const& pos) + void ShaderTool::pickColor(World* world, glm::vec3 const& pos) { glm::vec3 color = world->pickShaderColor(pos); @@ -204,12 +204,12 @@ namespace Noggit } - void shader_tool::addColorToPalette() + void ShaderTool::addColorToPalette() { _color_palette->append(); } - void shader_tool::set_hsv() + void ShaderTool::set_hsv() { if (!signalsBlocked()) { @@ -222,7 +222,7 @@ namespace Noggit } } - void shader_tool::update_color_widgets() + void ShaderTool::update_color_widgets() { bool blocked = signalsBlocked(); blockSignals(true); @@ -252,12 +252,12 @@ namespace Noggit } - QSize shader_tool::sizeHint() const + QSize ShaderTool::sizeHint() const { return QSize(215, height()); } - void shader_tool::updateMaskImage() + void ShaderTool::updateMaskImage() { QPixmap* pixmap = _image_mask_group->getPixmap(); @@ -270,7 +270,7 @@ namespace Noggit _map_view->setBrushTexture(&_mask_image); } - QJsonObject shader_tool::toJSON() + QJsonObject ShaderTool::toJSON() { QJsonObject json; @@ -293,7 +293,7 @@ namespace Noggit return json; } - void shader_tool::fromJSON(QJsonObject const& json) + void ShaderTool::fromJSON(QJsonObject const& json) { _radius_slider->setValue(json["radius"].toDouble()); _speed_slider->setValue(json["speed"].toDouble()); diff --git a/src/noggit/ui/shader_tool.hpp b/src/noggit/ui/ShaderTool.hpp similarity index 96% rename from src/noggit/ui/shader_tool.hpp rename to src/noggit/ui/ShaderTool.hpp index 843de27e..4347eb9a 100644 --- a/src/noggit/ui/shader_tool.hpp +++ b/src/noggit/ui/ShaderTool.hpp @@ -23,11 +23,11 @@ namespace Noggit { namespace Ui { - class shader_tool : public QWidget + class ShaderTool : public QWidget { Q_OBJECT public: - shader_tool(MapView* map_view, QWidget* parent = nullptr); + ShaderTool(MapView* map_view, QWidget* parent = nullptr); void changeShader (World*, glm::vec3 const& pos, float dt, bool add); void pickColor(World* world, glm::vec3 const& pos); diff --git a/src/noggit/ui/terrain_tool.cpp b/src/noggit/ui/TerrainTool.cpp similarity index 88% rename from src/noggit/ui/terrain_tool.cpp rename to src/noggit/ui/TerrainTool.cpp index ed73610d..7591a0a5 100644 --- a/src/noggit/ui/terrain_tool.cpp +++ b/src/noggit/ui/TerrainTool.cpp @@ -1,419 +1,419 @@ -// This file is part of Noggit3, licensed under GNU General Public License (version 3). - -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -#define _USE_MATH_DEFINES -#include - -namespace Noggit -{ - namespace Ui - { - terrain_tool::terrain_tool(MapView* map_view, QWidget* parent, bool stamp) - : QWidget(parent) - , _edit_type (eTerrainType_Linear) - , _vertex_angle (0.0f) - , _vertex_orientation (0.0f) - , _cursor_pos(nullptr) - , _vertex_mode(eVertexMode_Center) - , _map_view(map_view) - { - setMinimumWidth(250); - setMaximumWidth(250); - auto layout (new QVBoxLayout (this)); - layout->setAlignment(Qt::AlignTop); - - _type_button_group = new QButtonGroup (this); - QRadioButton* radio_flat = new QRadioButton ("Flat", this); - QRadioButton* radio_linear = new QRadioButton ("Linear", this); - QRadioButton* radio_smooth = new QRadioButton ("Smooth", this); - QRadioButton* radio_polynomial = new QRadioButton ("Polynomial", this); - QRadioButton* radio_trigo = new QRadioButton ("Trigonom", this); - QRadioButton* radio_quadra = new QRadioButton ("Quadratic", this); - QRadioButton* radio_gauss = new QRadioButton ("Gaussian", this); - - QRadioButton* radio_vertex; - if (!stamp) - radio_vertex = new QRadioButton ("Vertex", this); - - QRadioButton* radio_script = new QRadioButton ("Script", this); - - _type_button_group->addButton (radio_flat, (int)eTerrainType_Flat); - _type_button_group->addButton (radio_linear, (int)eTerrainType_Linear); - _type_button_group->addButton (radio_smooth, (int)eTerrainType_Smooth); - _type_button_group->addButton (radio_polynomial, (int)eTerrainType_Polynom); - _type_button_group->addButton (radio_trigo, (int)eTerrainType_Trigo); - _type_button_group->addButton (radio_quadra, (int)eTerrainType_Quadra); - _type_button_group->addButton (radio_gauss, (int)eTerrainType_Gaussian); - - if (!stamp) - _type_button_group->addButton (radio_vertex, (int)eTerrainType_Vertex); - - _type_button_group->addButton (radio_script, (int)eTerrainType_Script); - - radio_linear->toggle(); - - QGroupBox* terrain_type_group (new QGroupBox ("Type", this)); - QGridLayout* terrain_type_layout (new QGridLayout (terrain_type_group)); - terrain_type_layout->addWidget (radio_flat, 0, 0); - terrain_type_layout->addWidget (radio_linear, 0, 1); - terrain_type_layout->addWidget (radio_smooth, 1, 0); - terrain_type_layout->addWidget (radio_polynomial, 1, 1); - terrain_type_layout->addWidget (radio_trigo, 2, 0); - terrain_type_layout->addWidget (radio_quadra, 2, 1); - terrain_type_layout->addWidget (radio_gauss, 3, 0); - - if (!stamp) - { - terrain_type_layout->addWidget (radio_vertex, 3, 1); - terrain_type_layout->addWidget (radio_script, 4, 0); - } - else - { - terrain_type_layout->addWidget (radio_script, 3, 1); - } - - layout->addWidget(terrain_type_group); - - _radius_slider = new Noggit::Ui::Tools::UiCommon::ExtendedSlider(this); - _radius_slider->setRange (0, 1000); - _radius_slider->setPrefix("Radius:"); - _radius_slider->setDecimals(2); - _radius_slider->setValue(15); - - _inner_radius_slider = new Noggit::Ui::Tools::UiCommon::ExtendedSlider(this); - _inner_radius_slider->setRange (0.0, 1.0); - _inner_radius_slider->setPrefix("Inner Radius:"); - _inner_radius_slider->setDecimals(2); - _inner_radius_slider->setSingleStep(0.05f); - _inner_radius_slider->setValue(0); - - QGroupBox* settings_group(new QGroupBox ("Settings", this)); - auto settings_layout (new QVBoxLayout (settings_group)); - settings_layout->setContentsMargins(0, 12, 0, 12); - - _speed_slider = new Noggit::Ui::Tools::UiCommon::ExtendedSlider(this); - _speed_slider->setPrefix("Speed:"); - _speed_slider->setRange (0, 10 * 100); - _speed_slider->setSingleStep (1); - _speed_slider->setValue(2); - - settings_layout->addWidget(_radius_slider); - settings_layout->addWidget(_inner_radius_slider); - settings_layout->addWidget(_speed_slider); - - layout->addWidget(settings_group); - - _image_mask_group = new Noggit::Ui::Tools::ImageMaskSelector(map_view, this); - _mask_image = _image_mask_group->getPixmap()->toImage(); - layout->addWidget(_image_mask_group); - _image_mask_group->setBrushModeVisible(!stamp); - - _vertex_type_group = new QGroupBox ("Vertex edit", this); - _vertex_type_group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); - QVBoxLayout* vertex_layout (new QVBoxLayout (_vertex_type_group)); - - _vertex_button_group = new QButtonGroup (this); - QRadioButton* radio_mouse = new QRadioButton ("Cursor", _vertex_type_group); - QRadioButton* radio_center = new QRadioButton ("Selection center", _vertex_type_group); - - radio_mouse->setToolTip ("Orient vertices using the cursor pos as reference"); - radio_center->setToolTip ("Orient vertices using the selection center as reference"); - - _vertex_button_group->addButton (radio_mouse, (int)eVertexMode_Mouse); - _vertex_button_group->addButton (radio_center, (int)eVertexMode_Center); - - radio_center->toggle(); - - QHBoxLayout* vertex_type_layout (new QHBoxLayout); - vertex_type_layout->addWidget (radio_mouse); - vertex_type_layout->addWidget (radio_center); - vertex_layout->addItem (vertex_type_layout); - - QHBoxLayout* vertex_angle_layout (new QHBoxLayout); - vertex_angle_layout->addWidget (_orientation_dial = new QDial (_vertex_type_group)); - _orientation_dial->setRange(0, 360); - _orientation_dial->setWrapping(true); - _orientation_dial->setSliderPosition(_vertex_orientation._ - 90); // to get ingame orientation - _orientation_dial->setToolTip("Orientation"); - _orientation_dial->setSingleStep(10); - - vertex_angle_layout->addWidget (_angle_slider = new QSlider (_vertex_type_group)); - _angle_slider->setRange(-89, 89); - _angle_slider->setSliderPosition(_vertex_angle._); - _angle_slider->setToolTip("Angle"); - - vertex_layout->addItem (vertex_angle_layout); - - layout->addWidget(_vertex_type_group); - _vertex_type_group->hide(); - - connect ( _type_button_group, qOverload (&QButtonGroup::idClicked) - , [&] (int id) - { - _edit_type = static_cast (id); - updateVertexGroup(); - } - ); - - - connect ( _vertex_button_group, qOverload (&QButtonGroup::idClicked) - , [&] (int id) - { - _vertex_mode = id; - } - ); - - connect ( _angle_slider, &QSlider::valueChanged - , [this] (int v) - { - if (NOGGIT_CUR_ACTION) - { - setAngle(v); - } - else - { - NOGGIT_ACTION_MGR->beginAction(_map_view); - setAngle(v); - NOGGIT_ACTION_MGR->endAction(); - } - - } - ); - - connect ( _orientation_dial, &QDial::valueChanged - , [this] (int v) - { - if (NOGGIT_CUR_ACTION) - { - setOrientation(v + 90.0f); - } - else - { - NOGGIT_ACTION_MGR->beginAction(_map_view); - setOrientation(v + 90.0f); - NOGGIT_ACTION_MGR->endAction(); - } - - } - ); - - connect (_image_mask_group, &Noggit::Ui::Tools::ImageMaskSelector::rotationUpdated, this, &terrain_tool::updateMaskImage); - connect (_radius_slider, &Noggit::Ui::Tools::UiCommon::ExtendedSlider::valueChanged, this, &terrain_tool::updateMaskImage); - connect(_image_mask_group, &Noggit::Ui::Tools::ImageMaskSelector::pixmapUpdated, this, &terrain_tool::updateMaskImage); - - - } - - void terrain_tool::updateMaskImage() - { - QPixmap* pixmap = _image_mask_group->getPixmap(); - QTransform matrix; - matrix.rotateRadians(_image_mask_group->getRotation() / 360.0f * 2.0f * M_PI); - _mask_image = pixmap->toImage().transformed(matrix, Qt::SmoothTransformation); - - if (_map_view->get_editing_mode() != editing_mode::stamp - || (_map_view->getActiveStampModeItem() && _map_view->getActiveStampModeItem() == this)) - _map_view->setBrushTexture(&_mask_image); - } - - void terrain_tool::changeTerrain - (World* world, glm::vec3 const& pos, float dt) - { - - float radius = static_cast(_radius_slider->value()); - if(_edit_type != eTerrainType_Vertex) - { - if (_image_mask_group->isEnabled()) - { - world->stamp(pos, dt * _speed_slider->value(), &_mask_image, radius, - _inner_radius_slider->value(), _edit_type, _image_mask_group->getBrushMode()); - } - else - { - world->changeTerrain(pos, dt * _speed_slider->value(), radius, _edit_type, _inner_radius_slider->value()); - } - - } - else - { - // < 0 ==> control is pressed - if (dt >= 0.0f) - { - world->selectVertices(pos, radius); - } - else - { - if (world->deselectVertices(pos, radius)) - { - _vertex_angle = math::degrees (0.0f); - _vertex_orientation = math::degrees (0.0f); - world->clearVertexSelection(); - } - } - } - } - - void terrain_tool::moveVertices (World* world, float dt) - { - world->moveVertices(dt * _speed_slider->value()); - } - - void terrain_tool::flattenVertices (World* world) - { - if (_edit_type == eTerrainType_Vertex) - { - world->flattenVertices (world->vertexCenter().y); - } - } - - void terrain_tool::nextType() - { - _edit_type = static_cast ((static_cast (_edit_type) + 1) % eTerrainType_Count); - _type_button_group->button (_edit_type)->toggle(); - updateVertexGroup(); - } - - void terrain_tool::setRadius(float radius) - { - _radius_slider->setValue(radius); - } - - void terrain_tool::setInnerRadius(float radius) - { - _inner_radius_slider->setValue(radius); - } - - void terrain_tool::changeRadius(float change) - { - setRadius (_radius_slider->value() + change); - } - - void terrain_tool::changeInnerRadius(float change) - { - _inner_radius_slider->setValue(_inner_radius_slider->value() + change); - } - - void terrain_tool::changeSpeed(float change) - { - _speed_slider->setValue(_speed_slider->value() + change); - } - - void terrain_tool::setSpeed(float speed) - { - _speed_slider->setValue(speed); - } - - void terrain_tool::changeOrientation (float change) - { - setOrientation (_vertex_orientation._ + change); - } - - void terrain_tool::setOrientation (float orientation) - { - if (_edit_type == eTerrainType_Vertex) - { - QSignalBlocker const blocker (_orientation_dial); - - while (orientation >= 360.0f) - { - orientation -= 360.0f; - } - while (orientation < 0.0f) - { - orientation += 360.0f; - } - - _vertex_orientation = math::degrees (orientation); - _orientation_dial->setSliderPosition (_vertex_orientation._ - 90.0f); - - emit updateVertices(_vertex_mode, _vertex_angle, _vertex_orientation); - } - } - - void terrain_tool::setOrientRelativeTo (World* world, glm::vec3 const& pos) - { - if (_edit_type == eTerrainType_Vertex) - { - glm::vec3 const& center = world->vertexCenter(); - _vertex_orientation = math::radians (std::atan2(center.z - pos.z, center.x - pos.x)); - emit updateVertices(_vertex_mode, _vertex_angle, _vertex_orientation); - } - } - - void terrain_tool::changeAngle (float change) - { - setAngle (_vertex_angle._ + change); - } - - void terrain_tool::setAngle (float angle) - { - if (_edit_type == eTerrainType_Vertex) - { - QSignalBlocker const blocker (_angle_slider); - _vertex_angle = math::degrees (std::max(-89.0f, std::min(89.0f, angle))); - _angle_slider->setSliderPosition (_vertex_angle._); - emit updateVertices(_vertex_mode, _vertex_angle, _vertex_orientation); - } - } - - void terrain_tool::updateVertexGroup() - { - _vertex_type_group->setVisible(_edit_type == eTerrainType_Vertex); - _image_mask_group->setVisible(_edit_type != eTerrainType_Vertex && _edit_type != eTerrainType_Script); - } - - QSize terrain_tool::sizeHint() const - { - return QSize(250, height()); - } - - QJsonObject terrain_tool::toJSON() - { - QJsonObject json; - - json["brush_action_type"] = "TERRAIN"; - - json["radius"] = _radius_slider->rawValue(); - json["inner_radius"] = _inner_radius_slider->rawValue(); - json["speed"] = _speed_slider->rawValue(); - json["edit_type"] = static_cast(_edit_type); - - json["mask_enabled"] = _image_mask_group->isEnabled(); - json["brush_mode"] = _image_mask_group->getBrushMode(); - json["randomize_rot"] = _image_mask_group->getRandomizeRotation(); - json["mask_rot"] = _image_mask_group->getRotation(); - json["mask_image"] = _image_mask_group->getImageMaskPath(); - - return json; - } - - void terrain_tool::fromJSON(QJsonObject const& json) - { - _radius_slider->setValue(json["radius"].toDouble()); - _inner_radius_slider->setValue(json["inner_radius"].toDouble()); - _speed_slider->setValue(json["speed"].toDouble()); - _edit_type = static_cast(json["edit_type"].toInt()); - - _image_mask_group->setEnabled(json["mask_enabled"].toBool()); - _image_mask_group->setBrushMode(json["brush_mode"].toInt()); - _image_mask_group->setRandomizeRotation(json["randomize_rot"].toBool()); - _image_mask_group->setRotationRaw(json["mask_rot"].toInt()); - _image_mask_group->setImageMask(json["mask_image"].toString()); - } - } -} +// This file is part of Noggit3, licensed under GNU General Public License (version 3). + +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include + +#define _USE_MATH_DEFINES +#include + +namespace Noggit +{ + namespace Ui + { + TerrainTool::TerrainTool(MapView* map_view, QWidget* parent, bool stamp) + : QWidget(parent) + , _edit_type (eTerrainType_Linear) + , _vertex_angle (0.0f) + , _vertex_orientation (0.0f) + , _cursor_pos(nullptr) + , _vertex_mode(eVertexMode_Center) + , _map_view(map_view) + { + setMinimumWidth(250); + setMaximumWidth(250); + auto layout (new QVBoxLayout (this)); + layout->setAlignment(Qt::AlignTop); + + _type_button_group = new QButtonGroup (this); + QRadioButton* radio_flat = new QRadioButton ("Flat", this); + QRadioButton* radio_linear = new QRadioButton ("Linear", this); + QRadioButton* radio_smooth = new QRadioButton ("Smooth", this); + QRadioButton* radio_polynomial = new QRadioButton ("Polynomial", this); + QRadioButton* radio_trigo = new QRadioButton ("Trigonom", this); + QRadioButton* radio_quadra = new QRadioButton ("Quadratic", this); + QRadioButton* radio_gauss = new QRadioButton ("Gaussian", this); + + QRadioButton* radio_vertex; + if (!stamp) + radio_vertex = new QRadioButton ("Vertex", this); + + QRadioButton* radio_script = new QRadioButton ("Script", this); + + _type_button_group->addButton (radio_flat, (int)eTerrainType_Flat); + _type_button_group->addButton (radio_linear, (int)eTerrainType_Linear); + _type_button_group->addButton (radio_smooth, (int)eTerrainType_Smooth); + _type_button_group->addButton (radio_polynomial, (int)eTerrainType_Polynom); + _type_button_group->addButton (radio_trigo, (int)eTerrainType_Trigo); + _type_button_group->addButton (radio_quadra, (int)eTerrainType_Quadra); + _type_button_group->addButton (radio_gauss, (int)eTerrainType_Gaussian); + + if (!stamp) + _type_button_group->addButton (radio_vertex, (int)eTerrainType_Vertex); + + _type_button_group->addButton (radio_script, (int)eTerrainType_Script); + + radio_linear->toggle(); + + QGroupBox* terrain_type_group (new QGroupBox ("Type", this)); + QGridLayout* terrain_type_layout (new QGridLayout (terrain_type_group)); + terrain_type_layout->addWidget (radio_flat, 0, 0); + terrain_type_layout->addWidget (radio_linear, 0, 1); + terrain_type_layout->addWidget (radio_smooth, 1, 0); + terrain_type_layout->addWidget (radio_polynomial, 1, 1); + terrain_type_layout->addWidget (radio_trigo, 2, 0); + terrain_type_layout->addWidget (radio_quadra, 2, 1); + terrain_type_layout->addWidget (radio_gauss, 3, 0); + + if (!stamp) + { + terrain_type_layout->addWidget (radio_vertex, 3, 1); + terrain_type_layout->addWidget (radio_script, 4, 0); + } + else + { + terrain_type_layout->addWidget (radio_script, 3, 1); + } + + layout->addWidget(terrain_type_group); + + _radius_slider = new Noggit::Ui::Tools::UiCommon::ExtendedSlider(this); + _radius_slider->setRange (0, 1000); + _radius_slider->setPrefix("Radius:"); + _radius_slider->setDecimals(2); + _radius_slider->setValue(15); + + _inner_radius_slider = new Noggit::Ui::Tools::UiCommon::ExtendedSlider(this); + _inner_radius_slider->setRange (0.0, 1.0); + _inner_radius_slider->setPrefix("Inner Radius:"); + _inner_radius_slider->setDecimals(2); + _inner_radius_slider->setSingleStep(0.05f); + _inner_radius_slider->setValue(0); + + QGroupBox* settings_group(new QGroupBox ("Settings", this)); + auto settings_layout (new QVBoxLayout (settings_group)); + settings_layout->setContentsMargins(0, 12, 0, 12); + + _speed_slider = new Noggit::Ui::Tools::UiCommon::ExtendedSlider(this); + _speed_slider->setPrefix("Speed:"); + _speed_slider->setRange (0, 10 * 100); + _speed_slider->setSingleStep (1); + _speed_slider->setValue(2); + + settings_layout->addWidget(_radius_slider); + settings_layout->addWidget(_inner_radius_slider); + settings_layout->addWidget(_speed_slider); + + layout->addWidget(settings_group); + + _image_mask_group = new Noggit::Ui::Tools::ImageMaskSelector(map_view, this); + _mask_image = _image_mask_group->getPixmap()->toImage(); + layout->addWidget(_image_mask_group); + _image_mask_group->setBrushModeVisible(!stamp); + + _vertex_type_group = new QGroupBox ("Vertex edit", this); + _vertex_type_group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); + QVBoxLayout* vertex_layout (new QVBoxLayout (_vertex_type_group)); + + _vertex_button_group = new QButtonGroup (this); + QRadioButton* radio_mouse = new QRadioButton ("Cursor", _vertex_type_group); + QRadioButton* radio_center = new QRadioButton ("Selection center", _vertex_type_group); + + radio_mouse->setToolTip ("Orient vertices using the cursor pos as reference"); + radio_center->setToolTip ("Orient vertices using the selection center as reference"); + + _vertex_button_group->addButton (radio_mouse, (int)eVertexMode_Mouse); + _vertex_button_group->addButton (radio_center, (int)eVertexMode_Center); + + radio_center->toggle(); + + QHBoxLayout* vertex_type_layout (new QHBoxLayout); + vertex_type_layout->addWidget (radio_mouse); + vertex_type_layout->addWidget (radio_center); + vertex_layout->addItem (vertex_type_layout); + + QHBoxLayout* vertex_angle_layout (new QHBoxLayout); + vertex_angle_layout->addWidget (_orientation_dial = new QDial (_vertex_type_group)); + _orientation_dial->setRange(0, 360); + _orientation_dial->setWrapping(true); + _orientation_dial->setSliderPosition(_vertex_orientation._ - 90); // to get ingame orientation + _orientation_dial->setToolTip("Orientation"); + _orientation_dial->setSingleStep(10); + + vertex_angle_layout->addWidget (_angle_slider = new QSlider (_vertex_type_group)); + _angle_slider->setRange(-89, 89); + _angle_slider->setSliderPosition(_vertex_angle._); + _angle_slider->setToolTip("Angle"); + + vertex_layout->addItem (vertex_angle_layout); + + layout->addWidget(_vertex_type_group); + _vertex_type_group->hide(); + + connect ( _type_button_group, qOverload (&QButtonGroup::idClicked) + , [&] (int id) + { + _edit_type = static_cast (id); + updateVertexGroup(); + } + ); + + + connect ( _vertex_button_group, qOverload (&QButtonGroup::idClicked) + , [&] (int id) + { + _vertex_mode = id; + } + ); + + connect ( _angle_slider, &QSlider::valueChanged + , [this] (int v) + { + if (NOGGIT_CUR_ACTION) + { + setAngle(v); + } + else + { + NOGGIT_ACTION_MGR->beginAction(_map_view); + setAngle(v); + NOGGIT_ACTION_MGR->endAction(); + } + + } + ); + + connect ( _orientation_dial, &QDial::valueChanged + , [this] (int v) + { + if (NOGGIT_CUR_ACTION) + { + setOrientation(v + 90.0f); + } + else + { + NOGGIT_ACTION_MGR->beginAction(_map_view); + setOrientation(v + 90.0f); + NOGGIT_ACTION_MGR->endAction(); + } + + } + ); + + connect (_image_mask_group, &Noggit::Ui::Tools::ImageMaskSelector::rotationUpdated, this, &TerrainTool::updateMaskImage); + connect (_radius_slider, &Noggit::Ui::Tools::UiCommon::ExtendedSlider::valueChanged, this, &TerrainTool::updateMaskImage); + connect(_image_mask_group, &Noggit::Ui::Tools::ImageMaskSelector::pixmapUpdated, this, &TerrainTool::updateMaskImage); + + + } + + void TerrainTool::updateMaskImage() + { + QPixmap* pixmap = _image_mask_group->getPixmap(); + QTransform matrix; + matrix.rotateRadians(_image_mask_group->getRotation() / 360.0f * 2.0f * M_PI); + _mask_image = pixmap->toImage().transformed(matrix, Qt::SmoothTransformation); + + if (_map_view->get_editing_mode() != editing_mode::stamp + || (_map_view->getActiveStampModeItem() && _map_view->getActiveStampModeItem() == this)) + _map_view->setBrushTexture(&_mask_image); + } + + void TerrainTool::changeTerrain + (World* world, glm::vec3 const& pos, float dt) + { + + float radius = static_cast(_radius_slider->value()); + if(_edit_type != eTerrainType_Vertex) + { + if (_image_mask_group->isEnabled()) + { + world->stamp(pos, dt * _speed_slider->value(), &_mask_image, radius, + _inner_radius_slider->value(), _edit_type, _image_mask_group->getBrushMode()); + } + else + { + world->changeTerrain(pos, dt * _speed_slider->value(), radius, _edit_type, _inner_radius_slider->value()); + } + + } + else + { + // < 0 ==> control is pressed + if (dt >= 0.0f) + { + world->selectVertices(pos, radius); + } + else + { + if (world->deselectVertices(pos, radius)) + { + _vertex_angle = math::degrees (0.0f); + _vertex_orientation = math::degrees (0.0f); + world->clearVertexSelection(); + } + } + } + } + + void TerrainTool::moveVertices (World* world, float dt) + { + world->moveVertices(dt * _speed_slider->value()); + } + + void TerrainTool::flattenVertices (World* world) + { + if (_edit_type == eTerrainType_Vertex) + { + world->flattenVertices (world->vertexCenter().y); + } + } + + void TerrainTool::nextType() + { + _edit_type = static_cast ((static_cast (_edit_type) + 1) % eTerrainType_Count); + _type_button_group->button (_edit_type)->toggle(); + updateVertexGroup(); + } + + void TerrainTool::setRadius(float radius) + { + _radius_slider->setValue(radius); + } + + void TerrainTool::setInnerRadius(float radius) + { + _inner_radius_slider->setValue(radius); + } + + void TerrainTool::changeRadius(float change) + { + setRadius (_radius_slider->value() + change); + } + + void TerrainTool::changeInnerRadius(float change) + { + _inner_radius_slider->setValue(_inner_radius_slider->value() + change); + } + + void TerrainTool::changeSpeed(float change) + { + _speed_slider->setValue(_speed_slider->value() + change); + } + + void TerrainTool::setSpeed(float speed) + { + _speed_slider->setValue(speed); + } + + void TerrainTool::changeOrientation (float change) + { + setOrientation (_vertex_orientation._ + change); + } + + void TerrainTool::setOrientation (float orientation) + { + if (_edit_type == eTerrainType_Vertex) + { + QSignalBlocker const blocker (_orientation_dial); + + while (orientation >= 360.0f) + { + orientation -= 360.0f; + } + while (orientation < 0.0f) + { + orientation += 360.0f; + } + + _vertex_orientation = math::degrees (orientation); + _orientation_dial->setSliderPosition (_vertex_orientation._ - 90.0f); + + emit updateVertices(_vertex_mode, _vertex_angle, _vertex_orientation); + } + } + + void TerrainTool::setOrientRelativeTo (World* world, glm::vec3 const& pos) + { + if (_edit_type == eTerrainType_Vertex) + { + glm::vec3 const& center = world->vertexCenter(); + _vertex_orientation = math::radians (std::atan2(center.z - pos.z, center.x - pos.x)); + emit updateVertices(_vertex_mode, _vertex_angle, _vertex_orientation); + } + } + + void TerrainTool::changeAngle (float change) + { + setAngle (_vertex_angle._ + change); + } + + void TerrainTool::setAngle (float angle) + { + if (_edit_type == eTerrainType_Vertex) + { + QSignalBlocker const blocker (_angle_slider); + _vertex_angle = math::degrees (std::max(-89.0f, std::min(89.0f, angle))); + _angle_slider->setSliderPosition (_vertex_angle._); + emit updateVertices(_vertex_mode, _vertex_angle, _vertex_orientation); + } + } + + void TerrainTool::updateVertexGroup() + { + _vertex_type_group->setVisible(_edit_type == eTerrainType_Vertex); + _image_mask_group->setVisible(_edit_type != eTerrainType_Vertex && _edit_type != eTerrainType_Script); + } + + QSize TerrainTool::sizeHint() const + { + return QSize(250, height()); + } + + QJsonObject TerrainTool::toJSON() + { + QJsonObject json; + + json["brush_action_type"] = "TERRAIN"; + + json["radius"] = _radius_slider->rawValue(); + json["inner_radius"] = _inner_radius_slider->rawValue(); + json["speed"] = _speed_slider->rawValue(); + json["edit_type"] = static_cast(_edit_type); + + json["mask_enabled"] = _image_mask_group->isEnabled(); + json["brush_mode"] = _image_mask_group->getBrushMode(); + json["randomize_rot"] = _image_mask_group->getRandomizeRotation(); + json["mask_rot"] = _image_mask_group->getRotation(); + json["mask_image"] = _image_mask_group->getImageMaskPath(); + + return json; + } + + void TerrainTool::fromJSON(QJsonObject const& json) + { + _radius_slider->setValue(json["radius"].toDouble()); + _inner_radius_slider->setValue(json["inner_radius"].toDouble()); + _speed_slider->setValue(json["speed"].toDouble()); + _edit_type = static_cast(json["edit_type"].toInt()); + + _image_mask_group->setEnabled(json["mask_enabled"].toBool()); + _image_mask_group->setBrushMode(json["brush_mode"].toInt()); + _image_mask_group->setRandomizeRotation(json["randomize_rot"].toBool()); + _image_mask_group->setRotationRaw(json["mask_rot"].toInt()); + _image_mask_group->setImageMask(json["mask_image"].toString()); + } + } +} diff --git a/src/noggit/ui/terrain_tool.hpp b/src/noggit/ui/TerrainTool.hpp similarity index 96% rename from src/noggit/ui/terrain_tool.hpp rename to src/noggit/ui/TerrainTool.hpp index 56ebb53c..1d0c51b3 100644 --- a/src/noggit/ui/terrain_tool.hpp +++ b/src/noggit/ui/TerrainTool.hpp @@ -22,12 +22,12 @@ namespace Noggit namespace Ui { - class terrain_tool : public QWidget + class TerrainTool : public QWidget { Q_OBJECT public: - terrain_tool(MapView* map_view, QWidget* parent = nullptr, bool stamp = false); + TerrainTool(MapView* map_view, QWidget* parent = nullptr, bool stamp = false); void changeTerrain (World*, glm::vec3 const& pos, float dt); diff --git a/src/noggit/ui/TexturePicker.cpp b/src/noggit/ui/TexturePicker.cpp index d505f474..62e7231f 100644 --- a/src/noggit/ui/TexturePicker.cpp +++ b/src/noggit/ui/TexturePicker.cpp @@ -2,8 +2,8 @@ #include -#include -#include +#include +#include #include #include #include @@ -32,7 +32,7 @@ namespace Noggit for (int i = 0; i < 4; i++) { current_texture* click_label = new current_texture(false, this); - connect ( click_label, &clickable_label::clicked + connect ( click_label, &ClickableLabel::clicked , [=] { setTexture(i, current_texture_window); @@ -45,8 +45,8 @@ namespace Noggit QPushButton* btn_left = new QPushButton (this); QPushButton* btn_right = new QPushButton (this); - btn_left->setIcon(font_awesome_icon(font_awesome::angledoubleleft)); - btn_right->setIcon(font_awesome_icon(font_awesome::angledoubleright)); + btn_left->setIcon(FontAwesomeIcon(FontAwesome::angledoubleleft)); + btn_right->setIcon(FontAwesomeIcon(FontAwesome::angledoubleright)); btn_left->setMinimumHeight(16); btn_right->setMinimumHeight(16); diff --git a/src/noggit/ui/Toolbar.cpp b/src/noggit/ui/Toolbar.cpp index ab613c17..41f891ad 100644 --- a/src/noggit/ui/Toolbar.cpp +++ b/src/noggit/ui/Toolbar.cpp @@ -14,24 +14,24 @@ namespace Noggit setAllowedAreas(Qt::LeftToolBarArea); setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); - add_tool_icon (editing_mode::ground, tr("Raise / Lower"), font_noggit::TOOL_RAISE_LOWER); - add_tool_icon (editing_mode::flatten_blur, tr("Flatten / Blur"), font_noggit::TOOL_FLATTEN_BLUR); - add_tool_icon (editing_mode::paint, tr("Texture Painter"), font_noggit::TOOL_TEXTURE_PAINT); - add_tool_icon (editing_mode::holes, tr("Hole Cutter"), font_noggit::TOOL_HOLE_CUTTER); - add_tool_icon (editing_mode::areaid, tr("Area Designator"), font_noggit::TOOL_AREA_DESIGNATOR); - add_tool_icon (editing_mode::flags, tr("Impass Designator"), font_noggit::TOOL_IMPASS_DESIGNATOR); - add_tool_icon (editing_mode::water, tr("Water Editor"), font_noggit::TOOL_WATER_EDITOR); - add_tool_icon (editing_mode::mccv, tr("Vertex Painter"), font_noggit::TOOL_VERTEX_PAINT); - add_tool_icon (editing_mode::object, tr("Object Editor"), font_noggit::TOOL_OBJECT_EDITOR); - add_tool_icon (editing_mode::minimap, tr("Minimap Editor"), font_noggit::TOOL_MINIMAP_EDITOR); - add_tool_icon(editing_mode::stamp, tr("Stamp Mode"), font_noggit::TOOL_STAMP); - add_tool_icon(editing_mode::light, tr("Light Editor"), font_noggit::TOOL_STAMP); - add_tool_icon (editing_mode::scripting, tr("Scripting"), font_noggit::INFO); + add_tool_icon (editing_mode::ground, tr("Raise / Lower"), FontNoggit::TOOL_RAISE_LOWER); + add_tool_icon (editing_mode::flatten_blur, tr("Flatten / Blur"), FontNoggit::TOOL_FLATTEN_BLUR); + add_tool_icon (editing_mode::paint, tr("Texture Painter"), FontNoggit::TOOL_TEXTURE_PAINT); + add_tool_icon (editing_mode::holes, tr("Hole Cutter"), FontNoggit::TOOL_HOLE_CUTTER); + add_tool_icon (editing_mode::areaid, tr("Area Designator"), FontNoggit::TOOL_AREA_DESIGNATOR); + add_tool_icon (editing_mode::flags, tr("Impass Designator"), FontNoggit::TOOL_IMPASS_DESIGNATOR); + add_tool_icon (editing_mode::water, tr("Water Editor"), FontNoggit::TOOL_WATER_EDITOR); + add_tool_icon (editing_mode::mccv, tr("Vertex Painter"), FontNoggit::TOOL_VERTEX_PAINT); + add_tool_icon (editing_mode::object, tr("Object Editor"), FontNoggit::TOOL_OBJECT_EDITOR); + add_tool_icon (editing_mode::minimap, tr("Minimap Editor"), FontNoggit::TOOL_MINIMAP_EDITOR); + add_tool_icon(editing_mode::stamp, tr("Stamp Mode"), FontNoggit::TOOL_STAMP); + add_tool_icon(editing_mode::light, tr("Light Editor"), FontNoggit::TOOL_STAMP); + add_tool_icon (editing_mode::scripting, tr("Scripting"), FontNoggit::INFO); } - void toolbar::add_tool_icon(editing_mode mode, const QString& name, const font_noggit::icons& icon) + void toolbar::add_tool_icon(editing_mode mode, const QString& name, const FontNoggit::Icons& icon) { - auto action = addAction(font_noggit_icon{icon}, name); + auto action = addAction(FontNoggitIcon{icon}, name); connect (action, &QAction::triggered, [this, mode] () { _set_editing_mode (mode); }); diff --git a/src/noggit/ui/Toolbar.h b/src/noggit/ui/Toolbar.h index ac4f81aa..a424a00d 100644 --- a/src/noggit/ui/Toolbar.h +++ b/src/noggit/ui/Toolbar.h @@ -8,7 +8,7 @@ #include #include -#include +#include namespace Noggit { @@ -25,7 +25,7 @@ namespace Noggit std::function _set_editing_mode; QActionGroup _tool_group; - void add_tool_icon(editing_mode mode, const QString& name, const font_noggit::icons& icon); + void add_tool_icon(editing_mode mode, const QString& name, const FontNoggit::Icons& icon); }; } } diff --git a/src/noggit/ui/Water.cpp b/src/noggit/ui/Water.cpp index 17bf4553..bd239ba3 100644 --- a/src/noggit/ui/Water.cpp +++ b/src/noggit/ui/Water.cpp @@ -152,8 +152,8 @@ namespace Noggit auto override_group (new QGroupBox ("Override", this)); auto override_layout (new QFormLayout (override_group)); - override_layout->addWidget (new checkbox ("Liquid ID", &_override_liquid_id, this)); - override_layout->addWidget (new checkbox ("Height", &_override_height, this)); + override_layout->addWidget (new CheckBox ("Liquid ID", &_override_liquid_id, this)); + override_layout->addWidget (new CheckBox ("Height", &_override_height, this)); layout->addRow(override_group); @@ -212,7 +212,7 @@ namespace Noggit auto layer_group (new QGroupBox ("Layers", this)); auto layer_layout (new QFormLayout (layer_group)); - layer_layout->addRow (new checkbox("Show all layers", display_all_layers)); + layer_layout->addRow (new CheckBox("Show all layers", display_all_layers)); layer_layout->addRow (new QLabel("Current layer:", this)); waterLayer = new QSpinBox (this); diff --git a/src/noggit/ui/Water.h b/src/noggit/ui/Water.h index 93449ab0..e660be30 100644 --- a/src/noggit/ui/Water.h +++ b/src/noggit/ui/Water.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include class QDoubleSpinBox; diff --git a/src/noggit/ui/clickable_label.cpp b/src/noggit/ui/clickable_label.cpp deleted file mode 100644 index c28a9ea2..00000000 --- a/src/noggit/ui/clickable_label.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// This file is part of Noggit3, licensed under GNU General Public License (version 3). - -#include - -namespace Noggit -{ - namespace Ui - { - clickable_label::clickable_label(QWidget* parent) : QLabel(parent){} - - void clickable_label::mouseReleaseEvent (QMouseEvent*) - { - emit clicked(); - } - } -} diff --git a/src/noggit/ui/main_window.cpp b/src/noggit/ui/main_window.cpp index 70e53f52..c40ba229 100644 --- a/src/noggit/ui/main_window.cpp +++ b/src/noggit/ui/main_window.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/noggit/ui/object_palette.cpp b/src/noggit/ui/object_palette.cpp index 40e1858b..e0ce8e54 100644 --- a/src/noggit/ui/object_palette.cpp +++ b/src/noggit/ui/object_palette.cpp @@ -2,7 +2,7 @@ #include "object_palette.hpp" -#include +#include #include #include #include @@ -111,12 +111,12 @@ namespace Noggit QVBoxLayout* button_layout = new QVBoxLayout(this); _add_button = new QPushButton(this); - _add_button->setIcon(font_awesome_icon(font_awesome::plus)); + _add_button->setIcon(FontAwesomeIcon(FontAwesome::plus)); button_layout->addWidget(_add_button); connect(_add_button, &QAbstractButton::clicked, this, &ObjectPalette::addObject); _remove_button = new QPushButton(this); - _remove_button->setIcon(font_awesome_icon(font_awesome::times)); + _remove_button->setIcon(FontAwesomeIcon(FontAwesome::times)); button_layout->addWidget(_remove_button); connect(_remove_button, &QAbstractButton::clicked, this, &ObjectPalette::removeSelectedTexture); diff --git a/src/noggit/ui/texture_palette_small.cpp b/src/noggit/ui/texture_palette_small.cpp index b3b82e59..51289bd7 100644 --- a/src/noggit/ui/texture_palette_small.cpp +++ b/src/noggit/ui/texture_palette_small.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include #include @@ -100,12 +100,12 @@ namespace Noggit QVBoxLayout* button_layout = new QVBoxLayout(this); _add_button = new QPushButton(this); - _add_button->setIcon(font_awesome_icon(font_awesome::plus)); + _add_button->setIcon(FontAwesomeIcon(FontAwesome::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)); + _remove_button->setIcon(FontAwesomeIcon(FontAwesome::times)); button_layout->addWidget(_remove_button); connect(_remove_button, &QAbstractButton::clicked, this, &texture_palette_small::removeSelectedTexture); diff --git a/src/noggit/ui/texturing_tool.cpp b/src/noggit/ui/texturing_tool.cpp index efc0c9d0..960dfde3 100644 --- a/src/noggit/ui/texturing_tool.cpp +++ b/src/noggit/ui/texturing_tool.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include @@ -195,7 +195,7 @@ namespace Noggit anim_layout->addRow(_anim_group); - auto overbright_cb = new checkbox("Overbright", &_overbright_prop, anim_widget); + auto overbright_cb = new CheckBox("Overbright", &_overbright_prop, anim_widget); anim_layout->addRow(overbright_cb); tabs->addTab(tool_widget, "Paint"); diff --git a/src/noggit/ui/texturing_tool.hpp b/src/noggit/ui/texturing_tool.hpp index eccba5e6..420da167 100644 --- a/src/noggit/ui/texturing_tool.hpp +++ b/src/noggit/ui/texturing_tool.hpp @@ -23,7 +23,7 @@ namespace Noggit { namespace Ui { - class checkbox; + class CheckBox; class current_texture; class texture_swapper; diff --git a/src/noggit/ui/tools/ActionHistoryNavigator/ActionHistoryNavigator.cpp b/src/noggit/ui/tools/ActionHistoryNavigator/ActionHistoryNavigator.cpp index bb27fb32..1a91017f 100644 --- a/src/noggit/ui/tools/ActionHistoryNavigator/ActionHistoryNavigator.cpp +++ b/src/noggit/ui/tools/ActionHistoryNavigator/ActionHistoryNavigator.cpp @@ -3,7 +3,7 @@ #include "ActionHistoryNavigator.hpp" #include #include -#include +#include #include #include #include diff --git a/src/noggit/ui/tools/AssetBrowser/Ui/AssetBrowser.cpp b/src/noggit/ui/tools/AssetBrowser/Ui/AssetBrowser.cpp index 4dedcd1f..55c4210c 100644 --- a/src/noggit/ui/tools/AssetBrowser/Ui/AssetBrowser.cpp +++ b/src/noggit/ui/tools/AssetBrowser/Ui/AssetBrowser.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include @@ -58,12 +58,12 @@ AssetBrowserWidget::AssetBrowserWidget(MapView* map_view, QWidget *parent) } ); - viewport_overlay_ui->toggleAnimationButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_ANIMATION)); - viewport_overlay_ui->toggleModelsButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_DOODADS)); - viewport_overlay_ui->toggleParticlesButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_PARTICLES)); - viewport_overlay_ui->toggleBoundingBoxButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_WITH_BOX)); - viewport_overlay_ui->toggleWMOButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_WMO)); - viewport_overlay_ui->toggleGridButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_LINES)); + viewport_overlay_ui->toggleAnimationButton->setIcon(FontNoggitIcon(FontNoggit::Icons::VISIBILITY_ANIMATION)); + viewport_overlay_ui->toggleModelsButton->setIcon(FontNoggitIcon(FontNoggit::Icons::VISIBILITY_DOODADS)); + viewport_overlay_ui->toggleParticlesButton->setIcon(FontNoggitIcon(FontNoggit::Icons::VISIBILITY_PARTICLES)); + viewport_overlay_ui->toggleBoundingBoxButton->setIcon(FontNoggitIcon(FontNoggit::Icons::VISIBILITY_WITH_BOX)); + viewport_overlay_ui->toggleWMOButton->setIcon(FontNoggitIcon(FontNoggit::Icons::VISIBILITY_WMO)); + viewport_overlay_ui->toggleGridButton->setIcon(FontNoggitIcon(FontNoggit::Icons::VISIBILITY_LINES)); ui->viewport->installEventFilter(overlay); overlay->show(); diff --git a/src/noggit/ui/tools/BrushStack/BrushStack.cpp b/src/noggit/ui/tools/BrushStack/BrushStack.cpp index 24ef725f..2e68bbc0 100644 --- a/src/noggit/ui/tools/BrushStack/BrushStack.cpp +++ b/src/noggit/ui/tools/BrushStack/BrushStack.cpp @@ -48,7 +48,7 @@ BrushStack::BrushStack(MapView* map_view, QWidget* parent) switch (_add_operation_combo->currentIndex()) { case eTools::eRaiseLower: - brush_stack_item->setTool(new Noggit::Ui::terrain_tool(_map_view, this, true)); + brush_stack_item->setTool(new Noggit::Ui::TerrainTool(_map_view, this, true)); break; case eTools::eFlattenBlur: brush_stack_item->setTool(new Noggit::Ui::flatten_blur_tool(this)); @@ -57,7 +57,7 @@ BrushStack::BrushStack(MapView* map_view, QWidget* parent) brush_stack_item->setTool(new Noggit::Ui::texturing_tool(&_map_view->getCamera()->position, _map_view, nullptr, this)); break; case eTools::eShader: - brush_stack_item->setTool(new Noggit::Ui::shader_tool(_map_view, this)); + brush_stack_item->setTool(new Noggit::Ui::ShaderTool(_map_view, this)); break; } @@ -329,7 +329,7 @@ void BrushStack::fromJSON(const QJsonObject& json) if (type == "TERRAIN") { - brush_stack_item->setTool(new Noggit::Ui::terrain_tool(_map_view, this, true)); + brush_stack_item->setTool(new Noggit::Ui::TerrainTool(_map_view, this, true)); } else if (type == "FLATTEN_BLUR") { @@ -341,7 +341,7 @@ void BrushStack::fromJSON(const QJsonObject& json) } else if (type == "SHADER") { - brush_stack_item->setTool(new Noggit::Ui::shader_tool(_map_view, this)); + brush_stack_item->setTool(new Noggit::Ui::ShaderTool(_map_view, this)); } else { diff --git a/src/noggit/ui/tools/BrushStack/BrushStackItem.cpp b/src/noggit/ui/tools/BrushStack/BrushStackItem.cpp index a32779cb..d951e462 100644 --- a/src/noggit/ui/tools/BrushStack/BrushStackItem.cpp +++ b/src/noggit/ui/tools/BrushStack/BrushStackItem.cpp @@ -1,8 +1,8 @@ // This file is part of Noggit3, licensed under GNU General Public License (version 3). #include "BrushStackItem.hpp" -#include -#include +#include +#include #include #include #include @@ -18,8 +18,8 @@ BrushStackItem::BrushStackItem(QWidget* parent) layout()->setAlignment(Qt::AlignTop); // expander - _collapsed_icon = Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::caretright); - _expanded_icon = Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::caretdown); + _collapsed_icon = Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::caretright); + _expanded_icon = Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::caretdown); _ui.expanderButton->setIcon(_expanded_icon); connect(_ui.expanderButton, &QPushButton::clicked, [=](bool state) @@ -29,8 +29,8 @@ BrushStackItem::BrushStackItem(QWidget* parent) }); // visibility - _enabled_icon = Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::eye); - _disabled_icon = Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::eyeslash); + _enabled_icon = Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::eye); + _disabled_icon = Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::eyeslash); _ui.enabledButton->setIcon(_enabled_icon); connect(_ui.enabledButton, &QPushButton::clicked, [=](bool state) @@ -69,7 +69,7 @@ BrushStackItem::BrushStackItem(QWidget* parent) _settings_popup->repaint(); _settings_popup->setVisible(false); - _ui.settingsButton->setIcon(Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::wrench)); + _ui.settingsButton->setIcon(Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::wrench)); connect(_ui.settingsButton, &QPushButton::clicked, [this]() { @@ -87,7 +87,7 @@ BrushStackItem::BrushStackItem(QWidget* parent) }); // Delete - _ui.deleteButton->setIcon(Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::times)); + _ui.deleteButton->setIcon(Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::times)); connect(_ui.deleteButton, &QPushButton::clicked, [=]{ emit requestDelete(this); }); connect(_ui.brushNameLabel, &QToolButton::clicked, [=](bool checked) { if (checked) emit activated(this);}); @@ -103,18 +103,18 @@ void BrushStackItem::setTool(operation_type tool) switch(_tool_widget.index()) { case eRaiseLower: - _ui.contentWidget->layout()->addWidget(std::get(_tool_widget)); - _ui.brushNameLabel->setIcon(Noggit::Ui::font_noggit_icon(Noggit::Ui::font_noggit::TOOL_RAISE_LOWER)); + _ui.contentWidget->layout()->addWidget(std::get(_tool_widget)); + _ui.brushNameLabel->setIcon(Noggit::Ui::FontNoggitIcon(Noggit::Ui::FontNoggit::TOOL_RAISE_LOWER)); _ui.brushNameLabel->setToolTip("Raise | Lower"); break; case eFlattenBlur: _ui.contentWidget->layout()->addWidget(std::get(_tool_widget)); - _ui.brushNameLabel->setIcon(Noggit::Ui::font_noggit_icon(Noggit::Ui::font_noggit::TOOL_FLATTEN_BLUR)); + _ui.brushNameLabel->setIcon(Noggit::Ui::FontNoggitIcon(Noggit::Ui::FontNoggit::TOOL_FLATTEN_BLUR)); _ui.brushNameLabel->setToolTip("Flatten | Blur"); break; case eTexturing: _ui.contentWidget->layout()->addWidget(std::get(_tool_widget)); - _ui.brushNameLabel->setIcon(Noggit::Ui::font_noggit_icon(Noggit::Ui::font_noggit::TOOL_TEXTURE_PAINT)); + _ui.brushNameLabel->setIcon(Noggit::Ui::FontNoggitIcon(Noggit::Ui::FontNoggit::TOOL_TEXTURE_PAINT)); _ui.brushNameLabel->setToolTip("Texture"); _texture_palette = new Noggit::Ui::tileset_chooser(this); @@ -135,8 +135,8 @@ void BrushStackItem::setTool(operation_type tool) break; case eShader: - _ui.contentWidget->layout()->addWidget(std::get(_tool_widget)); - _ui.brushNameLabel->setIcon(Noggit::Ui::font_noggit_icon(Noggit::Ui::font_noggit::TOOL_VERTEX_PAINT)); + _ui.contentWidget->layout()->addWidget(std::get(_tool_widget)); + _ui.brushNameLabel->setIcon(Noggit::Ui::FontNoggitIcon(Noggit::Ui::FontNoggit::TOOL_VERTEX_PAINT)); _ui.brushNameLabel->setToolTip("Shader"); break; } @@ -148,13 +148,13 @@ QWidget* BrushStackItem::getTool() switch(_tool_widget.index()) { case eRaiseLower: - return std::get(_tool_widget); + return std::get(_tool_widget); case eFlattenBlur: return std::get(_tool_widget); case eTexturing: return std::get(_tool_widget); case eShader: - return std::get(_tool_widget); + return std::get(_tool_widget); } return nullptr; @@ -165,13 +165,13 @@ void BrushStackItem::setBrushMode(bool sculpt) switch(_tool_widget.index()) { case eRaiseLower: - std::get(_tool_widget)->getImageMaskSelector()->setBrushMode(sculpt); + std::get(_tool_widget)->getImageMaskSelector()->setBrushMode(sculpt); break; case eTexturing: std::get(_tool_widget)->getImageMaskSelector()->setBrushMode(sculpt); break; case eShader: - std::get(_tool_widget)->getImageMaskSelector()->setBrushMode(sculpt); + std::get(_tool_widget)->getImageMaskSelector()->setBrushMode(sculpt); break; } } @@ -182,7 +182,7 @@ QJsonObject BrushStackItem::toJSON() { case eRaiseLower: { - return std::get(_tool_widget)->toJSON(); + return std::get(_tool_widget)->toJSON(); } case eFlattenBlur: { @@ -194,7 +194,7 @@ QJsonObject BrushStackItem::toJSON() } case eShader: { - return std::get(_tool_widget)->toJSON(); + return std::get(_tool_widget)->toJSON(); } } @@ -207,7 +207,7 @@ void BrushStackItem::fromJSON(QJsonObject const& json) { case eRaiseLower: { - return std::get(_tool_widget)->fromJSON(json); + return std::get(_tool_widget)->fromJSON(json); } case eFlattenBlur: { @@ -219,7 +219,7 @@ void BrushStackItem::fromJSON(QJsonObject const& json) } case eShader: { - return std::get(_tool_widget)->fromJSON(json); + return std::get(_tool_widget)->fromJSON(json); } } } @@ -230,27 +230,27 @@ void BrushStackItem::syncSliders(double radius, double inner_radius, double spee { case eRaiseLower: { - auto rad_slider = std::get(_tool_widget)->getRadiusSlider(); + auto rad_slider = std::get(_tool_widget)->getRadiusSlider(); rad_slider->setEnabled(!_is_radius_affecting->isChecked()); if (_is_radius_affecting->isChecked()) rad_slider->setValue(radius); - auto inner_rad_slider = std::get(_tool_widget)->getInnerRadiusSlider(); + auto inner_rad_slider = std::get(_tool_widget)->getInnerRadiusSlider(); inner_rad_slider->setEnabled(!_is_inner_radius_affecting->isChecked()); if (_is_inner_radius_affecting->isChecked()) inner_rad_slider->setValue(inner_radius); - auto speed_slider = std::get(_tool_widget)->getSpeedSlider(); + auto speed_slider = std::get(_tool_widget)->getSpeedSlider(); speed_slider->setEnabled(!_is_speed_affecting->isChecked()); if (_is_speed_affecting->isChecked()) speed_slider->setValue(speed); - std::get(_tool_widget)->getImageMaskSelector()->enableControls(_is_mask_rotation_affecting->isChecked()); + std::get(_tool_widget)->getImageMaskSelector()->enableControls(_is_mask_rotation_affecting->isChecked()); - std::get(_tool_widget)->getImageMaskSelector()->setBrushMode(brushMode); + std::get(_tool_widget)->getImageMaskSelector()->setBrushMode(brushMode); break; @@ -300,21 +300,21 @@ void BrushStackItem::syncSliders(double radius, double inner_radius, double spee } case eShader: { - auto rad_slider = std::get(_tool_widget)->getRadiusSlider(); + auto rad_slider = std::get(_tool_widget)->getRadiusSlider(); rad_slider->setEnabled(!_is_radius_affecting->isChecked()); if (_is_radius_affecting->isChecked()) rad_slider->setValue(radius); - auto speed_slider = std::get(_tool_widget)->getSpeedSlider(); + auto speed_slider = std::get(_tool_widget)->getSpeedSlider(); speed_slider->setEnabled(!_is_speed_affecting->isChecked()); if (_is_speed_affecting->isChecked()) speed_slider->setValue(speed); - std::get(_tool_widget)->getImageMaskSelector()->enableControls(_is_mask_rotation_affecting->isChecked()); + std::get(_tool_widget)->getImageMaskSelector()->enableControls(_is_mask_rotation_affecting->isChecked()); - std::get(_tool_widget)->getImageMaskSelector()->setBrushMode(brushMode); + std::get(_tool_widget)->getImageMaskSelector()->setBrushMode(brushMode); break; } @@ -326,7 +326,7 @@ void BrushStackItem::setRadius(float radius) switch(_tool_widget.index()) { case eRaiseLower: - std::get(_tool_widget)->setRadius(radius); + std::get(_tool_widget)->setRadius(radius); break; case eFlattenBlur: std::get(_tool_widget)->setRadius(radius); @@ -335,7 +335,7 @@ void BrushStackItem::setRadius(float radius) std::get(_tool_widget)->setRadius(radius); break; case eShader: - std::get(_tool_widget)->setRadius(radius); + std::get(_tool_widget)->setRadius(radius); break; } } @@ -345,7 +345,7 @@ void BrushStackItem::setInnerRadius(float inner_radius) switch(_tool_widget.index()) { case eRaiseLower: - std::get(_tool_widget)->setInnerRadius(inner_radius); + std::get(_tool_widget)->setInnerRadius(inner_radius); break; case eTexturing: std::get(_tool_widget)->setHardness(inner_radius); @@ -358,7 +358,7 @@ void BrushStackItem::setSpeed(float speed) switch(_tool_widget.index()) { case eRaiseLower: - std::get(_tool_widget)->setSpeed(speed * 1000.f); + std::get(_tool_widget)->setSpeed(speed * 1000.f); break; case eFlattenBlur: std::get(_tool_widget)->setSpeed(speed * 10.f); @@ -367,7 +367,7 @@ void BrushStackItem::setSpeed(float speed) std::get(_tool_widget)->set_pressure(speed); break; case eShader: - std::get(_tool_widget)->setSpeed(speed * 10.f); + std::get(_tool_widget)->setSpeed(speed * 10.f); break; } } @@ -377,13 +377,13 @@ void BrushStackItem::setMaskRotation(int rot) switch(_tool_widget.index()) { case eRaiseLower: - std::get(_tool_widget)->getImageMaskSelector()->setRotationRaw(rot); + std::get(_tool_widget)->getImageMaskSelector()->setRotationRaw(rot); break; case eTexturing: std::get(_tool_widget)->getImageMaskSelector()->setRotationRaw(rot); break; case eShader: - std::get(_tool_widget)->getImageMaskSelector()->setRotationRaw(rot); + std::get(_tool_widget)->getImageMaskSelector()->setRotationRaw(rot); break; } } @@ -396,9 +396,9 @@ void BrushStackItem::execute(glm::vec3 const& cursor_pos, World* world, float dt { case eRaiseLower: if (mod_shift_down) - std::get(_tool_widget)->changeTerrain(world, cursor_pos, 7.5f * dt); + std::get(_tool_widget)->changeTerrain(world, cursor_pos, 7.5f * dt); else if (mod_ctrl_down) - std::get(_tool_widget)->changeTerrain(world, cursor_pos, -7.5f * dt); + std::get(_tool_widget)->changeTerrain(world, cursor_pos, -7.5f * dt); break; case eFlattenBlur: if (mod_shift_down) @@ -436,25 +436,25 @@ void BrushStackItem::execute(glm::vec3 const& cursor_pos, World* world, float dt break; case eShader: - auto tool = std::get(_tool_widget); + auto tool = std::get(_tool_widget); if (tool->getImageMaskSelector()->isEnabled() && !tool->getImageMaskSelector()->getBrushMode()) { if (action->checkAdressTag(reinterpret_cast(tool))) break; if (mod_shift_down) - std::get(_tool_widget)->changeShader(world, cursor_pos, 1000.f, true); + std::get(_tool_widget)->changeShader(world, cursor_pos, 1000.f, true); else if (mod_ctrl_down) - std::get(_tool_widget)->changeShader(world, cursor_pos, 1000.f, false); + std::get(_tool_widget)->changeShader(world, cursor_pos, 1000.f, false); action->tagAdress(reinterpret_cast(tool)); } else { if (mod_shift_down) - std::get(_tool_widget)->changeShader(world, cursor_pos, dt, true); + std::get(_tool_widget)->changeShader(world, cursor_pos, dt, true); else if (mod_ctrl_down) - std::get(_tool_widget)->changeShader(world, cursor_pos, dt, false); + std::get(_tool_widget)->changeShader(world, cursor_pos, dt, false); } } } @@ -464,13 +464,13 @@ bool BrushStackItem::isMaskEnabled() switch(_tool_widget.index()) { case eRaiseLower: - return std::get(_tool_widget)->getImageMaskSelector()->isEnabled(); + return std::get(_tool_widget)->getImageMaskSelector()->isEnabled(); case eFlattenBlur: return false; case eTexturing: return std::get(_tool_widget)->getImageMaskSelector()->isEnabled(); case eShader: - return std::get(_tool_widget)->getImageMaskSelector()->isEnabled(); + return std::get(_tool_widget)->getImageMaskSelector()->isEnabled(); } } @@ -479,7 +479,7 @@ void BrushStackItem::updateMask() switch(_tool_widget.index()) { case eRaiseLower: - std::get(_tool_widget)->updateMaskImage(); + std::get(_tool_widget)->updateMaskImage(); break; case eFlattenBlur: break; @@ -487,7 +487,7 @@ void BrushStackItem::updateMask() std::get(_tool_widget)->updateMaskImage(); break; case eShader: - std::get(_tool_widget)->updateMaskImage(); + std::get(_tool_widget)->updateMaskImage(); break; } } diff --git a/src/noggit/ui/tools/BrushStack/BrushStackItem.hpp b/src/noggit/ui/tools/BrushStack/BrushStackItem.hpp index ab801853..01ec05bb 100644 --- a/src/noggit/ui/tools/BrushStack/BrushStackItem.hpp +++ b/src/noggit/ui/tools/BrushStack/BrushStackItem.hpp @@ -14,11 +14,11 @@ #include -#include +#include #include #include #include -#include +#include #include #include #include @@ -28,10 +28,10 @@ class World; namespace Noggit::Ui::Tools { using operation_type = std::variant - < Noggit::Ui::terrain_tool* + < Noggit::Ui::TerrainTool* , Noggit::Ui::flatten_blur_tool* , Noggit::Ui::texturing_tool* - , Noggit::Ui::shader_tool* + , Noggit::Ui::ShaderTool* >; //! \note Keep in same order as variant! diff --git a/src/noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.cpp b/src/noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.cpp index df6facfc..4499a4b4 100644 --- a/src/noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.cpp +++ b/src/noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.cpp @@ -2,7 +2,7 @@ #include "MapCreationWizard.hpp" -#include +#include #include #include #include @@ -86,13 +86,13 @@ MapCreationWizard::MapCreationWizard(QWidget* parent) : Noggit::Ui::widget(paren } auto add_btn = new QPushButton("New",this); - add_btn->setIcon(Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::plus)); + add_btn->setIcon(Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::plus)); layout_selector->addWidget(add_btn); add_btn->setAccessibleName("map_wizard_add_button"); auto remove_btn = new QPushButton("Remove",this); - remove_btn->setIcon(Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::times)); + remove_btn->setIcon(Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::times)); layout_selector->addWidget(remove_btn); remove_btn->setAccessibleName("map_wizard_remove_button"); diff --git a/src/noggit/ui/tools/NodeEditor/Nodes/DataTypes/GenericData.hpp b/src/noggit/ui/tools/NodeEditor/Nodes/DataTypes/GenericData.hpp index 302ff827..20e9a83f 100644 --- a/src/noggit/ui/tools/NodeEditor/Nodes/DataTypes/GenericData.hpp +++ b/src/noggit/ui/tools/NodeEditor/Nodes/DataTypes/GenericData.hpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/noggit/ui/tools/NodeEditor/Nodes/Widgets/ProcedureSelector.cpp b/src/noggit/ui/tools/NodeEditor/Nodes/Widgets/ProcedureSelector.cpp index 507d04a9..e783e533 100644 --- a/src/noggit/ui/tools/NodeEditor/Nodes/Widgets/ProcedureSelector.cpp +++ b/src/noggit/ui/tools/NodeEditor/Nodes/Widgets/ProcedureSelector.cpp @@ -1,7 +1,7 @@ // This file is part of Noggit3, licensed under GNU General Public License (version 3). #include "ProcedureSelector.hpp" -#include +#include #include #include @@ -25,7 +25,7 @@ ProcedureSelector::ProcedureSelector(QWidget *parent) auto search_button = new QPushButton("None", this); layout->addWidget(search_button); - search_button->setIcon(Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::icons::networkwired)); + search_button->setIcon(Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::Icons::networkwired)); search_button->setToolTip("Select procedure"); search_button->adjustSize(); diff --git a/src/noggit/ui/tools/NodeEditor/Ui/NodeEditor.cpp b/src/noggit/ui/tools/NodeEditor/Ui/NodeEditor.cpp index c91e506f..9534adc2 100644 --- a/src/noggit/ui/tools/NodeEditor/Ui/NodeEditor.cpp +++ b/src/noggit/ui/tools/NodeEditor/Ui/NodeEditor.cpp @@ -2,7 +2,7 @@ #include "NodeEditor.hpp" #include -#include +#include #include #include #include @@ -147,7 +147,7 @@ NodeEditorWidget::NodeEditorWidget(QWidget *parent) _model->setNameFilters(filters_search); }); - ui->newButton->setIcon(Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::icons::file)); + ui->newButton->setIcon(Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::Icons::file)); connect(ui->newButton, &QPushButton::clicked , [this]() { @@ -175,14 +175,14 @@ NodeEditorWidget::NodeEditorWidget(QWidget *parent) }); - int tab_index = ui->nodeArea->addTab(tab, Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::icons::networkwired) + int tab_index = ui->nodeArea->addTab(tab, Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::Icons::networkwired) , "New scene *"); ui->nodeArea->setCurrentIndex(tab_index); }); - ui->clearButton->setIcon(Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::icons::eraser)); + ui->clearButton->setIcon(Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::Icons::eraser)); connect(ui->clearButton, &QPushButton::clicked , [this]() { @@ -194,7 +194,7 @@ NodeEditorWidget::NodeEditorWidget(QWidget *parent) static_cast(scene)->clearScene(); }); - ui->loadButton->setIcon(Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::icons::folderopen)); + ui->loadButton->setIcon(Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::Icons::folderopen)); connect(ui->loadButton, &QPushButton::clicked , [this]() { @@ -207,7 +207,7 @@ NodeEditorWidget::NodeEditorWidget(QWidget *parent) loadScene(path); }); - ui->saveButton->setIcon(Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::icons::save)); + ui->saveButton->setIcon(Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::Icons::save)); connect(ui->saveButton, &QPushButton::clicked , [this]() { @@ -230,7 +230,7 @@ NodeEditorWidget::NodeEditorWidget(QWidget *parent) }); - ui->saveAllButton->setIcon(Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::icons::save)); + ui->saveAllButton->setIcon(Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::Icons::save)); connect(ui->saveAllButton, &QPushButton::clicked , [this]() { @@ -253,7 +253,7 @@ NodeEditorWidget::NodeEditorWidget(QWidget *parent) }); - ui->executeButton->setIcon(Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::icons::play)); + ui->executeButton->setIcon(Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::Icons::play)); connect(ui->executeButton, &QPushButton::clicked , [this]() { @@ -308,7 +308,7 @@ void NodeEditorWidget::loadScene(const QString& filepath) layout->setSpacing(0); int tab_index = ui->nodeArea->addTab(tab, - Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::icons::networkwired), + Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::Icons::networkwired), scene->getSceneName()); ui->nodeArea->setCurrentIndex(tab_index); diff --git a/src/noggit/ui/tools/PresetEditor/Ui/PresetEditor.cpp b/src/noggit/ui/tools/PresetEditor/Ui/PresetEditor.cpp index 5d21dbff..7d8c6dc5 100644 --- a/src/noggit/ui/tools/PresetEditor/Ui/PresetEditor.cpp +++ b/src/noggit/ui/tools/PresetEditor/Ui/PresetEditor.cpp @@ -1,6 +1,6 @@ #include "PresetEditor.hpp" #include -#include +#include #include using namespace Noggit::Ui::Tools::PresetEditor::Ui; @@ -38,12 +38,12 @@ PresetEditorWidget::PresetEditorWidget(QWidget *parent) } ); - viewport_overlay_ui->toggleAnimationButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_ANIMATION)); - viewport_overlay_ui->toggleModelsButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_DOODADS)); - viewport_overlay_ui->toggleParticlesButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_UNUSED)); - viewport_overlay_ui->toggleBoundingBoxButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_WITH_BOX)); - viewport_overlay_ui->toggleWMOButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_WMO)); - viewport_overlay_ui->toggleGridButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_LINES)); + viewport_overlay_ui->toggleAnimationButton->setIcon(FontNoggitIcon(FontNoggit::Icons::VISIBILITY_ANIMATION)); + viewport_overlay_ui->toggleModelsButton->setIcon(FontNoggitIcon(FontNoggit::Icons::VISIBILITY_DOODADS)); + viewport_overlay_ui->toggleParticlesButton->setIcon(FontNoggitIcon(FontNoggit::Icons::VISIBILITY_UNUSED)); + viewport_overlay_ui->toggleBoundingBoxButton->setIcon(FontNoggitIcon(FontNoggit::Icons::VISIBILITY_WITH_BOX)); + viewport_overlay_ui->toggleWMOButton->setIcon(FontNoggitIcon(FontNoggit::Icons::VISIBILITY_WMO)); + viewport_overlay_ui->toggleGridButton->setIcon(FontNoggitIcon(FontNoggit::Icons::VISIBILITY_LINES)); ui->viewport->installEventFilter(overlay); overlay->show(); diff --git a/src/noggit/ui/tools/UiCommon/ExtendedSlider.cpp b/src/noggit/ui/tools/UiCommon/ExtendedSlider.cpp index bf5cc5f4..7676caaa 100644 --- a/src/noggit/ui/tools/UiCommon/ExtendedSlider.cpp +++ b/src/noggit/ui/tools/UiCommon/ExtendedSlider.cpp @@ -1,7 +1,7 @@ // This file is part of Noggit3, licensed under GNU General Public License (version 3). #include "ExtendedSlider.hpp" -#include +#include #include #include @@ -27,14 +27,14 @@ ExtendedSlider::ExtendedSlider(QWidget* parent) auto tablet_enabled = new QCheckBox(_tablet_popup); tablet_enabled->setText("Use Tablet"); layout->addWidget(tablet_enabled); - _ui.tabletControlMenuButton->setIcon(font_awesome_icon(font_awesome::icons::pen)); + _ui.tabletControlMenuButton->setIcon(FontAwesomeIcon(FontAwesome::Icons::pen)); connect(tablet_enabled, &QCheckBox::stateChanged, [=](int state) { _is_tablet_affecting = state; - _ui.tabletControlMenuButton->setIcon(font_awesome_icon( - state ? font_awesome::icons::edit : font_awesome::icons::pen)); + _ui.tabletControlMenuButton->setIcon(FontAwesomeIcon( + state ? FontAwesome::Icons::edit : FontAwesome::Icons::pen)); _ui.pressureBar->setVisible(state); }); diff --git a/src/noggit/ui/tools/UiCommon/ImageMaskSelector.cpp b/src/noggit/ui/tools/UiCommon/ImageMaskSelector.cpp index e848eb6e..385e27b8 100644 --- a/src/noggit/ui/tools/UiCommon/ImageMaskSelector.cpp +++ b/src/noggit/ui/tools/UiCommon/ImageMaskSelector.cpp @@ -2,7 +2,7 @@ #include "ImageMaskSelector.hpp" #include -#include +#include using namespace Noggit::Ui::Tools; @@ -24,7 +24,7 @@ ImageMaskSelector::ImageMaskSelector( MapView* map_view, QWidget* parent) _ui.curImageLabel->setPixmap(_pixmap); _ui.curImageLabel->setToolTip("No image"); - connect(_ui.curImageLabel, &Noggit::Ui::clickable_label::clicked, + connect(_ui.curImageLabel, &Noggit::Ui::ClickableLabel::clicked, [this]() { diff --git a/src/noggit/ui/tools/UiCommon/ImageMaskSelector.ui b/src/noggit/ui/tools/UiCommon/ImageMaskSelector.ui index 9c5387d3..81da4514 100644 --- a/src/noggit/ui/tools/UiCommon/ImageMaskSelector.ui +++ b/src/noggit/ui/tools/UiCommon/ImageMaskSelector.ui @@ -78,7 +78,7 @@ - + 0 @@ -145,9 +145,9 @@ - Noggit::Ui::clickable_label + Noggit::Ui::ClickableLabel QLabel -
noggit/ui/clickable_label.hpp
+
noggit/ui/ClickableLabel.hpp
 diff --git a/src/noggit/ui/tools/UiCommon/expanderwidget.cpp b/src/noggit/ui/tools/UiCommon/expanderwidget.cpp index d985548c..f464da7a 100644 --- a/src/noggit/ui/tools/UiCommon/expanderwidget.cpp +++ b/src/noggit/ui/tools/UiCommon/expanderwidget.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include "expanderwidget.h" @@ -12,8 +12,8 @@ ExpanderWidget::ExpanderWidget(QWidget *parent, bool in_designer) m_in_designer = in_designer; m_expanded = true; - m_collapsedIcon=Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::caretright); - m_expandedIcon=Noggit::Ui::font_awesome_icon(Noggit::Ui::font_awesome::caretdown); + m_collapsedIcon=Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::caretright); + m_expandedIcon=Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::caretdown); m_button = new QPushButton(); m_button->setObjectName("__qt__passive_button"); diff --git a/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp b/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp index 4a54f8e9..3e6fa8bd 100644 --- a/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp +++ b/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include using namespace Noggit::Ui; @@ -15,29 +15,29 @@ ViewToolbar::ViewToolbar(MapView* mapView) setAllowedAreas(Qt::TopToolBarArea | Qt::BottomToolBarArea); setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); - add_tool_icon(&mapView->_draw_models, tr("Doodads"), font_noggit::VISIBILITY_DOODADS); - add_tool_icon(&mapView->_draw_wmo, tr("WMOs"), font_noggit::VISIBILITY_WMO); - add_tool_icon(&mapView->_draw_wmo_doodads, tr("WMO doodads"), font_noggit::VISIBILITY_WMO_DOODADS); - add_tool_icon(&mapView->_draw_terrain, tr("Terrain"), font_noggit::VISIBILITY_TERRAIN); - add_tool_icon(&mapView->_draw_water, tr("Water"), font_noggit::VISIBILITY_WATER); + add_tool_icon(&mapView->_draw_models, tr("Doodads"), FontNoggit::VISIBILITY_DOODADS); + add_tool_icon(&mapView->_draw_wmo, tr("WMOs"), FontNoggit::VISIBILITY_WMO); + add_tool_icon(&mapView->_draw_wmo_doodads, tr("WMO doodads"), FontNoggit::VISIBILITY_WMO_DOODADS); + add_tool_icon(&mapView->_draw_terrain, tr("Terrain"), FontNoggit::VISIBILITY_TERRAIN); + add_tool_icon(&mapView->_draw_water, tr("Water"), FontNoggit::VISIBILITY_WATER); addSeparator(); - add_tool_icon(&mapView->_draw_lines, tr("Lines"), font_noggit::VISIBILITY_LINES); - add_tool_icon(&mapView->_draw_hole_lines, tr("Hole lines"), font_noggit::VISIBILITY_HOLE_LINES); - add_tool_icon(&mapView->_draw_wireframe, tr("Wireframe"), font_noggit::VISIBILITY_WIREFRAME); - add_tool_icon(&mapView->_draw_contour, tr("Contours"), font_noggit::VISIBILITY_CONTOURS); + add_tool_icon(&mapView->_draw_lines, tr("Lines"), FontNoggit::VISIBILITY_LINES); + add_tool_icon(&mapView->_draw_hole_lines, tr("Hole lines"), FontNoggit::VISIBILITY_HOLE_LINES); + add_tool_icon(&mapView->_draw_wireframe, tr("Wireframe"), FontNoggit::VISIBILITY_WIREFRAME); + add_tool_icon(&mapView->_draw_contour, tr("Contours"), FontNoggit::VISIBILITY_CONTOURS); addSeparator(); // Animation - add_tool_icon(&mapView->_draw_fog, tr("Fog"), font_noggit::VISIBILITY_FOG); - add_tool_icon(&mapView->_draw_mfbo, tr("Flight bounds"), font_noggit::VISIBILITY_FLIGHT_BOUNDS); + add_tool_icon(&mapView->_draw_fog, tr("Fog"), FontNoggit::VISIBILITY_FOG); + add_tool_icon(&mapView->_draw_mfbo, tr("Flight bounds"), FontNoggit::VISIBILITY_FLIGHT_BOUNDS); addSeparator(); // Hole lines always on - add_tool_icon(&mapView->_draw_models_with_box, tr("Models with box"), font_noggit::VISIBILITY_WITH_BOX); - add_tool_icon(&mapView->_draw_hidden_models, tr("Hidden models"), font_noggit::VISIBILITY_HIDDEN_MODELS); + add_tool_icon(&mapView->_draw_models_with_box, tr("Models with box"), FontNoggit::VISIBILITY_WITH_BOX); + add_tool_icon(&mapView->_draw_hidden_models, tr("Hidden models"), FontNoggit::VISIBILITY_HIDDEN_MODELS); addSeparator(); /* auto tablet_sensitivity = new QSlider(this); @@ -46,7 +46,7 @@ ViewToolbar::ViewToolbar(MapView* mapView) */ auto undo_stack_btn = new QPushButton(this); - undo_stack_btn->setIcon(font_awesome_icon(font_awesome::undo)); + undo_stack_btn->setIcon(FontAwesomeIcon(FontAwesome::undo)); undo_stack_btn->setToolTip("History"); addWidget(undo_stack_btn); @@ -85,9 +85,9 @@ ViewToolbar::ViewToolbar(MapView* mapView) } -void ViewToolbar::add_tool_icon(Noggit::bool_toggle_property* view_state, const QString& name, const font_noggit::icons& icon) +void ViewToolbar::add_tool_icon(Noggit::bool_toggle_property* view_state, const QString& name, const FontNoggit::Icons& icon) { - auto action = addAction(font_noggit_icon{icon}, name); + auto action = addAction(FontNoggitIcon{icon}, name); connect (action, &QAction::triggered, [this, action, view_state] () { action->setChecked(!view_state->get()); diff --git a/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.hpp b/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.hpp index 29c2194d..bad7b3ba 100644 --- a/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.hpp +++ b/src/noggit/ui/tools/ViewToolbar/Ui/ViewToolbar.hpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include namespace Noggit @@ -22,7 +22,7 @@ namespace Noggit private: QActionGroup _tool_group; - void add_tool_icon(Noggit::bool_toggle_property* view_state, const QString& name, const Noggit::Ui::font_noggit::icons& icon); + void add_tool_icon(Noggit::bool_toggle_property* view_state, const QString& name, const Noggit::Ui::FontNoggit::Icons& icon); }; } }