From 8e105de6ea8a7bac69f0085ea93dabddcc447b64 Mon Sep 17 00:00:00 2001 From: Iss Mneur Date: Sat, 24 Sep 2016 10:05:09 -0600 Subject: [PATCH 01/15] Lets use the same Xcode as jg18 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c4e7c03..4330d19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ addons: - build-essential - cmake - libopenal-dev +osx_image: xcode7.3 matrix: include: - os: linux From 02f6cd1c83741d7fc4f24c08241d0b4b7273d215 Mon Sep 17 00:00:00 2001 From: Iss Mneur Date: Fri, 30 Sep 2016 20:10:20 -0600 Subject: [PATCH 02/15] Make the binary finder explcitly case insensitive (#153) It seems that perhaps the wxDir::GetFirst and GetNext are not contractually case insensitive (at very least is not mentioned in the documentation) even if the windows implementation is and 3.1.0 wxMac is. --- code/datastructures/FSOExecutable.cpp | 66 ++++++++++++++++----------- code/datastructures/FSOExecutable.h | 12 +++-- 2 files changed, 49 insertions(+), 29 deletions(-) diff --git a/code/datastructures/FSOExecutable.cpp b/code/datastructures/FSOExecutable.cpp index 042c434..f4197ed 100644 --- a/code/datastructures/FSOExecutable.cpp +++ b/code/datastructures/FSOExecutable.cpp @@ -98,29 +98,39 @@ bool IsFileToIgnore(const wxString& filename) { } #endif +wxString EXECUTABLE_START_PATTERN(_T("fs2_open")); +wxString FRED_EXECUTABLE_START_PATTERN(_T("fred2_open")); #if IS_WIN32 -#define EXECUTABLE_GLOB_PATTERN _T("fs2_*.exe") -#define FRED_EXECUTABLE_GLOB_PATTERN _T("fred2_*.exe") +wxString EXECUTABLE_END_PATTERN(_T(".exe")); #elif IS_LINUX -#define EXECUTABLE_GLOB_PATTERN _T("fs2_*") -#define FRED_EXECUTABLE_GLOB_PATTERN _T("fred2_*") +wxString EXECUTABLE_END_PATTERN(wxEmptyString); #elif IS_APPLE -#define EXECUTABLE_GLOB_PATTERN _T("fs2_*.app") -#define FRED_EXECUTABLE_GLOB_PATTERN _T("fred2_*.app") +wxString EXECUTABLE_END_PATTERN(_T(".app")); #else #error "One of IS_WIN32, IS_LINUX, IS_APPLE must evaluate to true" #endif // quiet is for when you just want to check whether there are FSO/FRED binaries -wxArrayString FSOExecutable::GetBinariesFromRootFolder(const wxFileName& path, bool quiet) { - return FSOExecutable::GetBinariesFromRootFolder(path, EXECUTABLE_GLOB_PATTERN, quiet); +wxArrayString FSOExecutable::GetBinariesFromRootFolder( + const wxFileName& path, bool quiet) +{ + return FSOExecutable::GetBinariesFromRootFolder( + path, EXECUTABLE_START_PATTERN, EXECUTABLE_END_PATTERN, quiet); } -wxArrayString FSOExecutable::GetFredBinariesFromRootFolder(const wxFileName& path, bool quiet) { - return FSOExecutable::GetBinariesFromRootFolder(path, FRED_EXECUTABLE_GLOB_PATTERN, quiet); +wxArrayString FSOExecutable::GetFredBinariesFromRootFolder( + const wxFileName& path, bool quiet) +{ + return FSOExecutable::GetBinariesFromRootFolder( + path, FRED_EXECUTABLE_START_PATTERN, EXECUTABLE_END_PATTERN, quiet); } -wxArrayString FSOExecutable::GetBinariesFromRootFolder(const wxFileName& path, const wxString& globPattern, bool quiet) { +wxArrayString FSOExecutable::GetBinariesFromRootFolder( + const wxFileName& path, + const wxString& startPattern, + const wxString& endPattern, + bool quiet) +{ wxArrayString files; // Check args because this function gets crap tossed at it to validate @@ -141,27 +151,31 @@ wxArrayString FSOExecutable::GetBinariesFromRootFolder(const wxFileName& path, c wxString filename; #if IS_APPLE // Binaries are directories on OSX. - bool cont = folder.GetFirst(&filename, globPattern, wxDIR_DIRS); + bool cont = folder.GetFirst(&filename, wxEmptyString, wxDIR_DIRS); #else - bool cont = folder.GetFirst(&filename, globPattern, wxDIR_FILES); + bool cont = folder.GetFirst(&filename, wxEmptyString, wxDIR_FILES); #endif - while (cont) { -#if IS_LINUX - if ( !IsFileToIgnore(filename) ) { -#endif - files.Add(filename); + for (; cont; cont = folder.GetNext(&filename)) { + wxString lowerFilename(filename.Lower()); + + // filter out "launcher" binaries (particularly on OSX) + // otherwise they endup in the binary list + if (lowerFilename.Contains(_T("launcher"))) { + continue; + } + if (!lowerFilename.StartsWith(startPattern)) { + continue; + } #if IS_LINUX + if (!IsFileToIgnore(filename)) { + continue; } #endif - cont = folder.GetNext(&filename); - } - - // filter out launcher binaries (at least on OSX) - for (int i = files.GetCount() - 1; i >= 0; --i) { - if (files[i].Lower().Find(_T("launcher")) != wxNOT_FOUND) { - files.RemoveAt(i); + if (!lowerFilename.EndsWith(wxEmptyString)) { + continue; } + files.Add(filename); } #if IS_APPLE @@ -177,7 +191,7 @@ wxArrayString FSOExecutable::GetBinariesFromRootFolder(const wxFileName& path, c #endif if (!quiet) { - wxString execType = globPattern.Lower().Find(_T("fred")) == wxNOT_FOUND ? _T("FS2") : _T("FRED2"); + wxString execType = startPattern.Lower().Find(_T("fred")) == wxNOT_FOUND ? _T("FS2") : _T("FRED2"); wxLogInfo(_T(" Found %d %s Open executables in '%s'"), files.GetCount(), execType.c_str(), path.GetPath().c_str()); diff --git a/code/datastructures/FSOExecutable.h b/code/datastructures/FSOExecutable.h index 8b22bf2..5090680 100644 --- a/code/datastructures/FSOExecutable.h +++ b/code/datastructures/FSOExecutable.h @@ -41,8 +41,10 @@ class FSOExecutable: public wxClientData { static bool IsRootFolderValid(const wxFileName& path, bool quiet = false); static bool HasFSOExecutables(const wxFileName& path); - static wxArrayString GetBinariesFromRootFolder(const wxFileName &path, bool quiet = false); - static wxArrayString GetFredBinariesFromRootFolder(const wxFileName &path, bool quiet = false); + static wxArrayString GetBinariesFromRootFolder( + const wxFileName &path, bool quiet = false); + static wxArrayString GetFredBinariesFromRootFolder( + const wxFileName &path, bool quiet = false); static FSOExecutable GetBinaryVersion(wxString binaryname); static bool SmellsLikeGitCommitHash(const wxString& str); wxString GetVersionString() const; @@ -65,7 +67,11 @@ class FSOExecutable: public wxClientData { wxByte buildCaps; private: FSOExecutable(); - static wxArrayString GetBinariesFromRootFolder(const wxFileName &path, const wxString &globPattern, bool quiet); + static wxArrayString GetBinariesFromRootFolder( + const wxFileName &path, + const wxString &startPattern, + const wxString &endPattern, + bool quiet); }; inline bool FSOExecutable::ExecutableNameEqualTo(const wxString& str) const { From 0d192ba663c77f97ccf4b6d08fedd8383c42c35d Mon Sep 17 00:00:00 2001 From: Joshua Glatt Date: Mon, 17 Oct 2016 22:37:17 -0700 Subject: [PATCH 03/15] Fix issues with case-insensitive binary detection (#155) True means that we should ignore not vice versa. --- code/datastructures/FSOExecutable.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datastructures/FSOExecutable.cpp b/code/datastructures/FSOExecutable.cpp index f4197ed..da29adc 100644 --- a/code/datastructures/FSOExecutable.cpp +++ b/code/datastructures/FSOExecutable.cpp @@ -168,11 +168,11 @@ wxArrayString FSOExecutable::GetBinariesFromRootFolder( continue; } #if IS_LINUX - if (!IsFileToIgnore(filename)) { + if (IsFileToIgnore(lowerFilename)) { continue; } #endif - if (!lowerFilename.EndsWith(wxEmptyString)) { + if (!lowerFilename.EndsWith(endPattern)) { continue; } files.Add(filename); From 34659235a580c5e7a3d5ca780c1ada94969b261d Mon Sep 17 00:00:00 2001 From: plieblang Date: Mon, 6 Mar 2017 20:53:35 -0600 Subject: [PATCH 04/15] Update of wxLauncher manual --- onlinehelp/30Reference/20MODs/01modlist.help | 2 +- .../30Reference/30BasicSettings/02video.help | 10 +++--- .../30Reference/30BasicSettings/03audio.help | 4 +-- .../30Reference/30BasicSettings/04speech.help | 2 +- .../30Reference/30BasicSettings/index.help | 2 +- .../40AdvancedSettings/01flaglist.help | 10 +++++- .../40AdvancedSettings/021lighting.help | 8 ++--- .../40AdvancedSettings/05flagsets.help | 6 +++- .../40AdvancedSettings/10customflags.help | 7 +++- .../40AdvancedSettings/15commandline.help | 7 +++- .../30Reference/40AdvancedSettings/index.help | 7 +++- .../50TechnicalStuff/02Terminology.help | 15 ++++---- onlinehelp/50TechnicalStuff/03privacy.help | 2 +- onlinehelp/50TechnicalStuff/index.help | 12 ++++++- onlinehelp/ReadMe.txt | 2 +- onlinehelp/index.help | 13 +++++-- onlinehelp/jfaq.help | 12 +++---- onlinehelp/lchanges.help | 36 +++++++++++++++++++ 18 files changed, 120 insertions(+), 37 deletions(-) diff --git a/onlinehelp/30Reference/20MODs/01modlist.help b/onlinehelp/30Reference/20MODs/01modlist.help index a5283fb..b5c2c70 100644 --- a/onlinehelp/30Reference/20MODs/01modlist.help +++ b/onlinehelp/30Reference/20MODs/01modlist.help @@ -18,7 +18,7 @@ To learn more about a mod, such as a description and links to its website or for + [li]: /images/li.png [mod]: /50TechnicalStuff/02Terminology.help diff --git a/onlinehelp/30Reference/30BasicSettings/02video.help b/onlinehelp/30Reference/30BasicSettings/02video.help index c588e89..338a158 100644 --- a/onlinehelp/30Reference/30BasicSettings/02video.help +++ b/onlinehelp/30Reference/30BasicSettings/02video.help @@ -1,9 +1,9 @@ Video # Video -This is where you configure the basic settings of the graphics engine to best suit your needs (and to best fit your computer's graphic and processing power). +Here you configure the basic settings of the graphics engine to best suit your needs (and to best fit your computer's graphic and processing power). --- screenshot with the "video" section highlighted -- + ### Depth Bit depth (also called *color depth* or *screen depth*) describes the number of bits used to represent the color of a single pixel. In game terms, this means that a 32-bit depth creates a more vivid image than a 16-bit depth mode. @@ -32,7 +32,7 @@ Anisotropic is a second filter applied to the textures you see in-game to correc ### Anti-aliasing Anti-aliasing is a technique that minimizes the "jagged edges" of any object you see in-game. Check this [Wikipedia article on anti-aliasing][aa]![][le] for a more detailed explanation. -**TODO need to say something about FXAA** + **Tip**: In a furious dogfight, you won't notice any difference if this is turned off or set to maximum, but if you want to admire the beautiful world of FreeSpace, it could be worth using it. diff --git a/onlinehelp/30Reference/30BasicSettings/03audio.help b/onlinehelp/30Reference/30BasicSettings/03audio.help index 2082575..2a192ab 100644 --- a/onlinehelp/30Reference/30BasicSettings/03audio.help +++ b/onlinehelp/30Reference/30BasicSettings/03audio.help @@ -21,6 +21,6 @@ Click this to redetect the audio devices installed on your system. Useful if yo [li]: /images/li.png [le]: /images/le.png -[openalw]: http://en.wikipedia.org/wiki/OpenAL -[openald]: http://connect.creativelabs.com/openal/Downloads/Forms/AllItems.aspx +[openalw]: https://en.wikipedia.org/wiki/OpenAL +[openald]: https://www.openal.org/downloads/ [fso]: /50TechnicalStuff/02Terminology.help diff --git a/onlinehelp/30Reference/30BasicSettings/04speech.help b/onlinehelp/30Reference/30BasicSettings/04speech.help index 7ec0d46..b64cebc 100644 --- a/onlinehelp/30Reference/30BasicSettings/04speech.help +++ b/onlinehelp/30Reference/30BasicSettings/04speech.help @@ -35,7 +35,7 @@ Defines the areas of the game where the simulated speech should be used. Check a * **Windows XP or older**: You can download Mike and Mary from [Microsoft's Download Center][mdc]![][le]. * **Vista or 7**: There are no other free voices available from Microsoft (the voices available for Windows XP or older will install but Windows will not allow them to be used) -**TODO verify the above statements** + + +This big list of checkboxes lets you set various flags that are passed to the FreeSpace Open executable and that enable new features added by the SCP. +To see a full description of any option, double-clicking on it will lead to its description of the [Hard Light Wiki][flwiki]![][le]. +See [Current command line][ccl]![][le] for more. + +[le]: /images/le.png +[ccl]: 15commandline.help +[flwiki]: http://www.hard-light.net/wiki/index.php/Command-Line_Reference \ No newline at end of file diff --git a/onlinehelp/30Reference/40AdvancedSettings/021lighting.help b/onlinehelp/30Reference/40AdvancedSettings/021lighting.help index bbfe144..1ef3d62 100644 --- a/onlinehelp/30Reference/40AdvancedSettings/021lighting.help +++ b/onlinehelp/30Reference/40AdvancedSettings/021lighting.help @@ -2,11 +2,11 @@ # Lighting presets -**TODO scribble: presets of lighting settings. provide link to fs wiki ., select radio button to have preset automatically included in your command line. if you'd like to edit one of the presets, select it, then click on the copy button to copy it to your custom flags, where you can edit it to your taste .** +This page has some collections of flags that have been assembled by community members. +Selecting one of these presets will automatically update your [[current command line][ccl]![][le] settings +See more at the [Hard Light Wiki][presetdescs]![][le]. - - -[li]: /images/li.png +[ccl]: 15commandline.help [le]: /images/le.png [fso]: /50TechnicalStuff/02Terminology.help [scp]: /50TechnicalStuff/02Terminology.help diff --git a/onlinehelp/30Reference/40AdvancedSettings/05flagsets.help b/onlinehelp/30Reference/40AdvancedSettings/05flagsets.help index f1b245f..9382f35 100644 --- a/onlinehelp/30Reference/40AdvancedSettings/05flagsets.help +++ b/onlinehelp/30Reference/40AdvancedSettings/05flagsets.help @@ -2,4 +2,8 @@ # Flag sets -**TODO should also rename these to something else** \ No newline at end of file + + +This dropdown provides quick presets to turn on or off selected flags. + + \ No newline at end of file diff --git a/onlinehelp/30Reference/40AdvancedSettings/10customflags.help b/onlinehelp/30Reference/40AdvancedSettings/10customflags.help index 7dc26db..c40ed23 100644 --- a/onlinehelp/30Reference/40AdvancedSettings/10customflags.help +++ b/onlinehelp/30Reference/40AdvancedSettings/10customflags.help @@ -2,4 +2,9 @@ # Custom flags -**TODO** \ No newline at end of file +If you know what flag you want, you can type it in here and it will by added to the [current command line][ccl]![][le]. +The full list of flags is available at [http://www.hard-light.net/wiki/index.php/Command-Line_Reference][flwiki]![][le] + +[le]: /images/le.png +[ccl]: 15commandline.help +[flwiki]: http://www.hard-light.net/wiki/index.php/Command-Line_Reference \ No newline at end of file diff --git a/onlinehelp/30Reference/40AdvancedSettings/15commandline.help b/onlinehelp/30Reference/40AdvancedSettings/15commandline.help index 9447ead..8524db3 100644 --- a/onlinehelp/30Reference/40AdvancedSettings/15commandline.help +++ b/onlinehelp/30Reference/40AdvancedSettings/15commandline.help @@ -2,4 +2,9 @@ # Current command line -**TODO** + +This box is automatically modified whenever you modify the flag list, or you can manually set the parameters yourself. +See [Flag list][fl]![][le] for more. + +[fl]: 01flaglist.help +[le]: /images/le.png \ No newline at end of file diff --git a/onlinehelp/30Reference/40AdvancedSettings/index.help b/onlinehelp/30Reference/40AdvancedSettings/index.help index ec4bd15..21474f4 100644 --- a/onlinehelp/30Reference/40AdvancedSettings/index.help +++ b/onlinehelp/30Reference/40AdvancedSettings/index.help @@ -2,4 +2,9 @@ # Advanced Settings page -**TODO** + + + + + + \ No newline at end of file diff --git a/onlinehelp/50TechnicalStuff/02Terminology.help b/onlinehelp/50TechnicalStuff/02Terminology.help index bcaa932..94327c9 100644 --- a/onlinehelp/50TechnicalStuff/02Terminology.help +++ b/onlinehelp/50TechnicalStuff/02Terminology.help @@ -5,7 +5,7 @@ # Terminology ## FSO -The **FreeSpace 2 Open** (also called FreeSpace Open) engine is an [open-source][os]![][le] modification project of the retail FreeSpace 2 engine started after the public release of the original source code in 2002. The community, under the direction of the Source Code Project (or SCP), made major upgrades to the engine and made it portable to multiple operating systems. +The **FreeSpace 2 Open** (also called FreeSpace Open) engine is an [open-source][os]![][le] modification project of the retail FreeSpace 2 engine started after the public release of the original source code in 2002. The community, under the direction of the Source Code Project (or SCP), made major upgrades to the engine and made it multi-platform for Windows, Mac and Linux. ## SCP The **FreeSpace 2 Source Code Project** (or FreeSpace Source Code Project or simply Source Code Project) is a central source to coordinate development of the FreeSpace 2 Open engine. It was created after the source code of the FreeSpace 2 game engine become public in order to prevent multiple diverging versions of the game from appearing. @@ -27,19 +27,20 @@ Examples of TCs include * [The Babylon Project][tbp]![][le] - based on the Babylon 5 universe * [Wing Commander Saga][wcs]![][le] - based on the Wing Commander universe +* [Diaspora][dia]![][le] - based on the 2004 Battlestar Galactica universe -Check the **Hosted** section on the [Hard Light Productions][hl]![][le] website for a more detailed list. +Check the [**Total conversions**][tc]![][le] section on the [Hard Light Productions][hl]![][le] website for a more detailed list. -**TODO I think there's a list of TCs on the Campaigns List on the FS Wiki. Maybe use that instead of Hosted section.** - -**Technical note:** The launcher regards FreeSpace 2 as a TC itself. ***TODO for now.*** +**Technical note:** The launcher regards FreeSpace 2 as a TC itself. + [le]: ../images/le.png -[os]: http://en.wikipedia.org/wiki/Open_source +[os]: https://en.wikipedia.org/wiki/Open-source_model [scp]: http://scp.indiegames.us/ [forums]: http://www.hard-light.net/forums/index.php?board=50.0 [moddb]: http://www.hard-light.net/wiki/index.php/Mod_Database [fswiki]: http://www.hard-light.net/wiki/index.php/Main_Page [tbp]: http://babylon.hard-light.net/ -[wcs]: http://wcsaga.hard-light.net/ +[wcs]: http://wcsaga.com/ [hl]: http://www.hard-light.net/ +[tc]: http://www.hard-light.net/wiki/index.php/Total_conversions diff --git a/onlinehelp/50TechnicalStuff/03privacy.help b/onlinehelp/50TechnicalStuff/03privacy.help index 6b2482d..f3b55f0 100644 --- a/onlinehelp/50TechnicalStuff/03privacy.help +++ b/onlinehelp/50TechnicalStuff/03privacy.help @@ -2,7 +2,7 @@ Privacy: the technical details #Privacy: the technical details -As noted in the [FAQ][faq]![][li], no information is ever sent out that could endanger your privacy. Actually, what information wxLauncher sends is nothing more than a simple page request. +As noted in the [FAQ][faq]![][li], besides your IP address, which is sent when making any kind of internet request, no information is ever sent out that could endanger your privacy. Actually, wxLauncher sends nothing more than a simple page request. To get the highlights, wxLauncher asks for a [specially crafted page][page]![][le] that returns a list of the current highlights in a custom format. It's like a news feed, but with no HTML or XML, just plain text. diff --git a/onlinehelp/50TechnicalStuff/index.help b/onlinehelp/50TechnicalStuff/index.help index 750c4d9..cce19da 100644 --- a/onlinehelp/50TechnicalStuff/index.help +++ b/onlinehelp/50TechnicalStuff/index.help @@ -1,3 +1,13 @@ Other information -**TODO Under the hood, translating and stuff, terminology** +#Other information + +* [Terminology][term]![][li] +* [Privacy][priv]![][li] + +[li]: /images/li.png +[term]: 02Terminology.help +[priv]: 03privacy.help + + + diff --git a/onlinehelp/ReadMe.txt b/onlinehelp/ReadMe.txt index 1302603..85e9f32 100644 --- a/onlinehelp/ReadMe.txt +++ b/onlinehelp/ReadMe.txt @@ -1,6 +1,6 @@ What is this? ============= -This folder contains the Online help for wxLauncher. This online help is for the users and FSO modders. The documenation of the launcher's technical details can be found in the code itself, the /docs folder, the wxLauncher wiki or the doxygen generated help. +This folder contains the Online help for wxLauncher. This online help is for the users and FSO modders. The documentation of the launcher's technical details can be found in the code itself, the /docs folder, the wxLauncher wiki or the doxygen generated help. Technical details ================= diff --git a/onlinehelp/index.help b/onlinehelp/index.help index 81f4e09..411052f 100644 --- a/onlinehelp/index.help +++ b/onlinehelp/index.help @@ -3,14 +3,23 @@ #Welcome to wxLauncher ![wxLauncher logo](images/header.png "wxLauncher") + -The [FAQ][]![][li] has basic information about wxLauncher, **TODO something about how to get started, overview of the guide's contents, etc could direct people based on what they're looking for (the possible reasons why they would've looked at the manual in the first place).** **TODO scale down header image to fit default width of viewing area** +If you want to set up and start playing FreeSpace 2 immediately, [go here][]![start][li]. +If you're wondering about other settings, go to [basic][]![][li] or [advanced][]![][li] settings. + +The [FAQ][]![][li] has basic information about wxLauncher. + + + - [FAQ]: jfaq.help [li]: images/li.png +[start]: 30Reference/30BasicSettings/01executable.help +[start]: 30Reference/30BasicSettings/index.help +[advanced]: 30Reference/40AdvancedSettings \ No newline at end of file diff --git a/onlinehelp/jfaq.help b/onlinehelp/jfaq.help index ff37818..75a81c1 100644 --- a/onlinehelp/jfaq.help +++ b/onlinehelp/jfaq.help @@ -18,7 +18,7 @@ The launcher is published under the [GNU General Public License v2][gpl]![][le], ## Why is it called wxLauncher? The name was chosen because the launcher is built using the [wxWidgets][]![][le] GUI toolkit, which allows it to run on multiple platforms. -[wxWidgets]: http://www.wxwidgets.org/ +[wxWidgets]: https://www.wxwidgets.org/ ## On what platforms does wxLauncher run? wxLauncher runs on the same platforms as FSO, namely Windows, Linux and Mac OS X. @@ -27,7 +27,7 @@ wxLauncher runs on the same platforms as FSO, namely Windows, Linux and Mac OS X Check the [authors][]![][li] section for details. ## What about my privacy? -wxLauncher does not send any data over the Internet, so your privacy is safe. You don't have to take our word for it, though: if you have the necessary technical knowledge, you can examine the [source code][source]![][le] and see for yourself. If you don't, but would like to know what happens when wxLauncher goes online, you can check the [privacy][privacy]![][li] page in the [Other information][technical]![][li] section. +wxLauncher does not send any data over the Internet, so your privacy is safe. You don't have to take our word for it, though: if you have the necessary technical knowledge, you can examine the [source code][source]![][le] and see for yourself. If you don't, but would like to know what happens when wxLauncher goes online, you can check the [privacy][privacy]![][li] page in the [Other information][technical]![][li] section. You may also disable this feature quite easily. ## Are there any translations available? Not yet, although there will be for the official release of version 1.0. @@ -53,11 +53,11 @@ Suggestions are always welcome. Contact one of the [project owners or developers [li]: images/li.png [le]: images/le.png [fso]: 50TechnicalStuff/02Terminology.help -[gpl]: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html +[gpl]: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html [authors]: kauthors.help -[source]: http://code.google.com/p/wxlauncher/source/browse/ +[source]: https://github.com/scp-fs2open/wxLauncher [privacy]: 50TechnicalStuff/03privacy.help [technical]: 50TechnicalStuff/index.help -[downloads]: http://code.google.com/p/wxlauncher/downloads/list -[issues]: http://code.google.com/p/wxlauncher/issues/list +[downloads]: https://github.com/scp-fs2open/wxLauncher/releases +[issues]: https://github.com/scp-fs2open/wxLauncher/issues [people]: http://code.google.com/p/wxlauncher/people/list diff --git a/onlinehelp/lchanges.help b/onlinehelp/lchanges.help index fc8e716..4ef2b60 100644 --- a/onlinehelp/lchanges.help +++ b/onlinehelp/lchanges.help @@ -2,6 +2,42 @@ # Latest changes +## Version 0.10.1 + +* **Windows** - Fix the location of the virtualized registry writing + +## Version 0.10.0 + +* **Windows** - No more registry helper +* **Windows** - Support for SDL on Windows antipodes builds +* **All** - Auto saving that actually works + +## Version 0.9.6 + +* Better wxWidgets 3.0 and SDL support + +## Version 0.9.5 + +* Support for multiple versions of wxWidgets + +## Version 0.9.4 + +* **Note:** These changes are based off of v0.9.1, since 0.9.2 and 0.9.3 were special releases for Diaspora +* Mod-customizable features: **(both TCs and mods)** +* Skin system: **(TCs only)** +* Mod list is now sorted alphabetically +* Default image provided for mods that don't include an image of their own +* "Enable EFX" checkbox now appears when the selected playback device supports EFX +* Speech voices are now listed in the correct order +* Connection settings read from profile are now displayed correctly +* "All features on" flag set has been restored +* New splash image (special thanks to mjn.mixael for making this) +* FRED launching can now be toggled with F3 +* Faster startup thanks to more efficient mod.ini search +* Assorted bug fixes and text revisions +* **Linux** - RESOURCES_PATH can now be user-specified (special thanks to Firartix for identifying and fixing this) +* **Linux** - cmdline_fso.cfg is now written to ~/.fs2_open/data/ instead of FS2/TC folder + ## Version 0.9.0 * A brand new cross-platform launcher, the first ever to run on Windows, Linux, and OS X. From 927250345265da8d85a9eb5c877cdca2d18f6587 Mon Sep 17 00:00:00 2001 From: plieblang Date: Tue, 7 Mar 2017 13:10:46 -0600 Subject: [PATCH 05/15] Undid faulty comment-out --- onlinehelp/30Reference/20MODs/01modlist.help | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onlinehelp/30Reference/20MODs/01modlist.help b/onlinehelp/30Reference/20MODs/01modlist.help index b5c2c70..c3476c7 100644 --- a/onlinehelp/30Reference/20MODs/01modlist.help +++ b/onlinehelp/30Reference/20MODs/01modlist.help @@ -8,7 +8,7 @@ To change the active mod, scroll the list and click the [mod][mod]![][li] you wish to activate. Two buttons will appear, one labeled **Activate** and the other **Info**. Click **Activate** to make the selected mod active. - + -- screenshot with the buttos highlighted -- --> **Note**: The first item on the mod list is always the "(No mod)" entry. Activate this in order to play the current [TC][mod]![][li] in its original form without any mods. From f033f60b24740730b3d29b9c0e714e7f9d8d9b8e Mon Sep 17 00:00:00 2001 From: plieblang Date: Tue, 7 Mar 2017 14:31:44 -0600 Subject: [PATCH 06/15] Edits help file in grammar. --- onlinehelp/30Reference/40AdvancedSettings/01flaglist.help | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onlinehelp/30Reference/40AdvancedSettings/01flaglist.help b/onlinehelp/30Reference/40AdvancedSettings/01flaglist.help index 389cf0f..2e9b45f 100644 --- a/onlinehelp/30Reference/40AdvancedSettings/01flaglist.help +++ b/onlinehelp/30Reference/40AdvancedSettings/01flaglist.help @@ -3,7 +3,7 @@ # Flag list -This big list of checkboxes lets you set various flags that are passed to the FreeSpace Open executable and that enable new features added by the SCP. +This big list of checkboxes lets you set various flags that are passed to the FreeSpace Open executable. They enable new features added by the SCP. To see a full description of any option, double-clicking on it will lead to its description of the [Hard Light Wiki][flwiki]![][le]. See [Current command line][ccl]![][le] for more. From abadaa8385bced211410afbceaddac8a8ee4320f Mon Sep 17 00:00:00 2001 From: Cliff Gordon Date: Mon, 13 Mar 2017 13:45:35 -0500 Subject: [PATCH 07/15] Add FreeBSD guide, migrate OS X nomenclature to macOS. --- ReadMe.md | 70 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 25 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index bce8eb1..85a3a45 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -2,9 +2,9 @@ Introduction ============ -[wxLauncher] aims to give one unified answer to members of -the Freespace 2 Open community looking for an easy way -to control `fs2_open` on various platforms and to those +[wxLauncher] aims to give one unified answer to members of +the Freespace 2 Open community looking for an easy way +to control `fs2_open` on various platforms and to those looking for an easy way to find and get updates to their Freespace 2 MODs and TCs. @@ -41,9 +41,7 @@ Xcode, KDevelop, and of course autotools. * Windows * Windows SDK or Platform SDK * Nullsoft Scriptable Install System (NSIS) - * Linux - * SDL 2 - * OS X + * Linux/macOS/FreeBSD * SDL 2 ### Optional components @@ -53,12 +51,12 @@ Xcode, KDevelop, and of course autotools. ### Detailed requirements wxLauncher is built using CMake. Only version 2.8 or later has -been tested (and the CMake file enforces this). CMake can be +been tested (and the CMake file enforces this). CMake can be downloaded in binary form, from the [CMake Home Page] or if you run Linux, from your distro's package repository. [Cmake Home Page]: http://cmake.org -wxLauncher is a [wxWidgets]-based application. It can +wxLauncher is a [wxWidgets]-based application. It can only be built with wxWidgets version 2.8.10 or higher. Version 0.10.0 has been tested with: - 2.8.12 (no STL) @@ -66,14 +64,14 @@ Version 0.10.0 has been tested with: - 3.0.2 (no STL) - 3.0.2 (STL) [wxWidgets]: http://www.wxwidgets.org/ - + [Python] 2.7 or higher is required to build this project. -This project also assumes that the python executable is +This project also assumes that the python executable is in your PATH. Check your operating system's documentation for information on how to add Python to your PATH. [Python]: http://www.python.org/ - -Markdown in Python is required in order to build the + +Markdown in Python is required in order to build the integrated help system. * [Markdown in Python homepage](https://pypi.python.org/pypi/Markdown) * On `pip` enabled installs, try: `pip install markdown` but for Python @@ -82,12 +80,12 @@ integrated help system. The OpenAL Software Development Kit is an optional component needed to build this program. It can be downloaded from the -[OpenAL homepage]. OpenAL support requires the +[OpenAL homepage]. OpenAL support requires the preprocessor symbol `USE_OPENAL=1`. This symbol is set to 1 by default by CMake. You can pass `-DUSE_OPENAL=0` to CMake to disable building with OpenAL support. See the compiler specific instructions for getting your compiler ready to build -with OpenAL. Note that Mac OS X ships with OpenAL pre-installed. +with OpenAL. Note that Mac macOS ships with OpenAL pre-installed. wxLauncher should also work with the [OpenALSoft] library. [OpenAL homepage]: http://connect.creativelabs.com/openal/default.aspx [OpenALSoft]: http://kcat.strangesoft.net/openal.html @@ -99,7 +97,7 @@ Vista and Windows 7 have been tested with this application. The Nullsoft Scriptable Install System (NSIS) is required on Windows to build the installer. The latest version at the time -of writing is 2.46. Be sure to either install NSIS before +of writing is 2.46. Be sure to either install NSIS before running CMake or re-run CMake after installing NSIS. NSIS can be found on the [NSIS homepage](http://nsis.sourceforge.net/). @@ -112,20 +110,20 @@ and used for developing wxLauncher for free. wxLauncher's source can be explored from the project's [source page](https://github.com/wxLauncher/wxlauncher/) - + To get the source, you'll need Git: * [Command Line Git](http://git-scm.com/) * Graphical frontend: [TortioseGit](http://tortiosgit.org) * Distro package manager. Sometimes called `git-scm` - * The Homebrew Project for OS X + * The Homebrew Project for macOS Once Git is installed, you can get a copy of the source by running the following command in a folder of your choice: `git clone https://code.google.com/p/wxlauncher/` - + Building - Windows ================== -Run CMake in your favourite way (GUI, or on the commandline +Run CMake in your favourite way (GUI, or on the commandline ccmake (uses curses) or cmake). CMake QT Gui @@ -134,9 +132,9 @@ Assuming the GUI, select the CMakeLists.txt in the main wxLauncher source directory and set your output directory to where you want the native build tool to be placed, somewhere without spaces. Click configure until the Generate -button Enables. The lines that are highligted red are new -variables that CMake has found. -- Set wxWdigets_ROOT_DIR to the root directory of your wxWidgets +button Enables. The lines that are highligted red are new +variables that CMake has found. +- Set wxWdigets_ROOT_DIR to the root directory of your wxWidgets source directory if it remains NOTFOUND. - Set PYTHON_EXECUTABLE to the python that you want to use. It may not show up. If it doesn't show up, it means that cmake found python automatically, @@ -183,7 +181,7 @@ If you run into this problem, please post in this ticket with your distro, OS version, and whether you're running 32- or 64-bit. -Building - OS X (tested on 10.11, El Capitan) +Building - macOS (tested on 10.11, El Capitan) ============================================= - Get Xcode from the Mac App Store (used 7.3.1) - Get Python 3 from python.org if you don't have it. (used 3.5.2) @@ -191,7 +189,7 @@ Building - OS X (tested on 10.11, El Capitan) Use `pip3` to install Markdown rather than `pip`. By default this is in /usr/local/bin/pip3 . You will need root privileges. - Get Git, making sure that you select the version of - Git for your version of OS X. + Git for your version of macOS. - Clone the wxLauncher repository. - Get CMake 3 (used 3.6.1). - Get the latest stable version of wxWidgets 3 (used 3.0.2). Once you've @@ -240,12 +238,34 @@ your wxLauncher build folder. Make sure that the build configuration you choose (Debug or Release) matches the build configuration you used when you built wxWidgets. -Important known issues on OS X: +Important known issues on macOS: - After startup or after a FS2 Open binary is (re-)selected, checkboxes on the advanced settings page may not appear until after a moment or after the user interacts with the advanced settings page, such as by clicking on the flag list. +Building - FreeBSD (tested on TrueOS Desktop, 22 Feb 2017) +============================================= +- Download the wxLauncher source +- Ensure the following packages are installed: +- cmake, openal-soft, SDL2, wx28-gtk2, python, python2, python27, py27-markdown +- cd +- mkdir build +- cd build +- A typical fully usable build configuration will look something like: +- cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DUSE_OPENAL=1 -DUSE_JOYSTICK=1 +- -DwxWidgets_CONFIG_EXECUTABLE=/usr/local/bin/wxgtk2u-2.8-config ../ +- make +- make install (with root privileges if necessary) + +Notes +----- +Using wx30-gtk2 currently yields a compilation error (11 March 2017) +TrueOS desktop comes with python2/python27, but no binary 'python'. +Installing the python package seems to just create that symlink. +Joystick support has not been tested. If you have a joystick working +with FreeBSD please report test results. + License ======= See License.txt. From 109e2667912c4c9ffb3c12e36d6ac12d6c4a9367 Mon Sep 17 00:00:00 2001 From: Cliff Gordon Date: Tue, 14 Mar 2017 09:12:41 -0500 Subject: [PATCH 08/15] Catch a few more OS X references in the documentation, and fix a redundant goof. --- ReadMe.md | 2 +- onlinehelp/30Reference/30BasicSettings/02video.help | 2 +- onlinehelp/30Reference/30BasicSettings/05joystick.help | 2 +- onlinehelp/jfaq.help | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index 85a3a45..91f561c 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -85,7 +85,7 @@ preprocessor symbol `USE_OPENAL=1`. This symbol is set to 1 by default by CMake. You can pass `-DUSE_OPENAL=0` to CMake to disable building with OpenAL support. See the compiler specific instructions for getting your compiler ready to build -with OpenAL. Note that Mac macOS ships with OpenAL pre-installed. +with OpenAL. Note that macOS ships with OpenAL pre-installed. wxLauncher should also work with the [OpenALSoft] library. [OpenAL homepage]: http://connect.creativelabs.com/openal/default.aspx [OpenALSoft]: http://kcat.strangesoft.net/openal.html diff --git a/onlinehelp/30Reference/30BasicSettings/02video.help b/onlinehelp/30Reference/30BasicSettings/02video.help index 338a158..dd6faaf 100644 --- a/onlinehelp/30Reference/30BasicSettings/02video.help +++ b/onlinehelp/30Reference/30BasicSettings/02video.help @@ -21,7 +21,7 @@ Bit depth (also called *color depth* or *screen depth*) describes the number of **Note**: Although a 32-bit mode requires a bit more processing power than 16-bit, this option should be set to the same value as your Windows bit depth (usually 32-bit nowdays), as using a different bit depth can cause *major* slowdowns. If your graphics card is having difficulty running FSO, the SCP suggests that you change other graphics settings and leave this one where it is now. -## Options currently supported on Linux and Mac OS X only +## Options currently supported on Linux and macOS only ### Texture filter The texture filter determines the method used to blend the pixels you see on a textured object/model in game with that of neighbouring pixels to create the illusion of a continuous surface. The more advanced the method, the better the result. The cost is a slight performance loss. diff --git a/onlinehelp/30Reference/30BasicSettings/05joystick.help b/onlinehelp/30Reference/30BasicSettings/05joystick.help index b6a75b2..e20ed6f 100644 --- a/onlinehelp/30Reference/30BasicSettings/05joystick.help +++ b/onlinehelp/30Reference/30BasicSettings/05joystick.help @@ -9,7 +9,7 @@ This is where you select and configure your joystick. ### Select joystick This is a list if joysticks connected to your computer and recognized by the operating system. Choose the one you want to use. -**Linux and Mac OS X note**: If you connect or disconnect a joystick while wxLauncher is running, you will need to restart wxLauncher for it to detect the changes. +**Linux and macOS note**: If you connect or disconnect a joystick while wxLauncher is running, you will need to restart wxLauncher for it to detect the changes. ## Options currently supported on Windows only diff --git a/onlinehelp/jfaq.help b/onlinehelp/jfaq.help index 75a81c1..df9bb2a 100644 --- a/onlinehelp/jfaq.help +++ b/onlinehelp/jfaq.help @@ -21,7 +21,7 @@ The name was chosen because the launcher is built using the [wxWidgets][]![][le] [wxWidgets]: https://www.wxwidgets.org/ ## On what platforms does wxLauncher run? -wxLauncher runs on the same platforms as FSO, namely Windows, Linux and Mac OS X. +wxLauncher runs on the same platforms as FSO, namely Windows, Linux, macOS, and FreeBSD. ## Who made wxLauncher? Check the [authors][]![][li] section for details. From f067114eb25d5b298c427a70913b29a00a59d6fa Mon Sep 17 00:00:00 2001 From: plieblang Date: Thu, 16 Mar 2017 12:38:49 -0500 Subject: [PATCH 09/15] Fixes errors found in help files --- onlinehelp/30Reference/20MODs/01modlist.help | 2 +- onlinehelp/30Reference/30BasicSettings/01executable.help | 2 +- onlinehelp/30Reference/30BasicSettings/03audio.help | 2 +- onlinehelp/30Reference/30BasicSettings/05joystick.help | 2 +- onlinehelp/30Reference/30BasicSettings/06network.help | 2 +- onlinehelp/30Reference/40AdvancedSettings/021lighting.help | 2 +- onlinehelp/50TechnicalStuff/02Terminology.help | 1 + onlinehelp/index.help | 4 ++-- onlinehelp/jfaq.help | 2 +- onlinehelp/lchanges.help | 3 +++ 10 files changed, 13 insertions(+), 9 deletions(-) diff --git a/onlinehelp/30Reference/20MODs/01modlist.help b/onlinehelp/30Reference/20MODs/01modlist.help index c3476c7..1c0eb13 100644 --- a/onlinehelp/30Reference/20MODs/01modlist.help +++ b/onlinehelp/30Reference/20MODs/01modlist.help @@ -8,7 +8,7 @@ To change the active mod, scroll the list and click the [mod][mod]![][li] you wish to activate. Two buttons will appear, one labeled **Activate** and the other **Info**. Click **Activate** to make the selected mod active. - -- screenshot with the buttos highlighted -- --> + **Note**: The first item on the mod list is always the "(No mod)" entry. Activate this in order to play the current [TC][mod]![][li] in its original form without any mods. diff --git a/onlinehelp/30Reference/30BasicSettings/01executable.help b/onlinehelp/30Reference/30BasicSettings/01executable.help index 3f7a956..08d57cc 100644 --- a/onlinehelp/30Reference/30BasicSettings/01executable.help +++ b/onlinehelp/30Reference/30BasicSettings/01executable.help @@ -33,7 +33,7 @@ Once you have selected a valid root folder, the FS2 Open executable selection bo **Note**: FRED launching is not enabled by default. Enable it by pressing F3. -**TODO** + [li]: /images/li.png [fso]: ../../50TechnicalStuff/02Terminology.help diff --git a/onlinehelp/30Reference/30BasicSettings/03audio.help b/onlinehelp/30Reference/30BasicSettings/03audio.help index 2a192ab..73cfbf7 100644 --- a/onlinehelp/30Reference/30BasicSettings/03audio.help +++ b/onlinehelp/30Reference/30BasicSettings/03audio.help @@ -2,7 +2,7 @@ # Audio Here you set the device that [FSO][]![][li] will use to output the sound effects. --- screenshot with the "audio" section highlighted -- + ###Sound device Lists the compatible sound devices that are installed on your system. "Generic software" works on any machine, choose that if you don't have a high-end dedicated sound card. diff --git a/onlinehelp/30Reference/30BasicSettings/05joystick.help b/onlinehelp/30Reference/30BasicSettings/05joystick.help index e20ed6f..e4407ff 100644 --- a/onlinehelp/30Reference/30BasicSettings/05joystick.help +++ b/onlinehelp/30Reference/30BasicSettings/05joystick.help @@ -2,7 +2,7 @@ # Joystick This is where you select and configure your joystick. --- screenshot of with the joystick area highlighted -- + ## Options supported on all platforms diff --git a/onlinehelp/30Reference/30BasicSettings/06network.help b/onlinehelp/30Reference/30BasicSettings/06network.help index 45ed87d..086ffa7 100644 --- a/onlinehelp/30Reference/30BasicSettings/06network.help +++ b/onlinehelp/30Reference/30BasicSettings/06network.help @@ -18,7 +18,7 @@ For a smooth experience, select the appropriate connection speed here. If you want FSO to use a specific [port][]![][le] when playing over LAN/Internet, type it here. Most users will not need to use this setting, but some may need it to handle problems with older Network Address Translation (NAT) firewalls. ### Force IP address -Same as above, but for the [IP address][]![][le]. Only version 4 addresses (the "classic" IP address - IPv4) are supported for the moment. As with **Force local port**, most users will not need to use this setting, but some may need it to get around older NAT firewalls. +Same as above, but for the [IP address][]![ip][le]. Only version 4 addresses (the "classic" IP address - IPv4) are supported for the moment. As with **Force local port**, most users will not need to use this setting, but some may need it to get around older NAT firewalls. [li]: /images/li.png [le]: /images/le.png diff --git a/onlinehelp/30Reference/40AdvancedSettings/021lighting.help b/onlinehelp/30Reference/40AdvancedSettings/021lighting.help index 1ef3d62..91a74dd 100644 --- a/onlinehelp/30Reference/40AdvancedSettings/021lighting.help +++ b/onlinehelp/30Reference/40AdvancedSettings/021lighting.help @@ -3,7 +3,7 @@ # Lighting presets This page has some collections of flags that have been assembled by community members. -Selecting one of these presets will automatically update your [[current command line][ccl]![][le] settings +Selecting one of these presets will automatically update your [current command line][ccl]![][le] settings See more at the [Hard Light Wiki][presetdescs]![][le]. [ccl]: 15commandline.help diff --git a/onlinehelp/50TechnicalStuff/02Terminology.help b/onlinehelp/50TechnicalStuff/02Terminology.help index 94327c9..462db77 100644 --- a/onlinehelp/50TechnicalStuff/02Terminology.help +++ b/onlinehelp/50TechnicalStuff/02Terminology.help @@ -42,5 +42,6 @@ Check the [**Total conversions**][tc]![][le] section on the [Hard Light Producti [fswiki]: http://www.hard-light.net/wiki/index.php/Main_Page [tbp]: http://babylon.hard-light.net/ [wcs]: http://wcsaga.com/ +[dia]: http://diaspora.hard-light.net/ [hl]: http://www.hard-light.net/ [tc]: http://www.hard-light.net/wiki/index.php/Total_conversions diff --git a/onlinehelp/index.help b/onlinehelp/index.help index 411052f..99ce7eb 100644 --- a/onlinehelp/index.help +++ b/onlinehelp/index.help @@ -7,7 +7,7 @@ -If you want to set up and start playing FreeSpace 2 immediately, [go here][]![start][li]. +If you want to set up and start playing FreeSpace 2 immediately, [go here][start]![][li]. If you're wondering about other settings, go to [basic][]![][li] or [advanced][]![][li] settings. The [FAQ][]![][li] has basic information about wxLauncher. @@ -21,5 +21,5 @@ The [FAQ][]![][li] has basic information about wxLauncher. [li]: images/li.png [start]: 30Reference/30BasicSettings/01executable.help -[start]: 30Reference/30BasicSettings/index.help +[basic]: 30Reference/30BasicSettings/index.help [advanced]: 30Reference/40AdvancedSettings \ No newline at end of file diff --git a/onlinehelp/jfaq.help b/onlinehelp/jfaq.help index df9bb2a..b531227 100644 --- a/onlinehelp/jfaq.help +++ b/onlinehelp/jfaq.help @@ -18,7 +18,6 @@ The launcher is published under the [GNU General Public License v2][gpl]![][le], ## Why is it called wxLauncher? The name was chosen because the launcher is built using the [wxWidgets][]![][le] GUI toolkit, which allows it to run on multiple platforms. -[wxWidgets]: https://www.wxwidgets.org/ ## On what platforms does wxLauncher run? wxLauncher runs on the same platforms as FSO, namely Windows, Linux, macOS, and FreeBSD. @@ -54,6 +53,7 @@ Suggestions are always welcome. Contact one of the [project owners or developers [le]: images/le.png [fso]: 50TechnicalStuff/02Terminology.help [gpl]: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html +[wxWidgets]: https://www.wxwidgets.org/ [authors]: kauthors.help [source]: https://github.com/scp-fs2open/wxLauncher [privacy]: 50TechnicalStuff/03privacy.help diff --git a/onlinehelp/lchanges.help b/onlinehelp/lchanges.help index 4ef2b60..eb597af 100644 --- a/onlinehelp/lchanges.help +++ b/onlinehelp/lchanges.help @@ -1,5 +1,8 @@ Latest changes +# You are running wxLauncher 0.12.0. + + # Latest changes ## Version 0.10.1 From 33ff50d46724fbfb536e6811f4549495e9ea7f3c Mon Sep 17 00:00:00 2001 From: plieblang Date: Thu, 16 Mar 2017 12:50:21 -0500 Subject: [PATCH 10/15] Fixes one more help error --- onlinehelp/30Reference/30BasicSettings/06network.help | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onlinehelp/30Reference/30BasicSettings/06network.help b/onlinehelp/30Reference/30BasicSettings/06network.help index 086ffa7..0761326 100644 --- a/onlinehelp/30Reference/30BasicSettings/06network.help +++ b/onlinehelp/30Reference/30BasicSettings/06network.help @@ -18,7 +18,7 @@ For a smooth experience, select the appropriate connection speed here. If you want FSO to use a specific [port][]![][le] when playing over LAN/Internet, type it here. Most users will not need to use this setting, but some may need it to handle problems with older Network Address Translation (NAT) firewalls. ### Force IP address -Same as above, but for the [IP address][]![ip][le]. Only version 4 addresses (the "classic" IP address - IPv4) are supported for the moment. As with **Force local port**, most users will not need to use this setting, but some may need it to get around older NAT firewalls. +Same as above, but for the [IP address][ip]![][le]. Only version 4 addresses (the "classic" IP address - IPv4) are supported for the moment. As with **Force local port**, most users will not need to use this setting, but some may need it to get around older NAT firewalls. [li]: /images/li.png [le]: /images/le.png From 37f61b046ba4c9486cf87cd6e332033dfdc38b2c Mon Sep 17 00:00:00 2001 From: plieblang Date: Thu, 16 Mar 2017 19:39:40 -0500 Subject: [PATCH 11/15] Implements about button --- code/MainWindow.cpp | 4 +++- code/controls/BottomButtons.cpp | 2 ++ code/controls/BottomButtons.h | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/MainWindow.cpp b/code/MainWindow.cpp index 436947f..d3d917c 100644 --- a/code/MainWindow.cpp +++ b/code/MainWindow.cpp @@ -285,7 +285,9 @@ void MainWindow::OnUpdate(wxCommandEvent& WXUNUSED(event)) { wxMessageBox(_T("Update")); } void MainWindow::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox(_T("About")); + wxCHECK_RET( HelpManager::IsInitialized(), _T("Help is not initialized")); + wxString lchanges(_T("lchanges.htm")); + HelpManager::OpenHelpByString(lchanges); } void MainWindow::OnContextHelp(wxHelpEvent& event) { diff --git a/code/controls/BottomButtons.cpp b/code/controls/BottomButtons.cpp index d32d398..c426ddd 100644 --- a/code/controls/BottomButtons.cpp +++ b/code/controls/BottomButtons.cpp @@ -42,6 +42,7 @@ BottomButtons::BottomButtons(wxWindow* parent, wxPoint &pos, wxSize &size) : wxP this->close = new wxButton(this, ID_CLOSE_BUTTON, _("Close")); #endif this->help = new wxButton(this, ID_HELP_BUTTON, _("Help")); + this->about = new wxButton(this, ID_ABOUT_BUTTON, _("About")); this->fred = new wxButton(this, ID_FRED_BUTTON, _("FRED")); this->fred->Show(showFred); @@ -58,6 +59,7 @@ BottomButtons::BottomButtons(wxWindow* parent, wxPoint &pos, wxSize &size) : wxP sizer->Add(this->close); #endif sizer->Add(this->help); + sizer->Add(this->about); sizer->AddStretchSpacer(1); #if 0 sizer->Add(this->update, wxSizerFlags().ReserveSpaceEvenIfHidden()); diff --git a/code/controls/BottomButtons.h b/code/controls/BottomButtons.h index b3bf48d..ab57349 100644 --- a/code/controls/BottomButtons.h +++ b/code/controls/BottomButtons.h @@ -25,7 +25,7 @@ class BottomButtons: public wxPanel { public: BottomButtons(wxWindow* parent, wxPoint &pos, wxSize &size); private: - wxButton *close, *help, *fred, *update, *play; + wxButton *close, *help, *about, *fred, *update, *play; public: void OnTCChanges(wxCommandEvent &event); @@ -35,4 +35,4 @@ class BottomButtons: public wxPanel { }; -#endif \ No newline at end of file +#endif From d72c97c431eb4ec9aeafa67fa79f144b3950c596 Mon Sep 17 00:00:00 2001 From: plieblang Date: Sat, 27 May 2017 08:07:56 -0700 Subject: [PATCH 12/15] Fixes errors in help file (#161) * Fixes errors found in help files * Fixes one more help error From 042be7e6ebfa1cc11e09f932ff062f3470fa2931 Mon Sep 17 00:00:00 2001 From: Yuri Pieters Date: Tue, 13 Dec 2022 15:47:38 +0000 Subject: [PATCH 13/15] Use a themeable icon name & install a default icon --- cmake/wxLauncherInstaller.cmake | 2 ++ platform/freedesktop/wxLauncher.desktop.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/wxLauncherInstaller.cmake b/cmake/wxLauncherInstaller.cmake index e1d91f6..fc14b88 100644 --- a/cmake/wxLauncherInstaller.cmake +++ b/cmake/wxLauncherInstaller.cmake @@ -157,6 +157,8 @@ else() install(FILES "${CMAKE_BINARY_DIR}/platform/freedesktop/wxlauncher.desktop-$" DESTINATION share/applications RENAME wxlauncher.desktop) + install(FILES resources/wxlauncher.png + DESTINATION share/pixmaps/hicolor/256x256/apps) else() message(STATUS "The CMake version is too old to support desktop file generation. CMake 3.0 or newer required") endif() diff --git a/platform/freedesktop/wxLauncher.desktop.in b/platform/freedesktop/wxLauncher.desktop.in index f26981a..cf51b3c 100644 --- a/platform/freedesktop/wxLauncher.desktop.in +++ b/platform/freedesktop/wxLauncher.desktop.in @@ -3,7 +3,7 @@ Version=1.0 Name=wxLauncher Comment=A wxWidgets based launcher for FreeSpace Open Exec=@WXLAUNCHER_FILE@ -Icon=@RESOURCES_PATH@wxlauncher.png +Icon=wxlauncher Terminal=false Type=Application Categories=Utility;Application; \ No newline at end of file From e235763a8fe31841c4417046e0151993d54c52af Mon Sep 17 00:00:00 2001 From: Yuri Pieters Date: Tue, 13 Dec 2022 15:47:55 +0000 Subject: [PATCH 14/15] Use the system wxWidgets --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45011da..bd5a7f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ if(DEFINED WXVER AND NOT WXVER MATCHES "PLATFORM") endif() else() message("-- Searching for wxWidgets") - find_package(wxWidgets 2.8.10 + find_package(wxWidgets COMPONENTS base core net xml html adv qa richtext) endif() if(NOT wxWidgets_FOUND) From d4ffde4e2a2e3d734416244c7e769f4d9703c2ab Mon Sep 17 00:00:00 2001 From: Yuri Pieters Date: Tue, 13 Dec 2022 18:40:43 +0000 Subject: [PATCH 15/15] share/icons is better than share/pixmaps --- cmake/wxLauncherInstaller.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/wxLauncherInstaller.cmake b/cmake/wxLauncherInstaller.cmake index fc14b88..6bb33ae 100644 --- a/cmake/wxLauncherInstaller.cmake +++ b/cmake/wxLauncherInstaller.cmake @@ -158,7 +158,7 @@ else() DESTINATION share/applications RENAME wxlauncher.desktop) install(FILES resources/wxlauncher.png - DESTINATION share/pixmaps/hicolor/256x256/apps) + DESTINATION share/icons/hicolor/256x256/apps) else() message(STATUS "The CMake version is too old to support desktop file generation. CMake 3.0 or newer required") endif()