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

Setup new toolbar icons.

Browse Source
This commit is contained in:
p620
2020-10-23 22:13:03 +03:00
parent f35a67b0e1
commit 16c9a15c4f
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/noggit/ui/Toolbar.cpp
View File

@@ -10,21 +10,22 @@ namespace noggit
: _set_editing_mode (set_editing_mode)
, _tool_group(this)
{
add_tool_icon (editing_mode::ground, tr("Raise / Lower"), font_awesome::chartarea);
add_tool_icon (editing_mode::flatten_blur, tr("Flatten / Blur"), font_awesome::bacon);
add_tool_icon (editing_mode::paint, tr("Texturing editor"),font_awesome::paintbrush);
add_tool_icon (editing_mode::holes, tr("Holes"), font_awesome::cut);
add_tool_icon (editing_mode::areaid, tr("Area ID"), font_awesome::objectgroup);
add_tool_icon (editing_mode::flags, tr("Impassible flag"), font_awesome::ban);
add_tool_icon (editing_mode::water, tr("Water editor"), font_awesome::water);
add_tool_icon (editing_mode::mccv, tr("Shader editor"), font_awesome::eyedropper);
add_tool_icon (editing_mode::object, tr("Object editor"), font_awesome::cube);
add_tool_icon (editing_mode::minimap, tr("Minimap сreator"), font_awesome::images);
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);
}
void toolbar::add_tool_icon(editing_mode mode, const QString& name, const font_awesome::icons& icon)
void toolbar::add_tool_icon(editing_mode mode, const QString& name, const font_noggit::icons& icon)
{
auto action = addAction(font_awesome_icon(icon), name);
auto action = addAction(font_noggit_icon{icon}, name);
connect (action, &QAction::triggered, [this, mode] () {
_set_editing_mode (mode);
});

4
src/noggit/ui/Toolbar.h
View File

@@ -8,7 +8,7 @@
#include <QtWidgets/QToolBar>
#include <noggit/tool_enums.hpp>
#include <noggit/ui/font_awesome.hpp>
#include <noggit/ui/font_noggit.hpp>
namespace noggit
{
@@ -25,7 +25,7 @@ namespace noggit
std::function<void (editing_mode)> _set_editing_mode;
QActionGroup _tool_group;
void add_tool_icon(editing_mode mode, const QString& name, const font_awesome::icons& icon);
void add_tool_icon(editing_mode mode, const QString& name, const font_noggit::icons& icon);
};
}
}

13
src/noggit/ui/font_noggit.hpp
View File

@@ -70,7 +70,18 @@ namespace noggit
f9 = 0xf898,
f10 = 0xf899,
f11 = 0xf89A,
f12 = 0xf89B
f12 = 0xf89B,
TOOL_RAISE_LOWER = 0xF89C,
TOOL_FLATTEN_BLUR = 0xF89D,
TOOL_TEXTURE_PAINT = 0xF89E,
TOOL_HOLE_CUTTER = 0xF89F,
TOOL_AREA_DESIGNATOR = 0xF8A0,
TOOL_IMPASS_DESIGNATOR = 0xF8A1,
TOOL_WATER_EDITOR = 0xF8A2,
TOOL_VERTEX_PAINT = 0xF8A3,
TOOL_OBJECT_EDITOR = 0xF8A4,
TOOL_MINIMAP_EDITOR = 0xF8A5,
TOOL_STAMP = 0xF8A6
};
};