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

launcher link start fix, assume scn files in win1250

Browse Source
This commit is contained in:
milek7
2019-09-01 17:41:23 +02:00
parent c4d43f5a0a
commit f7ac7cc581
4 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/scenery_list.cpp
View File

@@ -61,7 +61,7 @@ void ui::scenerylist_panel::render_contents()
if (ImGui::Button(link.second.c_str(), ImVec2(-1, 0))) {
std::string file = ToLower(link.first);
#ifdef _WIN32
system(("start \"" + file + "\"").c_str());
system(("start \"eu07_link\" \"" + file + "\"").c_str());
#elif __linux__
system(("xdg-open \"" + file + "\"").c_str());
#elif __APPLE__
@@ -150,7 +150,6 @@ void ui::scenerylist_panel::render_contents()
set += "enddynamic\n";
}
set += "endtrainset\n";
WriteLog(set);
Global.trainset_overrides.emplace(selected_trainset->file_bounds.first, set);
@@ -227,7 +226,10 @@ void ui::scenerylist_panel::draw_trainset(trainset_desc &trainset)
}
ImGui::SameLine(afterX);
if (ImGui::IsItemClicked(1)) {
if (ImGui::IsItemDeactivated() && ImGui::IsItemHovered()) {
selected_trainset = &trainset;
}
else if (ImGui::IsItemClicked(1)) {
register_popup(std::make_unique<ui::dynamic_edit_popup>(*this, dyn_desc));
}
else if (ImGui::IsItemHovered()) {

8
launcher/scenery_scanner.cpp
View File

@@ -54,9 +54,9 @@ void scenery_scanner::scan_scn(std::filesystem::path path)
if (line[3] == 'i')
desc.image_path = "scenery/images/" + line.substr(5);
else if (line[3] == 'n')
desc.name = line.substr(5);
desc.name = win1250_to_utf8(line.substr(5));
else if (line[3] == 'd')
desc.description += line.substr(5) + '\n';
desc.description += win1250_to_utf8(line.substr(5)) + '\n';
else if (line[3] == 'f') {
std::string lang;
std::string file;
@@ -66,7 +66,7 @@ void scenery_scanner::scan_scn(std::filesystem::path path)
stream >> lang >> file;
std::getline(stream, label);
desc.links.push_back(std::make_pair(file, label));
desc.links.push_back(std::make_pair(file, win1250_to_utf8(label)));
}
else if (line[3] == 'o') {
for (auto &trainset : desc.trainsets) {
@@ -74,7 +74,7 @@ void scenery_scanner::scan_scn(std::filesystem::path path)
|| line_counter > trainset.file_bounds.second)
continue;
trainset.description = line.substr(5);
trainset.description = win1250_to_utf8(line.substr(5));
}
}
}