diff --git a/aegisub/packages/win_installer/aegisub3.iss b/aegisub/packages/win_installer/aegisub3.iss index 428a3c467..7de5a4ebb 100644 --- a/aegisub/packages/win_installer/aegisub3.iss +++ b/aegisub/packages/win_installer/aegisub3.iss @@ -58,7 +58,6 @@ ArchitecturesAllowed=x64 #include "fragment_automation.iss" #include "fragment_translations.iss" #include "fragment_spelling.iss" -#include "fragment_docs.iss" #include "fragment_assdraw.iss" diff --git a/aegisub/packages/win_installer/fragment_docs.iss b/aegisub/packages/win_installer/fragment_docs.iss deleted file mode 100644 index e2463ee09..000000000 --- a/aegisub/packages/win_installer/fragment_docs.iss +++ /dev/null @@ -1,38 +0,0 @@ -; Copyright (c) 2007-2009, Niels Martin Hansen -; -; Redistribution and use in source and binary forms, with or without -; modification, are permitted provided that the following conditions are met: -; -; * Redistributions of source code must retain the above copyright notice, -; this list of conditions and the following disclaimer. -; * Redistributions in binary form must reproduce the above copyright notice, -; this list of conditions and the following disclaimer in the documentation -; and/or other materials provided with the distribution. -; * Neither the name of the Aegisub Group nor the names of its contributors -; may be used to endorse or promote products derived from this software -; without specific prior written permission. -; -; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -; ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -; LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -; SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -; CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -; POSSIBILITY OF SUCH DAMAGE. -; -; ----------------------------------------------------------------------------- -; -; AEGISUB -; -; Website: http://www.aegisub.org/ -; Contact: mailto:nielsm@indvikleren.dk -; - -[Files] -; documentation -Source: src\docs\*; DestDir: {app}\docs; Flags: ignoreversion recursesubdirs; Excludes: *svn - diff --git a/aegisub/src/help_button.cpp b/aegisub/src/help_button.cpp index 4ef30f169..906e06365 100644 --- a/aegisub/src/help_button.cpp +++ b/aegisub/src/help_button.cpp @@ -93,19 +93,7 @@ void HelpButton::OpenPage(wxString const& pageID) { wxString section; page = page.BeforeFirst('#', §ion); - wxFileName docFile(config::path->Decode("?data/docs/").wstring(), page, "html", wxPATH_NATIVE); - - wxString url; - // If we can read a file by the constructed name, assume we have a local copy of the manual - if (docFile.IsFileReadable()) - // Tested IE8, Firefox 3.5, Safari 4, Chrome 4 and Opera 10 on Windows, they all handle - // various variations of slashes, missing one at the start and using backslashes throughout - // is safe with everything everyone uses. Blame Microsoft. - url = wxString("file://") + docFile.GetFullPath(wxPATH_NATIVE); - else - url = wxString::Format("http://docs.aegisub.org/3.1/%s/#%s", page, section); - - wxLaunchDefaultBrowser(url); + wxLaunchDefaultBrowser(wxString::Format("http://docs.aegisub.org/3.1/%s/#%s", page, section)); } void HelpButton::ClearPages() {