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

UI updates, new icons

Browse Source
This commit is contained in:
Balkron
2020-11-04 02:01:05 +05:00
parent 21dda85e51
commit 157f7eba5a
6 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
media/noggit.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
media/noggit_icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
resources/noggit_font.ttf
View File

Binary file not shown.

4
src/noggit/Red/MapCreationWizard/UI/MapCreationWizard.cpp
View File

@@ -83,14 +83,12 @@ MapCreationWizard::MapCreationWizard(QWidget* parent) : noggit::ui::widget(paren
layout_selector->addWidget(add_btn);
add_btn->setAccessibleName("map_wizard_add_button");
add_btn->setFixedSize(36, 22);
auto remove_btn = new QPushButton("Remove",this);
remove_btn->setIcon(noggit::ui::font_awesome_icon(noggit::ui::font_awesome::times));
layout_selector->addWidget(remove_btn);
remove_btn->setAccessibleName("map_wizard_remove_button");
remove_btn->setFixedSize(36, 22);
_map_settings = new QGroupBox("Map settings", this);
layout_right->addWidget(_map_settings);
@@ -179,6 +177,8 @@ MapCreationWizard::MapCreationWizard(QWidget* parent) : noggit::ui::widget(paren
auto discard_btn = new QPushButton("Discard", this);
btn_row_layout->addWidget(save_btn);
btn_row_layout->addWidget(discard_btn);
save_btn->setAccessibleName("map_wizard_save_button");
discard_btn->setAccessibleName("map_wizard_discard_button");
layout_right->addItem(btn_row_layout);

8
src/noggit/Red/ViewToolbar/Ui/ViewToolbar.cpp
View File

@@ -13,16 +13,18 @@ ViewToolbar::ViewToolbar(MapView* mapView)
setAllowedAreas(Qt::TopToolBarArea | Qt::BottomToolBarArea);
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_wmo, tr("WMOs"), font_noggit::VISIBILITY_WMO);
addSeparator();
add_tool_icon(&mapView->_draw_lines, tr("Lines"), font_noggit::VISIBILITY_LINES);
add_tool_icon(&mapView->_draw_contour, tr("Contours"), font_noggit::VISIBILITY_CONTOURS);
add_tool_icon(&mapView->_draw_wireframe, tr("Wireframe"), font_noggit::VISIBILITY_WIREFRAME);
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);
addSeparator();
// Animation

23
src/noggit/ui/About.cpp
View File

@@ -19,21 +19,20 @@ namespace noggit
setWindowIcon(QIcon(":/icon"));
setWindowTitle("About");
//! \todo make nice looking again, I don't care currently
new QVBoxLayout (this);
new QHBoxLayout (this);
auto icon (new QLabel (this));
icon->setPixmap (*BLPRenderer::getInstance().render_blp_to_pixmap ("interface/icons/inv_potion_83.blp"));
auto pixmap = QPixmap::fromImage(QImage(":/icon"));
icon->setPixmap(pixmap.scaled(128,128));
layout()->addWidget (icon);
//! \todo was Skurri32
layout()->addWidget (new QLabel ("Noggit Studio", this));
layout()->addWidget (new QLabel ("a wow map editor for 3.3.5a", this));
layout()->addWidget ( new QLabel ( "Ufoz [...], Cryect, Beket, Schlumpf, "
"Tigurius, Steff, Garthog, Glararan, Cromon, "
"Hanfer, Skarn, AxelSheva, Valium, Kaev, "
"Adspartan", this
)
);
layout()->addWidget (new QLabel ("Noggit Studio Red", this));
layout()->addWidget (new QLabel ("WoW map editor for 3.3.5a", this));
layout()->addWidget (new QLabel ("Ufoz [...], Cryect, Beket, Schlumpf, "
"Tigurius, Steff, Garthog, Glararan, Cromon, "
"Hanfer, Skarn, AxelSheva, Valium, Kaev, "
"Adspartan", this));
layout()->addWidget (new QLabel ("World of Warcraft is (C) Blizzard Entertainment", this));
layout()->addWidget (new QLabel (STRPRODUCTVER, this));
layout()->addWidget (new QLabel (__DATE__ ", " __TIME__, this));