fly/flightgear
1
0
Fork 0
Code Activity
12857 commits 1 branch 0 tags 41 MiB
Commit graph

986 commits

Author SHA1 Message Date
Alessandro Menti
e9e05081d5 Launcher: state that it is needed to press Enter to search for the airport 2016-04-17 17:53:36 +01:00
Alessandro Menti
0381ba8468 Launcher: disable Close button on the initial progress dialog 2016-04-17 17:53:24 +01:00
Alessandro Menti
34fd51d35c Launcher: spelling fix in "Add Catalog" dialog window 2016-04-17 17:53:02 +01:00
James Turner
bbd15eb370 Fix a typo 2016-04-15 18:03:01 +01:00
James Turner
a63da0cbde Minor improvement to hangar list in the launcher. 2016-04-15 17:27:29 +01:00
James Turner
31cad6d384 Fixes to launcher description rendering. 2016-04-15 17:21:49 +01:00
James Turner
6095646a62 Prompt the user when the default hangar is missing. 
In the Qt launcher, when the default hangar isn’t found, show
a hint in the aircraft list.
 2016-04-15 17:06:53 +01:00
James Turner
43add4f820 Fix stray back-button in Qt launcher 
- when no location is set, don’t show the back button.
 2016-04-14 18:54:27 +01:00
James Turner
5e4063b761 Move launcher settings store inside FG_HOME 
Settings now in .ini format, at $FG_HOME/flightgear.org/FlightGear.ini
 2016-04-08 10:40:26 +01:00
James Turner
5341d327fd Restructure paths handling in the launcher 
- move the dialog into a new ‘add-ons’ tab

- separate out ‘restore settings’ from selecting a new fg-data

- actually relaunch the app
 2016-04-08 10:26:34 +01:00
James Turner
08ea386197 Fix corrupt HUD fonts 
osg::texture2D changes GL_UNPACK_ROW_LENGTH, which fntLoadTXF is not
prepared to deal with. Reset the value back to 0 before loading +
caching TXF fonts on the PLIB side.
 2016-03-28 22:54:24 +01:00
James Turner
5baca8598f Improve download-dir behaviour. 
When set on the command line, will be used for aircraft packages. When
set in the Qt launcher, will also be used for aircraft downloads at
all times.

When changing the path in the launcher, the set of aircraft catalogs
is refresh automatically. Note the default catalog may need to be
re-installed.
 2016-03-24 15:10:06 +00:00
James Turner
733e3b3f0c HTTP subsystem has a default name. 
Switch to using type-safe accessors now.
 2016-03-24 15:08:38 +00:00
James Turner
cbf16b7966 Fix copy-paste bug setting season in the Qt guy 
Spotted by Adrian Serrano!
 2016-03-22 10:56:05 +00:00
James Turner
74f17d2882 Fix missing menubar on Mac in some setups 
- Only clear the OSG ‘pose as standalone’ flag when we really show
  a dialog, as opposed to when we /might/ show.

Tested:
 - Qt build using launcher
 - No Qt build 
 - Qt build but launcher not requested
 2016-03-19 14:46:11 +00:00
Torsten Dreyer
1bf5fe1c27 Fix for FreeBSD and a typo 
Fix provided by Ganael LAPLANCHE, thanks!
 2016-03-12 20:55:46 +01:00
James Turner
43b4db7ef7 Improve UI around adding aircraft dirs 
- Check if the selected path, or an ‘Aircraft’ subdir,  contains
some -set.xml files, and if not, warn the user.
 2016-03-05 09:35:02 +00:00
James Turner
688ae7d156 Bugfix: Qt launcher, enable variant aircraft on-disk 
When mapping a URI to a QModelIndex, we were only considering the 
primary aircraft path, for on-disk aircraft as opposed to packages.
 2016-03-05 09:34:16 +00:00
James Turner
1aa6482a59 Fix bug #1845, closing the Qt launcher 
Intercept the close event and quit the app instead of continuing to
run the main FlightGear application.

https://sourceforge.net/p/flightgear/codetickets/1845/
 2016-02-24 21:50:48 +02:00
Rebecca N. Palmer
e1d0699bdb add new QtFileDialog to avoid using Nasal in file selectors 
(and hence avoid applying Nasal security rules to them)
 2016-02-10 22:58:56 +00:00
