Skip to content

Q
qgroundcontrol
Commit 6c6684d3 authored by Jessica's avatar Jessica
Browse files
Options

Moved the images folder to the files directory. Changed all of the paths to images to files/images.

parent de71ad90
Show whitespace changes
Inline Side-by-side
Showing with 867 additions and 253 deletions
images/style-mission.css → files/images/style-mission.css
View file @ 6c6684d3
......@@ -61,11 +61,11 @@ border: 1px solid #777777;
}
QCheckBox::indicator:indeterminate:hover {
image: url(:/images/checkbox_indeterminate_hover.png);
image: url(:/files/images/checkbox_indeterminate_hover.png);
}
QCheckBox::indicator:indeterminate:pressed {
image: url(:/images/checkbox_indeterminate_pressed.png);
image: url(:/files/images/checkbox_indeterminate_pressed.png);
}
QGroupBox::title {
......@@ -151,13 +151,13 @@ QSpinBox {
QSpinBox::up-button {
subcontrol-origin: border;
subcontrol-position: top right; /* position at the top right corner */
border-image: url(:/images/actions/go-up.svg) 1;
border-image: url(:/files/images/actions/go-up.svg) 1;
border-width: 1px;
}
QSpinBox::down-button {
subcontrol-origin: border;
subcontrol-position: bottom right; /* position at the top right corner */
border-image: url(:/images/actions/go-down.svg) 1;
border-image: url(:/files/images/actions/go-down.svg) 1;
border-width: 1px;
}
......@@ -171,14 +171,14 @@ QDoubleSpinBox {
QDoubleSpinBox::up-button {
subcontrol-origin: border;
subcontrol-position: top right; /* position at the top right corner */
border-image: url(:/images/actions/go-up.svg) 1;
border-image: url(:/files/images/actions/go-up.svg) 1;
border-width: 1px;
max-width: 5px;
}
QDoubleSpinBox::down-button {
subcontrol-origin: border;
subcontrol-position: bottom right; /* position at the top right corner */
border-image: url(:/images/actions/go-down.svg) 1;
border-image: url(:/files/images/actions/go-down.svg) 1;
border-width: 1px;
max-width: 5px;
}
......
images/style-outdoor-dark.css → files/images/style-outdoor-dark.css
View file @ 6c6684d3
......@@ -61,11 +61,11 @@ border: 1px solid #777777;
}
QCheckBox::indicator:indeterminate:hover {
image: url(:/images/checkbox_indeterminate_hover.png);
image: url(:/files/images/checkbox_indeterminate_hover.png);
}
QCheckBox::indicator:indeterminate:pressed {
image: url(:/images/checkbox_indeterminate_pressed.png);
image: url(:/files/images/checkbox_indeterminate_pressed.png);
}
QGroupBox::title {
......@@ -151,13 +151,13 @@ QSpinBox {
QSpinBox::up-button {
subcontrol-origin: border;
subcontrol-position: top right; /* position at the top right corner */
border-image: url(:/images/actions/go-up.svg) 1;
border-image: url(:/files/images/actions/go-up.svg) 1;
border-width: 1px;
}
QSpinBox::down-button {
subcontrol-origin: border;
subcontrol-position: bottom right; /* position at the top right corner */
border-image: url(:/images/actions/go-down.svg) 1;
border-image: url(:/files/images/actions/go-down.svg) 1;
border-width: 1px;
}
......@@ -171,14 +171,14 @@ QDoubleSpinBox {
QDoubleSpinBox::up-button {
subcontrol-origin: border;
subcontrol-position: top right; /* position at the top right corner */
border-image: url(:/images/actions/go-up.svg) 1;
border-image: url(:/files/images/actions/go-up.svg) 1;
border-width: 1px;
max-width: 5px;
}
QDoubleSpinBox::down-button {
subcontrol-origin: border;
subcontrol-position: bottom right; /* position at the top right corner */
border-image: url(:/images/actions/go-down.svg) 1;
border-image: url(:/files/images/actions/go-down.svg) 1;
border-width: 1px;
max-width: 5px;
}
......
images/style-outdoor.css → files/images/style-outdoor.css
View file @ 6c6684d3
......@@ -61,11 +61,11 @@ border: 1px solid #111111;
}
QCheckBox::indicator:indeterminate:hover {
image: url(:/images/checkbox_indeterminate_hover.png);
image: url(:/files/images/checkbox_indeterminate_hover.png);
}
QCheckBox::indicator:indeterminate:pressed {
image: url(:/images/checkbox_indeterminate_pressed.png);
image: url(:/files/images/checkbox_indeterminate_pressed.png);
}
QGroupBox::title {
......@@ -137,13 +137,13 @@ QSpinBox {
QSpinBox::up-button {
subcontrol-origin: border;
subcontrol-position: top right; /* position at the top right corner */
border-image: url(:/images/actions/go-up.svg) 1;
border-image: url(:/files/images/actions/go-up.svg) 1;
border-width: 1px;
}
QSpinBox::down-button {
subcontrol-origin: border;
subcontrol-position: bottom right; /* position at the top right corner */
border-image: url(:/images/actions/go-down.svg) 1;
border-image: url(:/files/images/actions/go-down.svg) 1;
border-width: 1px;
}
......@@ -157,14 +157,14 @@ QDoubleSpinBox {
QDoubleSpinBox::up-button {
subcontrol-origin: border;
subcontrol-position: top right; /* position at the top right corner */
border-image: url(:/images/actions/go-up.svg) 1;
border-image: url(:/files/images/actions/go-up.svg) 1;
border-width: 1px;
max-width: 5px;
}
QDoubleSpinBox::down-button {
subcontrol-origin: border;
subcontrol-position: bottom right; /* position at the top right corner */
border-image: url(:/images/actions/go-down.svg) 1;
border-image: url(:/files/images/actions/go-down.svg) 1;
border-width: 1px;
max-width: 5px;
}
......
mavlink/share/pyshared/pymavlink/tools/mavplayback.py
View file @ 6c6684d3
......@@ -43,7 +43,7 @@ filename = args[0]
def LoadImage(filename):
'''return an image from the images/ directory'''
app_dir = os.path.dirname(os.path.realpath(__file__))
path = os.path.join(app_dir, 'images', filename)
path = os.path.join(app_dir, 'files/images', filename)
return Tkinter.PhotoImage(file=path)
......
qgroundcontrol.pri
View file @ 6c6684d3
......@@ -45,15 +45,15 @@ macx|macx-g++42|macx-g++: {
-framework ApplicationServices \
-lm
ICON = $$BASEDIR/images/icons/macx.icns
ICON = $$BASEDIR/files/images/icons/macx.icns
# Copy contributed files
QMAKE_POST_LINK += && cp -rf $$BASEDIR/files $$TARGETDIR/qgroundcontrol.app/Contents/MacOS
# Copy google earth starter file
QMAKE_POST_LINK += && cp -f $$BASEDIR/images/earth.html $$TARGETDIR/qgroundcontrol.app/Contents/MacOS
QMAKE_POST_LINK += && cp -f $$BASEDIR/files/images/earth.html $$TARGETDIR/qgroundcontrol.app/Contents/MacOS
# Copy CSS stylesheets
QMAKE_POST_LINK += && cp -f $$BASEDIR/images/style-mission.css $$TARGETDIR/qgroundcontrol.app/Contents/MacOS/style-indoor.css
QMAKE_POST_LINK += && cp -f $$BASEDIR/images/style-outdoor.css $$TARGETDIR/qgroundcontrol.app/Contents/MacOS
QMAKE_POST_LINK += && cp -f $$BASEDIR/files/images/style-mission.css $$TARGETDIR/qgroundcontrol.app/Contents/MacOS/style-indoor.css
QMAKE_POST_LINK += && cp -f $$BASEDIR/files/images/style-outdoor.css $$TARGETDIR/qgroundcontrol.app/Contents/MacOS
# Copy support files
QMAKE_POST_LINK += && cp -rf $$BASEDIR/files $$TARGETDIR/qgroundcontrol.app/Contents/MacOS
# Copy MAVLink
......@@ -232,8 +232,8 @@ linux-g++|linux-g++-64{
DESTDIR = $$TARGETDIR
QMAKE_POST_LINK += && cp -rf $$BASEDIR/files $$TARGETDIR
QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR
QMAKE_POST_LINK += && mkdir -p $$TARGETDIR/images
QMAKE_POST_LINK += && cp -rf $$BASEDIR/images/Vera.ttf $$TARGETDIR/images/Vera.ttf
QMAKE_POST_LINK += && mkdir -p $$TARGETDIR/files/images
QMAKE_POST_LINK += && cp -rf $$BASEDIR/files/images/Vera.ttf $$TARGETDIR/files/images/Vera.ttf
# osg/osgEarth dynamic casts might fail without this compiler option.
# see http://osgearth.org/wiki/FAQ for details.
......@@ -317,7 +317,7 @@ win32-msvc2008|win32-msvc2010 {
QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\files" "$$TARGETDIR_WIN\\debug\\files" /E /I $$escape_expand(\\n))
QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\mavlink" "$$TARGETDIR_WIN\\debug\\mavlink" /E /I $$escape_expand(\\n))
QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\models" "$$TARGETDIR_WIN\\debug\\models" /E /I $$escape_expand(\\n))
QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\images\\earth.html" "$$TARGETDIR_WIN\\debug"$$escape_expand(\\n))
QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\files\\images\\earth.html" "$$TARGETDIR_WIN\\debug"$$escape_expand(\\n))
QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\thirdParty\\libxbee\\lib\\libxbee.dll" "$$TARGETDIR_WIN\\debug"$$escape_expand(\\n))
QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$(QTDIR)\\plugins" "$$TARGETDIR_WIN\\debug" /E /I $$escape_expand(\\n))
QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$(QTDIR)\\bin\\phonond4.dll" "$$TARGETDIR_WIN\\debug"$$escape_expand(\\n))
......@@ -338,7 +338,7 @@ win32-msvc2008|win32-msvc2010 {
QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\files" "$$TARGETDIR_WIN\\release\\files" /E /I $$escape_expand(\\n))
QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\mavlink" "$$TARGETDIR_WIN\\release\\mavlink" /E /I $$escape_expand(\\n))
QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\models" "$$TARGETDIR_WIN\\release\\models" /E /I $$escape_expand(\\n))
QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\images\\earth.html" "$$TARGETDIR_WIN\\release\\earth.html" $$escape_expand(\\n))
QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\files\\images\\earth.html" "$$TARGETDIR_WIN\\release\\earth.html" $$escape_expand(\\n))
QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$BASEDIR_WIN\\thirdParty\\libxbee\\lib\\libxbee.dll" "$$TARGETDIR_WIN\\release"$$escape_expand(\\n))
QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$(QTDIR)\\plugins" "$$TARGETDIR_WIN\\release" /E /I $$escape_expand(\\n))
QMAKE_POST_LINK += $$quote(xcopy /D /Y "$$(QTDIR)\\bin\\phonon4.dll" "$$TARGETDIR_WIN\\release"$$escape_expand(\\n))
......@@ -422,7 +422,7 @@ win32-g++ {
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\files\" \"$$TARGETDIR_WIN\\debug\\files\\\" /S /E /Y
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\mavlink\" \"$$TARGETDIR_WIN\\debug\\mavlink\\\" /S /E /Y
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\models\" \"$$TARGETDIR_WIN\\debug\\models\\\" /S /E /Y
QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\images\\earth.html\" \"$$TARGETDIR_WIN\\debug\\earth.html\"
QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\files\\images\\earth.html\" \"$$TARGETDIR_WIN\\debug\\earth.html\"
}
exists($$TARGETDIR/release) {
......@@ -430,7 +430,7 @@ win32-g++ {
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\files\" \"$$TARGETDIR_WIN\\release\\files\\\" /S /E /Y
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\mavlink\" \"$$TARGETDIR_WIN\\release\\mavlink\\\" /S /E /Y
QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\models\" \"$$TARGETDIR_WIN\\release\\models\\\" /S /E /Y
QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\images\\earth.html\" \"$$TARGETDIR_WIN\\release\\earth.html\"
QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\files\\images\\earth.html\" \"$$TARGETDIR_WIN\\release\\earth.html\"
}
}
......
qgroundcontrol.qrc
View file @ 6c6684d3
<RCC>
<qresource prefix="/">
<file>images/control/launch.svg</file>
<file>images/status/dialog-error.svg</file>
<file>images/status/dialog-warning.svg</file>
<file>images/control/land.svg</file>
<file>images/actions/media-record.svg</file>
<file>images/actions/media-playback-stop.svg</file>
<file>images/actions/media-playback-start.svg</file>
<file>images/actions/media-playback-pause.svg</file>
<file>images/actions/list-remove.svg</file>
<file>images/actions/list-add.svg</file>
<file>images/actions/go-up.svg</file>
<file>images/actions/go-top.svg</file>
<file>images/actions/go-previous.svg</file>
<file>images/actions/go-next.svg</file>
<file>images/actions/go-last.svg</file>
<file>images/actions/go-jump.svg</file>
<file>images/actions/go-home.svg</file>
<file>images/actions/go-first.svg</file>
<file>images/actions/go-down.svg</file>
<file>images/actions/go-bottom.svg</file>
<file>images/actions/process-stop.svg</file>
<file>images/categories/preferences-system.svg</file>
<file>images/categories/applications-system.svg</file>
<file>images/categories/applications-internet.svg</file>
<file>images/categories/applications-development.svg</file>
<file>images/devices/network-wireless.svg</file>
<file>images/devices/network-wired.svg</file>
<file>images/apps/utilities-terminal.svg</file>
<file>images/apps/utilities-system-monitor.svg</file>
<file>images/apps/accessories-text-editor.svg</file>
<file>images/apps/accessories-calculator.svg</file>
<file>images/devices/input-gaming.svg</file>
<file>images/mavs/helicopter.svg</file>
<file>images/mavs/unknown.svg</file>
<file>images/mavs/fixed-wing.svg</file>
<file>images/mavs/groundstation.svg</file>
<file>images/mavs/generic.svg</file>
<file>images/mavs/quadrotor.svg</file>
<file>images/mavs/coaxial.svg</file>
<file>images/actions/system-shutdown.svg</file>
<file>images/actions/system-log-out.svg</file>
<file>images/actions/system-lock-screen.svg</file>
<file>images/status/weather-storm.svg</file>
<file>images/status/weather-snow.svg</file>
<file>images/status/weather-showers.svg</file>
<file>images/status/weather-showers-scattered.svg</file>
<file>images/status/weather-severe-alert.svg</file>
<file>images/status/weather-overcast.svg</file>
<file>images/status/weather-few-clouds.svg</file>
<file>images/status/weather-few-clouds-night.svg</file>
<file>images/status/weather-clear.svg</file>
<file>images/status/weather-clear-night.svg</file>
<file>images/status/user-trash-full.svg</file>
<file>images/status/software-update-urgent.svg</file>
<file>images/status/software-update-available.svg</file>
<file>images/status/printer-error.svg</file>
<file>images/status/network-wireless-encrypted.svg</file>
<file>images/status/network-transmit.svg</file>
<file>images/status/network-transmit-receive.svg</file>
<file>images/status/network-receive.svg</file>
<file>images/status/network-offline.svg</file>
<file>images/status/network-idle.svg</file>
<file>images/status/network-error.svg</file>
<file>images/status/mail-attachment.svg</file>
<file>images/status/image-missing.svg</file>
<file>images/status/image-loading.svg</file>
<file>images/status/folder-visiting.svg</file>
<file>images/status/folder-open.svg</file>
<file>images/status/folder-drag-accept.svg</file>
<file>images/status/dialog-information.svg</file>
<file>images/status/battery-caution.svg</file>
<file>images/status/audio-volume-muted.svg</file>
<file>images/status/audio-volume-medium.svg</file>
<file>images/status/audio-volume-low.svg</file>
<file>images/status/audio-volume-high.svg</file>
<file>images/status/colorbars.png</file>
<file>images/style-mission.css</file>
<file>images/splash.png</file>
<file>files/images/control/launch.svg</file>
<file>files/images/status/dialog-error.svg</file>
<file>files/images/status/dialog-warning.svg</file>
<file>files/images/control/land.svg</file>
<file>files/images/actions/media-record.svg</file>
<file>files/images/actions/media-playback-stop.svg</file>
<file>files/images/actions/media-playback-start.svg</file>
<file>files/images/actions/media-playback-pause.svg</file>
<file>files/images/actions/list-remove.svg</file>
<file>files/images/actions/list-add.svg</file>
<file>files/images/actions/go-up.svg</file>
<file>files/images/actions/go-top.svg</file>
<file>files/images/actions/go-previous.svg</file>
<file>files/images/actions/go-next.svg</file>
<file>files/images/actions/go-last.svg</file>
<file>files/images/actions/go-jump.svg</file>
<file>files/images/actions/go-home.svg</file>
<file>files/images/actions/go-first.svg</file>
<file>files/images/actions/go-down.svg</file>
<file>files/images/actions/go-bottom.svg</file>
<file>files/images/actions/process-stop.svg</file>
<file>files/images/categories/preferences-system.svg</file>
<file>files/images/categories/applications-system.svg</file>
<file>files/images/categories/applications-internet.svg</file>
<file>files/images/categories/applications-development.svg</file>
<file>files/images/devices/network-wireless.svg</file>
<file>files/images/devices/network-wired.svg</file>
<file>files/images/apps/utilities-terminal.svg</file>
<file>files/images/apps/utilities-system-monitor.svg</file>
<file>files/images/apps/accessories-text-editor.svg</file>
<file>files/images/apps/accessories-calculator.svg</file>
<file>files/images/devices/input-gaming.svg</file>
<file>files/images/mavs/helicopter.svg</file>
<file>files/images/mavs/unknown.svg</file>
<file>files/images/mavs/fixed-wing.svg</file>
<file>files/images/mavs/groundstation.svg</file>
<file>files/images/mavs/generic.svg</file>
<file>files/images/mavs/quadrotor.svg</file>
<file>files/images/mavs/coaxial.svg</file>
<file>files/images/actions/system-shutdown.svg</file>
<file>files/images/actions/system-log-out.svg</file>
<file>files/images/actions/system-lock-screen.svg</file>
<file>files/images/status/weather-storm.svg</file>
<file>files/images/status/weather-snow.svg</file>
<file>files/images/status/weather-showers.svg</file>
<file>files/images/status/weather-showers-scattered.svg</file>
<file>files/images/status/weather-severe-alert.svg</file>
<file>files/images/status/weather-overcast.svg</file>
<file>files/images/status/weather-few-clouds.svg</file>
<file>files/images/status/weather-few-clouds-night.svg</file>
<file>files/images/status/weather-clear.svg</file>
<file>files/images/status/weather-clear-night.svg</file>
<file>files/images/status/user-trash-full.svg</file>
<file>files/images/status/software-update-urgent.svg</file>
<file>files/images/status/software-update-available.svg</file>
<file>files/images/status/printer-error.svg</file>
<file>files/images/status/network-wireless-encrypted.svg</file>
<file>files/images/status/network-transmit.svg</file>
<file>files/images/status/network-transmit-receive.svg</file>
<file>files/images/status/network-receive.svg</file>
<file>files/images/status/network-offline.svg</file>
<file>files/images/status/network-idle.svg</file>
<file>files/images/status/network-error.svg</file>
<file>files/images/status/mail-attachment.svg</file>
<file>files/images/status/image-missing.svg</file>
<file>files/images/status/image-loading.svg</file>
<file>files/images/status/folder-visiting.svg</file>
<file>files/images/status/folder-open.svg</file>
<file>files/images/status/folder-drag-accept.svg</file>
<file>files/images/status/dialog-information.svg</file>
<file>files/images/status/battery-caution.svg</file>
<file>files/images/status/audio-volume-muted.svg</file>
<file>files/images/status/audio-volume-medium.svg</file>
<file>files/images/status/audio-volume-low.svg</file>
<file>files/images/status/audio-volume-high.svg</file>
<file>files/images/status/colorbars.png</file>
<file>files/images/style-mission.css</file>
<file>files/images/splash.png</file>
<file>files/audio/alert.wav</file>
<file>demo-log.txt</file>
<file>images/mapproviders/openstreetmap.png</file>
<file>images/mapproviders/google.png</file>
<file>images/mapproviders/yahoo.png</file>
<file>images/earth.html</file>
<file>images/mapproviders/googleearth.svg</file>
<file>images/contrib/slugs.png</file>
<file>images/style-outdoor.css</file>
<file>images/patterns/lenna.jpg</file>
<file>files/images/mapproviders/openstreetmap.png</file>
<file>files/images/mapproviders/google.png</file>
<file>files/images/mapproviders/yahoo.png</file>
<file>files/images/earth.html</file>
<file>files/images/mapproviders/googleearth.svg</file>
<file>files/images/contrib/slugs.png</file>
<file>files/images/style-outdoor.css</file>
<file>files/images/patterns/lenna.jpg</file>
</qresource>
<qresource prefix="/general">
<file alias="vera.ttf">images/Vera.ttf</file>
<file alias="vera.ttf">files/images/Vera.ttf</file>
</qresource>
</RCC>
qgroundcontrol.rc
View file @ 6c6684d3
IDI_ICON1 ICON DISCARDABLE "images/icons/qgroundcontrol.ico"
\ No newline at end of file
IDI_ICON1 ICON DISCARDABLE "files/images/icons/qgroundcontrol.ico"
src/MG.h
View file @ 6c6684d3
......@@ -394,7 +394,7 @@ public:
* @return The absolute path of the icon directory
**/
static QString getIconDirectory() {
return MG::DIR::getSupportFilesDirectory() + "/images/";
return MG::DIR::getSupportFilesDirectory() + "/files/images/";
}
};
......
src/QGCCore.cc
View file @ 6c6684d3
......@@ -107,7 +107,7 @@ QGCCore::QGCCore(int &argc, char* argv[]) : QApplication(argc, argv)
settings.sync();
// Show splash screen
QPixmap splashImage(":images/splash.png");
QPixmap splashImage(":/files/images/splash.png");
QSplashScreen* splashScreen = new QSplashScreen(splashImage, Qt::WindowStaysOnTopHint);
// Delete splash screen after mainWindow was displayed
splashScreen->setAttribute(Qt::WA_DeleteOnClose);
......
src/apps/mavlinkgen/ui/XMLCommProtocolWidget.ui
View file @ 6c6684d3
......@@ -46,7 +46,7 @@
</property>
<property name="icon">
<iconset resource="../../../../qgroundcontrol.qrc">
<normaloff>:/images/status/folder-open.svg</normaloff>:/images/status/folder-open.svg</iconset>
<normaloff>:/files/images/status/folder-open.svg</normaloff>:/files/images/status/folder-open.svg</iconset>
</property>
</widget>
</item>
......@@ -92,7 +92,7 @@
</property>
<property name="icon">
<iconset resource="../../../../qgroundcontrol.qrc">
<normaloff>:/images/status/folder-open.svg</normaloff>:/images/status/folder-open.svg</iconset>
<normaloff>:/files/images/status/folder-open.svg</normaloff>:/files/images/status/folder-open.svg</iconset>
</property>
</widget>
</item>
......@@ -131,7 +131,7 @@
</property>
<property name="icon">
<iconset resource="../../../../qgroundcontrol.qrc">
<normaloff>:/images/categories/applications-system.svg</normaloff>:/images/categories/applications-system.svg</iconset>
<normaloff>:/files/images/categories/applications-system.svg</normaloff>:/files/images/categories/applications-system.svg</iconset>
</property>
</widget>
</item>
......
src/qgcunittest.pro 0 → 100644
View file @ 6c6684d3
# -------------------------------------------------
# QGroundControl - Micro Air Vehicle Groundstation
# Please see our website at <http://qgroundcontrol.org>
# Maintainer:
# Lorenz Meier <lm@inf.ethz.ch>
# (c) 2009-2011 QGroundControl Developers
# This file is part of the open groundstation project
# QGroundControl is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# QGroundControl is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with QGroundControl. If not, see <http://www.gnu.org/licenses/>.
# -------------------------------------------------
# Qt configuration
CONFIG += qt \
thread \
console
QT += network \
opengl \
svg \
xml \
phonon \
webkit \
sql \
testlib \
TEMPLATE = app
TARGET = qgcunittest
BASEDIR = $${IN_PWD}
TESTDIR = $$BASEDIR/qgcunittest
linux-g++|linux-g++-64{
debug {
TARGETDIR = $${OUT_PWD}/debug
BUILDDIR = $${OUT_PWD}/build-debug
}
release {
TARGETDIR = $${OUT_PWD}/release
BUILDDIR = $${OUT_PWD}/build-release
}
} else {
TARGETDIR = $${OUT_PWD}
BUILDDIR = $${OUT_PWD}/build
}
LANGUAGE = C++
OBJECTS_DIR = $${BUILDDIR}/obj
MOC_DIR = $${BUILDDIR}/moc
UI_DIR = $${BUILDDIR}/ui
RCC_DIR = $${BUILDDIR}/rcc
MAVLINK_CONF = ""
MAVLINKPATH = $$BASEDIR/mavlink/include/v1.0
DEFINES += MAVLINK_NO_DATA
win32 {
QMAKE_INCDIR_QT = $$(QTDIR)/include
QMAKE_LIBDIR_QT = $$(QTDIR)/lib
QMAKE_UIC = "$$(QTDIR)/bin/uic.exe"
QMAKE_MOC = "$$(QTDIR)/bin/moc.exe"
QMAKE_RCC = "$$(QTDIR)/bin/rcc.exe"
QMAKE_QMAKE = "$$(QTDIR)/bin/qmake.exe"
}
#################################################################
# EXTERNAL LIBRARY CONFIGURATION
# EIGEN matrix library (header-only)
INCLUDEPATH += src/libs/eigen
# OPMapControl library (from OpenPilot)
include(src/libs/utils/utils_external.pri)
include(src/libs/opmapcontrol/opmapcontrol_external.pri)
DEPENDPATH += \
../src/libs/utils \
../src/libs/utils/src \
../src/libs/opmapcontrol \
../src/libs/opmapcontrol/src \
../src/libs/opmapcontrol/src/mapwidget
INCLUDEPATH += \
../src/libs/utils \
src/libs \
src/libs/opmapcontrol
# If the user config file exists, it will be included.
# if the variable MAVLINK_CONF contains the name of an
# additional project, QGroundControl includes the support
# of custom MAVLink messages of this project
exists(user_config.pri) {
include(user_config.pri)
message("----- USING CUSTOM USER QGROUNDCONTROL CONFIG FROM user_config.pri -----")
message("Adding support for additional MAVLink messages for: " $$MAVLINK_CONF)
message("------------------------------------------------------------------------")
}
INCLUDEPATH += $$MAVLINKPATH/common
INCLUDEPATH += $$MAVLINKPATH
contains(MAVLINK_CONF, pixhawk) {
# Remove the default set - it is included anyway
INCLUDEPATH -= $$MAVLINKPATH/common
# PIXHAWK SPECIAL MESSAGES
INCLUDEPATH += $$MAVLINKPATH/pixhawk
DEFINES += QGC_USE_PIXHAWK_MESSAGES
}
contains(MAVLINK_CONF, slugs) {
# Remove the default set - it is included anyway
INCLUDEPATH -= $$MAVLINKPATH/common
# SLUGS SPECIAL MESSAGES
INCLUDEPATH += $$MAVLINKPATH/slugs
DEFINES += QGC_USE_SLUGS_MESSAGES
SOURCES += $$TESTDIR/SlugsMavUnitTest.cc
HEADERS += $$TESTDIR/SlugsMavUnitTest.h
}
contains(MAVLINK_CONF, ualberta) {
# Remove the default set - it is included anyway
INCLUDEPATH -= $$MAVLINKPATH/common
# UALBERTA SPECIAL MESSAGES
INCLUDEPATH += $$MAVLINKPATH/ualberta
DEFINES += QGC_USE_UALBERTA_MESSAGES
}
contains(MAVLINK_CONF, ardupilotmega) {
# Remove the default set - it is included anyway
INCLUDEPATH -= $$MAVLINKPATH/common
# UALBERTA SPECIAL MESSAGES
INCLUDEPATH += $$MAVLINKPATH/ardupilotmega
DEFINES += QGC_USE_ARDUPILOTMEGA_MESSAGES
}
contains(MAVLINK_CONF, senseSoar) {
# Remove the default set - it is included anyway
INCLUDEPATH -= $$MAVLINKPATH/common
# SENSESOAR SPECIAL MESSAGES
INCLUDEPATH += $$MAVLINKPATH/SenseSoar
DEFINES += QGC_USE_SENSESOAR_MESSAGES
}
# Include general settings for QGroundControl
# necessary as last include to override any non-acceptable settings
# done by the plugins above
include(qgroundcontrol.pri)
# Reset QMAKE_POST_LINK to prevent file copy operations
QMAKE_POST_LINK = ""
# Include MAVLink generator
# has been deprecated
DEPENDPATH += \
src/apps/mavlinkgen
INCLUDEPATH += \
src/apps/mavlinkgen \
src/apps/mavlinkgen/ui \
src/apps/mavlinkgen/generator
include(src/apps/mavlinkgen/mavlinkgen.pri)
# Include QWT plotting library
include(src/lib/qwt/qwt.pri)
DEPENDPATH += . \
plugins \
thirdParty/qserialport/include \
thirdParty/qserialport/include/QtSerialPort \
thirdParty/qserialport \
src/libs/qextserialport
INCLUDEPATH += . \
thirdParty/qserialport/include \
thirdParty/qserialport/include/QtSerialPort \
thirdParty/qserialport/src \
src/libs/qextserialport
# Include serial port library (QSerial)
include(qserialport.pri)
# Serial port detection (ripped-off from qextserialport library)
macx|macx-g++|macx-g++42::SOURCES += src/libs/qextserialport/qextserialenumerator_osx.cpp
linux-g++::SOURCES += src/libs/qextserialport/qextserialenumerator_unix.cpp
linux-g++-64::SOURCES += src/libs/qextserialport/qextserialenumerator_unix.cpp
win32::SOURCES += src/libs/qextserialport/qextserialenumerator_win.cpp
win32-msvc2008|win32-msvc2010::SOURCES += src/libs/qextserialport/qextserialenumerator_win.cpp
# Input
FORMS += ../src/ui/MainWindow.ui \
../src/ui/CommSettings.ui \
../src/ui/SerialSettings.ui \
../src/ui/UASControl.ui \
../src/ui/UASList.ui \
../src/ui/UASInfo.ui \
../src/ui/Linechart.ui \
../src/ui/UASView.ui \
../src/ui/ParameterInterface.ui \
../src/ui/WaypointList.ui \
../src/ui/ObjectDetectionView.ui \
../src/ui/JoystickWidget.ui \
../src/ui/DebugConsole.ui \
../src/ui/HDDisplay.ui \
../src/ui/MAVLinkSettingsWidget.ui \
../src/ui/AudioOutputWidget.ui \
../src/ui/QGCSensorSettingsWidget.ui \
../src/ui/watchdog/WatchdogControl.ui \
../src/ui/watchdog/WatchdogProcessView.ui \
../src/ui/watchdog/WatchdogView.ui \
../src/ui/QGCFirmwareUpdate.ui \
../src/ui/QGCPxImuFirmwareUpdate.ui \
../src/ui/QGCDataPlot2D.ui \
../src/ui/QGCRemoteControlView.ui \
../src/ui/QMap3D.ui \
../src/ui/QGCWebView.ui \
../src/ui/map3D/QGCGoogleEarthView.ui \
../src/ui/SlugsDataSensorView.ui \
../src/ui/SlugsHilSim.ui \
../src/ui/SlugsPadCameraControl.ui \
../src/ui/uas/QGCUnconnectedInfoWidget.ui \
../src/ui/designer/QGCToolWidget.ui \
../src/ui/designer/QGCParamSlider.ui \
../src/ui/designer/QGCActionButton.ui \
../src/ui/designer/QGCCommandButton.ui \
../src/ui/QGCMAVLinkLogPlayer.ui \
../src/ui/QGCWaypointListMulti.ui \
../src/ui/mission/QGCCustomWaypointAction.ui \
../src/ui/QGCUDPLinkConfiguration.ui \
../src/ui/QGCSettingsWidget.ui \
../src/ui/UASControlParameters.ui \
../src/ui/mission/QGCMissionDoWidget.ui \
../src/ui/mission/QGCMissionConditionWidget.ui \
../src/ui/map/QGCMapTool.ui \
../src/ui/map/QGCMapToolBar.ui \
../src/ui/QGCMAVLinkInspector.ui \
../src/ui/WaypointViewOnlyView.ui \
../src/ui/WaypointEditableView.ui \
../src/ui/UnconnectedUASInfoWidget.ui \
../src/ui/mavlink/QGCMAVLinkMessageSender.ui \
../src/ui/firmwareupdate/QGCFirmwareUpdateWidget.ui \
../src/ui/QGCPluginHost.ui \
../src/ui/firmwareupdate/QGCPX4FirmwareUpdate.ui
INCLUDEPATH += src \
src/ui \
src/ui/linechart \
src/ui/uas \
src/ui/map \
src/uas \
src/comm \
src/input \
src/ui/mavlink \
src/ui/watchdog \
src/ui/map3D \
src/ui/designer
HEADERS += src/MG.h \
src/QGCCore.h \
src/uas/UASInterface.h \
src/uas/UAS.h \
src/uas/UASManager.h \
src/comm/LinkManager.h \
src/comm/LinkInterface.h \
src/comm/SerialLinkInterface.h \
src/comm/SerialLink.h \
src/comm/ProtocolInterface.h \
src/comm/MAVLinkProtocol.h \
src/comm/QGCFlightGearLink.h \
src/ui/CommConfigurationWindow.h \
src/ui/SerialConfigurationWindow.h \
../src/ui/MainWindow.h \
src/ui/uas/UASControlWidget.h \
src/ui/uas/UASListWidget.h \
src/ui/uas/UASInfoWidget.h \
src/ui/HUD.h \
src/ui/linechart/LinechartWidget.h \
src/ui/linechart/LinechartPlot.h \
src/ui/linechart/Scrollbar.h \
src/ui/linechart/ScrollZoomer.h \
src/configuration.h \
src/ui/uas/UASView.h \
src/ui/CameraView.h \
src/comm/MAVLinkSimulationLink.h \
src/comm/UDPLink.h \
src/ui/ParameterInterface.h \
src/ui/WaypointList.h \
src/Waypoint.h \
src/ui/ObjectDetectionView.h \
src/input/JoystickInput.h \
src/ui/JoystickWidget.h \
src/ui/DebugConsole.h \
src/ui/HDDisplay.h \
src/ui/MAVLinkSettingsWidget.h \
src/ui/AudioOutputWidget.h \
src/GAudioOutput.h \
src/LogCompressor.h \
src/ui/QGCParamWidget.h \
src/ui/QGCSensorSettingsWidget.h \
src/ui/linechart/Linecharts.h \
src/uas/SlugsMAV.h \
src/uas/PxQuadMAV.h \
src/uas/ArduPilotMegaMAV.h \
src/uas/senseSoarMAV.h \
src/ui/watchdog/WatchdogControl.h \
src/ui/watchdog/WatchdogProcessView.h \
src/ui/watchdog/WatchdogView.h \
src/uas/UASWaypointManager.h \
src/ui/HSIDisplay.h \
src/QGC.h \
src/ui/QGCFirmwareUpdate.h \
src/ui/QGCPxImuFirmwareUpdate.h \
src/ui/QGCDataPlot2D.h \
src/ui/linechart/IncrementalPlot.h \
src/ui/QGCRemoteControlView.h \
src/ui/RadioCalibration/RadioCalibrationData.h \
src/ui/RadioCalibration/RadioCalibrationWindow.h \
src/ui/RadioCalibration/AirfoilServoCalibrator.h \
src/ui/RadioCalibration/SwitchCalibrator.h \
src/ui/RadioCalibration/CurveCalibrator.h \
src/ui/RadioCalibration/AbstractCalibrator.h \
src/comm/QGCMAVLink.h \
src/ui/QGCWebView.h \
src/ui/map3D/QGCWebPage.h \
src/ui/SlugsDataSensorView.h \
src/ui/SlugsHilSim.h \
src/ui/SlugsPadCameraControl.h \
src/ui/QGCMainWindowAPConfigurator.h \
src/comm/MAVLinkSwarmSimulationLink.h \
src/ui/uas/QGCUnconnectedInfoWidget.h \
src/ui/designer/QGCToolWidget.h \
src/ui/designer/QGCParamSlider.h \
src/ui/designer/QGCCommandButton.h \
src/ui/designer/QGCToolWidgetItem.h \
src/ui/QGCMAVLinkLogPlayer.h \
src/comm/MAVLinkSimulationWaypointPlanner.h \
src/comm/MAVLinkSimulationMAV.h \
src/uas/QGCMAVLinkUASFactory.h \
src/ui/QGCWaypointListMulti.h \
src/ui/QGCUDPLinkConfiguration.h \
src/ui/QGCSettingsWidget.h \
src/ui/uas/UASControlParameters.h \
src/ui/mission/QGCMissionDoWidget.h \
src/ui/mission/QGCMissionConditionWidget.h \
src/uas/QGCUASParamManager.h \
src/ui/map/QGCMapWidget.h \
src/ui/map/MAV2DIcon.h \
src/ui/map/Waypoint2DIcon.h \
src/ui/map/QGCMapTool.h \
src/ui/map/QGCMapToolBar.h \
src/libs/qextserialport/qextserialenumerator.h \
src/QGCGeo.h \
src/ui/QGCToolBar.h \
src/ui/QGCMAVLinkInspector.h \
src/ui/MAVLinkDecoder.h \
src/ui/WaypointViewOnlyView.h \
src/ui/WaypointViewOnlyView.h \
src/ui/WaypointEditableView.h \
src/ui/UnconnectedUASInfoWidget.h \
src/ui/QGCRGBDView.h \
src/ui/mavlink/QGCMAVLinkMessageSender.h \
src/ui/firmwareupdate/QGCFirmwareUpdateWidget.h \
src/ui/QGCPluginHost.h \
src/ui/firmwareupdate/QGCPX4FirmwareUpdate.h \
$$TESTDIR/AutoTest.h \
$$TESTDIR/UASUnitTest.h \
# Google Earth is only supported on Mac OS and Windows with Visual Studio Compiler
macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010::HEADERS += src/ui/map3D/QGCGoogleEarthView.h
contains(DEPENDENCIES_PRESENT, osg) {
message("Including headers for OpenSceneGraph")
# Enable only if OpenSceneGraph is available
HEADERS += src/ui/map3D/gpl.h \
src/ui/map3D/CameraParams.h \
src/ui/map3D/ViewParamWidget.h \
src/ui/map3D/SystemContainer.h \
src/ui/map3D/SystemViewParams.h \
src/ui/map3D/GlobalViewParams.h \
src/ui/map3D/SystemGroupNode.h \
src/ui/map3D/Q3DWidget.h \
src/ui/map3D/GCManipulator.h \
src/ui/map3D/ImageWindowGeode.h \
src/ui/map3D/PixhawkCheetahGeode.h \
src/ui/map3D/Pixhawk3DWidget.h \
src/ui/map3D/Q3DWidgetFactory.h \
src/ui/map3D/WebImageCache.h \
src/ui/map3D/WebImage.h \
src/ui/map3D/TextureCache.h \
src/ui/map3D/Texture.h \
src/ui/map3D/Imagery.h \
src/ui/map3D/HUDScaleGeode.h \
src/ui/map3D/WaypointGroupNode.h \
src/ui/map3D/TerrainParamDialog.h \
src/ui/map3D/ImageryParamDialog.h
}
contains(DEPENDENCIES_PRESENT, protobuf):contains(MAVLINK_CONF, pixhawk) {
message("Including headers for Protocol Buffers")
# Enable only if protobuf is available
HEADERS += mavlink/include/v1.0/pixhawk/pixhawk.pb.h \
src/ui/map3D/ObstacleGroupNode.h \
src/ui/map3D/GLOverlayGeode.h
}
contains(DEPENDENCIES_PRESENT, libfreenect) {
message("Including headers for libfreenect")
# Enable only if libfreenect is available
HEADERS += src/input/Freenect.h
}
SOURCES += src/QGCCore.cc \
src/uas/UASManager.cc \
src/uas/UAS.cc \
src/comm/LinkManager.cc \
src/comm/LinkInterface.cpp \
src/comm/SerialLink.cc \
src/comm/MAVLinkProtocol.cc \
src/comm/QGCFlightGearLink.cc \
src/ui/CommConfigurationWindow.cc \
src/ui/SerialConfigurationWindow.cc \
src/ui/MainWindow.cc \
src/ui/uas/UASControlWidget.cc \
src/ui/uas/UASListWidget.cc \
src/ui/uas/UASInfoWidget.cc \
src/ui/HUD.cc \
src/ui/linechart/LinechartWidget.cc \
src/ui/linechart/LinechartPlot.cc \
src/ui/linechart/Scrollbar.cc \
src/ui/linechart/ScrollZoomer.cc \
src/ui/uas/UASView.cc \
src/ui/CameraView.cc \
src/comm/MAVLinkSimulationLink.cc \
src/comm/UDPLink.cc \
src/ui/ParameterInterface.cc \
src/ui/WaypointList.cc \
src/Waypoint.cc \
src/ui/ObjectDetectionView.cc \
src/input/JoystickInput.cc \
src/ui/JoystickWidget.cc \
src/ui/DebugConsole.cc \
src/ui/HDDisplay.cc \
src/ui/MAVLinkSettingsWidget.cc \
src/ui/AudioOutputWidget.cc \
src/GAudioOutput.cc \
src/LogCompressor.cc \
src/ui/QGCParamWidget.cc \
src/ui/QGCSensorSettingsWidget.cc \
src/ui/linechart/Linecharts.cc \
src/uas/SlugsMAV.cc \
src/uas/PxQuadMAV.cc \
src/uas/ArduPilotMegaMAV.cc \
src/uas/senseSoarMAV.cpp \
src/ui/watchdog/WatchdogControl.cc \
src/ui/watchdog/WatchdogProcessView.cc \
src/ui/watchdog/WatchdogView.cc \
src/uas/UASWaypointManager.cc \
src/ui/HSIDisplay.cc \
src/QGC.cc \
src/ui/QGCFirmwareUpdate.cc \
src/ui/QGCPxImuFirmwareUpdate.cc \
src/ui/QGCDataPlot2D.cc \
src/ui/linechart/IncrementalPlot.cc \
src/ui/QGCRemoteControlView.cc \
src/ui/RadioCalibration/RadioCalibrationWindow.cc \
src/ui/RadioCalibration/AirfoilServoCalibrator.cc \
src/ui/RadioCalibration/SwitchCalibrator.cc \
src/ui/RadioCalibration/CurveCalibrator.cc \
src/ui/RadioCalibration/AbstractCalibrator.cc \
src/ui/RadioCalibration/RadioCalibrationData.cc \
src/ui/QGCWebView.cc \
src/ui/map3D/QGCWebPage.cc \
src/ui/SlugsDataSensorView.cc \
src/ui/SlugsHilSim.cc \
src/ui/SlugsPadCameraControl.cpp \
src/ui/QGCMainWindowAPConfigurator.cc \
src/comm/MAVLinkSwarmSimulationLink.cc \
src/ui/uas/QGCUnconnectedInfoWidget.cc \
src/ui/designer/QGCToolWidget.cc \
src/ui/designer/QGCParamSlider.cc \
src/ui/designer/QGCCommandButton.cc \
src/ui/designer/QGCToolWidgetItem.cc \
src/ui/QGCMAVLinkLogPlayer.cc \
src/comm/MAVLinkSimulationWaypointPlanner.cc \
src/comm/MAVLinkSimulationMAV.cc \
src/uas/QGCMAVLinkUASFactory.cc \
src/ui/QGCWaypointListMulti.cc \
src/ui/QGCUDPLinkConfiguration.cc \
src/ui/QGCSettingsWidget.cc \
src/ui/uas/UASControlParameters.cpp \
src/ui/mission/QGCMissionDoWidget.cc \
src/ui/mission/QGCMissionConditionWidget.cc \
src/uas/QGCUASParamManager.cc \
src/ui/map/QGCMapWidget.cc \
src/ui/map/MAV2DIcon.cc \
src/ui/map/Waypoint2DIcon.cc \
src/ui/map/QGCMapTool.cc \
src/ui/map/QGCMapToolBar.cc \
src/ui/QGCToolBar.cc \
src/ui/QGCMAVLinkInspector.cc \
src/ui/MAVLinkDecoder.cc \
src/ui/WaypointViewOnlyView.cc \
src/ui/WaypointEditableView.cc \
src/ui/UnconnectedUASInfoWidget.cc \
src/ui/QGCRGBDView.cc \
src/ui/mavlink/QGCMAVLinkMessageSender.cc \
src/ui/firmwareupdate/QGCFirmwareUpdateWidget.cc \
src/ui/QGCPluginHost.cc \
src/ui/firmwareupdate/QGCPX4FirmwareUpdate.cc \
$$TESTDIR/testSuite.cc \
$$TESTDIR/UASUnitTest.cc
# Enable Google Earth only on Mac OS and Windows with Visual Studio compiler
macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010::SOURCES += src/ui/map3D/QGCGoogleEarthView.cc
# Enable OSG only if it has been found
contains(DEPENDENCIES_PRESENT, osg) {
message("Including sources for OpenSceneGraph")
# Enable only if OpenSceneGraph is available
SOURCES += src/ui/map3D/gpl.cc \
src/ui/map3D/CameraParams.cc \
src/ui/map3D/ViewParamWidget.cc \
src/ui/map3D/SystemContainer.cc \
src/ui/map3D/SystemViewParams.cc \
src/ui/map3D/GlobalViewParams.cc \
src/ui/map3D/SystemGroupNode.cc \
src/ui/map3D/Q3DWidget.cc \
src/ui/map3D/ImageWindowGeode.cc \
src/ui/map3D/GCManipulator.cc \
src/ui/map3D/PixhawkCheetahGeode.cc \
src/ui/map3D/Pixhawk3DWidget.cc \
src/ui/map3D/Q3DWidgetFactory.cc \
src/ui/map3D/WebImageCache.cc \
src/ui/map3D/WebImage.cc \
src/ui/map3D/TextureCache.cc \
src/ui/map3D/Texture.cc \
src/ui/map3D/Imagery.cc \
src/ui/map3D/HUDScaleGeode.cc \
src/ui/map3D/WaypointGroupNode.cc \
src/ui/map3D/TerrainParamDialog.cc \
src/ui/map3D/ImageryParamDialog.cc
contains(DEPENDENCIES_PRESENT, osgearth) {
message("Including sources for osgEarth")
# Enable only if OpenSceneGraph is available
SOURCES += src/ui/map3D/QMap3D.cc
}
}
contains(DEPENDENCIES_PRESENT, protobuf):contains(MAVLINK_CONF, pixhawk) {
message("Including sources for Protocol Buffers")
# Enable only if protobuf is available
SOURCES += mavlink/src/v1.0/pixhawk/pixhawk.pb.cc \
src/ui/map3D/ObstacleGroupNode.cc \
src/ui/map3D/GLOverlayGeode.cc
}
contains(DEPENDENCIES_PRESENT, libfreenect) {
message("Including sources for libfreenect")
# Enable only if libfreenect is available
SOURCES += src/input/Freenect.cc
}
# Add icons and other resources
RESOURCES += qgroundcontrol.qrc
# Include RT-LAB Library
win32:exists(src/lib/opalrt/OpalApi.h):exists(C:/OPAL-RT/RT-LAB7.2.4/Common/bin) {
message("Building support for Opal-RT")
LIBS += -LC:/OPAL-RT/RT-LAB7.2.4/Common/bin \
-lOpalApi
INCLUDEPATH += src/lib/opalrt
HEADERS += src/comm/OpalRT.h \
src/comm/OpalLink.h \
src/comm/Parameter.h \
src/comm/QGCParamID.h \
src/comm/ParameterList.h \
src/ui/OpalLinkConfigurationWindow.h
SOURCES += src/comm/OpalRT.cc \
src/comm/OpalLink.cc \
src/comm/Parameter.cc \
src/comm/QGCParamID.cc \
src/comm/ParameterList.cc \
src/ui/OpalLinkConfigurationWindow.cc
FORMS += src/ui/OpalLinkSettings.ui
DEFINES += OPAL_RT
}
TRANSLATIONS += es-MX.ts \
en-US.ts
# xbee support
# libxbee only supported by linux and windows systems
win32-msvc2008|win32-msvc2010|linux {
HEADERS += src/comm/XbeeLinkInterface.h \
src/comm/XbeeLink.h \
src/comm/HexSpinBox.h \
src/ui/XbeeConfigurationWindow.h \
src/comm/CallConv.h
SOURCES += src/comm/XbeeLink.cpp \
src/comm/HexSpinBox.cpp \
src/ui/XbeeConfigurationWindow.cpp
DEFINES += XBEELINK
INCLUDEPATH += thirdParty/libxbee
# TO DO: build library when it does not exist already
LIBS += -LthirdParty/libxbee/lib \
-llibxbee
}
src/ui/AudioOutputWidget.ui
View file @ 6c6684d3
......@@ -50,7 +50,7 @@
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/status/audio-volume-muted.svg</normaloff>:/images/status/audio-volume-muted.svg</iconset>
<normaloff>:/files/images/status/audio-volume-muted.svg</normaloff>:/files/images/status/audio-volume-muted.svg</iconset>
</property>
<property name="iconSize">
<size>
......
src/ui/CommConfigurationWindow.cc
View file @ 6c6684d3
......@@ -77,7 +77,7 @@ CommConfigurationWindow::CommConfigurationWindow(LinkInterface* link, ProtocolIn
// Create action to open this menu
// Create configuration action for this link
// Connect the current UAS
action = new QAction(QIcon(":/images/devices/network-wireless.svg"), "", this);
action = new QAction(QIcon(":/files/images/devices/network-wireless.svg"), "", this);
LinkManager::instance()->add(link);
action->setData(link->getId());
action->setEnabled(true);
......
src/ui/DebugConsole.ui
View file @ 6c6684d3
......@@ -201,7 +201,7 @@
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/actions/list-add.svg</normaloff>:/images/actions/list-add.svg</iconset>
<normaloff>:/files/images/actions/list-add.svg</normaloff>:/files/images/actions/list-add.svg</iconset>
</property>
</widget>
</item>
......@@ -225,7 +225,7 @@
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/devices/network-wireless.svg</normaloff>:/images/devices/network-wireless.svg</iconset>
<normaloff>:/files/images/devices/network-wireless.svg</normaloff>:/files/images/devices/network-wireless.svg</iconset>
</property>
</widget>
</item>
......
src/ui/MainWindow.cc
View file @ 6c6684d3
......@@ -868,12 +868,12 @@ void MainWindow::loadStyle(QGC_MAINWINDOW_STYLE style)
break;
case QGC_MAINWINDOW_STYLE_INDOOR:
qApp->setStyle("plastique");
styleFileName = ":/images/style-mission.css";
styleFileName = ":files/images/style-mission.css";
reloadStylesheet();
break;
case QGC_MAINWINDOW_STYLE_OUTDOOR:
qApp->setStyle("plastique");
styleFileName = ":/images/style-outdoor.css";
styleFileName = ":files/images/style-outdoor.css";
reloadStylesheet();
break;
}
......@@ -907,12 +907,12 @@ void MainWindow::reloadStylesheet()
QFile* styleSheet = new QFile(styleFileName);
if (!styleSheet->exists())
{
styleSheet = new QFile(":/images/style-mission.css");
styleSheet = new QFile(":files/images/style-mission.css");
}
if (styleSheet->open(QIODevice::ReadOnly | QIODevice::Text))
{
QString style = QString(styleSheet->readAll());
style.replace("ICONDIR", QCoreApplication::applicationDirPath()+ "/images/");
style.replace("ICONDIR", QCoreApplication::applicationDirPath()+ "files/images/");
qApp->setStyleSheet(style);
}
else
......@@ -1229,25 +1229,25 @@ void MainWindow::UASCreated(UASInterface* uas)
switch (uas->getSystemType())
{
case MAV_TYPE_GENERIC:
icon = QIcon(":/images/mavs/generic.svg");
icon = QIcon(":files/images/mavs/generic.svg");
break;
case MAV_TYPE_FIXED_WING:
icon = QIcon(":/images/mavs/fixed-wing.svg");
icon = QIcon(":files/images/mavs/fixed-wing.svg");
break;
case MAV_TYPE_QUADROTOR:
icon = QIcon(":/images/mavs/quadrotor.svg");
icon = QIcon(":files/images/mavs/quadrotor.svg");
break;
case MAV_TYPE_COAXIAL:
icon = QIcon(":/images/mavs/coaxial.svg");
icon = QIcon(":files/images/mavs/coaxial.svg");
break;
case MAV_TYPE_HELICOPTER:
icon = QIcon(":/images/mavs/helicopter.svg");
icon = QIcon(":files/images/mavs/helicopter.svg");
break;
case MAV_TYPE_GCS:
icon = QIcon(":/images/mavs/groundstation.svg");
icon = QIcon(":files/images/mavs/groundstation.svg");
break;
default:
icon = QIcon(":/images/mavs/unknown.svg");
icon = QIcon(":files/images/mavs/unknown.svg");
break;
}
......@@ -1308,7 +1308,7 @@ void MainWindow::UASCreated(UASInterface* uas)
if (!detectionDockWidget)
{
detectionDockWidget = new QDockWidget(tr("Object Recognition"), this);
detectionDockWidget->setWidget( new ObjectDetectionView("images/patterns", this) );
detectionDockWidget->setWidget( new ObjectDetectionView("files/images/patterns", this) );
detectionDockWidget->setObjectName("OBJECT_DETECTION_DOCK_WIDGET");
addTool(detectionDockWidget, tr("Object Recognition"), Qt::RightDockWidgetArea);
}
......
src/ui/MainWindow.ui
View file @ 6c6684d3
......@@ -160,7 +160,7 @@
<action name="actionExit">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/actions/system-log-out.svg</normaloff>:/images/actions/system-log-out.svg</iconset>
<normaloff>:/files/images/actions/system-log-out.svg</normaloff>:/files/images/actions/system-log-out.svg</iconset>
</property>
<property name="text">
<string>Exit</string>
......@@ -175,8 +175,8 @@
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/control/launch.svg</normaloff>
<normalon>:/images/control/launch.svg</normalon>:/images/control/launch.svg</iconset>
<normaloff>:/files/images/control/launch.svg</normaloff>
<normalon>:/files/images/control/launch.svg</normalon>:/files/images/control/launch.svg</iconset>
</property>
<property name="text">
<string>Liftoff</string>
......@@ -185,7 +185,7 @@
<action name="actionLand">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/control/land.svg</normaloff>:/images/control/land.svg</iconset>
<normaloff>:/files/images/control/land.svg</normaloff>:/files/images/control/land.svg</iconset>
</property>
<property name="text">
<string>Land</string>
......@@ -194,7 +194,7 @@
<action name="actionEmergency_Land">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/actions/process-stop.svg</normaloff>:/images/actions/process-stop.svg</iconset>
<normaloff>:/files/images/actions/process-stop.svg</normaloff>:/files/images/actions/process-stop.svg</iconset>
</property>
<property name="text">
<string>Emergency Land</string>
......@@ -206,7 +206,7 @@
<action name="actionEmergency_Kill">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/actions/process-stop.svg</normaloff>:/images/actions/process-stop.svg</iconset>
<normaloff>:/files/images/actions/process-stop.svg</normaloff>:/files/images/actions/process-stop.svg</iconset>
</property>
<property name="text">
<string>Kill UAS</string>
......@@ -218,7 +218,7 @@
<action name="actionAdd_Link">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/actions/list-add.svg</normaloff>:/images/actions/list-add.svg</iconset>
<normaloff>:/files/images/actions/list-add.svg</normaloff>:/files/images/actions/list-add.svg</iconset>
</property>
<property name="text">
<string>Add Link</string>
......@@ -227,7 +227,7 @@
<action name="actionConfiguration">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/categories/applications-system.svg</normaloff>:/images/categories/applications-system.svg</iconset>
<normaloff>:/files/images/categories/applications-system.svg</normaloff>:/files/images/categories/applications-system.svg</iconset>
</property>
<property name="text">
<string>Preferences</string>
......@@ -239,7 +239,7 @@
<action name="actionJoystickSettings">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/devices/input-gaming.svg</normaloff>:/images/devices/input-gaming.svg</iconset>
<normaloff>:/files/images/devices/input-gaming.svg</normaloff>:/files/images/devices/input-gaming.svg</iconset>
</property>
<property name="text">
<string>Joystick Test</string>
......@@ -254,7 +254,7 @@
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/control/launch.svg</normaloff>:/images/control/launch.svg</iconset>
<normaloff>:/files/images/control/launch.svg</normaloff>:/files/images/control/launch.svg</iconset>
</property>
<property name="text">
<string>Simulate</string>
......@@ -266,7 +266,7 @@
<action name="actionShow_Slugs_View">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/contrib/slugs.png</normaloff>:/images/contrib/slugs.png</iconset>
<normaloff>:/files/images/contrib/slugs.png</normaloff>:/files/images/contrib/slugs.png</iconset>
</property>
<property name="text">
<string>Show Slugs View</string>
......@@ -275,7 +275,7 @@
<action name="actionJoystick_Settings">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/devices/input-gaming.svg</normaloff>:/images/devices/input-gaming.svg</iconset>
<normaloff>:/files/images/devices/input-gaming.svg</normaloff>:/files/images/devices/input-gaming.svg</iconset>
</property>
<property name="text">
<string>Joystick Settings</string>
......@@ -287,7 +287,7 @@
<action name="actionOnline_Documentation">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/apps/utilities-system-monitor.svg</normaloff>:/images/apps/utilities-system-monitor.svg</iconset>
<normaloff>:/files/images/apps/utilities-system-monitor.svg</normaloff>:/files/images/apps/utilities-system-monitor.svg</iconset>
</property>
<property name="text">
<string>Online Documentation</string>
......@@ -296,7 +296,7 @@
<action name="actionProject_Roadmap_2">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/status/software-update-available.svg</normaloff>:/images/status/software-update-available.svg</iconset>
<normaloff>:/files/images/status/software-update-available.svg</normaloff>:/files/images/status/software-update-available.svg</iconset>
</property>
<property name="text">
<string>Project Roadmap</string>
......@@ -305,7 +305,7 @@
<action name="actionDeveloper_Credits">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/categories/preferences-system.svg</normaloff>:/images/categories/preferences-system.svg</iconset>
<normaloff>:/files/images/categories/preferences-system.svg</normaloff>:/files/images/categories/preferences-system.svg</iconset>
</property>
<property name="text">
<string>Developer Credits</string>
......@@ -317,7 +317,7 @@
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/status/weather-overcast.svg</normaloff>:/images/status/weather-overcast.svg</iconset>
<normaloff>:/files/images/status/weather-overcast.svg</normaloff>:/files/images/status/weather-overcast.svg</iconset>
</property>
<property name="text">
<string>Operator</string>
......@@ -332,7 +332,7 @@
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/apps/utilities-system-monitor.svg</normaloff>:/images/apps/utilities-system-monitor.svg</iconset>
<normaloff>:/files/images/apps/utilities-system-monitor.svg</normaloff>:/files/images/apps/utilities-system-monitor.svg</iconset>
</property>
<property name="text">
<string>Engineer</string>
......@@ -347,7 +347,7 @@
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/devices/network-wired.svg</normaloff>:/images/devices/network-wired.svg</iconset>
<normaloff>:/files/images/devices/network-wired.svg</normaloff>:/files/images/devices/network-wired.svg</iconset>
</property>
<property name="text">
<string>Mavlink</string>
......@@ -359,7 +359,7 @@
<action name="actionSelectStylesheet">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/categories/applications-internet.svg</normaloff>:/images/categories/applications-internet.svg</iconset>
<normaloff>:/files/images/categories/applications-internet.svg</normaloff>:/files/images/categories/applications-internet.svg</iconset>
</property>
<property name="text">
<string>Select Stylesheet</string>
......@@ -371,7 +371,7 @@
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/status/network-wireless-encrypted.svg</normaloff>:/images/status/network-wireless-encrypted.svg</iconset>
<normaloff>:/files/images/status/network-wireless-encrypted.svg</normaloff>:/files/images/status/network-wireless-encrypted.svg</iconset>
</property>
<property name="text">
<string>Pilot</string>
......@@ -383,7 +383,7 @@
<action name="actionNewCustomWidget">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/apps/utilities-system-monitor.svg</normaloff>:/images/apps/utilities-system-monitor.svg</iconset>
<normaloff>:/files/images/apps/utilities-system-monitor.svg</normaloff>:/files/images/apps/utilities-system-monitor.svg</iconset>
</property>
<property name="text">
<string>New Custom Widget</string>
......@@ -395,11 +395,11 @@
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/status/audio-volume-high.svg</normaloff>
<normalon>:/images/status/audio-volume-muted.svg</normalon>
<activeon>:/images/status/audio-volume-muted.svg</activeon>
<selectedoff>:/images/status/audio-volume-high.svg</selectedoff>
<selectedon>:/images/status/audio-volume-muted.svg</selectedon>:/images/status/audio-volume-high.svg</iconset>
<normaloff>:/files/images/status/audio-volume-high.svg</normaloff>
<normalon>:/files/images/status/audio-volume-muted.svg</normalon>
<activeon>:/files/images/status/audio-volume-muted.svg</activeon>
<selectedoff>:/files/images/status/audio-volume-high.svg</selectedoff>
<selectedon>:/files/images/status/audio-volume-muted.svg</selectedon>:/files/images/status/audio-volume-high.svg</iconset>
</property>
<property name="text">
<string>Mute Audio Output</string>
......@@ -411,7 +411,7 @@
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/devices/network-wireless.svg</normaloff>:/images/devices/network-wireless.svg</iconset>
<normaloff>:/files/images/devices/network-wireless.svg</normaloff>:/files/images/devices/network-wireless.svg</iconset>
</property>
<property name="text">
<string>Unconnected</string>
......@@ -423,7 +423,7 @@
<action name="actionShutdownMAV">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/actions/system-log-out.svg</normaloff>:/images/actions/system-log-out.svg</iconset>
<normaloff>:/files/images/actions/system-log-out.svg</normaloff>:/files/images/actions/system-log-out.svg</iconset>
</property>
<property name="text">
<string>Shutdown MAV</string>
......@@ -467,7 +467,7 @@
<action name="actionLoadCustomWidgetFile">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/status/folder-drag-accept.svg</normaloff>:/images/status/folder-drag-accept.svg</iconset>
<normaloff>:/files/images/status/folder-drag-accept.svg</normaloff>:/files/images/status/folder-drag-accept.svg</iconset>
</property>
<property name="text">
<string>Load Custom Widget File</string>
......@@ -476,7 +476,7 @@
<action name="actionFirmwareUpdateView">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/status/software-update-available.svg</normaloff>:/images/status/software-update-available.svg</iconset>
<normaloff>:/files/images/status/software-update-available.svg</normaloff>:/files/images/status/software-update-available.svg</iconset>
</property>
<property name="text">
<string>Firmware Update</string>
......
src/ui/MapWidget.cc
View file @ 6c6684d3
......@@ -123,11 +123,11 @@ void MapWidget::init()
// Add controls to select map provider
/////////////////////////////////////////////////
QActionGroup* mapproviderGroup = new QActionGroup(this);
osmAction = new QAction(QIcon(":/images/mapproviders/openstreetmap.png"), tr("OpenStreetMap"), mapproviderGroup);
yahooActionMap = new QAction(QIcon(":/images/mapproviders/yahoo.png"), tr("Yahoo: Map"), mapproviderGroup);
yahooActionSatellite = new QAction(QIcon(":/images/mapproviders/yahoo.png"), tr("Yahoo: Satellite"), mapproviderGroup);
googleActionMap = new QAction(QIcon(":/images/mapproviders/google.png"), tr("Google: Map"), mapproviderGroup);
googleSatAction = new QAction(QIcon(":/images/mapproviders/google.png"), tr("Google: Sat"), mapproviderGroup);
osmAction = new QAction(QIcon(":/files/images/mapproviders/openstreetmap.png"), tr("OpenStreetMap"), mapproviderGroup);
yahooActionMap = new QAction(QIcon(":/files/images/mapproviders/yahoo.png"), tr("Yahoo: Map"), mapproviderGroup);
yahooActionSatellite = new QAction(QIcon(":/files/images/mapproviders/yahoo.png"), tr("Yahoo: Satellite"), mapproviderGroup);
googleActionMap = new QAction(QIcon(":/files/images/mapproviders/google.png"), tr("Google: Map"), mapproviderGroup);
googleSatAction = new QAction(QIcon(":/files/images/mapproviders/google.png"), tr("Google: Sat"), mapproviderGroup);
osmAction->setCheckable(true);
yahooActionMap->setCheckable(true);
yahooActionSatellite->setCheckable(true);
......@@ -163,17 +163,17 @@ void MapWidget::init()
mapButton->setStyleSheet(buttonStyle);
// create buttons to control the map (zoom, GPS tracking and WP capture)
QPushButton* zoomin = new QPushButton(QIcon(":/images/actions/list-add.svg"), "", this);
QPushButton* zoomin = new QPushButton(QIcon(":/files/images/actions/list-add.svg"), "", this);
zoomin->setStyleSheet(buttonStyle);
QPushButton* zoomout = new QPushButton(QIcon(":/images/actions/list-remove.svg"), "", this);
QPushButton* zoomout = new QPushButton(QIcon(":/files/images/actions/list-remove.svg"), "", this);
zoomout->setStyleSheet(buttonStyle);
createPath = new QPushButton(QIcon(":/images/actions/go-bottom.svg"), "", this);
createPath = new QPushButton(QIcon(":/files/images/actions/go-bottom.svg"), "", this);
createPath->setStyleSheet(buttonStyle);
createPath->setToolTip(tr("Start / end waypoint add mode"));
createPath->setStatusTip(tr("Start / end waypoint add mode"));
// clearTracking = new QPushButton(QIcon(""), "", this);
// clearTracking->setStyleSheet(buttonStyle);
followgps = new QPushButton(QIcon(":/images/actions/system-lock-screen.svg"), "", this);
followgps = new QPushButton(QIcon(":/files/images/actions/system-lock-screen.svg"), "", this);
followgps->setStyleSheet(buttonStyle);
followgps->setToolTip(tr("Follow the position of the current MAV with the map center"));
followgps->setStatusTip(tr("Follow the position of the current MAV with the map center"));
......
src/ui/ObjectDetectionView.h
View file @ 6c6684d3
......@@ -65,7 +65,7 @@ class ObjectDetectionView : public QWidget
};
public:
explicit ObjectDetectionView(QString folder="images/patterns", QWidget *parent = 0);
explicit ObjectDetectionView(QString folder="files/images/patterns", QWidget *parent = 0);
virtual ~ObjectDetectionView();
/** @brief Resize widget contents */
......
src/ui/OpalLinkSettings.ui
View file @ 6c6684d3
......@@ -75,7 +75,7 @@
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/status/folder-open.svg</normaloff>:/images/status/folder-open.svg</iconset>
<normaloff>:/files/images/status/folder-open.svg</normaloff>:/files/images/status/folder-open.svg</iconset>
</property>
</widget>
</item>
......@@ -89,7 +89,7 @@
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/status/folder-open.svg</normaloff>:/images/status/folder-open.svg</iconset>
<normaloff>:/files/images/status/folder-open.svg</normaloff>:/files/images/status/folder-open.svg</iconset>
</property>
</widget>
</item>
......
src/ui/QGCMAVLinkLogPlayer.cc
View file @ 6c6684d3
......@@ -104,7 +104,7 @@ void QGCMAVLinkLogPlayer::play()
}
isPlaying = true;
ui->logStatsLabel->setText(tr("Started playing.."));
ui->playButton->setIcon(QIcon(":images/actions/media-playback-pause.svg"));
ui->playButton->setIcon(QIcon(":files/images/actions/media-playback-pause.svg"));
}
else
{
......@@ -123,7 +123,7 @@ void QGCMAVLinkLogPlayer::pause()
{
isPlaying = false;
loopTimer.stop();
ui->playButton->setIcon(QIcon(":images/actions/media-playback-start.svg"));
ui->playButton->setIcon(QIcon(":files/images/actions/media-playback-start.svg"));
ui->selectFileButton->setEnabled(true);
if (logLink)
{
......@@ -153,7 +153,7 @@ bool QGCMAVLinkLogPlayer::reset(int packetIndex)
result = false;
}
ui->playButton->setIcon(QIcon(":images/actions/media-playback-start.svg"));
ui->playButton->setIcon(QIcon(":files/images/actions/media-playback-start.svg"));
ui->positionSlider->blockSignals(true);
int sliderVal = (packetIndex / (double)(logFile.size()/packetSize)) * (ui->positionSlider->maximum() - ui->positionSlider->minimum());
ui->positionSlider->setValue(sliderVal);
......
src/ui/QGCMAVLinkLogPlayer.ui
View file @ 6c6684d3
......@@ -123,7 +123,7 @@
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/actions/media-playback-start.svg</normaloff>:/images/actions/media-playback-start.svg</iconset>
<normaloff>:/files/images/actions/media-playback-start.svg</normaloff>:/files/images/actions/media-playback-start.svg</iconset>
</property>
<property name="checkable">
<bool>true</bool>
......
src/ui/QGCRGBDView.cc
View file @ 6c6684d3
......@@ -76,7 +76,7 @@ void QGCRGBDView::setActiveUAS(UASInterface* uas)
void QGCRGBDView::clearData(void)
{
QImage offlineImg;
qDebug() << offlineImg.load(":/images/status/colorbars.png");
qDebug() << offlineImg.load(":/files/images/status/colorbars.png");
glImage = QGLWidget::convertToGLFormat(offlineImg);
}
......
src/ui/QGCSettingsWidget.ui
View file @ 6c6684d3
......@@ -31,7 +31,7 @@
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/status/audio-volume-muted.svg</normaloff>:/images/status/audio-volume-muted.svg</iconset>
<normaloff>:/files/images/status/audio-volume-muted.svg</normaloff>:/files/images/status/audio-volume-muted.svg</iconset>
</property>
</widget>
</item>
......@@ -42,7 +42,7 @@
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/devices/network-wireless.svg</normaloff>:/images/devices/network-wireless.svg</iconset>
<normaloff>:/files/images/devices/network-wireless.svg</normaloff>:/files/images/devices/network-wireless.svg</iconset>
</property>
</widget>
</item>
......
src/ui/QGCToolBar.cc
View file @ 6c6684d3
......@@ -370,25 +370,25 @@ void QGCToolBar::setSystemType(UASInterface* uas, unsigned int systemType)
// Set matching icon
switch (systemType) {
case 0:
symbolButton->setIcon(QIcon(":/images/mavs/generic.svg"));
symbolButton->setIcon(QIcon(":/files/images/mavs/generic.svg"));
break;
case 1:
symbolButton->setIcon(QIcon(":/images/mavs/fixed-wing.svg"));
symbolButton->setIcon(QIcon(":/files/images/mavs/fixed-wing.svg"));
break;
case 2:
symbolButton->setIcon(QIcon(":/images/mavs/quadrotor.svg"));
symbolButton->setIcon(QIcon(":/files/images/mavs/quadrotor.svg"));
break;
case 3:
symbolButton->setIcon(QIcon(":/images/mavs/coaxial.svg"));
symbolButton->setIcon(QIcon(":/files/images/mavs/coaxial.svg"));
break;
case 4:
symbolButton->setIcon(QIcon(":/images/mavs/helicopter.svg"));
symbolButton->setIcon(QIcon(":/files/images/mavs/helicopter.svg"));
break;
case 5:
symbolButton->setIcon(QIcon(":/images/mavs/unknown.svg"));
symbolButton->setIcon(QIcon(":/files/images/mavs/unknown.svg"));
break;
default:
symbolButton->setIcon(QIcon(":/images/mavs/unknown.svg"));
symbolButton->setIcon(QIcon(":/files/images/mavs/unknown.svg"));
break;
}
}
......
src/ui/SerialConfigurationWindow.cc
View file @ 6c6684d3
......@@ -52,7 +52,7 @@ SerialConfigurationWindow::SerialConfigurationWindow(LinkInterface* link, QWidge
// Create action to open this menu
// Create configuration action for this link
// Connect the current UAS
action = new QAction(QIcon(":/images/devices/network-wireless.svg"), "", link);
action = new QAction(QIcon(":/files/images/devices/network-wireless.svg"), "", link);
setLinkName(link->getName());
setupPortList();
......
src/ui/UASControl.ui
View file @ 6c6684d3
......@@ -113,7 +113,7 @@
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/control/launch.svg</normaloff>:/images/control/launch.svg</iconset>
<normaloff>:/files/images/control/launch.svg</normaloff>:/files/images/control/launch.svg</iconset>
</property>
</widget>
</item>
......@@ -136,7 +136,7 @@
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/control/land.svg</normaloff>:/images/control/land.svg</iconset>
<normaloff>:/files/images/control/land.svg</normaloff>:/files/images/control/land.svg</iconset>
</property>
</widget>
</item>
......@@ -159,7 +159,7 @@
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/actions/system-log-out.svg</normaloff>:/images/actions/system-log-out.svg</iconset>
<normaloff>:/files/images/actions/system-log-out.svg</normaloff>:/files/images/actions/system-log-out.svg</iconset>
</property>
</widget>
</item>
......@@ -200,7 +200,7 @@
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/devices/network-wireless.svg</normaloff>:/images/devices/network-wireless.svg</iconset>
<normaloff>:/files/images/devices/network-wireless.svg</normaloff>:/files/images/devices/network-wireless.svg</iconset>
</property>
</widget>
</item>
......
src/ui/UASView.ui
View file @ 6c6684d3
......@@ -316,7 +316,7 @@ QMenu::separator {
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/mavs/unknown.svg</normaloff>:/images/mavs/unknown.svg</iconset>
<normaloff>:/files/images/mavs/unknown.svg</normaloff>:/files/images/mavs/unknown.svg</iconset>
</property>
<property name="iconSize">
<size>
......@@ -648,7 +648,7 @@ QMenu::separator {
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/control/launch.svg</normaloff>:/images/control/launch.svg</iconset>
<normaloff>:/files/images/control/launch.svg</normaloff>:/files/images/control/launch.svg</iconset>
</property>
</widget>
</item>
......@@ -677,7 +677,7 @@ QMenu::separator {
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/actions/media-playback-pause.svg</normaloff>:/images/actions/media-playback-pause.svg</iconset>
<normaloff>:/files/images/actions/media-playback-pause.svg</normaloff>:/files/images/actions/media-playback-pause.svg</iconset>
</property>
</widget>
</item>
......@@ -706,7 +706,7 @@ QMenu::separator {
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/actions/media-playback-start.svg</normaloff>:/images/actions/media-playback-start.svg</iconset>
<normaloff>:/files/images/actions/media-playback-start.svg</normaloff>:/files/images/actions/media-playback-start.svg</iconset>
</property>
</widget>
</item>
......@@ -735,7 +735,7 @@ QMenu::separator {
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/control/land.svg</normaloff>:/images/control/land.svg</iconset>
<normaloff>:/files/images/control/land.svg</normaloff>:/files/images/control/land.svg</iconset>
</property>
</widget>
</item>
......@@ -758,7 +758,7 @@ QMenu::separator {
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/actions/system-log-out.svg</normaloff>:/images/actions/system-log-out.svg</iconset>
<normaloff>:/files/images/actions/system-log-out.svg</normaloff>:/files/images/actions/system-log-out.svg</iconset>
</property>
</widget>
</item>
......@@ -793,7 +793,7 @@ QMenu::separator {
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/actions/media-playback-stop.svg</normaloff>:/images/actions/media-playback-stop.svg</iconset>
<normaloff>:/files/images/actions/media-playback-stop.svg</normaloff>:/files/images/actions/media-playback-stop.svg</iconset>
</property>
</widget>
</item>
......@@ -822,7 +822,7 @@ QMenu::separator {
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/actions/process-stop.svg</normaloff>:/images/actions/process-stop.svg</iconset>
<normaloff>:/files/images/actions/process-stop.svg</normaloff>:/files/images/actions/process-stop.svg</iconset>
</property>
</widget>
</item>
......
src/ui/WaypointEditableView.ui
View file @ 6c6684d3
......@@ -288,7 +288,7 @@ QPushButton:pressed {
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/actions/go-up.svg</normaloff>:/images/actions/go-up.svg</iconset>
<normaloff>:/files/images/actions/go-up.svg</normaloff>:/files/images/actions/go-up.svg</iconset>
</property>
</widget>
</item>
......@@ -320,7 +320,7 @@ QPushButton:pressed {
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/actions/go-down.svg</normaloff>:/images/actions/go-down.svg</iconset>
<normaloff>:/files/images/actions/go-down.svg</normaloff>:/files/images/actions/go-down.svg</iconset>
</property>
</widget>
</item>
......@@ -349,7 +349,7 @@ QPushButton:pressed {
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/actions/list-remove.svg</normaloff>:/images/actions/list-remove.svg</iconset>
<normaloff>:/files/images/actions/list-remove.svg</normaloff>:/files/images/actions/list-remove.svg</iconset>
</property>
</widget>
</item>
......
src/ui/WaypointList.ui
View file @ 6c6684d3
......@@ -153,7 +153,7 @@
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/actions/go-bottom.svg</normaloff>:/images/actions/go-bottom.svg</iconset>
<normaloff>:/files/images/actions/go-bottom.svg</normaloff>:/files/images/actions/go-bottom.svg</iconset>
</property>
</widget>
</item>
......@@ -173,7 +173,7 @@
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/actions/list-add.svg</normaloff>:/images/actions/list-add.svg</iconset>
<normaloff>:/files/images/actions/list-add.svg</normaloff>:/files/images/actions/list-add.svg</iconset>
</property>
</widget>
</item>
......@@ -193,7 +193,7 @@
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/actions/process-stop.svg</normaloff>:/images/actions/process-stop.svg</iconset>
<normaloff>:/files/images/actions/process-stop.svg</normaloff>:/files/images/actions/process-stop.svg</iconset>
</property>
</widget>
</item>
......@@ -213,7 +213,7 @@
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/status/software-update-available.svg</normaloff>:/images/status/software-update-available.svg</iconset>
<normaloff>:/files/images/status/software-update-available.svg</normaloff>:/files/images/status/software-update-available.svg</iconset>
</property>
</widget>
</item>
......@@ -233,7 +233,7 @@
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/devices/network-wireless.svg</normaloff>:/images/devices/network-wireless.svg</iconset>
<normaloff>:/files/images/devices/network-wireless.svg</normaloff>:/files/images/devices/network-wireless.svg</iconset>
</property>
</widget>
</item>
......@@ -343,7 +343,7 @@
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/actions/go-jump.svg</normaloff>:/images/actions/go-jump.svg</iconset>
<normaloff>:/files/images/actions/go-jump.svg</normaloff>:/files/images/actions/go-jump.svg</iconset>
</property>
</widget>
</item>
......@@ -355,7 +355,7 @@
<action name="actionAddWaypoint">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/actions/list-add.svg</normaloff>:/images/actions/list-add.svg</iconset>
<normaloff>:/files/images/actions/list-add.svg</normaloff>:/files/images/actions/list-add.svg</iconset>
</property>
<property name="text">
<string>Add Waypoint</string>
......@@ -367,7 +367,7 @@
<action name="actionTransmit">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/devices/network-wireless.svg</normaloff>:/images/devices/network-wireless.svg</iconset>
<normaloff>:/files/images/devices/network-wireless.svg</normaloff>:/files/images/devices/network-wireless.svg</iconset>
</property>
<property name="text">
<string>Transmit</string>
......@@ -379,7 +379,7 @@
<action name="actionRead">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/images/status/software-update-available.svg</normaloff>:/images/status/software-update-available.svg</iconset>
<normaloff>:/files/images/status/software-update-available.svg</normaloff>:/files/images/status/software-update-available.svg</iconset>
</property>
<property name="text">
<string>Read</string>
......
src/ui/XbeeConfigurationWindow.cpp
View file @ 6c6684d3
......@@ -203,7 +203,7 @@ XbeeConfigurationWindow::XbeeConfigurationWindow(LinkInterface* link, QWidget *p
{
this->link = xbeeLink;
action = new QAction(QIcon(":/images/devices/network-wireless.svg"), "", link);
action = new QAction(QIcon(":/files/images/devices/network-wireless.svg"), "", link);
baudLabel = new QLabel;
baudLabel->setText(tr("Baut Rate"));
......
src/ui/generated/AudioOutputWidget.h
View file @ 6c6684d3
......@@ -48,7 +48,7 @@ public:
muteButton = new QPushButton(AudioOutputWidget);
muteButton->setObjectName(QString::fromUtf8("muteButton"));
QIcon icon;
icon.addFile(QString::fromUtf8(":/images/status/audio-volume-muted.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon.addFile(QString::fromUtf8(":/files/images/status/audio-volume-muted.svg"), QSize(), QIcon::Normal, QIcon::Off);
muteButton->setIcon(icon);
muteButton->setIconSize(QSize(16, 16));
......
src/ui/generated/DebugConsole.h
View file @ 6c6684d3
......@@ -107,7 +107,7 @@ public:
transmitButton = new QPushButton(DebugConsole);
transmitButton->setObjectName(QString::fromUtf8("transmitButton"));
QIcon icon;
icon.addFile(QString::fromUtf8(":/images/devices/network-wireless.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon.addFile(QString::fromUtf8(":/files/images/devices/network-wireless.svg"), QSize(), QIcon::Normal, QIcon::Off);
transmitButton->setIcon(icon);
horizontalLayout->addWidget(transmitButton);
......
src/ui/generated/UASControl.h
View file @ 6c6684d3
......@@ -71,7 +71,7 @@ public:
liftoffButton = new QPushButton(uasControl);
liftoffButton->setObjectName(QString::fromUtf8("liftoffButton"));
QIcon icon;
icon.addFile(QString::fromUtf8(":/images/control/launch.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon.addFile(QString::fromUtf8(":/files/images/control/launch.svg"), QSize(), QIcon::Normal, QIcon::Off);
liftoffButton->setIcon(icon);
gridLayout->addWidget(liftoffButton, 3, 1, 1, 1);
......@@ -79,7 +79,7 @@ public:
landButton = new QPushButton(uasControl);
landButton->setObjectName(QString::fromUtf8("landButton"));
QIcon icon1;
icon1.addFile(QString::fromUtf8(":/images/control/land.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon1.addFile(QString::fromUtf8(":/files/images/control/land.svg"), QSize(), QIcon::Normal, QIcon::Off);
landButton->setIcon(icon1);
gridLayout->addWidget(landButton, 3, 2, 1, 2);
......@@ -87,7 +87,7 @@ public:
shutdownButton = new QPushButton(uasControl);
shutdownButton->setObjectName(QString::fromUtf8("shutdownButton"));
QIcon icon2;
icon2.addFile(QString::fromUtf8(":/images/actions/system-log-out.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon2.addFile(QString::fromUtf8(":/files/images/actions/system-log-out.svg"), QSize(), QIcon::Normal, QIcon::Off);
shutdownButton->setIcon(icon2);
gridLayout->addWidget(shutdownButton, 3, 4, 1, 1);
......@@ -104,7 +104,7 @@ public:
setModeButton = new QPushButton(uasControl);
setModeButton->setObjectName(QString::fromUtf8("setModeButton"));
QIcon icon3;
icon3.addFile(QString::fromUtf8(":/images/devices/network-wireless.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon3.addFile(QString::fromUtf8(":/files/images/devices/network-wireless.svg"), QSize(), QIcon::Normal, QIcon::Off);
setModeButton->setIcon(icon3);
gridLayout->addWidget(setModeButton, 4, 3, 1, 2);
......
src/ui/generated/UASView.h
View file @ 6c6684d3
......@@ -249,7 +249,7 @@ public:
typeButton->setMaximumSize(QSize(48, 48));
typeButton->setBaseSize(QSize(30, 30));
QIcon icon;
icon.addFile(QString::fromUtf8(":/images/mavs/unknown.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon.addFile(QString::fromUtf8(":/files/images/mavs/unknown.svg"), QSize(), QIcon::Normal, QIcon::Off);
typeButton->setIcon(icon);
typeButton->setIconSize(QSize(42, 42));
......@@ -384,7 +384,7 @@ public:
liftoffButton->setObjectName(QString::fromUtf8("liftoffButton"));
liftoffButton->setMinimumSize(QSize(26, 22));
QIcon icon1;
icon1.addFile(QString::fromUtf8(":/images/control/launch.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon1.addFile(QString::fromUtf8(":/files/images/control/launch.svg"), QSize(), QIcon::Normal, QIcon::Off);
liftoffButton->setIcon(icon1);
horizontalLayout->addWidget(liftoffButton);
......@@ -393,7 +393,7 @@ public:
haltButton->setObjectName(QString::fromUtf8("haltButton"));
haltButton->setMinimumSize(QSize(26, 22));
QIcon icon2;
icon2.addFile(QString::fromUtf8(":/images/actions/media-playback-pause.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon2.addFile(QString::fromUtf8(":/files/images/actions/media-playback-pause.svg"), QSize(), QIcon::Normal, QIcon::Off);
haltButton->setIcon(icon2);
horizontalLayout->addWidget(haltButton);
......@@ -402,7 +402,7 @@ public:
continueButton->setObjectName(QString::fromUtf8("continueButton"));
continueButton->setMinimumSize(QSize(26, 22));
QIcon icon3;
icon3.addFile(QString::fromUtf8(":/images/actions/media-playback-start.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon3.addFile(QString::fromUtf8(":/files/images/actions/media-playback-start.svg"), QSize(), QIcon::Normal, QIcon::Off);
continueButton->setIcon(icon3);
horizontalLayout->addWidget(continueButton);
......@@ -411,7 +411,7 @@ public:
landButton->setObjectName(QString::fromUtf8("landButton"));
landButton->setMinimumSize(QSize(26, 22));
QIcon icon4;
icon4.addFile(QString::fromUtf8(":/images/control/land.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon4.addFile(QString::fromUtf8(":/files/images/control/land.svg"), QSize(), QIcon::Normal, QIcon::Off);
landButton->setIcon(icon4);
horizontalLayout->addWidget(landButton);
......@@ -419,7 +419,7 @@ public:
shutdownButton = new QPushButton(uasViewFrame);
shutdownButton->setObjectName(QString::fromUtf8("shutdownButton"));
QIcon icon5;
icon5.addFile(QString::fromUtf8(":/images/actions/system-log-out.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon5.addFile(QString::fromUtf8(":/files/images/actions/system-log-out.svg"), QSize(), QIcon::Normal, QIcon::Off);
shutdownButton->setIcon(icon5);
horizontalLayout->addWidget(shutdownButton);
......@@ -428,7 +428,7 @@ public:
abortButton->setObjectName(QString::fromUtf8("abortButton"));
abortButton->setMinimumSize(QSize(26, 22));
QIcon icon6;
icon6.addFile(QString::fromUtf8(":/images/actions/media-playback-stop.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon6.addFile(QString::fromUtf8(":/files/images/actions/media-playback-stop.svg"), QSize(), QIcon::Normal, QIcon::Off);
abortButton->setIcon(icon6);
horizontalLayout->addWidget(abortButton);
......@@ -437,7 +437,7 @@ public:
killButton->setObjectName(QString::fromUtf8("killButton"));
killButton->setMinimumSize(QSize(26, 22));
QIcon icon7;
icon7.addFile(QString::fromUtf8(":/images/actions/process-stop.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon7.addFile(QString::fromUtf8(":/files/images/actions/process-stop.svg"), QSize(), QIcon::Normal, QIcon::Off);
killButton->setIcon(icon7);
horizontalLayout->addWidget(killButton);
......
src/ui/generated/WaypointList.h
View file @ 6c6684d3
......@@ -54,17 +54,17 @@ public:
actionAddWaypoint = new QAction(WaypointList);
actionAddWaypoint->setObjectName(QString::fromUtf8("actionAddWaypoint"));
QIcon icon;
icon.addFile(QString::fromUtf8(":/images/actions/list-add.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon.addFile(QString::fromUtf8(":/files/images/actions/list-add.svg"), QSize(), QIcon::Normal, QIcon::Off);
actionAddWaypoint->setIcon(icon);
actionTransmit = new QAction(WaypointList);
actionTransmit->setObjectName(QString::fromUtf8("actionTransmit"));
QIcon icon1;
icon1.addFile(QString::fromUtf8(":/images/devices/network-wireless.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon1.addFile(QString::fromUtf8(":/files/images/devices/network-wireless.svg"), QSize(), QIcon::Normal, QIcon::Off);
actionTransmit->setIcon(icon1);
actionRead = new QAction(WaypointList);
actionRead->setObjectName(QString::fromUtf8("actionRead"));
QIcon icon2;
icon2.addFile(QString::fromUtf8(":/images/status/software-update-available.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon2.addFile(QString::fromUtf8(":/files/images/status/software-update-available.svg"), QSize(), QIcon::Normal, QIcon::Off);
actionRead->setIcon(icon2);
gridLayout = new QGridLayout(WaypointList);
gridLayout->setSpacing(4);
......@@ -129,7 +129,7 @@ public:
positionAddButton = new QToolButton(WaypointList);
positionAddButton->setObjectName(QString::fromUtf8("positionAddButton"));
QIcon icon3;
icon3.addFile(QString::fromUtf8(":/images/actions/go-bottom.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon3.addFile(QString::fromUtf8(":/files/images/actions/go-bottom.svg"), QSize(), QIcon::Normal, QIcon::Off);
positionAddButton->setIcon(icon3);
gridLayout->addWidget(positionAddButton, 2, 5, 1, 1);
......
src/ui/generated/WaypointView.h
View file @ 6c6684d3
......@@ -144,7 +144,7 @@ public:
upButton->setObjectName(QString::fromUtf8("upButton"));
upButton->setMinimumSize(QSize(28, 22));
QIcon icon;
icon.addFile(QString::fromUtf8(":/images/actions/go-up.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon.addFile(QString::fromUtf8(":/files/images/actions/go-up.svg"), QSize(), QIcon::Normal, QIcon::Off);
upButton->setIcon(icon);
horizontalLayout->addWidget(upButton);
......@@ -153,7 +153,7 @@ public:
downButton->setObjectName(QString::fromUtf8("downButton"));
downButton->setMinimumSize(QSize(28, 22));
QIcon icon1;
icon1.addFile(QString::fromUtf8(":/images/actions/go-down.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon1.addFile(QString::fromUtf8(":/files/images/actions/go-down.svg"), QSize(), QIcon::Normal, QIcon::Off);
downButton->setIcon(icon1);
horizontalLayout->addWidget(downButton);
......@@ -162,7 +162,7 @@ public:
removeButton->setObjectName(QString::fromUtf8("removeButton"));
removeButton->setMinimumSize(QSize(28, 22));
QIcon icon2;
icon2.addFile(QString::fromUtf8(":/images/actions/list-remove.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon2.addFile(QString::fromUtf8(":/files/images/actions/list-remove.svg"), QSize(), QIcon::Normal, QIcon::Off);
removeButton->setIcon(icon2);
horizontalLayout->addWidget(removeButton);
......
src/ui/generated/XMLCommProtocolWidget.h
View file @ 6c6684d3
......@@ -60,7 +60,7 @@ public:
selectFileButton = new QPushButton(XMLCommProtocolWidget);
selectFileButton->setObjectName(QString::fromUtf8("selectFileButton"));
QIcon icon;
icon.addFile(QString::fromUtf8(":/images/status/folder-open.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon.addFile(QString::fromUtf8(":/files/images/status/folder-open.svg"), QSize(), QIcon::Normal, QIcon::Off);
selectFileButton->setIcon(icon);
gridLayout->addWidget(selectFileButton, 0, 2, 1, 1);
......@@ -112,7 +112,7 @@ public:
generateButton = new QPushButton(XMLCommProtocolWidget);
generateButton->setObjectName(QString::fromUtf8("generateButton"));
QIcon icon1;
icon1.addFile(QString::fromUtf8(":/images/categories/applications-system.svg"), QSize(), QIcon::Normal, QIcon::Off);
icon1.addFile(QString::fromUtf8(":/files/images/categories/applications-system.svg"), QSize(), QIcon::Normal, QIcon::Off);
generateButton->setIcon(icon1);
gridLayout->addWidget(generateButton, 5, 2, 1, 1);
......
src/ui/map3D/Q3DWidget.cc
View file @ 6c6684d3
......@@ -55,7 +55,7 @@ Q3DWidget::Q3DWidget(QWidget* parent)
fontImpl = new osgQt::QFontImplementation(QFont(":/general/vera.ttf"));
#else
osg::ref_ptr<osgText::Font::FontImplementation> fontImpl;
fontImpl = 0;//new osgText::Font::Font("images/Vera.ttf");
fontImpl = 0;//new osgText::Font::Font("files/images/Vera.ttf");
#endif
mFont = new osgText::Font(fontImpl);
......
src/ui/uas/UASView.cc
View file @ 6c6684d3
......@@ -321,22 +321,22 @@ void UASView::setSystemType(UASInterface* uas, unsigned int systemType)
switch (systemType)
{
case 0:
m_ui->typeButton->setIcon(QIcon(":/images/mavs/generic.svg"));
m_ui->typeButton->setIcon(QIcon(":/files/images/mavs/generic.svg"));
break;
case 1:
m_ui->typeButton->setIcon(QIcon(":/images/mavs/fixed-wing.svg"));
m_ui->typeButton->setIcon(QIcon(":/files/images/mavs/fixed-wing.svg"));
break;
case 2:
m_ui->typeButton->setIcon(QIcon(":/images/mavs/quadrotor.svg"));
m_ui->typeButton->setIcon(QIcon(":/files/images/mavs/quadrotor.svg"));
break;
case 3:
m_ui->typeButton->setIcon(QIcon(":/images/mavs/coaxial.svg"));
m_ui->typeButton->setIcon(QIcon(":/files/images/mavs/coaxial.svg"));
break;
case 4:
m_ui->typeButton->setIcon(QIcon(":/images/mavs/helicopter.svg"));
m_ui->typeButton->setIcon(QIcon(":/files/images/mavs/helicopter.svg"));
break;
case 5:
m_ui->typeButton->setIcon(QIcon(":/images/mavs/unknown.svg"));
m_ui->typeButton->setIcon(QIcon(":/files/images/mavs/unknown.svg"));
break;
case 6: {
// A groundstation is a special system type, update widget
......@@ -354,11 +354,11 @@ void UASView::setSystemType(UASInterface* uas, unsigned int systemType)
m_ui->landButton->hide();
m_ui->shutdownButton->hide();
m_ui->abortButton->hide();
m_ui->typeButton->setIcon(QIcon(":/images/mavs/groundstation.svg"));
m_ui->typeButton->setIcon(QIcon(":/files/images/mavs/groundstation.svg"));
}
break;
default:
m_ui->typeButton->setIcon(QIcon(":/images/mavs/unknown.svg"));
m_ui->typeButton->setIcon(QIcon(":/files/images/mavs/unknown.svg"));
break;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment