From f457e131a6007ccb6d1fbdb7401487b9a65c53cd Mon Sep 17 00:00:00 2001 From: WrinklyNinja Date: Thu, 8 May 2014 20:38:21 +0100 Subject: [PATCH] Removed ability to open report in default browser. It didn't actually add anything really useful, and the static report HTML file broke opening the browser. --- resources/settings.yaml | 1 - src/backend/generators.cpp | 1 - src/gui/main.cpp | 24 +++++++----------------- src/gui/settings.cpp | 10 ---------- src/gui/settings.h | 1 - 5 files changed, 7 insertions(+), 30 deletions(-) diff --git a/resources/settings.yaml b/resources/settings.yaml index 0ffe09eb..1b6b32dd 100644 --- a/resources/settings.yaml +++ b/resources/settings.yaml @@ -7,7 +7,6 @@ Game: auto # auto, or one of the 'folder' values below. Last Game: auto # auto, or one of the 'folder' values below. Debug Verbosity: 0 # 0, 1, 2, 3. Logging takes place if > 0. Update Masterlist: true -View Report Externally: false Generate Graph Image: false # Games. The four types are 'Oblivion', 'Skyrim', 'Fallout3' and 'FalloutNV'. They correspond to each base game's libespm and libloadorder settings. diff --git a/src/backend/generators.cpp b/src/backend/generators.cpp index 30a6a316..9b01cd73 100644 --- a/src/backend/generators.cpp +++ b/src/backend/generators.cpp @@ -263,7 +263,6 @@ namespace loot { root["Last Game"] = "auto"; root["Debug Verbosity"] = 0; root["Update Masterlist"] = true; - root["View Report Externally"] = false; games.push_back(Game(Game::tes4)); games.push_back(Game(Game::tes5)); diff --git a/src/gui/main.cpp b/src/gui/main.cpp index ebe69506..4fd980ba 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -514,16 +514,10 @@ void Launcher::OnClose(wxCloseEvent& event) { } void Launcher::OnViewLastReport(wxCommandEvent& event) { - if (_settings["View Report Externally"] && _settings["View Report Externally"].as()) { - BOOST_LOG_TRIVIAL(debug) << "Opening report in external application..."; - wxLaunchDefaultBrowser(FromUTF8(ToFileURL(g_path_report.string() + "?data=" + _game->ReportDataPath().string()))); - } - else { - //Create viewer window. - BOOST_LOG_TRIVIAL(debug) << "Opening viewer window..."; - Viewer *viewer = new Viewer(this, translate("LOOT: Report Viewer"), FromUTF8(ToFileURL(g_path_report.string() + "?data=" + _game->ReportDataPath().string()))); - viewer->Show(); - } + //Create viewer window. + BOOST_LOG_TRIVIAL(debug) << "Opening viewer window..."; + Viewer *viewer = new Viewer(this, translate("LOOT: Report Viewer"), FromUTF8(ToFileURL(g_path_report.string() + "?data=" + _game->ReportDataPath().string()))); + viewer->Show(); BOOST_LOG_TRIVIAL(debug) << "Report displayed."; } @@ -932,13 +926,9 @@ void Launcher::OnSortPlugins(wxCommandEvent& event) { ViewButton->Enable(true); BOOST_LOG_TRIVIAL(debug) << "Displaying report..."; - if (_settings["View Report Externally"] && _settings["View Report Externally"].as()) { - wxLaunchDefaultBrowser(FromUTF8(ToFileURL(g_path_report.string() + "?data=" + _game->ReportDataPath().string()))); - } else { - //Create viewer window. - Viewer *viewer = new Viewer(this, translate("LOOT: Report Viewer"), FromUTF8(ToFileURL(g_path_report.string() + "?data=" + _game->ReportDataPath().string()))); - viewer->Show(); - } + //Create viewer window. + Viewer *viewer = new Viewer(this, translate("LOOT: Report Viewer"), FromUTF8(ToFileURL(g_path_report.string() + "?data=" + _game->ReportDataPath().string()))); + viewer->Show(); BOOST_LOG_TRIVIAL(debug) << "Report display successful. Sorting process complete."; } diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp index 6543ba0b..80fb2cf2 100644 --- a/src/gui/settings.cpp +++ b/src/gui/settings.cpp @@ -68,7 +68,6 @@ SettingsFrame::SettingsFrame(wxWindow *parent, const wxString& title, YAML::Node removeBtn = new wxButton(this, BUTTON_RemoveGame, translate("Remove Game")); UpdateMasterlistBox = new wxCheckBox(this, wxID_ANY, translate("Update masterlist before sorting.")); - reportViewBox = new wxCheckBox(this, wxID_ANY, translate("View reports externally in default browser.")); //Set up list columns. gamesList->AppendColumn(translate("Name")); @@ -123,8 +122,6 @@ SettingsFrame::SettingsFrame(wxWindow *parent, const wxString& title, YAML::Node bigBox->Add(UpdateMasterlistBox, wholeItem); - bigBox->Add(reportViewBox, wholeItem); - bigBox->AddSpacer(10); bigBox->Add(new wxStaticText(this, wxID_ANY, translate("Language and game changes will be applied after LOOT is restarted.")), wholeItem); @@ -178,11 +175,6 @@ void SettingsFrame::SetDefaultValues() { UpdateMasterlistBox->SetValue(update); } - if (_settings["View Report Externally"]) { - bool view = _settings["View Report Externally"].as(); - reportViewBox->SetValue(view); - } - for (size_t i=0, max=_games.size(); i < max; ++i) { gamesList->InsertItem(i, FromUTF8(_games[i].Name())); gamesList->SetItem(i, 1, FromUTF8(loot::Game(_games[i].Id()).FolderName())); @@ -229,8 +221,6 @@ void SettingsFrame::OnQuit(wxCommandEvent& event) { _settings["Update Masterlist"] = UpdateMasterlistBox->IsChecked(); - _settings["View Report Externally"] = reportViewBox->IsChecked(); - _games.clear(); for (size_t i=0,max=gamesList->GetItemCount(); i < max; ++i) { string name, folder, master, repo, branch, path, registry; diff --git a/src/gui/settings.h b/src/gui/settings.h index d15de1a7..4c8317e1 100644 --- a/src/gui/settings.h +++ b/src/gui/settings.h @@ -47,7 +47,6 @@ private: wxChoice *GameChoice; wxChoice *LanguageChoice; wxCheckBox *UpdateMasterlistBox; - wxCheckBox *reportViewBox; wxListView *gamesList; wxButton * addBtn;