eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 04:19:19 +02:00
Code Issues 121 Wiki Activity

snapshot

Browse Source
This commit is contained in:
milek7
2019-07-02 15:33:49 +02:00
parent d039207b03
commit a0c44fbaa3
15 changed files with 140 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
widgets/map.cpp
View File

@@ -8,7 +8,7 @@
#include "Driver.h"
#include "AnimModel.h"
ui::map_panel::map_panel() : ui_panel(LOC_STR(ui_map), false)
ui::map_panel::map_panel() : ui_panel(STR_C(ui_map), false)
{
size_min = {200, 200};
size_max = {fb_size, fb_size};
@@ -445,13 +445,13 @@ void ui::launcher_window::render_content()
{
ImGui::TextUnformatted(m_switch->name.c_str());
const std::string &open_label = locale::strings[
const std::string &open_label = STR(
m_switch->type == map::launcher::track_switch
? locale::string::map_straight : locale::string::map_open];
? locale::string::map_straight : locale::string::map_open);
const std::string &close_label = locale::strings[
const std::string &close_label = STR(
m_switch->type == map::launcher::track_switch
? locale::string::map_divert : locale::string::map_close];
? locale::string::map_divert : locale::string::map_close);
if (ImGui::Button(open_label.c_str()))
{
@@ -495,7 +495,7 @@ void ui::obstacle_insert_window::render_content()
return;
}
ImGui::TextUnformatted(LOC_STR(map_obstacle_insert));
ImGui::TextUnformatted(STR_C(map_obstacle_insert));
for (auto const &entry : m_obstacles)
{
if (ImGui::Button(entry.first.c_str()))
@@ -526,7 +526,7 @@ ui::obstacle_remove_window::obstacle_remove_window(ui_panel &panel, std::shared_
void ui::obstacle_remove_window::render_content()
{
if (ImGui::Button(LOC_STR(map_obstacle_remove))) {
if (ImGui::Button(STR_C(map_obstacle_remove))) {
m_relay.post(user_command::deletemodel, 0.0, 0.0, GLFW_PRESS, 0, glm::vec3(), &m_obstacle->model_name);
auto &entries = map::Objects.entries;