Laurent Lalanne
c49e53977f
Merge branch 'next' into translations_next
2013-10-25 11:31:14 +02:00
Laurent Lalanne
9e3d464523
Merge branch 'master' into translations_next
...
Conflicts:
ground/openpilotgcs/copydata.pro
ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts
2013-10-25 11:27:28 +02:00
Fredrik Arvidsson
cd83fc6d90
OP-1082 Added some more mapping between states and readable text.
2013-10-22 07:41:15 +02:00
Fredrik Arvidsson
e39c0b44ce
Merge remote-tracking branch 'origin/next' into thread/OP-1082_Activity_QML_Ticker
2013-10-20 10:03:06 +02:00
Corvus Corax
b3ebb91ceb
uncrustification
2013-10-19 21:59:07 +02:00
Fredrik Arvidsson
926e187365
Merge branch 'next' into thread/OP-1082_Activity_QML_Ticker
2013-10-19 09:32:21 +02:00
Rich von Lehe
d6e711cfd7
Additional fixes as a result of review comments.
2013-10-18 23:18:35 +02:00
Rich von Lehe
3affd6a7cd
Fixed some minor spelling errors in tooltips within stabilization.ui
2013-10-18 23:18:25 +02:00
Philippe Renon
6998c782db
Merge remote-tracking branch 'origin/filnet/qt5.1.0' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp
2013-10-17 22:00:54 +02:00
Philippe Renon
09408b40ca
[OP-835] Qt 5.1.0 - uncrustified gcs sources
2013-10-17 21:45:37 +02:00
Fredrik Arvidsson
162c19a438
OP-1082 Added mapping for event.
2013-10-17 18:23:24 +02:00
Fredrik Arvidsson
e122e60939
OP-1082 First commit of Activity panel, a QML RSS reader for OpenPilot development activity.
2013-10-13 23:38:09 +02:00
Laurent Lalanne
d02449048b
Little updates, help links to Wiki Fr
2013-10-09 15:01:00 +02:00
Laurent Lalanne
90940c2e4e
Added some tr() missing for Mapripper dialogs, AboutDialog, OpMap menu.
...
Modified ground/openpilotgcs/src/plugins/systemhealth/systemhealth.qrc (Alarms) to allow html files translations and added french html files in ground/openpilotgcs/src/plugins/systemhealth/html/fr/ directory.
2013-10-07 13:59:16 +02:00
Philippe Renon
28e57242f7
[OP-835] Qt 5.1.0 - disabled all compilation warnings for glc_lib and qwt libs as both use imported sources
2013-09-20 22:58:18 +02:00
Philippe Renon
c9895179f4
[OP-835] Qt 5.1.0 - disabled compilation of antennatrack plugin
2013-09-20 22:26:00 +02:00
Philippe Renon
939ba5956c
[OP-835] Qt 5.1.0 - fixed compilation error in GCS main.cpp
2013-09-15 23:55:50 +02:00
Philippe Renon
1e3117c789
[OP-835] Qt 5.1.0 - migrated shared/qtlockedfile/qtlockedfile_win.cpp
2013-09-15 23:37:21 +02:00
Philippe Renon
a2ba33f28a
[OP-835] Qt 5.1.0 - migrated GCS plugins
2013-09-15 23:37:20 +02:00
Philippe Renon
ec09e17d6e
[OP-835] Qt 5.1.0 - all plugins now depend on QT widgets
2013-09-15 23:37:19 +02:00
Philippe Renon
2e02843e59
[OP-835] Qt 5.1.0 - migrated GCS libs/util
2013-09-15 23:37:19 +02:00
Philippe Renon
706c371ccc
[OP-835] Qt 5.1.0 - migrated GCS libs/qwt
2013-09-15 23:37:18 +02:00
Philippe Renon
0e347a90f9
[OP-835] Qt 5.1.0 - migrated GCS libs/qtconcurrent
2013-09-15 23:37:18 +02:00
Philippe Renon
df7f10fb08
[OP-835] Qt 5.1.0 - migrated GCS libs/qscispinbox
2013-09-15 23:36:52 +02:00
Philippe Renon
c10ffd0519
[OP-835] Qt 5.0.1 - migrated GCS libs/opmapcontrol
2013-09-15 23:35:23 +02:00
Philippe Renon
b249e58861
[OP-835] Qt 5.1.0 - migrated GCS libs/glc_lib
2013-09-15 23:35:22 +02:00
Philippe Renon
7e042a0bd3
[OP-835] Qt 5.1.0 - migrated GCS libs/extensionsystem
2013-09-15 23:35:15 +02:00
Philippe Renon
3149dc1144
[OP-835] Qt 5.1.0 - removed libqxt and qextserialport libraries as they are now included in Qt
2013-09-15 23:34:59 +02:00
Philippe Renon
221cc6557a
[OP-835] Qt 5.1.0 - GCS will now write log file to temporay directory in Release builds (currenlty disabled)
2013-09-15 23:34:14 +02:00
Philippe Renon
5ced372f7d
[OP-835] Qt 5.1.0 - migrated GCS main
2013-09-15 23:34:14 +02:00
Philippe Renon
a9f2cfdf3e
[OP-835] Qt 5.1.0 - removed libs/qextserialport as it is now part of Qt
2013-09-15 23:24:36 +02:00
Philippe Renon
7bcb82478d
[OP-835] Qt 5.1.0 - removed libs/qxt as it is now part of Qt
2013-09-15 23:24:14 +02:00
Philippe Renon
2d3076e9b8
[OP-835] Upgrade toolchain system to Qt 5.1 (Windows only, use packages for Linux and OSX)
2013-09-15 23:24:13 +02:00
Philippe Renon
560223da70
OP-996 Added GCS option to remember and restore the last selected workspace
...
Also reorganized the workspace options page
2013-09-15 23:24:13 +02:00
Philippe Renon
6dfd7c1c88
Merge branch 'filnet/OP-996_add_option_to_remember_last_selected_workspace' into next
2013-09-07 15:23:17 +02:00
Alessio Morale
05c6d12eac
OP-1044 Uncrustify
2013-08-16 09:18:16 +02:00
Alessio Morale
27aa911af2
OP-1044 fix slow tiles loading preventig to ask for version at each request
2013-08-16 09:18:04 +02:00
Andrew Finegan
42ff8a24bb
Updated urlfactory file, google maps now require ssl then recieving tiles, also updated the google map version parser to ssl
2013-08-16 09:17:23 +02:00
Fredrik Arvidsson
50f82b3768
Fixed a .html file that was missing a leading < character.
2013-07-30 14:54:23 +02:00
Alessio Morale
19a92ddc7e
OP-1044 Uncrustify
2013-07-19 14:23:41 +00:00
Alessio Morale
ab9f9cacec
OP-1044 fix slow tiles loading preventig to ask for version at each request
2013-07-19 14:14:24 +00:00
Andrew Finegan
6d00239e13
Updated urlfactory file, google maps now require ssl then recieving tiles, also updated the google map version parser to ssl
2013-07-19 01:34:09 -04:00
Corvus Corax
27eadc200b
Merge branch 'corvuscorax/lla2nedfilter' into next
...
Conflicts:
flight/modules/StateEstimation/stateestimation.c
2013-07-10 14:38:12 +02:00
Corvus Corax
551780c74b
Merge branch 'corvuscorax/complementary_altitude_filter' into next
...
Conflicts:
flight/targets/boards/revolution/firmware/UAVObjects.inc
2013-07-10 14:27:25 +02:00
Brian Webb
c2df59498b
Merge remote-tracking branch 'origin/master' into next
2013-07-06 07:08:30 -07:00
Brian Webb
fd8d5352e2
OP-932 Adds tooltips to the channel widgets.
2013-07-03 20:20:31 -07:00
Corvus Corax
51a4b16af5
New Filter to calculate NED from LLA as part of StateEstimation
2013-06-30 18:49:29 +02:00
Fredrik Arvidsson
91c19ca829
Fixes 'Categorize' issue in UAVOBrowser.
2013-06-30 12:54:41 +02:00
Fredrik Arvidsson
3dcaea1cb0
Merge remote-tracking branch 'origin/glenneaux/OP-1027_GCS_UAVObjectBrowser_CategoryTreeItem_ButtonsNotDisabled' into thread/glenneaux_test
2013-06-30 11:18:42 +02:00
Fredrik Arvidsson
6ef2f3d626
Merge remote-tracking branch 'origin/glenneaux/OP-1004_GCS_UAVObjectBrowser_ScientificNotation_breaks_buttons' into thread/glenneaux_test
2013-06-30 11:18:30 +02:00