James Turner
c72309360e Defensive handling of locales. 
- Use setlocale() to ensure consistent handling of locales and
  string handling irrespective of whether or not QCoreApplication
  is invoked. Forces a the C locale for numerics and collation,
  since many pieces of FG assume this.
 2016-02-02 20:44:46 +00:00
James Turner
2677b3a226 Use target_include_directories in some places. 
I didn’t know about this feature when doing the original CMake files,
we can use this to target header-file includes more precisely.

(Probably more cases exist that can be changed from global to target-
specific includes)
 2016-01-26 07:48:30 +01:00
James Turner
d81d353940 Improved fg-root control from the Qt Launcher 
- add a button to the main dialog, explaining how to adjust the 
  fg-root path via the GUI
- tweak the GUI flow to support explicitly changing the path even
  when the default path is acceptable.
 2016-01-18 20:06:43 -05:00
James Turner
e32b02b28f Launcher: fix slot name for old-style syntax 2016-01-12 17:25:54 -06:00
Erik Hofman
f19c8ac05d Apperently maybeRestoreAircraftSelection() needs to be a slot 2016-01-11 09:46:16 +01:00
James Turner
409ffc971d Fixes to launcher aircraft delegate. 
- fix some text size computation issues
 2016-01-10 23:46:44 -06:00
James Turner
d10d279064 Launcher finds parking positions from scenery 
- change launcher to examine the scenery paths and hence load
  ground-net files for airports to populate parking data.

- refactor ground-net XML parsing to use FGGroundNetwork only, not
  AirportDynamics. 

- change parenting  of GroundNetwork to Airport, since it contains
  immutable data now.
 2016-01-10 16:38:01 -06:00
James Turner
4befe0e6ea Launcher: Maintain aircraft selection better 
- when launching or toggling settings, try to keep the current
  aircraft selected and in-view.
 2016-01-10 13:47:57 -06:00
James Turner
b0ee3f98f3 ‘only show installed checkbox’ for Qt launcher 
- will be replaced when I think of a prettier UI, but this
  feature is important to have for now.
 2016-01-10 12:56:46 -06:00
James Turner
e5c6d14cef Allow re-ordering of paths in the launcher. 
- suggested by Gilberto, allow the user to set the order of the
  scenery and aircraft paths by dragging.
 2016-01-09 17:17:58 -06:00
James Turner
359f924ec9 Package variants working. 2016-01-03 20:58:03 -06:00
James Turner
fc9c43b48d Remove FontCache from globals. 
- access via a singleton instead.
 2016-01-03 12:00:15 -06:00
Torsten Dreyer
7a69b9beff don't always open "file opened in new browser window" popup 
Setting /sim/gui/show-browser-open-hint to false disables the popup.
Default is true (show the popup)
 2015-12-22 11:42:27 +01:00
James Turner
7afedb1702 Work on visualisation of Vias 2015-12-11 13:43:25 -06:00
James Turner
846fd21698 GUI support for VIA/Discontinuity 2015-12-11 13:43:25 -06:00
James Turner
8877b442f8 ATC/Traffic doesn’t crash reset. 
- remove some global headers from AI headers, to avoid pollution
- change how ATC owns the ‘player’ FGAIAircraft so reset works
- ensure AIAircraft controllers are cleared on unbind for reset
 2015-12-11 12:11:59 -06:00
James Turner
fc887b106b Checkpoint - ground-net skips the cache 2015-12-01 14:01:32 +00:00
James Turner
cec1de6219 Use a transaction when indexing polylines. 2015-11-29 14:18:30 +00:00
James Turner
5e4f212b84 Remove some debugs 2015-11-27 23:25:24 +00:00
James Turner
6ee7e51af3 Clamp diagram zoom. 
- avoid poor performance and unusable UI when zooming out
 2015-11-27 23:25:11 +00:00
James Turner
242e79f5e9 Fix some coastline issues. 2015-11-27 23:02:42 +00:00
James Turner
bfb539f090 Launcher shows polygon/polyline data 2015-11-27 23:02:42 +00:00
James Turner
6a41353bdc Remove accidentally duplicated functions. 2015-11-26 23:48:16 +00:00
James Turner
f39fc0f086 Remove a stray debug. 2015-11-26 23:48:16 +00:00
James Turner
a63fff14cc Graphical picking of parking/helipads too. 2015-11-24 22:14:22 +00:00
James Turner
cfcdd9da45 Add helipad support to the diagram. 
- stops crashes selecting a heliport.
 2015-11-24 21:46:14 +00:00
James Turner
3cee5eea73 Initial work on rendering parking locations. 2015-11-24 21:46:14 +00:00
Rebecca N. Palmer
cc725c61de Use SLOT for both uses of QTimer::singleShot 
(fix Qt < 5.4 build)
 2015-11-24 18:40:54 +00:00
James Turner
2d1c5d47ee Fix MSVC2012 build 
- multi-line QStringLiteral doesn’t work on MSVC prior to 2013. Boo.
 2015-11-24 15:36:53 +00:00
James Turner
9e60dcba61 Use old-style SLOT macro for Qtimer::singleShot 
- member-function-pointer variant was only added in 5.4
 2015-11-24 08:05:17 +00:00
Rebecca N. Palmer
997a431d53 {fatal,modal}MessageBox: Use Qt on Linux when available 
(console error messages are invisible when started from an icon)
 2015-11-24 07:24:32 +00:00
James Turner
be1291f689 Change handling of default hangar / catalog. 
- no longer re-add it on startup, add an explicit button in the UI

(will add a more obvious item to the aircraft list in a follow-up
commit)
 2015-11-23 22:58:00 +00:00
James Turner
4ea093ecc4 Ensure aircraft list stays in sync 
- when removing a catalog, use the new notification to refresh
  the list, so we don’t show stale package data.
 2015-11-23 17:59:16 +00:00
James Turner
3ccea681ea Fix merge noise 2015-11-23 01:19:03 +00:00
James Turner
579881322e Lat-lon startup location fixes. 2015-11-23 00:48:21 +00:00
James Turner
5184f3404c Labels on large airports in the diagram 2015-11-23 00:48:21 +00:00
James Turner
e356e691b2 Cap number of airports displayed in diagrams 
- restrict heliports / seaports by aircraft type
- prioritise by runway length
- clean up airport label names
 2015-11-23 00:48:21 +00:00
James Turner
1010caeaf6 Remove some debugs. 2015-11-23 00:48:20 +00:00
James Turner
97a5e15aaf Show paused message when starting frozen. 2015-11-23 00:48:20 +00:00
James Turner
e63a95feb9 Draw aircraft on airport diagram 2015-11-23 00:48:20 +00:00
James Turner
5fd350cb3d Fix unproject / navaid drawing. 2015-11-23 00:48:20 +00:00
James Turner
eb06aeba97 Closed airport support. 2015-11-23 00:48:20 +00:00
James Turner
f4500e03f4 Label de-overlapping for diagrams 2015-11-23 00:48:20 +00:00
James Turner
317498fe4a Move airplane drawing into the base class. 
- ground work for showing airplane on airport diagram
 2015-11-23 00:48:20 +00:00
James Turner
6ec9c36afb Fix Linux compilation issues. 2015-11-23 00:48:20 +00:00
James Turner
9ab672abd8 Location history re-instaed 2015-11-23 00:48:20 +00:00
James Turner
19a8fc8822 Fixing launcher save/restore of settings. 2015-11-23 00:48:20 +00:00
James Turner
b9acb26c07 Work on launcher diagrams. 2015-11-23 00:47:01 +00:00
James Turner
5043bf0966 Fixes to launcher aircraft thumbnail sizing 
- handle large images and longer descriptions correctly
 2015-11-23 00:47:01 +00:00
James Turner
ceebd59001 Fallback when aircraft description is missing. 
- avoids corrupted delegate display caused by asking for
  bounds of empty string.
 2015-11-23 00:47:01 +00:00
James Turner
a39df48772 Navaid diagram for launcher 
- work in progress, needs labels
 2015-11-23 00:47:01 +00:00
James Turner
2b18479859 Lat-lon position support 2015-11-23 00:47:01 +00:00
James Turner
adedf7af65 Navaid diagram work 2015-11-23 00:47:01 +00:00
James Turner
c277395010 Start-paused for in-air starts 2015-11-23 00:47:01 +00:00
James Turner
addcc432fd ILS drawing in the airport diagram 2015-11-23 00:47:01 +00:00
James Turner
09cac14089 Work on LocationWidget for Qt launcher 2015-11-23 00:47:01 +00:00
James Turner
56d7d049bc Launcher GUI for in-air / navaid starts 2015-11-23 00:46:25 +00:00
James Turner
1e213201cf Work on the launcher 2015-11-23 00:45:21 +00:00
Rebecca N. Palmer
9d0fe40a45 QtLauncher::initApp: store argc to avoid crash 
As QApplication only stores a reference to argc, it may crash if
the argc passed to it goes out of scope.  (One way to trigger this
is to pass an invalid --fg-root, triggering an initApp call from
Options::setupRoot.)  Copy argc to prevent this.
 2015-11-22 21:05:09 +00:00
James Turner
b49dd70de9 Remove some debug noise 2015-09-27 23:13:18 -05:00
James Turner
43bcc85919 Correct handling of updating packages 2015-09-27 19:44:29 -05:00
James Turner
1e2460d9bf Disable mouse hover code for now. 2015-09-27 19:43:50 -05:00
Rebecca N. Palmer
a64cf82296 Use +=, not (5.5+ only) append, for concatenating QVectors 2015-09-21 22:12:24 +01:00
James Turner
18a898f5f9 Lots of work on aircraft package support 2015-09-20 19:46:35 -05:00
James Turner
c2cbb36d16 Work around a strange link failure on Mac 
- Xcode 7 seems to dislike this code as was, adjusted version
links fine. Very odd.
 2015-09-20 19:45:03 -05:00
James Turner
67352a1a52 Fix SIGSEGV with Qt launcher on Linux. 
- patch from Dirk Dittmann
 2015-08-02 18:33:05 -05:00
James Turner
4289ac77dd Remove some debug output. 2015-06-08 10:37:26 +01:00
James Turner
6e3a935abb Fix a Cocoa warning. 2015-06-08 10:37:26 +01:00
James Turner
f88b4aefe9 Disable testing hacks for package installs. 2015-06-05 14:27:23 +02:00
James Turner
9f5a4609d6 Launcher: airport diagram runways can be clicked 
- indicate selected runway visually
 2015-06-05 14:27:23 +02:00
James Turner
1933b71729 Explicit NSPathUtilities include. 2015-04-20 10:42:22 +01:00
James Turner
f4b07f899a Explicit NSBundle include 
- should fix Jenkins build, hopefully.
 2015-04-20 10:35:24 +01:00
James Turner
c07ce6d9bc Explicit AppKit includes for Mac. 2015-04-11 21:59:29 +01:00
James Turner
4f15e1a840 New PathsDialog, for managing locations. 2015-04-10 15:11:14 +01:00
James Turner
aa20e0acd8 Work on new download-dir option 
- simplify management of a single, user-facing
  location for large downloaded data.
 2015-04-10 15:01:54 +01:00
James Turner
41ca6bd1de GUI exclude support. 
- visual refinements in the delegate.
 2015-04-10 14:44:44 +01:00
James Turner
d170de1909 Hacking on the delegate height. 2015-04-10 14:44:44 +01:00
James Turner
9ebdce3995 AircraftModel hacking for package support. 2015-04-10 14:44:44 +01:00
James Turner
217db33b99 Working on adding catalogs from the GUI 2015-04-10 14:44:44 +01:00
James Turner
d9a53e1140 Basics on catalog list model in the GUI. 2015-04-10 14:44:44 +01:00
Rebecca N. Palmer
ca362e9251 QtLauncher: fix adding aircraft paths 
Avoids Nasal security errors when using "Additional aircraft locations"
 2015-04-03 14:13:13 +01:00
James Turner
e0274af493 Percentage feedback during nav-cache build. 
- also used by the GUI launcher for the same.
 2015-03-19 12:01:38 -05:00
James Turner
2ebf21221d Fix a clang unused constant warning 2015-03-18 20:34:15 +01:00
James Turner
61eae124d4 Enable anti-aliasing in the airport diagram 2015-03-18 20:34:10 +01:00
bcoconni
32a8c712b0 The QUrl header is needed for compilation on Linux 2015-03-13 22:03:22 +01:00
James Turner
a6937e25ad Make a new launcher tab for add-ons 
- avoids the settings page being overloaded with list boxes.
 2015-03-12 10:36:41 +00:00
James Turner
1e1326d8f3 Aircraft path support in the Qt launcher 
- aircraft dirs are re-scanned when the paths change.
 2015-03-11 23:20:29 +00:00
James Turner
11c2623dec Start wiring package manager into the launcher. 2015-03-11 17:09:59 +00:00
James Turner
92864265af Refactor aircraft helper classes 
- move the aircraft list and delegate to their own files
 2015-03-11 17:09:59 +00:00
James Turner
c3543f8fdd GUI ‘restore defaults’ support. 
- Hold ‘alt’ on launch to restore defaults, including launcher prefs.
 2015-03-08 00:42:39 +00:00
James Turner
f9c23eb096 Add missing GPL boilerplate. 2015-03-08 00:42:39 +00:00
James Turner
a466dbce73 Very crude work on GUI base package selection. 
- feedback on wording greatly appreciated.
- needed to make nightly builds usable without bundled data.
 2015-03-08 00:42:05 +00:00
James Turner
8d9db2824e Launch aircraft data cache 
- makes successive aircraft scans much faster since -set.xml parsing
  can be skipped when the file is unmodified.
 2015-03-08 00:42:05 +00:00
James Turner
4038ba3d51 Arrow icons for variant selection. 2015-03-05 15:53:40 +00:00
James Turner
7ca9fba4a8 Fix some off-by-one errors in variants GUI 2015-03-05 14:51:33 +00:00
James Turner
13d50853df Launcher support for aircraft variants. 
- Allows for a less confusing UX when aircraft has several variants.
- Requires changes to aircraft -set.xml files.
 2015-03-05 14:01:53 +00:00
James Turner
548b899fb6 Fix a couple more Qt version issues. 
- only set the clearButton on QLineEdit if we have 5.2
- use itemData/currentIndex to avoid currentData()
 2015-02-27 11:58:22 +00:00
James Turner
a3d3e81a86 Set placeholderText from code 
Avoids a hard requirement of Qt 5.3; only 5.1 is
needed.
 2015-02-25 23:14:02 +00:00
James Turner
1898a5fef8 Guard against a crash Torsten encountered once. 2015-02-23 18:22:52 +00:00
James Turner
c9c0833741 Qt launcher: additional arguments UI 
Add a plain text edit widget to the launcher to support
custom command line arguments.
 2015-02-23 13:41:50 +00:00
James Turner
8bfb63e4ed Launcher: select season. 2015-01-10 14:57:59 +00:00
James Turner
ce10b4c8f1 Ask before creating the custom aircraft dir. 2015-01-10 14:18:44 +00:00
James Turner
55b092771f Launcher: hook up MSAA checkbox. 2015-01-07 11:30:44 +00:00
James Turner
72e0ea9e40 Only set AUTOMOC for fglauncher target. 
(Avoids pointless noise for all other targets)
 2015-01-07 09:38:02 +00:00
James Turner
02bcb3718a Hook up parking position in launcher. 2015-01-06 21:12:19 +00:00
James Turner
53b478654c Linux fixes for launcher code. 2015-01-06 20:36:05 +00:00
James Turner
78e8f53312 In-app launcher for Mac, based on Qt5. 
The old Mac launcher doesn’t work on Yosemite, add a tiny
Qt-based launcher inside the main process (no need to fork /
exec) which runs before the OSG window is created.

Will be merged for 3.4, hopefully with no impact on other
platforms.
 2015-01-06 19:13:30 +00:00
James Turner
7317aff22d Fix route-path bugs: 
- accurate fly-over / fly-by computations
 - parse additional LevelD XML elements
 - path vector contains curves for turns

Remove dead code.
 2014-12-18 23:05:28 +00:00
James Turner
01622dd1f4 Fix flight-plan course and distance computations. 
Always use the RoutePath system for course and distance computations
in the flight plan, so that dynamic segments are handled correctly.
 2014-12-08 17:56:15 +00:00
