Merge pull request #461 from DrChat/trace_viewer_open_dlg

Trace Viewer: Display a File Open Dialog if no File Specified
This commit is contained in:
Ben Vanik 2015-11-16 18:26:17 -08:00
commit 2602d54775
1 changed files with 26 additions and 6 deletions

View File

@ -19,6 +19,7 @@
#include "xenia/gpu/gl4/gl4_command_processor.h"
#include "xenia/gpu/gl4/gl4_graphics_system.h"
#include "xenia/gpu/gl4/gl4_shader.h"
#include "xenia/ui/file_picker.h"
DEFINE_string(target_trace_file, "", "Specifies the trace file to load.");
@ -69,21 +70,40 @@ class GL4TraceViewer : public TraceViewer {
int trace_viewer_main(const std::vector<std::wstring>& args) {
// Grab path from the flag or unnamed argument.
if (FLAGS_target_trace_file.empty() && args.size() < 2) {
xe::FatalError("No trace file specified");
return 1;
}
std::wstring path;
if (!FLAGS_target_trace_file.empty()) {
// Passed as a named argument.
// TODO(benvanik): find something better than gflags that supports
// unicode.
path = xe::to_wstring(FLAGS_target_trace_file);
} else {
} else if (args.size() >= 2) {
// Passed as an unnamed argument.
path = args[1];
}
// If no path passed, ask the user.
if (path.empty()) {
auto file_picker = xe::ui::FilePicker::Create();
file_picker->set_mode(ui::FilePicker::Mode::kOpen);
file_picker->set_type(ui::FilePicker::Type::kFile);
file_picker->set_multi_selection(false);
file_picker->set_title(L"Select Trace File");
file_picker->set_extensions({
{L"Supported Files", L"*.*"}, {L"All Files (*.*)", L"*.*"},
});
if (file_picker->Show()) {
auto selected_files = file_picker->selected_files();
if (!selected_files.empty()) {
path = selected_files[0];
}
}
}
if (path.empty()) {
xe::FatalError("No trace file specified");
return 1;
}
// Normalize the path and make absolute.
auto abs_path = xe::to_absolute_path(path);