Oleg Semyonov e62cc8914c Merge remote branch 'origin/next' into os/features/pid-tuning-from-transmitter-next ...

Conflicts:
	flight/CopterControl/Makefile
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configtaskwidget.cpp
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/hwsettings.xml

2012-02-22 23:03:17 +02:00

..

actionmanager

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

dialogs

Changes to allow icons to be displayed for gadgets in the options page and in the gadget dropdown list.

2011-05-29 09:32:42 +02:00

images

Improve inline help icons, place them next to request/apply/save buttons where the eye logically goes when surveying the UI. Open for comments of course.

2011-05-31 21:20:38 +02:00

uavgadgetmanager

Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.

2011-08-04 11:55:18 +02:00

authorsdialog.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

authorsdialog.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

basemode.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

basemode.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

baseview.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

baseview.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

connectionmanager.cpp

OP-608

2012-01-10 17:03:58 +00:00

connectionmanager.h

OP-608

2012-01-10 17:03:58 +00:00

core_global.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

Core.pluginspec

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

core.qrc

Improve inline help icons, place them next to request/apply/save buttons where the eye logically goes when surveying the UI. Open for comments of course.

2011-05-31 21:20:38 +02:00

coreconstants.h

State we are a alpha release

2011-05-04 19:08:03 +10:00

coreimpl.cpp

Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.

2011-08-04 11:55:18 +02:00

coreimpl.h

Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.

2011-08-04 11:55:18 +02:00

coreplugin_dependencies.pri

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

coreplugin.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

coreplugin.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

coreplugin.pri

OP-520 Change $$qtLibraryTarget to $$qtLibraryName

2011-08-04 15:17:08 +02:00

coreplugin.pro

Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.

2011-08-04 11:55:18 +02:00

CREDITS.html

credits: fix mixed newlines and trailing spaces

2011-05-25 17:59:18 +03:00

eventfilteringmainwindow.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

eventfilteringmainwindow.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

fancyactionbar.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

fancyactionbar.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

fancyactionbar.qrc

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

fancytabwidget.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

fancytabwidget.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

fileiconprovider.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

fileiconprovider.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

gcsversioninfo.pri

gcs: add git version info to the About dialog using version-info.py

2011-05-29 00:27:07 +03:00

generalsettings.cpp

Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.

2011-08-04 11:55:18 +02:00

generalsettings.h

Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.

2011-08-04 11:55:18 +02:00

generalsettings.ui

Fix for generalsettings.ui

2011-08-04 17:30:18 +02:00

iconfigurableplugin.h

OP-99 gcs Import/Export Plugin: Support configurable plugins

2011-02-05 14:01:18 +00:00

iconnection.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

iconnection.h

OP356/GCS - Makes the dropbox show devices "friendly name". Type of connection and previous serial number accessible via tooltip.

2011-03-29 18:25:24 +00:00

icontext.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

icore.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

icore.h

Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.

2011-08-04 11:55:18 +02:00

icorelistener.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

imode.h

Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.

2011-08-04 11:55:18 +02:00

ioutputpane.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

iuavgadget.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

iuavgadget.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

iuavgadgetconfiguration.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

iuavgadgetconfiguration.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

iuavgadgetfactory.h

Changes to allow icons to be displayed for gadgets in the options page and in the gadget dropdown list.

2011-05-29 09:32:42 +02:00

iversioncontrol.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

iview.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

mainwindow.cpp

OP-290: allow GCS tabs to shrink (by eliding the text), less limit min window width

2011-08-16 20:58:39 +03:00

mainwindow.h

Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.

2011-08-04 11:55:18 +02:00

manhattanstyle.cpp

Add ifdef to retain default behaviour on OSX

2011-11-06 21:13:10 +00:00

manhattanstyle.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

messagemanager.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

messagemanager.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

messageoutputwindow.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

messageoutputwindow.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

mimedatabase.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

mimedatabase.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

minisplitter.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

minisplitter.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

modemanager.cpp

Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.

2011-08-04 11:55:18 +02:00

modemanager.h

Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.

2011-08-04 11:55:18 +02:00

OpenPilotGCS.xml

Remove flightplanner screen

2012-02-01 20:09:43 +11:00

outputpane.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

plugindialog.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

plugindialog.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

rightpane.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

rightpane.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

settingsdatabase.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

settingsdatabase.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

sidebar.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

sidebar.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

styleanimator.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

styleanimator.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

tabpositionindicator.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

tabpositionindicator.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

threadmanager.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

threadmanager.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

uavconfiginfo.cpp

OP-232 GCS Configuration: Reset Settings. Proper functioning is blocked by OP-310.

2011-02-05 20:20:01 +00:00

uavconfiginfo.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

uavgadgetdecorator.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

uavgadgetdecorator.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

uavgadgetinstancemanager.cpp

Changes to allow icons to be displayed for gadgets in the options page and in the gadget dropdown list.

2011-05-29 09:32:42 +02:00

uavgadgetinstancemanager.h

Changes to allow icons to be displayed for gadgets in the options page and in the gadget dropdown list.

2011-05-29 09:32:42 +02:00

uavgadgetoptionspage.ui

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

uavgadgetoptionspagedecorator.cpp

Changes to allow icons to be displayed for gadgets in the options page and in the gadget dropdown list.

2011-05-29 09:32:42 +02:00

uavgadgetoptionspagedecorator.h

Changes to allow icons to be displayed for gadgets in the options page and in the gadget dropdown list.

2011-05-29 09:32:42 +02:00

uniqueidmanager.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

uniqueidmanager.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

variablemanager.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

variablemanager.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

versiondialog.cpp

gcs: add git version info to the About dialog using version-info.py

2011-05-29 00:27:07 +03:00

versiondialog.h

gcs: add git version info to the About dialog using version-info.py

2011-05-29 00:27:07 +03:00

workspacesettings.cpp

Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.

2011-08-04 11:55:18 +02:00

workspacesettings.h

Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.

2011-08-04 11:55:18 +02:00

workspacesettings.ui

Change to normal tabwidget for workspace panel, allow placement of tab panel on top or bottom and allow reordering of tabs through drag n drop, allow changes to number of workspaces to take effect immediately, merge uavgadgetmanager with uavgadgetmode.

2011-08-04 11:55:18 +02:00