Thomas Geymayer
d836126c75 Better fallback for missing menu and splash translations. 2014-07-30 23:53:16 +02:00
Thomas Geymayer
a673f4a5f9 Nasal: update for simgear changes. 2014-07-21 00:26:54 +02:00
James Turner
3f433e2c35 Fix polar rendering of map. (Bug #55) 
Use an azimuth-equidistant projection, which handles high latitudes and
polar regions correctly. Written by Gijs de Rooy.
 2014-06-29 21:45:18 +01:00
Thomas Geymayer
821af95e0d Keep (PUI) menubar visibility on gui-redraw. (Fix #1251) 
For aircraft using fgcommand("gui-redraw"), which is for example
also used by gui.menuBind, the menubar was always hidden and
not shown again.
 2014-06-21 14:51:34 +02:00
Thomas Geymayer
75f5eba002 Update includes (required by simgear changes) 2014-06-04 02:58:14 +02:00
Thomas Geymayer
3c0b7f88b8 Updates for simgear nasal::Ghost changes. 2014-06-03 19:00:25 +02:00
Thomas Geymayer
5b74a72506 Canvas: support for custom events and event dispatching. 2014-05-19 00:28:40 +02:00
James Turner
070dba29f9 Close dialogs on GUI shutdown 
- avoids orphaned dialogs on reset
- requires some guards in NasalSys since Nasal is shutdown first, but
  dialogs can have Nasal modules.
 2014-03-16 22:52:55 +00:00
Thomas Geymayer
764fbd519c CanvasWidget (PUI): make button index consistent with Canvas windows 2014-03-15 15:01:09 +01:00
James Turner
f2a3090384 Fix some Clang warnings. 2014-03-11 16:46:00 +00:00
Thomas Geymayer
de38157916 FGPUIDialog: fix reading from already free'd memory. 
Calls to updateValues can cause nested calls invalidating
the char* passed as argument, if retrieved from a
SGPropertyNode.
Probably SGPropertyNode should also be modified to return
a std::string instead of a pointer to an internal buffer.
 2014-02-28 17:34:41 +01:00
Christian Schmitt
a0184ac80c MapWidget: silence compiler warning 2014-02-02 16:47:25 +01:00
James Turner
4df9c61d2a Check for and warn about old nVidia drivers. 
(Had a bug report with someone using 189 drivers on Windows!)
 2014-01-27 17:27:12 +00:00
James Turner
1a372d9366 Update image-server logic. 
- no dependency on libJpeg or Simgear
- no duplicate rendering of the scene (uses a draw callback)
- supports other image types, eg PNG
- threaded so doesn't block the main loop ever
 2014-01-27 09:08:34 +00:00
James Turner
45d67406a4 CrashRpt tweaks, checking. 
- show a message box if setup fails
- log setup status
 2014-01-22 22:33:30 +00:00
James Turner
1b585fa415 Windows native file-dialog, menu-bar 
By Gijs with additions by James. Menubar is disabled at present
since it's not usable and potentially inferior to other solutions,
but committing the code so it doesn't rot.
 2014-01-20 18:43:02 +00:00
James Turner
5e7574c9c2 Bug-fix: Cocoa menus work in aircraft with custom dialogs. 
Restarting the GUI could cause Cocoa menus to misbehave, due to
destruction behaviour of SGBinding. Use new clear() helper in the
short term to work around this.
 2014-01-15 22:00:09 +00:00
James Turner
1b9394fc37 Crashfix: move spatial, AI queries in map-widget 
In threaded OSG drawing, MapWidget::draw runs in the render
thread context, but touches lots of main thread state. Move most of the
work to an update() helper run on the main thread instead, so draw()
mostly makes pure GL calls.

(This is a fix for 3.0, the real solution is to migrate to a
Canvas-based map and GUI)
 2014-01-14 13:11:06 +00:00
James Turner
4c51ad0d87 Cocoa: fix warning about deprecated function. 
SetFrontProcess is deprecated, use NSApplication instead now we
have the CocoaHelpers file.
 2013-12-21 15:31:27 +00:00
Clément de l'Hamaide
efdb488736 Fix accent bug in MapWidget 2013-12-01 18:50:54 +01:00
James Turner
77075a2d66 Cocoa: more Function-key shortcuts in menus 2013-11-24 17:25:02 +00:00