James Cotton
5e20705347
Windows copy data: Use the environmental $$(QTMINGW) variable to locate
...
files to copy into the package. This makes it more robust against various
relative locations of mingw and qt.
It may be necessary to move all SDL-related files (SDL.dll, static libraries
and include files) from, for instance, .\QtSDK\Desktop\Qt\4.8.1\mingw\bin
to .\QtSDK\mingw\bin to be found.
Conflicts:
ground/gcs/copydata.pro
ground/gcs/src/plugins/hitl/aerosimrc/src/plugin.pro
2013-02-03 01:06:07 +02:00
Philippe Renon
3ab33cf163
OP-833 gcs options dialog polishing:
...
- createOptionsPage() now returns NULL to avoid having empty page in
Options dialog
- removed Gadget from gadget name
- added some TODOs for for further cleanups
2013-02-02 16:09:53 +01:00
Philippe Renon
6b3e0c7ee3
OP-833 gcs options dialog polishing: zeroed margin of top level widget
2013-02-02 16:08:37 +01:00
Philippe Renon
03ca63978b
OP-833 gcs options dialog polishing:
...
- zeroed margin of top level widget
- chnaged size policy of scrollArea from Expanding to Minimum to get a
tighter fit
2013-02-02 16:06:13 +01:00
Philippe Renon
96651e302a
OP-833 gcs options dialog polishing: zeroed margin of top level widget
2013-02-02 16:03:54 +01:00
Philippe Renon
d8ce755cfd
OP-833 gcs options dialog polishing:
...
- increased width of splitter handle from default (6) to 9
- removed bottom Line widget
2013-02-02 15:58:47 +01:00
Brian Webb
ca6aa9fcea
Reformatted PPM output code to match coding standards.
2013-02-02 01:53:39 +00:00
Brian Webb
18c592a37a
Reformatted PPM output code to match coding standards.
2013-02-02 01:50:02 +00:00
David Willis
3b5f3c8125
OP-825 set minimum and target api versions to 14 & 17 respectively. Tidy formatting.
2013-02-02 00:57:57 +00:00
Alessio Morale
153db89663
OP-815 changed PIOS_WDG_RegisterFlag to reset the WDG to prevent timeouts during module initialization
2013-02-01 20:05:44 +01:00
Platypus
d76a61b430
Merge branch 'laurent/translations' of ssh://git.openpilot.org/OpenPilot into laurent/translations
2013-02-01 17:56:19 +01:00
Platypus
dfdd074997
Working progress...
...
Signed-off-by: Platypus <platypusman@free.fr>
2013-02-01 17:55:13 +01:00
Brian Webb
a4faa22c4b
Merge remote-tracking branch 'origin/brian/rfm22_autoconf' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
2013-01-31 13:40:32 +00:00
Laurent Lalanne
cc8bb5dc5e
Erreur de frappe
2013-01-31 11:51:03 +01:00
Cliff Geerdes
5e2aeeea76
Fixed tab stops in two c files.
2013-01-31 05:38:10 -05:00
Fredrik Arvidsson
da55998f27
OP-786 Removed the Qt::WindowStaysOnTopHint since it conflicts with the dialog opened to select default configuration first time GCS is launched.
2013-01-31 11:33:43 +01:00
Platypus
21bb408c21
Quelques corrections et modifications - Any corrections and modifications
...
Signed-off-by: Platypus <platypusman@free.fr>
2013-01-31 09:24:50 +01:00
Laurent Lalanne
3dd37e51b2
Small corrections, spaces.
2013-01-31 01:23:39 +01:00
Cliff Geerdes
6806e895cc
First version. Passes simple tests.
2013-01-30 18:57:32 -05:00
Platypus
0c77a2b374
Premières corrections et suggestions
...
Signed-off-by: Platypus <platypusman@free.fr>
2013-01-31 00:09:01 +01:00
filnet
d03db9c6d1
OP-803 remove spurious commit
2013-01-29 23:12:55 +01:00
Fredrik Arvidsson
f59bcd1949
OP-786 Replaced the splash screen backdrop image to address some shadow transparency issues.
2013-01-29 09:37:58 +01:00
filnet
3e9c819850
OP-803 more cleanups
2013-01-28 23:13:47 +01:00
Oleg Semyonov
396f210d07
Remove stray file in RemoteSystemsTempFiles
2013-01-28 03:02:04 +02:00
Stacey Sheldon
f500ac1e23
rename: move UAVObjects and UAVTalk directories under targets
2013-01-28 02:33:06 +02:00
Stacey Sheldon
e55519b1e2
makefile: split tool install rules into separate makefile
...
The rules for downloading/building/installing the various
tools were cluttering the top-level makefile.
Conflicts:
Makefile
2013-01-28 02:29:08 +02:00
Stacey Sheldon
0fda8035c2
makefile: update to released openocd 0.6.1
2013-01-28 02:13:17 +02:00
Stacey Sheldon
2f93d983b0
makefile: update ARM toolchain to 4.6-2012-q4
2013-01-28 02:11:26 +02:00
Stacey Sheldon
dbcf440bb9
makefile: factor out paths for major flight components
...
Conflicts:
flight/targets/CopterControl/Makefile
2013-01-28 02:01:39 +02:00
Stacey Sheldon
833b730870
makefile: remove duplicate definitions
2013-01-28 01:56:50 +02:00
Stacey Sheldon
69a2691bc2
rename: move board-specific dirs into flight/targets
...
Conflicts:
flight/targets/Bootloaders/Revolution/Makefile
flight/targets/CopterControl/Makefile
2013-01-28 01:52:44 +02:00
Fredrik Arvidsson
7ff257ee77
OP-786 Removed code that set the Qt graphics system to type 'raster'. The 'raster' graphics system does not work correctly on MacOSX. The graphics system is now set to the default for each platform.
2013-01-27 21:33:17 +01:00
filnet
e8659cf9d5
OP-682 added some comments
2013-01-26 15:10:30 +01:00
filnet
813aaf5d85
OP-682 fixed two crashes on firmware uploader gadget.
...
crash 1 : would happen when clicking Halt and then Boot as soon as the Boot button became enabled.
crash 2 : would happen when clicking Boot and then quickly pressing then Open button.
2013-01-24 22:36:00 +01:00
Fredrik Arvidsson
4f09e80489
Merge branch 'thread/OP-786_SplashScreen' of ssh://git.openpilot.org/OpenPilot into thread/OP-786_SplashScreen
...
Conflicts:
ground/openpilotgcs/src/app/main.cpp
2013-01-24 15:59:12 +01:00
Fredrik Arvidsson
87d15a4a64
OP-786 Changed delay before splash screen is closed to 1500 ms. Rebased on next.
2013-01-24 15:54:25 +01:00
Fredrik Arvidsson
d00b4efdea
OP-786 Changed the delay before closing the splash screen to 3 seconds.
2013-01-24 15:22:16 +01:00
Fredrik Arvidsson
3705a2d0a8
OP-786 Moved the actual file and the dependency to gcsversioninfo.pri to the /app sub project from the /plugins/coreplugin project. This was necessary since the new splash screen depends on defines in the generated gcsversioninfo.h header file.
...
Changed position of the revision text to make it look nicer.
2013-01-24 15:22:15 +01:00
Fredrik Arvidsson
3f30d7d101
OP-786 Fixed the Revision text to use the same info as in the about dialog. Updated text drawing code to use word wrap since developer build revision numbers are fairly long strings.
2013-01-24 15:22:15 +01:00
Fredrik Arvidsson
90b72798c4
OP-786 Implemented progress label drawing. Added timer to close splash window 5 seconds after main window opens if not clicked.
2013-01-24 15:22:14 +01:00
Fredrik Arvidsson
eccdf5fa91
OP-786 Added new splash screen art. Added new custom splash screen class. Added signal on plugin manager emitting signal when a plugin is about to be loaded.
2013-01-24 15:22:13 +01:00
Fredrik Arvidsson
cf40948bf0
OP-786 Added static splash screen shown during application launch.
2013-01-24 15:22:12 +01:00
Kevin Vertucio
bb999ae44f
cleanup formatting
...
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
2013-01-24 08:04:55 -05:00
Kevin Vertucio
0cfed60638
added OP Icon to About GCS Version tab
...
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
2013-01-24 07:09:36 -05:00
Kevin Vertucio
63657c6586
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into kevinv033/OP-791
2013-01-23 22:09:40 -05:00
Alessio Morale
1a303aa85f
Merge remote-tracking branch 'origin/next' into amorale/bigmerge
2013-01-23 19:47:32 +01:00
Fredrik Arvidsson
7eef09463d
OP-786 Changed the delay before closing the splash screen to 3 seconds.
2013-01-23 07:35:40 +01:00
Fredrik Arvidsson
6b683665b6
OP-786 Moved the actual file and the dependency to gcsversioninfo.pri to the /app sub project from the /plugins/coreplugin project. This was necessary since the new splash screen depends on defines in the generated gcsversioninfo.h header file.
...
Changed position of the revision text to make it look nicer.
2013-01-22 21:09:35 +01:00
Kevin Vertucio
24068a6638
set dialog windowFlags for a frameless window.
...
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
2013-01-22 14:05:02 -05:00
Fredrik Arvidsson
38820f5d7d
OP-786 Fixed the Revision text to use the same info as in the about dialog. Updated text drawing code to use word wrap since developer build revision numbers are fairly long strings.
2013-01-22 15:18:40 +01:00