diff --git a/images/.gitignore b/files/images/.gitignore similarity index 100% rename from images/.gitignore rename to files/images/.gitignore diff --git a/images/Vera.ttf b/files/images/Vera.ttf similarity index 100% rename from images/Vera.ttf rename to files/images/Vera.ttf diff --git a/images/actions/address-book-new.svg b/files/images/actions/address-book-new.svg similarity index 100% rename from images/actions/address-book-new.svg rename to files/images/actions/address-book-new.svg diff --git a/images/actions/appointment-new.svg b/files/images/actions/appointment-new.svg similarity index 100% rename from images/actions/appointment-new.svg rename to files/images/actions/appointment-new.svg diff --git a/images/actions/bookmark-new.svg b/files/images/actions/bookmark-new.svg similarity index 100% rename from images/actions/bookmark-new.svg rename to files/images/actions/bookmark-new.svg diff --git a/images/actions/contact-new.svg b/files/images/actions/contact-new.svg similarity index 100% rename from images/actions/contact-new.svg rename to files/images/actions/contact-new.svg diff --git a/images/actions/document-new.svg b/files/images/actions/document-new.svg similarity index 100% rename from images/actions/document-new.svg rename to files/images/actions/document-new.svg diff --git a/images/actions/document-open.svg b/files/images/actions/document-open.svg similarity index 100% rename from images/actions/document-open.svg rename to files/images/actions/document-open.svg diff --git a/images/actions/document-print-preview.svg b/files/images/actions/document-print-preview.svg similarity index 100% rename from images/actions/document-print-preview.svg rename to files/images/actions/document-print-preview.svg diff --git a/images/actions/document-print.svg b/files/images/actions/document-print.svg similarity index 100% rename from images/actions/document-print.svg rename to files/images/actions/document-print.svg diff --git a/images/actions/document-properties.svg b/files/images/actions/document-properties.svg similarity index 100% rename from images/actions/document-properties.svg rename to files/images/actions/document-properties.svg diff --git a/images/actions/document-save-as.svg b/files/images/actions/document-save-as.svg similarity index 100% rename from images/actions/document-save-as.svg rename to files/images/actions/document-save-as.svg diff --git a/images/actions/document-save.svg b/files/images/actions/document-save.svg similarity index 100% rename from images/actions/document-save.svg rename to files/images/actions/document-save.svg diff --git a/images/actions/edit-clear.svg b/files/images/actions/edit-clear.svg similarity index 100% rename from images/actions/edit-clear.svg rename to files/images/actions/edit-clear.svg diff --git a/images/actions/edit-copy.svg b/files/images/actions/edit-copy.svg similarity index 100% rename from images/actions/edit-copy.svg rename to files/images/actions/edit-copy.svg diff --git a/images/actions/edit-cut.svg b/files/images/actions/edit-cut.svg similarity index 100% rename from images/actions/edit-cut.svg rename to files/images/actions/edit-cut.svg diff --git a/images/actions/edit-delete.svg b/files/images/actions/edit-delete.svg similarity index 100% rename from images/actions/edit-delete.svg rename to files/images/actions/edit-delete.svg diff --git a/images/actions/edit-find-replace.svg b/files/images/actions/edit-find-replace.svg similarity index 100% rename from images/actions/edit-find-replace.svg rename to files/images/actions/edit-find-replace.svg diff --git a/images/actions/edit-find.svg b/files/images/actions/edit-find.svg similarity index 100% rename from images/actions/edit-find.svg rename to files/images/actions/edit-find.svg diff --git a/images/actions/edit-paste.svg b/files/images/actions/edit-paste.svg similarity index 100% rename from images/actions/edit-paste.svg rename to files/images/actions/edit-paste.svg diff --git a/images/actions/edit-redo.svg b/files/images/actions/edit-redo.svg similarity index 100% rename from images/actions/edit-redo.svg rename to files/images/actions/edit-redo.svg diff --git a/images/actions/edit-select-all.svg b/files/images/actions/edit-select-all.svg similarity index 100% rename from images/actions/edit-select-all.svg rename to files/images/actions/edit-select-all.svg diff --git a/images/actions/edit-undo.svg b/files/images/actions/edit-undo.svg similarity index 100% rename from images/actions/edit-undo.svg rename to files/images/actions/edit-undo.svg diff --git a/images/actions/folder-new.svg b/files/images/actions/folder-new.svg similarity index 100% rename from images/actions/folder-new.svg rename to files/images/actions/folder-new.svg diff --git a/images/actions/format-indent-less.svg b/files/images/actions/format-indent-less.svg similarity index 100% rename from images/actions/format-indent-less.svg rename to files/images/actions/format-indent-less.svg diff --git a/images/actions/format-indent-more.svg b/files/images/actions/format-indent-more.svg similarity index 100% rename from images/actions/format-indent-more.svg rename to files/images/actions/format-indent-more.svg diff --git a/images/actions/format-justify-center.svg b/files/images/actions/format-justify-center.svg similarity index 100% rename from images/actions/format-justify-center.svg rename to files/images/actions/format-justify-center.svg diff --git a/images/actions/format-justify-fill.svg b/files/images/actions/format-justify-fill.svg similarity index 100% rename from images/actions/format-justify-fill.svg rename to files/images/actions/format-justify-fill.svg diff --git a/images/actions/format-justify-left.svg b/files/images/actions/format-justify-left.svg similarity index 100% rename from images/actions/format-justify-left.svg rename to files/images/actions/format-justify-left.svg diff --git a/images/actions/format-justify-right.svg b/files/images/actions/format-justify-right.svg similarity index 100% rename from images/actions/format-justify-right.svg rename to files/images/actions/format-justify-right.svg diff --git a/images/actions/format-text-bold.svg b/files/images/actions/format-text-bold.svg similarity index 100% rename from images/actions/format-text-bold.svg rename to files/images/actions/format-text-bold.svg diff --git a/images/actions/format-text-italic.svg b/files/images/actions/format-text-italic.svg similarity index 100% rename from images/actions/format-text-italic.svg rename to files/images/actions/format-text-italic.svg diff --git a/images/actions/format-text-strikethrough.svg b/files/images/actions/format-text-strikethrough.svg similarity index 100% rename from images/actions/format-text-strikethrough.svg rename to files/images/actions/format-text-strikethrough.svg diff --git a/images/actions/format-text-underline.svg b/files/images/actions/format-text-underline.svg similarity index 100% rename from images/actions/format-text-underline.svg rename to files/images/actions/format-text-underline.svg diff --git a/images/actions/go-bottom.svg b/files/images/actions/go-bottom.svg similarity index 100% rename from images/actions/go-bottom.svg rename to files/images/actions/go-bottom.svg diff --git a/images/actions/go-down.svg b/files/images/actions/go-down.svg similarity index 100% rename from images/actions/go-down.svg rename to files/images/actions/go-down.svg diff --git a/images/actions/go-first.svg b/files/images/actions/go-first.svg similarity index 100% rename from images/actions/go-first.svg rename to files/images/actions/go-first.svg diff --git a/images/actions/go-home.svg b/files/images/actions/go-home.svg similarity index 100% rename from images/actions/go-home.svg rename to files/images/actions/go-home.svg diff --git a/images/actions/go-jump.svg b/files/images/actions/go-jump.svg similarity index 100% rename from images/actions/go-jump.svg rename to files/images/actions/go-jump.svg diff --git a/images/actions/go-last.svg b/files/images/actions/go-last.svg similarity index 100% rename from images/actions/go-last.svg rename to files/images/actions/go-last.svg diff --git a/images/actions/go-next.svg b/files/images/actions/go-next.svg similarity index 100% rename from images/actions/go-next.svg rename to files/images/actions/go-next.svg diff --git a/images/actions/go-previous.svg b/files/images/actions/go-previous.svg similarity index 100% rename from images/actions/go-previous.svg rename to files/images/actions/go-previous.svg diff --git a/images/actions/go-top.svg b/files/images/actions/go-top.svg similarity index 100% rename from images/actions/go-top.svg rename to files/images/actions/go-top.svg diff --git a/images/actions/go-up.svg b/files/images/actions/go-up.svg similarity index 100% rename from images/actions/go-up.svg rename to files/images/actions/go-up.svg diff --git a/images/actions/list-add.svg b/files/images/actions/list-add.svg similarity index 100% rename from images/actions/list-add.svg rename to files/images/actions/list-add.svg diff --git a/images/actions/list-remove.svg b/files/images/actions/list-remove.svg similarity index 100% rename from images/actions/list-remove.svg rename to files/images/actions/list-remove.svg diff --git a/images/actions/mail-forward.svg b/files/images/actions/mail-forward.svg similarity index 100% rename from images/actions/mail-forward.svg rename to files/images/actions/mail-forward.svg diff --git a/images/actions/mail-mark-junk.svg b/files/images/actions/mail-mark-junk.svg similarity index 100% rename from images/actions/mail-mark-junk.svg rename to files/images/actions/mail-mark-junk.svg diff --git a/images/actions/mail-message-new.svg b/files/images/actions/mail-message-new.svg similarity index 100% rename from images/actions/mail-message-new.svg rename to files/images/actions/mail-message-new.svg diff --git a/images/actions/mail-reply-all.svg b/files/images/actions/mail-reply-all.svg similarity index 100% rename from images/actions/mail-reply-all.svg rename to files/images/actions/mail-reply-all.svg diff --git a/images/actions/mail-reply-sender.svg b/files/images/actions/mail-reply-sender.svg similarity index 100% rename from images/actions/mail-reply-sender.svg rename to files/images/actions/mail-reply-sender.svg diff --git a/images/actions/mail-send-receive.svg b/files/images/actions/mail-send-receive.svg similarity index 100% rename from images/actions/mail-send-receive.svg rename to files/images/actions/mail-send-receive.svg diff --git a/images/actions/media-eject.svg b/files/images/actions/media-eject.svg similarity index 100% rename from images/actions/media-eject.svg rename to files/images/actions/media-eject.svg diff --git a/images/actions/media-playback-pause.svg b/files/images/actions/media-playback-pause.svg similarity index 100% rename from images/actions/media-playback-pause.svg rename to files/images/actions/media-playback-pause.svg diff --git a/images/actions/media-playback-start.svg b/files/images/actions/media-playback-start.svg similarity index 100% rename from images/actions/media-playback-start.svg rename to files/images/actions/media-playback-start.svg diff --git a/images/actions/media-playback-stop.svg b/files/images/actions/media-playback-stop.svg similarity index 100% rename from images/actions/media-playback-stop.svg rename to files/images/actions/media-playback-stop.svg diff --git a/images/actions/media-record.svg b/files/images/actions/media-record.svg similarity index 100% rename from images/actions/media-record.svg rename to files/images/actions/media-record.svg diff --git a/images/actions/media-seek-backward.svg b/files/images/actions/media-seek-backward.svg similarity index 100% rename from images/actions/media-seek-backward.svg rename to files/images/actions/media-seek-backward.svg diff --git a/images/actions/media-seek-forward.svg b/files/images/actions/media-seek-forward.svg similarity index 100% rename from images/actions/media-seek-forward.svg rename to files/images/actions/media-seek-forward.svg diff --git a/images/actions/media-skip-backward.svg b/files/images/actions/media-skip-backward.svg similarity index 100% rename from images/actions/media-skip-backward.svg rename to files/images/actions/media-skip-backward.svg diff --git a/images/actions/media-skip-forward.svg b/files/images/actions/media-skip-forward.svg similarity index 100% rename from images/actions/media-skip-forward.svg rename to files/images/actions/media-skip-forward.svg diff --git a/images/actions/process-stop.svg b/files/images/actions/process-stop.svg similarity index 100% rename from images/actions/process-stop.svg rename to files/images/actions/process-stop.svg diff --git a/images/actions/system-lock-screen.svg b/files/images/actions/system-lock-screen.svg similarity index 100% rename from images/actions/system-lock-screen.svg rename to files/images/actions/system-lock-screen.svg diff --git a/images/actions/system-log-out.svg b/files/images/actions/system-log-out.svg similarity index 100% rename from images/actions/system-log-out.svg rename to files/images/actions/system-log-out.svg diff --git a/images/actions/system-search.svg b/files/images/actions/system-search.svg similarity index 100% rename from images/actions/system-search.svg rename to files/images/actions/system-search.svg diff --git a/images/actions/system-shutdown.svg b/files/images/actions/system-shutdown.svg similarity index 100% rename from images/actions/system-shutdown.svg rename to files/images/actions/system-shutdown.svg diff --git a/images/actions/tab-new.svg b/files/images/actions/tab-new.svg similarity index 100% rename from images/actions/tab-new.svg rename to files/images/actions/tab-new.svg diff --git a/images/actions/view-fullscreen.svg b/files/images/actions/view-fullscreen.svg similarity index 100% rename from images/actions/view-fullscreen.svg rename to files/images/actions/view-fullscreen.svg diff --git a/images/actions/view-refresh.svg b/files/images/actions/view-refresh.svg similarity index 100% rename from images/actions/view-refresh.svg rename to files/images/actions/view-refresh.svg diff --git a/images/actions/window-new.svg b/files/images/actions/window-new.svg similarity index 100% rename from images/actions/window-new.svg rename to files/images/actions/window-new.svg diff --git a/images/apps/accessories-calculator.svg b/files/images/apps/accessories-calculator.svg similarity index 100% rename from images/apps/accessories-calculator.svg rename to files/images/apps/accessories-calculator.svg diff --git a/images/apps/accessories-character-map.svg b/files/images/apps/accessories-character-map.svg similarity index 100% rename from images/apps/accessories-character-map.svg rename to files/images/apps/accessories-character-map.svg diff --git a/images/apps/accessories-text-editor.svg b/files/images/apps/accessories-text-editor.svg similarity index 100% rename from images/apps/accessories-text-editor.svg rename to files/images/apps/accessories-text-editor.svg diff --git a/images/apps/help-browser.svg b/files/images/apps/help-browser.svg similarity index 100% rename from images/apps/help-browser.svg rename to files/images/apps/help-browser.svg diff --git a/images/apps/internet-group-chat.svg b/files/images/apps/internet-group-chat.svg similarity index 100% rename from images/apps/internet-group-chat.svg rename to files/images/apps/internet-group-chat.svg diff --git a/images/apps/internet-mail.svg b/files/images/apps/internet-mail.svg similarity index 100% rename from images/apps/internet-mail.svg rename to files/images/apps/internet-mail.svg diff --git a/images/apps/internet-news-reader.svg b/files/images/apps/internet-news-reader.svg similarity index 100% rename from images/apps/internet-news-reader.svg rename to files/images/apps/internet-news-reader.svg diff --git a/images/apps/internet-web-browser.svg b/files/images/apps/internet-web-browser.svg similarity index 100% rename from images/apps/internet-web-browser.svg rename to files/images/apps/internet-web-browser.svg diff --git a/images/apps/office-calendar.svg b/files/images/apps/office-calendar.svg similarity index 100% rename from images/apps/office-calendar.svg rename to files/images/apps/office-calendar.svg diff --git a/images/apps/preferences-desktop-accessibility.svg b/files/images/apps/preferences-desktop-accessibility.svg similarity index 100% rename from images/apps/preferences-desktop-accessibility.svg rename to files/images/apps/preferences-desktop-accessibility.svg diff --git a/images/apps/preferences-desktop-assistive-technology.svg b/files/images/apps/preferences-desktop-assistive-technology.svg similarity index 100% rename from images/apps/preferences-desktop-assistive-technology.svg rename to files/images/apps/preferences-desktop-assistive-technology.svg diff --git a/images/apps/preferences-desktop-font.svg b/files/images/apps/preferences-desktop-font.svg similarity index 100% rename from images/apps/preferences-desktop-font.svg rename to files/images/apps/preferences-desktop-font.svg diff --git a/images/apps/preferences-desktop-keyboard-shortcuts.svg b/files/images/apps/preferences-desktop-keyboard-shortcuts.svg similarity index 100% rename from images/apps/preferences-desktop-keyboard-shortcuts.svg rename to files/images/apps/preferences-desktop-keyboard-shortcuts.svg diff --git a/images/apps/preferences-desktop-locale.svg b/files/images/apps/preferences-desktop-locale.svg similarity index 100% rename from images/apps/preferences-desktop-locale.svg rename to files/images/apps/preferences-desktop-locale.svg diff --git a/images/apps/preferences-desktop-multimedia.svg b/files/images/apps/preferences-desktop-multimedia.svg similarity index 100% rename from images/apps/preferences-desktop-multimedia.svg rename to files/images/apps/preferences-desktop-multimedia.svg diff --git a/images/apps/preferences-desktop-remote-desktop.svg b/files/images/apps/preferences-desktop-remote-desktop.svg similarity index 100% rename from images/apps/preferences-desktop-remote-desktop.svg rename to files/images/apps/preferences-desktop-remote-desktop.svg diff --git a/images/apps/preferences-desktop-screensaver.svg b/files/images/apps/preferences-desktop-screensaver.svg similarity index 100% rename from images/apps/preferences-desktop-screensaver.svg rename to files/images/apps/preferences-desktop-screensaver.svg diff --git a/images/apps/preferences-desktop-theme.svg b/files/images/apps/preferences-desktop-theme.svg similarity index 100% rename from images/apps/preferences-desktop-theme.svg rename to files/images/apps/preferences-desktop-theme.svg diff --git a/images/apps/preferences-desktop-wallpaper.svg b/files/images/apps/preferences-desktop-wallpaper.svg similarity index 100% rename from images/apps/preferences-desktop-wallpaper.svg rename to files/images/apps/preferences-desktop-wallpaper.svg diff --git a/images/apps/preferences-system-network-proxy.svg b/files/images/apps/preferences-system-network-proxy.svg similarity index 100% rename from images/apps/preferences-system-network-proxy.svg rename to files/images/apps/preferences-system-network-proxy.svg diff --git a/images/apps/preferences-system-session.svg b/files/images/apps/preferences-system-session.svg similarity index 100% rename from images/apps/preferences-system-session.svg rename to files/images/apps/preferences-system-session.svg diff --git a/images/apps/preferences-system-windows.svg b/files/images/apps/preferences-system-windows.svg similarity index 100% rename from images/apps/preferences-system-windows.svg rename to files/images/apps/preferences-system-windows.svg diff --git a/images/apps/system-file-manager.svg b/files/images/apps/system-file-manager.svg similarity index 100% rename from images/apps/system-file-manager.svg rename to files/images/apps/system-file-manager.svg diff --git a/images/apps/system-installer.svg b/files/images/apps/system-installer.svg similarity index 100% rename from images/apps/system-installer.svg rename to files/images/apps/system-installer.svg diff --git a/images/apps/system-software-update.svg b/files/images/apps/system-software-update.svg similarity index 100% rename from images/apps/system-software-update.svg rename to files/images/apps/system-software-update.svg diff --git a/images/apps/system-users.svg b/files/images/apps/system-users.svg similarity index 100% rename from images/apps/system-users.svg rename to files/images/apps/system-users.svg diff --git a/images/apps/utilities-system-monitor.svg b/files/images/apps/utilities-system-monitor.svg similarity index 100% rename from images/apps/utilities-system-monitor.svg rename to files/images/apps/utilities-system-monitor.svg diff --git a/images/apps/utilities-terminal.svg b/files/images/apps/utilities-terminal.svg similarity index 100% rename from images/apps/utilities-terminal.svg rename to files/images/apps/utilities-terminal.svg diff --git a/images/backgrounds/background-caution-button-active.png b/files/images/backgrounds/background-caution-button-active.png similarity index 100% rename from images/backgrounds/background-caution-button-active.png rename to files/images/backgrounds/background-caution-button-active.png diff --git a/images/backgrounds/background-caution-button.png b/files/images/backgrounds/background-caution-button.png similarity index 100% rename from images/backgrounds/background-caution-button.png rename to files/images/backgrounds/background-caution-button.png diff --git a/images/backgrounds/background-caution.png b/files/images/backgrounds/background-caution.png similarity index 100% rename from images/backgrounds/background-caution.png rename to files/images/backgrounds/background-caution.png diff --git a/images/categories/applications-accessories.svg b/files/images/categories/applications-accessories.svg similarity index 100% rename from images/categories/applications-accessories.svg rename to files/images/categories/applications-accessories.svg diff --git a/images/categories/applications-development.svg b/files/images/categories/applications-development.svg similarity index 100% rename from images/categories/applications-development.svg rename to files/images/categories/applications-development.svg diff --git a/images/categories/applications-games.svg b/files/images/categories/applications-games.svg similarity index 100% rename from images/categories/applications-games.svg rename to files/images/categories/applications-games.svg diff --git a/images/categories/applications-graphics.svg b/files/images/categories/applications-graphics.svg similarity index 100% rename from images/categories/applications-graphics.svg rename to files/images/categories/applications-graphics.svg diff --git a/images/categories/applications-internet.svg b/files/images/categories/applications-internet.svg similarity index 100% rename from images/categories/applications-internet.svg rename to files/images/categories/applications-internet.svg diff --git a/images/categories/applications-multimedia.svg b/files/images/categories/applications-multimedia.svg similarity index 100% rename from images/categories/applications-multimedia.svg rename to files/images/categories/applications-multimedia.svg diff --git a/images/categories/applications-office.svg b/files/images/categories/applications-office.svg similarity index 100% rename from images/categories/applications-office.svg rename to files/images/categories/applications-office.svg diff --git a/images/categories/applications-other.svg b/files/images/categories/applications-other.svg similarity index 100% rename from images/categories/applications-other.svg rename to files/images/categories/applications-other.svg diff --git a/images/categories/applications-system.svg b/files/images/categories/applications-system.svg similarity index 100% rename from images/categories/applications-system.svg rename to files/images/categories/applications-system.svg diff --git a/images/categories/preferences-desktop-peripherals.svg b/files/images/categories/preferences-desktop-peripherals.svg similarity index 100% rename from images/categories/preferences-desktop-peripherals.svg rename to files/images/categories/preferences-desktop-peripherals.svg diff --git a/images/categories/preferences-desktop.svg b/files/images/categories/preferences-desktop.svg similarity index 100% rename from images/categories/preferences-desktop.svg rename to files/images/categories/preferences-desktop.svg diff --git a/images/categories/preferences-system.svg b/files/images/categories/preferences-system.svg similarity index 100% rename from images/categories/preferences-system.svg rename to files/images/categories/preferences-system.svg diff --git a/images/contrib/slugs.png b/files/images/contrib/slugs.png similarity index 100% rename from images/contrib/slugs.png rename to files/images/contrib/slugs.png diff --git a/images/control/emergency-button-gradient.png b/files/images/control/emergency-button-gradient.png similarity index 100% rename from images/control/emergency-button-gradient.png rename to files/images/control/emergency-button-gradient.png diff --git a/images/control/emergency-button-simple.png b/files/images/control/emergency-button-simple.png similarity index 100% rename from images/control/emergency-button-simple.png rename to files/images/control/emergency-button-simple.png diff --git a/images/control/emergency-button.png b/files/images/control/emergency-button.png similarity index 100% rename from images/control/emergency-button.png rename to files/images/control/emergency-button.png diff --git a/images/control/emergency-button.svg b/files/images/control/emergency-button.svg similarity index 100% rename from images/control/emergency-button.svg rename to files/images/control/emergency-button.svg diff --git a/images/control/empty-button.png b/files/images/control/empty-button.png similarity index 100% rename from images/control/empty-button.png rename to files/images/control/empty-button.png diff --git a/images/control/empty-button.svg b/files/images/control/empty-button.svg similarity index 100% rename from images/control/empty-button.svg rename to files/images/control/empty-button.svg diff --git a/images/control/empty-emergency-button-v2.svg b/files/images/control/empty-emergency-button-v2.svg similarity index 100% rename from images/control/empty-emergency-button-v2.svg rename to files/images/control/empty-emergency-button-v2.svg diff --git a/images/control/empty-emergency-button.svg b/files/images/control/empty-emergency-button.svg similarity index 100% rename from images/control/empty-emergency-button.svg rename to files/images/control/empty-emergency-button.svg diff --git a/images/control/land-button.svg b/files/images/control/land-button.svg similarity index 100% rename from images/control/land-button.svg rename to files/images/control/land-button.svg diff --git a/images/control/land.svg b/files/images/control/land.svg similarity index 100% rename from images/control/land.svg rename to files/images/control/land.svg diff --git a/images/control/launch.svg b/files/images/control/launch.svg similarity index 100% rename from images/control/launch.svg rename to files/images/control/launch.svg diff --git a/images/devices/audio-card.svg b/files/images/devices/audio-card.svg similarity index 100% rename from images/devices/audio-card.svg rename to files/images/devices/audio-card.svg diff --git a/images/devices/audio-input-microphone.svg b/files/images/devices/audio-input-microphone.svg similarity index 100% rename from images/devices/audio-input-microphone.svg rename to files/images/devices/audio-input-microphone.svg diff --git a/images/devices/battery.svg b/files/images/devices/battery.svg similarity index 100% rename from images/devices/battery.svg rename to files/images/devices/battery.svg diff --git a/images/devices/camera-photo.svg b/files/images/devices/camera-photo.svg similarity index 100% rename from images/devices/camera-photo.svg rename to files/images/devices/camera-photo.svg diff --git a/images/devices/camera-video.svg b/files/images/devices/camera-video.svg similarity index 100% rename from images/devices/camera-video.svg rename to files/images/devices/camera-video.svg diff --git a/images/devices/computer.svg b/files/images/devices/computer.svg similarity index 100% rename from images/devices/computer.svg rename to files/images/devices/computer.svg diff --git a/images/devices/drive-harddisk.svg b/files/images/devices/drive-harddisk.svg similarity index 100% rename from images/devices/drive-harddisk.svg rename to files/images/devices/drive-harddisk.svg diff --git a/images/devices/drive-optical.svg b/files/images/devices/drive-optical.svg similarity index 100% rename from images/devices/drive-optical.svg rename to files/images/devices/drive-optical.svg diff --git a/images/devices/drive-removable-media.svg b/files/images/devices/drive-removable-media.svg similarity index 100% rename from images/devices/drive-removable-media.svg rename to files/images/devices/drive-removable-media.svg diff --git a/images/devices/input-gaming.svg b/files/images/devices/input-gaming.svg similarity index 100% rename from images/devices/input-gaming.svg rename to files/images/devices/input-gaming.svg diff --git a/images/devices/input-keyboard.svg b/files/images/devices/input-keyboard.svg similarity index 100% rename from images/devices/input-keyboard.svg rename to files/images/devices/input-keyboard.svg diff --git a/images/devices/input-mouse.svg b/files/images/devices/input-mouse.svg similarity index 100% rename from images/devices/input-mouse.svg rename to files/images/devices/input-mouse.svg diff --git a/images/devices/media-flash.svg b/files/images/devices/media-flash.svg similarity index 100% rename from images/devices/media-flash.svg rename to files/images/devices/media-flash.svg diff --git a/images/devices/media-floppy.svg b/files/images/devices/media-floppy.svg similarity index 100% rename from images/devices/media-floppy.svg rename to files/images/devices/media-floppy.svg diff --git a/images/devices/media-optical.svg b/files/images/devices/media-optical.svg similarity index 100% rename from images/devices/media-optical.svg rename to files/images/devices/media-optical.svg diff --git a/images/devices/multimedia-player.svg b/files/images/devices/multimedia-player.svg similarity index 100% rename from images/devices/multimedia-player.svg rename to files/images/devices/multimedia-player.svg diff --git a/images/devices/network-wired.svg b/files/images/devices/network-wired.svg similarity index 100% rename from images/devices/network-wired.svg rename to files/images/devices/network-wired.svg diff --git a/images/devices/network-wireless.svg b/files/images/devices/network-wireless.svg similarity index 100% rename from images/devices/network-wireless.svg rename to files/images/devices/network-wireless.svg diff --git a/images/devices/printer.svg b/files/images/devices/printer.svg similarity index 100% rename from images/devices/printer.svg rename to files/images/devices/printer.svg diff --git a/images/devices/video-display.svg b/files/images/devices/video-display.svg similarity index 100% rename from images/devices/video-display.svg rename to files/images/devices/video-display.svg diff --git a/images/earth-singlesystem.html b/files/images/earth-singlesystem.html similarity index 100% rename from images/earth-singlesystem.html rename to files/images/earth-singlesystem.html diff --git a/images/earth.html b/files/images/earth.html similarity index 100% rename from images/earth.html rename to files/images/earth.html diff --git a/images/emblems/emblem-favorite.svg b/files/images/emblems/emblem-favorite.svg similarity index 100% rename from images/emblems/emblem-favorite.svg rename to files/images/emblems/emblem-favorite.svg diff --git a/images/emblems/emblem-important.svg b/files/images/emblems/emblem-important.svg similarity index 100% rename from images/emblems/emblem-important.svg rename to files/images/emblems/emblem-important.svg diff --git a/images/emblems/emblem-photos.svg b/files/images/emblems/emblem-photos.svg similarity index 100% rename from images/emblems/emblem-photos.svg rename to files/images/emblems/emblem-photos.svg diff --git a/images/emblems/emblem-readonly.svg b/files/images/emblems/emblem-readonly.svg similarity index 100% rename from images/emblems/emblem-readonly.svg rename to files/images/emblems/emblem-readonly.svg diff --git a/images/emblems/emblem-symbolic-link.svg b/files/images/emblems/emblem-symbolic-link.svg similarity index 100% rename from images/emblems/emblem-symbolic-link.svg rename to files/images/emblems/emblem-symbolic-link.svg diff --git a/images/emblems/emblem-system.svg b/files/images/emblems/emblem-system.svg similarity index 100% rename from images/emblems/emblem-system.svg rename to files/images/emblems/emblem-system.svg diff --git a/images/emblems/emblem-unreadable.svg b/files/images/emblems/emblem-unreadable.svg similarity index 100% rename from images/emblems/emblem-unreadable.svg rename to files/images/emblems/emblem-unreadable.svg diff --git a/images/icons/macx.icns b/files/images/icons/macx.icns similarity index 100% rename from images/icons/macx.icns rename to files/images/icons/macx.icns diff --git a/images/icons/macx_128x128x32.png b/files/images/icons/macx_128x128x32.png similarity index 100% rename from images/icons/macx_128x128x32.png rename to files/images/icons/macx_128x128x32.png diff --git a/images/icons/macx_16x16x1.png b/files/images/icons/macx_16x16x1.png similarity index 100% rename from images/icons/macx_16x16x1.png rename to files/images/icons/macx_16x16x1.png diff --git a/images/icons/macx_16x16x32.png b/files/images/icons/macx_16x16x32.png similarity index 100% rename from images/icons/macx_16x16x32.png rename to files/images/icons/macx_16x16x32.png diff --git a/images/icons/macx_32x32x1.png b/files/images/icons/macx_32x32x1.png similarity index 100% rename from images/icons/macx_32x32x1.png rename to files/images/icons/macx_32x32x1.png diff --git a/images/icons/macx_32x32x32.png b/files/images/icons/macx_32x32x32.png similarity index 100% rename from images/icons/macx_32x32x32.png rename to files/images/icons/macx_32x32x32.png diff --git a/images/icons/macx_48x48x1.png b/files/images/icons/macx_48x48x1.png similarity index 100% rename from images/icons/macx_48x48x1.png rename to files/images/icons/macx_48x48x1.png diff --git a/images/icons/macx_48x48x32.png b/files/images/icons/macx_48x48x32.png similarity index 100% rename from images/icons/macx_48x48x32.png rename to files/images/icons/macx_48x48x32.png diff --git a/images/icons/qgroundcontrol.ico b/files/images/icons/qgroundcontrol.ico similarity index 100% rename from images/icons/qgroundcontrol.ico rename to files/images/icons/qgroundcontrol.ico diff --git a/images/icons/v2/t.ico b/files/images/icons/v2/t.ico similarity index 100% rename from images/icons/v2/t.ico rename to files/images/icons/v2/t.ico diff --git a/images/icons/v2/t128.png b/files/images/icons/v2/t128.png similarity index 100% rename from images/icons/v2/t128.png rename to files/images/icons/v2/t128.png diff --git a/images/icons/v2/t16.png b/files/images/icons/v2/t16.png similarity index 100% rename from images/icons/v2/t16.png rename to files/images/icons/v2/t16.png diff --git a/images/icons/v2/t24.png b/files/images/icons/v2/t24.png similarity index 100% rename from images/icons/v2/t24.png rename to files/images/icons/v2/t24.png diff --git a/images/icons/v2/t256.png b/files/images/icons/v2/t256.png similarity index 100% rename from images/icons/v2/t256.png rename to files/images/icons/v2/t256.png diff --git a/images/icons/v2/t32.png b/files/images/icons/v2/t32.png similarity index 100% rename from images/icons/v2/t32.png rename to files/images/icons/v2/t32.png diff --git a/images/icons/v2/t48.png b/files/images/icons/v2/t48.png similarity index 100% rename from images/icons/v2/t48.png rename to files/images/icons/v2/t48.png diff --git a/images/icons/v2/t64.png b/files/images/icons/v2/t64.png similarity index 100% rename from images/icons/v2/t64.png rename to files/images/icons/v2/t64.png diff --git a/images/manhattanstyle/closebutton.png b/files/images/manhattanstyle/closebutton.png similarity index 100% rename from images/manhattanstyle/closebutton.png rename to files/images/manhattanstyle/closebutton.png diff --git a/images/manhattanstyle/darkclosebutton.png b/files/images/manhattanstyle/darkclosebutton.png similarity index 100% rename from images/manhattanstyle/darkclosebutton.png rename to files/images/manhattanstyle/darkclosebutton.png diff --git a/images/manhattanstyle/empty14.png b/files/images/manhattanstyle/empty14.png similarity index 100% rename from images/manhattanstyle/empty14.png rename to files/images/manhattanstyle/empty14.png diff --git a/images/manhattanstyle/extension.png b/files/images/manhattanstyle/extension.png similarity index 100% rename from images/manhattanstyle/extension.png rename to files/images/manhattanstyle/extension.png diff --git a/images/manhattanstyle/fancytoolbutton.svg b/files/images/manhattanstyle/fancytoolbutton.svg similarity index 100% rename from images/manhattanstyle/fancytoolbutton.svg rename to files/images/manhattanstyle/fancytoolbutton.svg diff --git a/images/manhattanstyle/inputfield.png b/files/images/manhattanstyle/inputfield.png similarity index 100% rename from images/manhattanstyle/inputfield.png rename to files/images/manhattanstyle/inputfield.png diff --git a/images/manhattanstyle/inputfield_disabled.png b/files/images/manhattanstyle/inputfield_disabled.png similarity index 100% rename from images/manhattanstyle/inputfield_disabled.png rename to files/images/manhattanstyle/inputfield_disabled.png diff --git a/images/manhattanstyle/magnifier.png b/files/images/manhattanstyle/magnifier.png similarity index 100% rename from images/manhattanstyle/magnifier.png rename to files/images/manhattanstyle/magnifier.png diff --git a/images/manhattanstyle/panel_button.png b/files/images/manhattanstyle/panel_button.png similarity index 100% rename from images/manhattanstyle/panel_button.png rename to files/images/manhattanstyle/panel_button.png diff --git a/images/manhattanstyle/panel_button_checked.png b/files/images/manhattanstyle/panel_button_checked.png similarity index 100% rename from images/manhattanstyle/panel_button_checked.png rename to files/images/manhattanstyle/panel_button_checked.png diff --git a/images/manhattanstyle/panel_button_checked_hover.png b/files/images/manhattanstyle/panel_button_checked_hover.png similarity index 100% rename from images/manhattanstyle/panel_button_checked_hover.png rename to files/images/manhattanstyle/panel_button_checked_hover.png diff --git a/images/manhattanstyle/panel_button_hover.png b/files/images/manhattanstyle/panel_button_hover.png similarity index 100% rename from images/manhattanstyle/panel_button_hover.png rename to files/images/manhattanstyle/panel_button_hover.png diff --git a/images/manhattanstyle/panel_button_pressed.png b/files/images/manhattanstyle/panel_button_pressed.png similarity index 100% rename from images/manhattanstyle/panel_button_pressed.png rename to files/images/manhattanstyle/panel_button_pressed.png diff --git a/images/manhattanstyle/pushbutton.png b/files/images/manhattanstyle/pushbutton.png similarity index 100% rename from images/manhattanstyle/pushbutton.png rename to files/images/manhattanstyle/pushbutton.png diff --git a/images/manhattanstyle/pushbutton_hover.png b/files/images/manhattanstyle/pushbutton_hover.png similarity index 100% rename from images/manhattanstyle/pushbutton_hover.png rename to files/images/manhattanstyle/pushbutton_hover.png diff --git a/images/manhattanstyle/pushbutton_pressed.png b/files/images/manhattanstyle/pushbutton_pressed.png similarity index 100% rename from images/manhattanstyle/pushbutton_pressed.png rename to files/images/manhattanstyle/pushbutton_pressed.png diff --git a/images/manhattanstyle/sidebaricon.png b/files/images/manhattanstyle/sidebaricon.png similarity index 100% rename from images/manhattanstyle/sidebaricon.png rename to files/images/manhattanstyle/sidebaricon.png diff --git a/images/manhattanstyle/splitbutton_horizontal.png b/files/images/manhattanstyle/splitbutton_horizontal.png similarity index 100% rename from images/manhattanstyle/splitbutton_horizontal.png rename to files/images/manhattanstyle/splitbutton_horizontal.png diff --git a/images/manhattanstyle/statusbar.png b/files/images/manhattanstyle/statusbar.png similarity index 100% rename from images/manhattanstyle/statusbar.png rename to files/images/manhattanstyle/statusbar.png diff --git a/images/mapproviders/google.png b/files/images/mapproviders/google.png similarity index 100% rename from images/mapproviders/google.png rename to files/images/mapproviders/google.png diff --git a/images/mapproviders/googleearth.svg b/files/images/mapproviders/googleearth.svg similarity index 100% rename from images/mapproviders/googleearth.svg rename to files/images/mapproviders/googleearth.svg diff --git a/images/mapproviders/openstreetmap.png b/files/images/mapproviders/openstreetmap.png similarity index 100% rename from images/mapproviders/openstreetmap.png rename to files/images/mapproviders/openstreetmap.png diff --git a/images/mapproviders/yahoo.png b/files/images/mapproviders/yahoo.png similarity index 100% rename from images/mapproviders/yahoo.png rename to files/images/mapproviders/yahoo.png diff --git a/images/mavs/coaxial.svg b/files/images/mavs/coaxial.svg similarity index 100% rename from images/mavs/coaxial.svg rename to files/images/mavs/coaxial.svg diff --git a/images/mavs/fixed-wing.svg b/files/images/mavs/fixed-wing.svg similarity index 100% rename from images/mavs/fixed-wing.svg rename to files/images/mavs/fixed-wing.svg diff --git a/images/mavs/generic.svg b/files/images/mavs/generic.svg similarity index 100% rename from images/mavs/generic.svg rename to files/images/mavs/generic.svg diff --git a/images/mavs/groundstation.svg b/files/images/mavs/groundstation.svg similarity index 100% rename from images/mavs/groundstation.svg rename to files/images/mavs/groundstation.svg diff --git a/images/mavs/helicopter.svg b/files/images/mavs/helicopter.svg similarity index 100% rename from images/mavs/helicopter.svg rename to files/images/mavs/helicopter.svg diff --git a/images/mavs/quadrotor.svg b/files/images/mavs/quadrotor.svg similarity index 100% rename from images/mavs/quadrotor.svg rename to files/images/mavs/quadrotor.svg diff --git a/images/mavs/unknown.svg b/files/images/mavs/unknown.svg similarity index 100% rename from images/mavs/unknown.svg rename to files/images/mavs/unknown.svg diff --git a/images/mimetypes/application-certificate.svg b/files/images/mimetypes/application-certificate.svg similarity index 100% rename from images/mimetypes/application-certificate.svg rename to files/images/mimetypes/application-certificate.svg diff --git a/images/mimetypes/application-x-executable.svg b/files/images/mimetypes/application-x-executable.svg similarity index 100% rename from images/mimetypes/application-x-executable.svg rename to files/images/mimetypes/application-x-executable.svg diff --git a/images/mimetypes/audio-x-generic.svg b/files/images/mimetypes/audio-x-generic.svg similarity index 100% rename from images/mimetypes/audio-x-generic.svg rename to files/images/mimetypes/audio-x-generic.svg diff --git a/images/mimetypes/font-x-generic.svg b/files/images/mimetypes/font-x-generic.svg similarity index 100% rename from images/mimetypes/font-x-generic.svg rename to files/images/mimetypes/font-x-generic.svg diff --git a/images/mimetypes/image-x-generic.svg b/files/images/mimetypes/image-x-generic.svg similarity index 100% rename from images/mimetypes/image-x-generic.svg rename to files/images/mimetypes/image-x-generic.svg diff --git a/images/mimetypes/package-x-generic.svg b/files/images/mimetypes/package-x-generic.svg similarity index 100% rename from images/mimetypes/package-x-generic.svg rename to files/images/mimetypes/package-x-generic.svg diff --git a/images/mimetypes/text-html.svg b/files/images/mimetypes/text-html.svg similarity index 100% rename from images/mimetypes/text-html.svg rename to files/images/mimetypes/text-html.svg diff --git a/images/mimetypes/text-x-generic-template.svg b/files/images/mimetypes/text-x-generic-template.svg similarity index 100% rename from images/mimetypes/text-x-generic-template.svg rename to files/images/mimetypes/text-x-generic-template.svg diff --git a/images/mimetypes/text-x-generic.svg b/files/images/mimetypes/text-x-generic.svg similarity index 100% rename from images/mimetypes/text-x-generic.svg rename to files/images/mimetypes/text-x-generic.svg diff --git a/images/mimetypes/text-x-script.svg b/files/images/mimetypes/text-x-script.svg similarity index 100% rename from images/mimetypes/text-x-script.svg rename to files/images/mimetypes/text-x-script.svg diff --git a/images/mimetypes/video-x-generic.svg b/files/images/mimetypes/video-x-generic.svg similarity index 100% rename from images/mimetypes/video-x-generic.svg rename to files/images/mimetypes/video-x-generic.svg diff --git a/images/mimetypes/x-office-address-book.svg b/files/images/mimetypes/x-office-address-book.svg similarity index 100% rename from images/mimetypes/x-office-address-book.svg rename to files/images/mimetypes/x-office-address-book.svg diff --git a/images/mimetypes/x-office-calendar.svg b/files/images/mimetypes/x-office-calendar.svg similarity index 100% rename from images/mimetypes/x-office-calendar.svg rename to files/images/mimetypes/x-office-calendar.svg diff --git a/images/mimetypes/x-office-document-template.svg b/files/images/mimetypes/x-office-document-template.svg similarity index 100% rename from images/mimetypes/x-office-document-template.svg rename to files/images/mimetypes/x-office-document-template.svg diff --git a/images/mimetypes/x-office-document.svg b/files/images/mimetypes/x-office-document.svg similarity index 100% rename from images/mimetypes/x-office-document.svg rename to files/images/mimetypes/x-office-document.svg diff --git a/images/mimetypes/x-office-drawing-template.svg b/files/images/mimetypes/x-office-drawing-template.svg similarity index 100% rename from images/mimetypes/x-office-drawing-template.svg rename to files/images/mimetypes/x-office-drawing-template.svg diff --git a/images/mimetypes/x-office-drawing.svg b/files/images/mimetypes/x-office-drawing.svg similarity index 100% rename from images/mimetypes/x-office-drawing.svg rename to files/images/mimetypes/x-office-drawing.svg diff --git a/images/mimetypes/x-office-presentation-template.svg b/files/images/mimetypes/x-office-presentation-template.svg similarity index 100% rename from images/mimetypes/x-office-presentation-template.svg rename to files/images/mimetypes/x-office-presentation-template.svg diff --git a/images/mimetypes/x-office-presentation.svg b/files/images/mimetypes/x-office-presentation.svg similarity index 100% rename from images/mimetypes/x-office-presentation.svg rename to files/images/mimetypes/x-office-presentation.svg diff --git a/images/mimetypes/x-office-spreadsheet-template.svg b/files/images/mimetypes/x-office-spreadsheet-template.svg similarity index 100% rename from images/mimetypes/x-office-spreadsheet-template.svg rename to files/images/mimetypes/x-office-spreadsheet-template.svg diff --git a/images/mimetypes/x-office-spreadsheet.svg b/files/images/mimetypes/x-office-spreadsheet.svg similarity index 100% rename from images/mimetypes/x-office-spreadsheet.svg rename to files/images/mimetypes/x-office-spreadsheet.svg diff --git a/images/originals/image3511.png b/files/images/originals/image3511.png similarity index 100% rename from images/originals/image3511.png rename to files/images/originals/image3511.png diff --git a/images/originals/qgroundcontrol-logo.png b/files/images/originals/qgroundcontrol-logo.png similarity index 100% rename from images/originals/qgroundcontrol-logo.png rename to files/images/originals/qgroundcontrol-logo.png diff --git a/images/originals/qgroundcontrol-logo.svg b/files/images/originals/qgroundcontrol-logo.svg similarity index 100% rename from images/originals/qgroundcontrol-logo.svg rename to files/images/originals/qgroundcontrol-logo.svg diff --git a/images/patterns/0.bmp b/files/images/patterns/0.bmp similarity index 100% rename from images/patterns/0.bmp rename to files/images/patterns/0.bmp diff --git a/images/patterns/1.bmp b/files/images/patterns/1.bmp similarity index 100% rename from images/patterns/1.bmp rename to files/images/patterns/1.bmp diff --git a/images/patterns/2.bmp b/files/images/patterns/2.bmp similarity index 100% rename from images/patterns/2.bmp rename to files/images/patterns/2.bmp diff --git a/images/patterns/3.bmp b/files/images/patterns/3.bmp similarity index 100% rename from images/patterns/3.bmp rename to files/images/patterns/3.bmp diff --git a/images/patterns/4.bmp b/files/images/patterns/4.bmp similarity index 100% rename from images/patterns/4.bmp rename to files/images/patterns/4.bmp diff --git a/images/patterns/5.bmp b/files/images/patterns/5.bmp similarity index 100% rename from images/patterns/5.bmp rename to files/images/patterns/5.bmp diff --git a/images/patterns/6.bmp b/files/images/patterns/6.bmp similarity index 100% rename from images/patterns/6.bmp rename to files/images/patterns/6.bmp diff --git a/images/patterns/7.bmp b/files/images/patterns/7.bmp similarity index 100% rename from images/patterns/7.bmp rename to files/images/patterns/7.bmp diff --git a/images/patterns/8.bmp b/files/images/patterns/8.bmp similarity index 100% rename from images/patterns/8.bmp rename to files/images/patterns/8.bmp diff --git a/images/patterns/9.bmp b/files/images/patterns/9.bmp similarity index 100% rename from images/patterns/9.bmp rename to files/images/patterns/9.bmp diff --git a/images/patterns/a.bmp b/files/images/patterns/a.bmp similarity index 100% rename from images/patterns/a.bmp rename to files/images/patterns/a.bmp diff --git a/images/patterns/abby.jpg b/files/images/patterns/abby.jpg similarity index 100% rename from images/patterns/abby.jpg rename to files/images/patterns/abby.jpg diff --git a/images/patterns/b.bmp b/files/images/patterns/b.bmp similarity index 100% rename from images/patterns/b.bmp rename to files/images/patterns/b.bmp diff --git a/images/patterns/board-center.png b/files/images/patterns/board-center.png similarity index 100% rename from images/patterns/board-center.png rename to files/images/patterns/board-center.png diff --git a/images/patterns/board-left.png b/files/images/patterns/board-left.png similarity index 100% rename from images/patterns/board-left.png rename to files/images/patterns/board-left.png diff --git a/images/patterns/board-right.png b/files/images/patterns/board-right.png similarity index 100% rename from images/patterns/board-right.png rename to files/images/patterns/board-right.png diff --git a/images/patterns/c.bmp b/files/images/patterns/c.bmp similarity index 100% rename from images/patterns/c.bmp rename to files/images/patterns/c.bmp diff --git a/images/patterns/cake.jpg b/files/images/patterns/cake.jpg similarity index 100% rename from images/patterns/cake.jpg rename to files/images/patterns/cake.jpg diff --git a/images/patterns/cola.jpg b/files/images/patterns/cola.jpg similarity index 100% rename from images/patterns/cola.jpg rename to files/images/patterns/cola.jpg diff --git a/images/patterns/d.bmp b/files/images/patterns/d.bmp similarity index 100% rename from images/patterns/d.bmp rename to files/images/patterns/d.bmp diff --git a/images/patterns/e.bmp b/files/images/patterns/e.bmp similarity index 100% rename from images/patterns/e.bmp rename to files/images/patterns/e.bmp diff --git a/images/patterns/einstein.bmp b/files/images/patterns/einstein.bmp similarity index 100% rename from images/patterns/einstein.bmp rename to files/images/patterns/einstein.bmp diff --git a/images/patterns/f.bmp b/files/images/patterns/f.bmp similarity index 100% rename from images/patterns/f.bmp rename to files/images/patterns/f.bmp diff --git a/images/patterns/face1.png b/files/images/patterns/face1.png similarity index 100% rename from images/patterns/face1.png rename to files/images/patterns/face1.png diff --git a/images/patterns/face1_fisheye.png b/files/images/patterns/face1_fisheye.png similarity index 100% rename from images/patterns/face1_fisheye.png rename to files/images/patterns/face1_fisheye.png diff --git a/images/patterns/face1_light.png b/files/images/patterns/face1_light.png similarity index 100% rename from images/patterns/face1_light.png rename to files/images/patterns/face1_light.png diff --git a/images/patterns/face1_noise.png b/files/images/patterns/face1_noise.png similarity index 100% rename from images/patterns/face1_noise.png rename to files/images/patterns/face1_noise.png diff --git a/images/patterns/face1_noise_fisheye.png b/files/images/patterns/face1_noise_fisheye.png similarity index 100% rename from images/patterns/face1_noise_fisheye.png rename to files/images/patterns/face1_noise_fisheye.png diff --git a/images/patterns/face1_noise_light.png b/files/images/patterns/face1_noise_light.png similarity index 100% rename from images/patterns/face1_noise_light.png rename to files/images/patterns/face1_noise_light.png diff --git a/images/patterns/face1_noise_light_fisheye.png b/files/images/patterns/face1_noise_light_fisheye.png similarity index 100% rename from images/patterns/face1_noise_light_fisheye.png rename to files/images/patterns/face1_noise_light_fisheye.png diff --git a/images/patterns/face2.png b/files/images/patterns/face2.png similarity index 100% rename from images/patterns/face2.png rename to files/images/patterns/face2.png diff --git a/images/patterns/face3.png b/files/images/patterns/face3.png similarity index 100% rename from images/patterns/face3.png rename to files/images/patterns/face3.png diff --git a/images/patterns/face3_perspect1.png b/files/images/patterns/face3_perspect1.png similarity index 100% rename from images/patterns/face3_perspect1.png rename to files/images/patterns/face3_perspect1.png diff --git a/images/patterns/face3_perspect2.png b/files/images/patterns/face3_perspect2.png similarity index 100% rename from images/patterns/face3_perspect2.png rename to files/images/patterns/face3_perspect2.png diff --git a/images/patterns/face3_perspect3.png b/files/images/patterns/face3_perspect3.png similarity index 100% rename from images/patterns/face3_perspect3.png rename to files/images/patterns/face3_perspect3.png diff --git a/images/patterns/face4.png b/files/images/patterns/face4.png similarity index 100% rename from images/patterns/face4.png rename to files/images/patterns/face4.png diff --git a/images/patterns/face4_treshold1.png b/files/images/patterns/face4_treshold1.png similarity index 100% rename from images/patterns/face4_treshold1.png rename to files/images/patterns/face4_treshold1.png diff --git a/images/patterns/face4_treshold2.png b/files/images/patterns/face4_treshold2.png similarity index 100% rename from images/patterns/face4_treshold2.png rename to files/images/patterns/face4_treshold2.png diff --git a/images/patterns/face5.png b/files/images/patterns/face5.png similarity index 100% rename from images/patterns/face5.png rename to files/images/patterns/face5.png diff --git a/images/patterns/face5_perspect1.png b/files/images/patterns/face5_perspect1.png similarity index 100% rename from images/patterns/face5_perspect1.png rename to files/images/patterns/face5_perspect1.png diff --git a/images/patterns/face5_threshold.png b/files/images/patterns/face5_threshold.png similarity index 100% rename from images/patterns/face5_threshold.png rename to files/images/patterns/face5_threshold.png diff --git a/images/patterns/flag.jpg b/files/images/patterns/flag.jpg similarity index 100% rename from images/patterns/flag.jpg rename to files/images/patterns/flag.jpg diff --git a/images/patterns/floors1.png b/files/images/patterns/floors1.png similarity index 100% rename from images/patterns/floors1.png rename to files/images/patterns/floors1.png diff --git a/images/patterns/floors2.png b/files/images/patterns/floors2.png similarity index 100% rename from images/patterns/floors2.png rename to files/images/patterns/floors2.png diff --git a/images/patterns/floors5.png b/files/images/patterns/floors5.png similarity index 100% rename from images/patterns/floors5.png rename to files/images/patterns/floors5.png diff --git a/images/patterns/floors6.png b/files/images/patterns/floors6.png similarity index 100% rename from images/patterns/floors6.png rename to files/images/patterns/floors6.png diff --git a/images/patterns/frame_2010-03-17_2_rect.bmp b/files/images/patterns/frame_2010-03-17_2_rect.bmp similarity index 100% rename from images/patterns/frame_2010-03-17_2_rect.bmp rename to files/images/patterns/frame_2010-03-17_2_rect.bmp diff --git a/images/patterns/frame_2010-03-17_3_rect.bmp b/files/images/patterns/frame_2010-03-17_3_rect.bmp similarity index 100% rename from images/patterns/frame_2010-03-17_3_rect.bmp rename to files/images/patterns/frame_2010-03-17_3_rect.bmp diff --git a/images/patterns/frog.bmp b/files/images/patterns/frog.bmp similarity index 100% rename from images/patterns/frog.bmp rename to files/images/patterns/frog.bmp diff --git a/images/patterns/g.bmp b/files/images/patterns/g.bmp similarity index 100% rename from images/patterns/g.bmp rename to files/images/patterns/g.bmp diff --git a/images/patterns/h.bmp b/files/images/patterns/h.bmp similarity index 100% rename from images/patterns/h.bmp rename to files/images/patterns/h.bmp diff --git a/images/patterns/i.bmp b/files/images/patterns/i.bmp similarity index 100% rename from images/patterns/i.bmp rename to files/images/patterns/i.bmp diff --git a/images/patterns/j.bmp b/files/images/patterns/j.bmp similarity index 100% rename from images/patterns/j.bmp rename to files/images/patterns/j.bmp diff --git a/images/patterns/k.bmp b/files/images/patterns/k.bmp similarity index 100% rename from images/patterns/k.bmp rename to files/images/patterns/k.bmp diff --git a/images/patterns/l.bmp b/files/images/patterns/l.bmp similarity index 100% rename from images/patterns/l.bmp rename to files/images/patterns/l.bmp diff --git a/images/patterns/lenna.jpg b/files/images/patterns/lenna.jpg similarity index 100% rename from images/patterns/lenna.jpg rename to files/images/patterns/lenna.jpg diff --git a/images/patterns/letterB.png b/files/images/patterns/letterB.png similarity index 100% rename from images/patterns/letterB.png rename to files/images/patterns/letterB.png diff --git a/images/patterns/letterD.png b/files/images/patterns/letterD.png similarity index 100% rename from images/patterns/letterD.png rename to files/images/patterns/letterD.png diff --git a/images/patterns/letterP.png b/files/images/patterns/letterP.png similarity index 100% rename from images/patterns/letterP.png rename to files/images/patterns/letterP.png diff --git a/images/patterns/letterP_light.png b/files/images/patterns/letterP_light.png similarity index 100% rename from images/patterns/letterP_light.png rename to files/images/patterns/letterP_light.png diff --git a/images/patterns/letterP_noise.png b/files/images/patterns/letterP_noise.png similarity index 100% rename from images/patterns/letterP_noise.png rename to files/images/patterns/letterP_noise.png diff --git a/images/patterns/letterR.png b/files/images/patterns/letterR.png similarity index 100% rename from images/patterns/letterR.png rename to files/images/patterns/letterR.png diff --git a/images/patterns/letterR_strongnoise.png b/files/images/patterns/letterR_strongnoise.png similarity index 100% rename from images/patterns/letterR_strongnoise.png rename to files/images/patterns/letterR_strongnoise.png diff --git a/images/patterns/letterS.png b/files/images/patterns/letterS.png similarity index 100% rename from images/patterns/letterS.png rename to files/images/patterns/letterS.png diff --git a/images/patterns/m.bmp b/files/images/patterns/m.bmp similarity index 100% rename from images/patterns/m.bmp rename to files/images/patterns/m.bmp diff --git a/images/patterns/mona.jpg b/files/images/patterns/mona.jpg similarity index 100% rename from images/patterns/mona.jpg rename to files/images/patterns/mona.jpg diff --git a/images/patterns/n.bmp b/files/images/patterns/n.bmp similarity index 100% rename from images/patterns/n.bmp rename to files/images/patterns/n.bmp diff --git a/images/patterns/o.bmp b/files/images/patterns/o.bmp similarity index 100% rename from images/patterns/o.bmp rename to files/images/patterns/o.bmp diff --git a/images/patterns/p.bmp b/files/images/patterns/p.bmp similarity index 100% rename from images/patterns/p.bmp rename to files/images/patterns/p.bmp diff --git a/images/patterns/q.bmp b/files/images/patterns/q.bmp similarity index 100% rename from images/patterns/q.bmp rename to files/images/patterns/q.bmp diff --git a/images/patterns/r.bmp b/files/images/patterns/r.bmp similarity index 100% rename from images/patterns/r.bmp rename to files/images/patterns/r.bmp diff --git a/images/patterns/s.bmp b/files/images/patterns/s.bmp similarity index 100% rename from images/patterns/s.bmp rename to files/images/patterns/s.bmp diff --git a/images/patterns/santa-delft.png b/files/images/patterns/santa-delft.png similarity index 100% rename from images/patterns/santa-delft.png rename to files/images/patterns/santa-delft.png diff --git a/images/patterns/sign.jpg b/files/images/patterns/sign.jpg similarity index 100% rename from images/patterns/sign.jpg rename to files/images/patterns/sign.jpg diff --git a/images/patterns/stereo_left01.png b/files/images/patterns/stereo_left01.png similarity index 100% rename from images/patterns/stereo_left01.png rename to files/images/patterns/stereo_left01.png diff --git a/images/patterns/stereo_right01.png b/files/images/patterns/stereo_right01.png similarity index 100% rename from images/patterns/stereo_right01.png rename to files/images/patterns/stereo_right01.png diff --git a/images/patterns/supa.png b/files/images/patterns/supa.png similarity index 100% rename from images/patterns/supa.png rename to files/images/patterns/supa.png diff --git a/images/patterns/t.bmp b/files/images/patterns/t.bmp similarity index 100% rename from images/patterns/t.bmp rename to files/images/patterns/t.bmp diff --git a/images/patterns/turm.jpg b/files/images/patterns/turm.jpg similarity index 100% rename from images/patterns/turm.jpg rename to files/images/patterns/turm.jpg diff --git a/images/patterns/u.bmp b/files/images/patterns/u.bmp similarity index 100% rename from images/patterns/u.bmp rename to files/images/patterns/u.bmp diff --git a/images/patterns/v.bmp b/files/images/patterns/v.bmp similarity index 100% rename from images/patterns/v.bmp rename to files/images/patterns/v.bmp diff --git a/images/patterns/w.bmp b/files/images/patterns/w.bmp similarity index 100% rename from images/patterns/w.bmp rename to files/images/patterns/w.bmp diff --git a/images/patterns/white.png b/files/images/patterns/white.png similarity index 100% rename from images/patterns/white.png rename to files/images/patterns/white.png diff --git a/images/patterns/work.jpg b/files/images/patterns/work.jpg similarity index 100% rename from images/patterns/work.jpg rename to files/images/patterns/work.jpg diff --git a/images/patterns/x.bmp b/files/images/patterns/x.bmp similarity index 100% rename from images/patterns/x.bmp rename to files/images/patterns/x.bmp diff --git a/images/patterns/y.bmp b/files/images/patterns/y.bmp similarity index 100% rename from images/patterns/y.bmp rename to files/images/patterns/y.bmp diff --git a/images/patterns/z.bmp b/files/images/patterns/z.bmp similarity index 100% rename from images/patterns/z.bmp rename to files/images/patterns/z.bmp diff --git a/images/places/folder-remote.svg b/files/images/places/folder-remote.svg similarity index 100% rename from images/places/folder-remote.svg rename to files/images/places/folder-remote.svg diff --git a/images/places/folder-saved-search.svg b/files/images/places/folder-saved-search.svg similarity index 100% rename from images/places/folder-saved-search.svg rename to files/images/places/folder-saved-search.svg diff --git a/images/places/folder.icon b/files/images/places/folder.icon similarity index 100% rename from images/places/folder.icon rename to files/images/places/folder.icon diff --git a/images/places/folder.svg b/files/images/places/folder.svg similarity index 100% rename from images/places/folder.svg rename to files/images/places/folder.svg diff --git a/images/places/network-server.svg b/files/images/places/network-server.svg similarity index 100% rename from images/places/network-server.svg rename to files/images/places/network-server.svg diff --git a/images/places/network-workgroup.svg b/files/images/places/network-workgroup.svg similarity index 100% rename from images/places/network-workgroup.svg rename to files/images/places/network-workgroup.svg diff --git a/images/places/start-here.svg b/files/images/places/start-here.svg similarity index 100% rename from images/places/start-here.svg rename to files/images/places/start-here.svg diff --git a/images/places/user-desktop.svg b/files/images/places/user-desktop.svg similarity index 100% rename from images/places/user-desktop.svg rename to files/images/places/user-desktop.svg diff --git a/images/places/user-home.svg b/files/images/places/user-home.svg similarity index 100% rename from images/places/user-home.svg rename to files/images/places/user-home.svg diff --git a/images/places/user-trash.svg b/files/images/places/user-trash.svg similarity index 100% rename from images/places/user-trash.svg rename to files/images/places/user-trash.svg diff --git a/images/scaling/scaling-linear.svg b/files/images/scaling/scaling-linear.svg similarity index 100% rename from images/scaling/scaling-linear.svg rename to files/images/scaling/scaling-linear.svg diff --git a/images/splash.png b/files/images/splash.png similarity index 100% rename from images/splash.png rename to files/images/splash.png diff --git a/images/status/audio-volume-high.svg b/files/images/status/audio-volume-high.svg similarity index 100% rename from images/status/audio-volume-high.svg rename to files/images/status/audio-volume-high.svg diff --git a/images/status/audio-volume-low.svg b/files/images/status/audio-volume-low.svg similarity index 100% rename from images/status/audio-volume-low.svg rename to files/images/status/audio-volume-low.svg diff --git a/images/status/audio-volume-medium.svg b/files/images/status/audio-volume-medium.svg similarity index 100% rename from images/status/audio-volume-medium.svg rename to files/images/status/audio-volume-medium.svg diff --git a/images/status/audio-volume-muted.svg b/files/images/status/audio-volume-muted.svg similarity index 100% rename from images/status/audio-volume-muted.svg rename to files/images/status/audio-volume-muted.svg diff --git a/images/status/battery-caution.svg b/files/images/status/battery-caution.svg similarity index 100% rename from images/status/battery-caution.svg rename to files/images/status/battery-caution.svg diff --git a/images/status/colorbars.png b/files/images/status/colorbars.png similarity index 100% rename from images/status/colorbars.png rename to files/images/status/colorbars.png diff --git a/images/status/dialog-error.svg b/files/images/status/dialog-error.svg similarity index 100% rename from images/status/dialog-error.svg rename to files/images/status/dialog-error.svg diff --git a/images/status/dialog-information.svg b/files/images/status/dialog-information.svg similarity index 100% rename from images/status/dialog-information.svg rename to files/images/status/dialog-information.svg diff --git a/images/status/dialog-warning.svg b/files/images/status/dialog-warning.svg similarity index 100% rename from images/status/dialog-warning.svg rename to files/images/status/dialog-warning.svg diff --git a/images/status/folder-drag-accept.icon b/files/images/status/folder-drag-accept.icon similarity index 100% rename from images/status/folder-drag-accept.icon rename to files/images/status/folder-drag-accept.icon diff --git a/images/status/folder-drag-accept.svg b/files/images/status/folder-drag-accept.svg similarity index 100% rename from images/status/folder-drag-accept.svg rename to files/images/status/folder-drag-accept.svg diff --git a/images/status/folder-open.svg b/files/images/status/folder-open.svg similarity index 100% rename from images/status/folder-open.svg rename to files/images/status/folder-open.svg diff --git a/images/status/folder-visiting.icon b/files/images/status/folder-visiting.icon similarity index 100% rename from images/status/folder-visiting.icon rename to files/images/status/folder-visiting.icon diff --git a/images/status/folder-visiting.svg b/files/images/status/folder-visiting.svg similarity index 100% rename from images/status/folder-visiting.svg rename to files/images/status/folder-visiting.svg diff --git a/images/status/image-loading.svg b/files/images/status/image-loading.svg similarity index 100% rename from images/status/image-loading.svg rename to files/images/status/image-loading.svg diff --git a/images/status/image-missing.svg b/files/images/status/image-missing.svg similarity index 100% rename from images/status/image-missing.svg rename to files/images/status/image-missing.svg diff --git a/images/status/mail-attachment.svg b/files/images/status/mail-attachment.svg similarity index 100% rename from images/status/mail-attachment.svg rename to files/images/status/mail-attachment.svg diff --git a/images/status/network-error.svg b/files/images/status/network-error.svg similarity index 100% rename from images/status/network-error.svg rename to files/images/status/network-error.svg diff --git a/images/status/network-idle.svg b/files/images/status/network-idle.svg similarity index 100% rename from images/status/network-idle.svg rename to files/images/status/network-idle.svg diff --git a/images/status/network-offline.svg b/files/images/status/network-offline.svg similarity index 100% rename from images/status/network-offline.svg rename to files/images/status/network-offline.svg diff --git a/images/status/network-receive.svg b/files/images/status/network-receive.svg similarity index 100% rename from images/status/network-receive.svg rename to files/images/status/network-receive.svg diff --git a/images/status/network-transmit-receive.svg b/files/images/status/network-transmit-receive.svg similarity index 100% rename from images/status/network-transmit-receive.svg rename to files/images/status/network-transmit-receive.svg diff --git a/images/status/network-transmit.svg b/files/images/status/network-transmit.svg similarity index 100% rename from images/status/network-transmit.svg rename to files/images/status/network-transmit.svg diff --git a/images/status/network-wireless-encrypted.svg b/files/images/status/network-wireless-encrypted.svg similarity index 100% rename from images/status/network-wireless-encrypted.svg rename to files/images/status/network-wireless-encrypted.svg diff --git a/images/status/printer-error.svg b/files/images/status/printer-error.svg similarity index 100% rename from images/status/printer-error.svg rename to files/images/status/printer-error.svg diff --git a/images/status/software-update-available.svg b/files/images/status/software-update-available.svg similarity index 100% rename from images/status/software-update-available.svg rename to files/images/status/software-update-available.svg diff --git a/images/status/software-update-urgent.svg b/files/images/status/software-update-urgent.svg similarity index 100% rename from images/status/software-update-urgent.svg rename to files/images/status/software-update-urgent.svg diff --git a/images/status/user-trash-full.svg b/files/images/status/user-trash-full.svg similarity index 100% rename from images/status/user-trash-full.svg rename to files/images/status/user-trash-full.svg diff --git a/images/status/weather-clear-night.svg b/files/images/status/weather-clear-night.svg similarity index 100% rename from images/status/weather-clear-night.svg rename to files/images/status/weather-clear-night.svg diff --git a/images/status/weather-clear.svg b/files/images/status/weather-clear.svg similarity index 100% rename from images/status/weather-clear.svg rename to files/images/status/weather-clear.svg diff --git a/images/status/weather-few-clouds-night.svg b/files/images/status/weather-few-clouds-night.svg similarity index 100% rename from images/status/weather-few-clouds-night.svg rename to files/images/status/weather-few-clouds-night.svg diff --git a/images/status/weather-few-clouds.svg b/files/images/status/weather-few-clouds.svg similarity index 100% rename from images/status/weather-few-clouds.svg rename to files/images/status/weather-few-clouds.svg diff --git a/images/status/weather-overcast.svg b/files/images/status/weather-overcast.svg similarity index 100% rename from images/status/weather-overcast.svg rename to files/images/status/weather-overcast.svg diff --git a/images/status/weather-severe-alert.svg b/files/images/status/weather-severe-alert.svg similarity index 100% rename from images/status/weather-severe-alert.svg rename to files/images/status/weather-severe-alert.svg diff --git a/images/status/weather-showers-scattered.svg b/files/images/status/weather-showers-scattered.svg similarity index 100% rename from images/status/weather-showers-scattered.svg rename to files/images/status/weather-showers-scattered.svg diff --git a/images/status/weather-showers.svg b/files/images/status/weather-showers.svg similarity index 100% rename from images/status/weather-showers.svg rename to files/images/status/weather-showers.svg diff --git a/images/status/weather-snow.svg b/files/images/status/weather-snow.svg similarity index 100% rename from images/status/weather-snow.svg rename to files/images/status/weather-snow.svg diff --git a/images/status/weather-storm.svg b/files/images/status/weather-storm.svg similarity index 100% rename from images/status/weather-storm.svg rename to files/images/status/weather-storm.svg diff --git a/images/style-mission.css b/files/images/style-mission.css similarity index 96% rename from images/style-mission.css rename to files/images/style-mission.css index a1f78db1c2874073050c9e0d8791b40ec0af4681..1f4420259b854c3c891ad1771f7d83123a583ab0 100644 --- a/images/style-mission.css +++ b/files/images/style-mission.css @@ -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; } diff --git a/images/style-outdoor-dark.css b/files/images/style-outdoor-dark.css similarity index 96% rename from images/style-outdoor-dark.css rename to files/images/style-outdoor-dark.css index 0ad06a80d1deb8f939e9ad7cf6d71f549b28a6fb..c0d0015f1f78a1dd2443dfd40b87d737df872ed9 100644 --- a/images/style-outdoor-dark.css +++ b/files/images/style-outdoor-dark.css @@ -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; } diff --git a/images/style-outdoor.css b/files/images/style-outdoor.css similarity index 94% rename from images/style-outdoor.css rename to files/images/style-outdoor.css index 7b4da9c970af02eba2277fdbaf301000876b06e0..f43f04196bd12a07a53d08962ba1bdfe4838248b 100644 --- a/images/style-outdoor.css +++ b/files/images/style-outdoor.css @@ -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; } diff --git a/mavlink/share/pyshared/pymavlink/tools/mavplayback.py b/mavlink/share/pyshared/pymavlink/tools/mavplayback.py index 50a6fd45ddc510e7ea2ed2d19cb7a2b6c4982a54..033746697f06b482c2e60bff8256ff2445a00711 100644 --- a/mavlink/share/pyshared/pymavlink/tools/mavplayback.py +++ b/mavlink/share/pyshared/pymavlink/tools/mavplayback.py @@ -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) diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index e588a574c8e3a2b531834407b1dacd0ab9329682..5f48518337e1b2176954438f17e89d5df704e4c6 100644 --- a/qgroundcontrol.pri +++ b/qgroundcontrol.pri @@ -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\" } } diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index 42b43b30e03f04feff5d580e99716abe532cefda..be0566ad134534fdc055b17ae84d0143d0dd7c1a 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -1,95 +1,95 @@ - images/control/launch.svg - images/status/dialog-error.svg - images/status/dialog-warning.svg - images/control/land.svg - images/actions/media-record.svg - images/actions/media-playback-stop.svg - images/actions/media-playback-start.svg - images/actions/media-playback-pause.svg - images/actions/list-remove.svg - images/actions/list-add.svg - images/actions/go-up.svg - images/actions/go-top.svg - images/actions/go-previous.svg - images/actions/go-next.svg - images/actions/go-last.svg - images/actions/go-jump.svg - images/actions/go-home.svg - images/actions/go-first.svg - images/actions/go-down.svg - images/actions/go-bottom.svg - images/actions/process-stop.svg - images/categories/preferences-system.svg - images/categories/applications-system.svg - images/categories/applications-internet.svg - images/categories/applications-development.svg - images/devices/network-wireless.svg - images/devices/network-wired.svg - images/apps/utilities-terminal.svg - images/apps/utilities-system-monitor.svg - images/apps/accessories-text-editor.svg - images/apps/accessories-calculator.svg - images/devices/input-gaming.svg - images/mavs/helicopter.svg - images/mavs/unknown.svg - images/mavs/fixed-wing.svg - images/mavs/groundstation.svg - images/mavs/generic.svg - images/mavs/quadrotor.svg - images/mavs/coaxial.svg - images/actions/system-shutdown.svg - images/actions/system-log-out.svg - images/actions/system-lock-screen.svg - images/status/weather-storm.svg - images/status/weather-snow.svg - images/status/weather-showers.svg - images/status/weather-showers-scattered.svg - images/status/weather-severe-alert.svg - images/status/weather-overcast.svg - images/status/weather-few-clouds.svg - images/status/weather-few-clouds-night.svg - images/status/weather-clear.svg - images/status/weather-clear-night.svg - images/status/user-trash-full.svg - images/status/software-update-urgent.svg - images/status/software-update-available.svg - images/status/printer-error.svg - images/status/network-wireless-encrypted.svg - images/status/network-transmit.svg - images/status/network-transmit-receive.svg - images/status/network-receive.svg - images/status/network-offline.svg - images/status/network-idle.svg - images/status/network-error.svg - images/status/mail-attachment.svg - images/status/image-missing.svg - images/status/image-loading.svg - images/status/folder-visiting.svg - images/status/folder-open.svg - images/status/folder-drag-accept.svg - images/status/dialog-information.svg - images/status/battery-caution.svg - images/status/audio-volume-muted.svg - images/status/audio-volume-medium.svg - images/status/audio-volume-low.svg - images/status/audio-volume-high.svg - images/status/colorbars.png - images/style-mission.css - images/splash.png + files/images/control/launch.svg + files/images/status/dialog-error.svg + files/images/status/dialog-warning.svg + files/images/control/land.svg + files/images/actions/media-record.svg + files/images/actions/media-playback-stop.svg + files/images/actions/media-playback-start.svg + files/images/actions/media-playback-pause.svg + files/images/actions/list-remove.svg + files/images/actions/list-add.svg + files/images/actions/go-up.svg + files/images/actions/go-top.svg + files/images/actions/go-previous.svg + files/images/actions/go-next.svg + files/images/actions/go-last.svg + files/images/actions/go-jump.svg + files/images/actions/go-home.svg + files/images/actions/go-first.svg + files/images/actions/go-down.svg + files/images/actions/go-bottom.svg + files/images/actions/process-stop.svg + files/images/categories/preferences-system.svg + files/images/categories/applications-system.svg + files/images/categories/applications-internet.svg + files/images/categories/applications-development.svg + files/images/devices/network-wireless.svg + files/images/devices/network-wired.svg + files/images/apps/utilities-terminal.svg + files/images/apps/utilities-system-monitor.svg + files/images/apps/accessories-text-editor.svg + files/images/apps/accessories-calculator.svg + files/images/devices/input-gaming.svg + files/images/mavs/helicopter.svg + files/images/mavs/unknown.svg + files/images/mavs/fixed-wing.svg + files/images/mavs/groundstation.svg + files/images/mavs/generic.svg + files/images/mavs/quadrotor.svg + files/images/mavs/coaxial.svg + files/images/actions/system-shutdown.svg + files/images/actions/system-log-out.svg + files/images/actions/system-lock-screen.svg + files/images/status/weather-storm.svg + files/images/status/weather-snow.svg + files/images/status/weather-showers.svg + files/images/status/weather-showers-scattered.svg + files/images/status/weather-severe-alert.svg + files/images/status/weather-overcast.svg + files/images/status/weather-few-clouds.svg + files/images/status/weather-few-clouds-night.svg + files/images/status/weather-clear.svg + files/images/status/weather-clear-night.svg + files/images/status/user-trash-full.svg + files/images/status/software-update-urgent.svg + files/images/status/software-update-available.svg + files/images/status/printer-error.svg + files/images/status/network-wireless-encrypted.svg + files/images/status/network-transmit.svg + files/images/status/network-transmit-receive.svg + files/images/status/network-receive.svg + files/images/status/network-offline.svg + files/images/status/network-idle.svg + files/images/status/network-error.svg + files/images/status/mail-attachment.svg + files/images/status/image-missing.svg + files/images/status/image-loading.svg + files/images/status/folder-visiting.svg + files/images/status/folder-open.svg + files/images/status/folder-drag-accept.svg + files/images/status/dialog-information.svg + files/images/status/battery-caution.svg + files/images/status/audio-volume-muted.svg + files/images/status/audio-volume-medium.svg + files/images/status/audio-volume-low.svg + files/images/status/audio-volume-high.svg + files/images/status/colorbars.png + files/images/style-mission.css + files/images/splash.png files/audio/alert.wav demo-log.txt - images/mapproviders/openstreetmap.png - images/mapproviders/google.png - images/mapproviders/yahoo.png - images/earth.html - images/mapproviders/googleearth.svg - images/contrib/slugs.png - images/style-outdoor.css - images/patterns/lenna.jpg + files/images/mapproviders/openstreetmap.png + files/images/mapproviders/google.png + files/images/mapproviders/yahoo.png + files/images/earth.html + files/images/mapproviders/googleearth.svg + files/images/contrib/slugs.png + files/images/style-outdoor.css + files/images/patterns/lenna.jpg - images/Vera.ttf + files/images/Vera.ttf diff --git a/qgroundcontrol.rc b/qgroundcontrol.rc index 5f1f579368686d458dc9caeb5f096ff1d106bc28..b16014c427d44e86627a65b513b7d8de699faca1 100644 --- a/qgroundcontrol.rc +++ b/qgroundcontrol.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "images/icons/qgroundcontrol.ico" \ No newline at end of file +IDI_ICON1 ICON DISCARDABLE "files/images/icons/qgroundcontrol.ico" diff --git a/src/MG.h b/src/MG.h index db3955d765b9f5ed7ed0ccaf35514c7073f06b00..8bc9426028092e8cf3df148f176c0150dde7adc8 100644 --- a/src/MG.h +++ b/src/MG.h @@ -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/"; } }; diff --git a/src/QGCCore.cc b/src/QGCCore.cc index d7593b1e6f14181010eb11bbc0d1022f5892d367..88ddf98275bd52fcc04f22dde90dbb081e001636 100644 --- a/src/QGCCore.cc +++ b/src/QGCCore.cc @@ -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); diff --git a/src/apps/mavlinkgen/ui/XMLCommProtocolWidget.ui b/src/apps/mavlinkgen/ui/XMLCommProtocolWidget.ui index d754517c629622f09ef8dae8ed46077023b83a42..38b68cf472cde5b0c8d2d2a59c036174683bb558 100644 --- a/src/apps/mavlinkgen/ui/XMLCommProtocolWidget.ui +++ b/src/apps/mavlinkgen/ui/XMLCommProtocolWidget.ui @@ -46,7 +46,7 @@ - :/images/status/folder-open.svg:/images/status/folder-open.svg + :/files/images/status/folder-open.svg:/files/images/status/folder-open.svg @@ -92,7 +92,7 @@ - :/images/status/folder-open.svg:/images/status/folder-open.svg + :/files/images/status/folder-open.svg:/files/images/status/folder-open.svg @@ -131,7 +131,7 @@ - :/images/categories/applications-system.svg:/images/categories/applications-system.svg + :/files/images/categories/applications-system.svg:/files/images/categories/applications-system.svg diff --git a/src/qgcunittest.pro b/src/qgcunittest.pro new file mode 100644 index 0000000000000000000000000000000000000000..1dd4597c160971654902021286b9abf5d5edcc18 --- /dev/null +++ b/src/qgcunittest.pro @@ -0,0 +1,614 @@ +# ------------------------------------------------- +# QGroundControl - Micro Air Vehicle Groundstation +# Please see our website at +# Maintainer: +# Lorenz Meier +# (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 . +# ------------------------------------------------- + + +# 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 +} diff --git a/src/ui/AudioOutputWidget.ui b/src/ui/AudioOutputWidget.ui index c84b123a6daf10393284649811110b51ae54707e..0a87bcab55bd62eb2f05b0eaba6109e515e40055 100644 --- a/src/ui/AudioOutputWidget.ui +++ b/src/ui/AudioOutputWidget.ui @@ -50,7 +50,7 @@ - :/images/status/audio-volume-muted.svg:/images/status/audio-volume-muted.svg + :/files/images/status/audio-volume-muted.svg:/files/images/status/audio-volume-muted.svg diff --git a/src/ui/CommConfigurationWindow.cc b/src/ui/CommConfigurationWindow.cc index 53dd2f7d6aa4e20bf6daa93af3377c30bd5ed93a..9713fc14067aeacbc1979fd10e468a4ab9932698 100644 --- a/src/ui/CommConfigurationWindow.cc +++ b/src/ui/CommConfigurationWindow.cc @@ -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); diff --git a/src/ui/DebugConsole.ui b/src/ui/DebugConsole.ui index 9fcfe00d4989ebb2c89f58ef62511bba2ddf0f92..addd295e1d45ab340af55a513900e63bd76b3149 100644 --- a/src/ui/DebugConsole.ui +++ b/src/ui/DebugConsole.ui @@ -201,7 +201,7 @@ - :/images/actions/list-add.svg:/images/actions/list-add.svg + :/files/images/actions/list-add.svg:/files/images/actions/list-add.svg @@ -225,7 +225,7 @@ - :/images/devices/network-wireless.svg:/images/devices/network-wireless.svg + :/files/images/devices/network-wireless.svg:/files/images/devices/network-wireless.svg diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index 9dd831210fc2caf1a9e1f8acd120a19b99f1f07c..721e318a073877dc4c6680f7cfe934ebd0901e21 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -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); } diff --git a/src/ui/MainWindow.ui b/src/ui/MainWindow.ui index 17cb443ab94354102b94f6bc577094a96a57a332..0a3ba15b55128b0abea01aa5503efb08d9282f52 100644 --- a/src/ui/MainWindow.ui +++ b/src/ui/MainWindow.ui @@ -160,7 +160,7 @@ - :/images/actions/system-log-out.svg:/images/actions/system-log-out.svg + :/files/images/actions/system-log-out.svg:/files/images/actions/system-log-out.svg Exit @@ -175,8 +175,8 @@ - :/images/control/launch.svg - :/images/control/launch.svg:/images/control/launch.svg + :/files/images/control/launch.svg + :/files/images/control/launch.svg:/files/images/control/launch.svg Liftoff @@ -185,7 +185,7 @@ - :/images/control/land.svg:/images/control/land.svg + :/files/images/control/land.svg:/files/images/control/land.svg Land @@ -194,7 +194,7 @@ - :/images/actions/process-stop.svg:/images/actions/process-stop.svg + :/files/images/actions/process-stop.svg:/files/images/actions/process-stop.svg Emergency Land @@ -206,7 +206,7 @@ - :/images/actions/process-stop.svg:/images/actions/process-stop.svg + :/files/images/actions/process-stop.svg:/files/images/actions/process-stop.svg Kill UAS @@ -218,7 +218,7 @@ - :/images/actions/list-add.svg:/images/actions/list-add.svg + :/files/images/actions/list-add.svg:/files/images/actions/list-add.svg Add Link @@ -227,7 +227,7 @@ - :/images/categories/applications-system.svg:/images/categories/applications-system.svg + :/files/images/categories/applications-system.svg:/files/images/categories/applications-system.svg Preferences @@ -239,7 +239,7 @@ - :/images/devices/input-gaming.svg:/images/devices/input-gaming.svg + :/files/images/devices/input-gaming.svg:/files/images/devices/input-gaming.svg Joystick Test @@ -254,7 +254,7 @@ - :/images/control/launch.svg:/images/control/launch.svg + :/files/images/control/launch.svg:/files/images/control/launch.svg Simulate @@ -266,7 +266,7 @@ - :/images/contrib/slugs.png:/images/contrib/slugs.png + :/files/images/contrib/slugs.png:/files/images/contrib/slugs.png Show Slugs View @@ -275,7 +275,7 @@ - :/images/devices/input-gaming.svg:/images/devices/input-gaming.svg + :/files/images/devices/input-gaming.svg:/files/images/devices/input-gaming.svg Joystick Settings @@ -287,7 +287,7 @@ - :/images/apps/utilities-system-monitor.svg:/images/apps/utilities-system-monitor.svg + :/files/images/apps/utilities-system-monitor.svg:/files/images/apps/utilities-system-monitor.svg Online Documentation @@ -296,7 +296,7 @@ - :/images/status/software-update-available.svg:/images/status/software-update-available.svg + :/files/images/status/software-update-available.svg:/files/images/status/software-update-available.svg Project Roadmap @@ -305,7 +305,7 @@ - :/images/categories/preferences-system.svg:/images/categories/preferences-system.svg + :/files/images/categories/preferences-system.svg:/files/images/categories/preferences-system.svg Developer Credits @@ -317,7 +317,7 @@ - :/images/status/weather-overcast.svg:/images/status/weather-overcast.svg + :/files/images/status/weather-overcast.svg:/files/images/status/weather-overcast.svg Operator @@ -332,7 +332,7 @@ - :/images/apps/utilities-system-monitor.svg:/images/apps/utilities-system-monitor.svg + :/files/images/apps/utilities-system-monitor.svg:/files/images/apps/utilities-system-monitor.svg Engineer @@ -347,7 +347,7 @@ - :/images/devices/network-wired.svg:/images/devices/network-wired.svg + :/files/images/devices/network-wired.svg:/files/images/devices/network-wired.svg Mavlink @@ -359,7 +359,7 @@ - :/images/categories/applications-internet.svg:/images/categories/applications-internet.svg + :/files/images/categories/applications-internet.svg:/files/images/categories/applications-internet.svg Select Stylesheet @@ -371,7 +371,7 @@ - :/images/status/network-wireless-encrypted.svg:/images/status/network-wireless-encrypted.svg + :/files/images/status/network-wireless-encrypted.svg:/files/images/status/network-wireless-encrypted.svg Pilot @@ -383,7 +383,7 @@ - :/images/apps/utilities-system-monitor.svg:/images/apps/utilities-system-monitor.svg + :/files/images/apps/utilities-system-monitor.svg:/files/images/apps/utilities-system-monitor.svg New Custom Widget @@ -395,11 +395,11 @@ - :/images/status/audio-volume-high.svg - :/images/status/audio-volume-muted.svg - :/images/status/audio-volume-muted.svg - :/images/status/audio-volume-high.svg - :/images/status/audio-volume-muted.svg:/images/status/audio-volume-high.svg + :/files/images/status/audio-volume-high.svg + :/files/images/status/audio-volume-muted.svg + :/files/images/status/audio-volume-muted.svg + :/files/images/status/audio-volume-high.svg + :/files/images/status/audio-volume-muted.svg:/files/images/status/audio-volume-high.svg Mute Audio Output @@ -411,7 +411,7 @@ - :/images/devices/network-wireless.svg:/images/devices/network-wireless.svg + :/files/images/devices/network-wireless.svg:/files/images/devices/network-wireless.svg Unconnected @@ -423,7 +423,7 @@ - :/images/actions/system-log-out.svg:/images/actions/system-log-out.svg + :/files/images/actions/system-log-out.svg:/files/images/actions/system-log-out.svg Shutdown MAV @@ -467,7 +467,7 @@ - :/images/status/folder-drag-accept.svg:/images/status/folder-drag-accept.svg + :/files/images/status/folder-drag-accept.svg:/files/images/status/folder-drag-accept.svg Load Custom Widget File @@ -476,7 +476,7 @@ - :/images/status/software-update-available.svg:/images/status/software-update-available.svg + :/files/images/status/software-update-available.svg:/files/images/status/software-update-available.svg Firmware Update diff --git a/src/ui/MapWidget.cc b/src/ui/MapWidget.cc index b82366e20dcbbc1640446432b693d74c73946072..c5fceed5edd8b60612e1934732e8fcd0ec16dc40 100644 --- a/src/ui/MapWidget.cc +++ b/src/ui/MapWidget.cc @@ -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")); diff --git a/src/ui/ObjectDetectionView.h b/src/ui/ObjectDetectionView.h index c2baf160734aeaba3d7b1d65361de31c19a863d1..4acc01defd333399ba8d66febb82501794bce179 100644 --- a/src/ui/ObjectDetectionView.h +++ b/src/ui/ObjectDetectionView.h @@ -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 */ diff --git a/src/ui/OpalLinkSettings.ui b/src/ui/OpalLinkSettings.ui index 8fd6796fb68e9073cb0da17ba018b4f23d91b709..3d29f7d449a265c2bb6d7afc33c4da6260cf6012 100644 --- a/src/ui/OpalLinkSettings.ui +++ b/src/ui/OpalLinkSettings.ui @@ -75,7 +75,7 @@ - :/images/status/folder-open.svg:/images/status/folder-open.svg + :/files/images/status/folder-open.svg:/files/images/status/folder-open.svg @@ -89,7 +89,7 @@ - :/images/status/folder-open.svg:/images/status/folder-open.svg + :/files/images/status/folder-open.svg:/files/images/status/folder-open.svg diff --git a/src/ui/QGCMAVLinkLogPlayer.cc b/src/ui/QGCMAVLinkLogPlayer.cc index f7982149e2f201a23f05c84a463dc824ea0c6e43..56076d0cfe126ed684a0ac5c3030b9dd5ca9a0ec 100644 --- a/src/ui/QGCMAVLinkLogPlayer.cc +++ b/src/ui/QGCMAVLinkLogPlayer.cc @@ -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); diff --git a/src/ui/QGCMAVLinkLogPlayer.ui b/src/ui/QGCMAVLinkLogPlayer.ui index 48427ca3c8b2e3e7bc475d94b08afe06f7d103c4..ac207f79b698a13f40078036509c6d0e38e0141e 100644 --- a/src/ui/QGCMAVLinkLogPlayer.ui +++ b/src/ui/QGCMAVLinkLogPlayer.ui @@ -123,7 +123,7 @@ - :/images/actions/media-playback-start.svg:/images/actions/media-playback-start.svg + :/files/images/actions/media-playback-start.svg:/files/images/actions/media-playback-start.svg true diff --git a/src/ui/QGCRGBDView.cc b/src/ui/QGCRGBDView.cc index 750314535a41d786947cf7e53f3d4f40e4a6b12c..7a163b78b674664101aeddab6eaf55eb7cc9a426 100644 --- a/src/ui/QGCRGBDView.cc +++ b/src/ui/QGCRGBDView.cc @@ -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); } diff --git a/src/ui/QGCSettingsWidget.ui b/src/ui/QGCSettingsWidget.ui index a184265ceef1389d7af1421d8b3bc33c4825e736..19e7676a15f7e311fd1c23b00128c17d8770e244 100644 --- a/src/ui/QGCSettingsWidget.ui +++ b/src/ui/QGCSettingsWidget.ui @@ -31,7 +31,7 @@ - :/images/status/audio-volume-muted.svg:/images/status/audio-volume-muted.svg + :/files/images/status/audio-volume-muted.svg:/files/images/status/audio-volume-muted.svg @@ -42,7 +42,7 @@ - :/images/devices/network-wireless.svg:/images/devices/network-wireless.svg + :/files/images/devices/network-wireless.svg:/files/images/devices/network-wireless.svg diff --git a/src/ui/QGCToolBar.cc b/src/ui/QGCToolBar.cc index d80cfdbf68ec5eeaaad80f44edd958de67fdce85..31bfa88594e325cc6c20dfbe0261932a79a2de23 100644 --- a/src/ui/QGCToolBar.cc +++ b/src/ui/QGCToolBar.cc @@ -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; } } diff --git a/src/ui/SerialConfigurationWindow.cc b/src/ui/SerialConfigurationWindow.cc index 1e575912103551db64ab278299d7fcbb5d5ca80a..5c5cb720921095cc14fcffeea0ac6668d3e9a006 100644 --- a/src/ui/SerialConfigurationWindow.cc +++ b/src/ui/SerialConfigurationWindow.cc @@ -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(); diff --git a/src/ui/UASControl.ui b/src/ui/UASControl.ui index 12a4ee1a26331611ec217e714dfdf50671f7b78a..d9c5d898ec5b09efc0f80121de06c05040999977 100644 --- a/src/ui/UASControl.ui +++ b/src/ui/UASControl.ui @@ -113,7 +113,7 @@ - :/images/control/launch.svg:/images/control/launch.svg + :/files/images/control/launch.svg:/files/images/control/launch.svg @@ -136,7 +136,7 @@ - :/images/control/land.svg:/images/control/land.svg + :/files/images/control/land.svg:/files/images/control/land.svg @@ -159,7 +159,7 @@ - :/images/actions/system-log-out.svg:/images/actions/system-log-out.svg + :/files/images/actions/system-log-out.svg:/files/images/actions/system-log-out.svg @@ -200,7 +200,7 @@ - :/images/devices/network-wireless.svg:/images/devices/network-wireless.svg + :/files/images/devices/network-wireless.svg:/files/images/devices/network-wireless.svg diff --git a/src/ui/UASView.ui b/src/ui/UASView.ui index b4d8569080e58b1714337dcd42ead1736edadd36..66f1b67f3d7d6075de8faf648d5d718511be0ba4 100644 --- a/src/ui/UASView.ui +++ b/src/ui/UASView.ui @@ -316,7 +316,7 @@ QMenu::separator { - :/images/mavs/unknown.svg:/images/mavs/unknown.svg + :/files/images/mavs/unknown.svg:/files/images/mavs/unknown.svg @@ -648,7 +648,7 @@ QMenu::separator { - :/images/control/launch.svg:/images/control/launch.svg + :/files/images/control/launch.svg:/files/images/control/launch.svg @@ -677,7 +677,7 @@ QMenu::separator { - :/images/actions/media-playback-pause.svg:/images/actions/media-playback-pause.svg + :/files/images/actions/media-playback-pause.svg:/files/images/actions/media-playback-pause.svg @@ -706,7 +706,7 @@ QMenu::separator { - :/images/actions/media-playback-start.svg:/images/actions/media-playback-start.svg + :/files/images/actions/media-playback-start.svg:/files/images/actions/media-playback-start.svg @@ -735,7 +735,7 @@ QMenu::separator { - :/images/control/land.svg:/images/control/land.svg + :/files/images/control/land.svg:/files/images/control/land.svg @@ -758,7 +758,7 @@ QMenu::separator { - :/images/actions/system-log-out.svg:/images/actions/system-log-out.svg + :/files/images/actions/system-log-out.svg:/files/images/actions/system-log-out.svg @@ -793,7 +793,7 @@ QMenu::separator { - :/images/actions/media-playback-stop.svg:/images/actions/media-playback-stop.svg + :/files/images/actions/media-playback-stop.svg:/files/images/actions/media-playback-stop.svg @@ -822,7 +822,7 @@ QMenu::separator { - :/images/actions/process-stop.svg:/images/actions/process-stop.svg + :/files/images/actions/process-stop.svg:/files/images/actions/process-stop.svg diff --git a/src/ui/WaypointEditableView.ui b/src/ui/WaypointEditableView.ui index 581c087f88923d02c8f4bdd75a8943abb467aba6..c77317ccf6374292506fc5523e14a727487753f3 100644 --- a/src/ui/WaypointEditableView.ui +++ b/src/ui/WaypointEditableView.ui @@ -288,7 +288,7 @@ QPushButton:pressed { - :/images/actions/go-up.svg:/images/actions/go-up.svg + :/files/images/actions/go-up.svg:/files/images/actions/go-up.svg @@ -320,7 +320,7 @@ QPushButton:pressed { - :/images/actions/go-down.svg:/images/actions/go-down.svg + :/files/images/actions/go-down.svg:/files/images/actions/go-down.svg @@ -349,7 +349,7 @@ QPushButton:pressed { - :/images/actions/list-remove.svg:/images/actions/list-remove.svg + :/files/images/actions/list-remove.svg:/files/images/actions/list-remove.svg diff --git a/src/ui/WaypointList.ui b/src/ui/WaypointList.ui index 2773693df804e4d8a66a5644fd96f78a7d5d19e4..ffb5935a925087b99687fd7dbc1e2f48df53f244 100644 --- a/src/ui/WaypointList.ui +++ b/src/ui/WaypointList.ui @@ -153,7 +153,7 @@ - :/images/actions/go-bottom.svg:/images/actions/go-bottom.svg + :/files/images/actions/go-bottom.svg:/files/images/actions/go-bottom.svg @@ -173,7 +173,7 @@ - :/images/actions/list-add.svg:/images/actions/list-add.svg + :/files/images/actions/list-add.svg:/files/images/actions/list-add.svg @@ -193,7 +193,7 @@ - :/images/actions/process-stop.svg:/images/actions/process-stop.svg + :/files/images/actions/process-stop.svg:/files/images/actions/process-stop.svg @@ -213,7 +213,7 @@ - :/images/status/software-update-available.svg:/images/status/software-update-available.svg + :/files/images/status/software-update-available.svg:/files/images/status/software-update-available.svg @@ -233,7 +233,7 @@ - :/images/devices/network-wireless.svg:/images/devices/network-wireless.svg + :/files/images/devices/network-wireless.svg:/files/images/devices/network-wireless.svg @@ -343,7 +343,7 @@ - :/images/actions/go-jump.svg:/images/actions/go-jump.svg + :/files/images/actions/go-jump.svg:/files/images/actions/go-jump.svg @@ -355,7 +355,7 @@ - :/images/actions/list-add.svg:/images/actions/list-add.svg + :/files/images/actions/list-add.svg:/files/images/actions/list-add.svg Add Waypoint @@ -367,7 +367,7 @@ - :/images/devices/network-wireless.svg:/images/devices/network-wireless.svg + :/files/images/devices/network-wireless.svg:/files/images/devices/network-wireless.svg Transmit @@ -379,7 +379,7 @@ - :/images/status/software-update-available.svg:/images/status/software-update-available.svg + :/files/images/status/software-update-available.svg:/files/images/status/software-update-available.svg Read diff --git a/src/ui/XbeeConfigurationWindow.cpp b/src/ui/XbeeConfigurationWindow.cpp index 54c3b45c4e301002e3fc70ea81b7de0efd0629b5..7be847ac651f6300758dc7ee8355238d5803045c 100644 --- a/src/ui/XbeeConfigurationWindow.cpp +++ b/src/ui/XbeeConfigurationWindow.cpp @@ -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")); @@ -446,4 +446,4 @@ void XbeeConfigurationWindow::addrChangedLow(int addr) outStr << this->lowAddr->value(); } emit addrLowChanged(uaddr); -} \ No newline at end of file +} diff --git a/src/ui/generated/AudioOutputWidget.h b/src/ui/generated/AudioOutputWidget.h index 9ecd33e06e4a148468bdb596d11fa9cef5eb7905..1b9c4caaa644a1a78b47d276cc75169f8d9bc655 100644 --- a/src/ui/generated/AudioOutputWidget.h +++ b/src/ui/generated/AudioOutputWidget.h @@ -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)); diff --git a/src/ui/generated/DebugConsole.h b/src/ui/generated/DebugConsole.h index f4e79b1ffcdc2e87944d66d9f3b8d61289f9f2a5..70d7b3073cc5cb86d42de386afc1b986e3305681 100644 --- a/src/ui/generated/DebugConsole.h +++ b/src/ui/generated/DebugConsole.h @@ -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); diff --git a/src/ui/generated/UASControl.h b/src/ui/generated/UASControl.h index a1fea1fb0aa34026e650ba740c2af06f0e495fb5..92cf42a24da116710d6dac2709c6c96c98058c18 100644 --- a/src/ui/generated/UASControl.h +++ b/src/ui/generated/UASControl.h @@ -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); diff --git a/src/ui/generated/UASView.h b/src/ui/generated/UASView.h index 5c761f1eab3873a87afda48cd668106e17e32593..1f8e91ebf722f5c44208d49d8b3a9790a4066353 100644 --- a/src/ui/generated/UASView.h +++ b/src/ui/generated/UASView.h @@ -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); diff --git a/src/ui/generated/WaypointList.h b/src/ui/generated/WaypointList.h index 8093a1b61ed0dcf2ac53bbe1bbeffce4e3b477b8..da933424010be19e26949c884fa1c20510a966bc 100644 --- a/src/ui/generated/WaypointList.h +++ b/src/ui/generated/WaypointList.h @@ -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); diff --git a/src/ui/generated/WaypointView.h b/src/ui/generated/WaypointView.h index de7195822e892a4f04d297985cc353f3c2b55a9e..09cb6580d0cc75976e48b90c7922234580c7bf7a 100644 --- a/src/ui/generated/WaypointView.h +++ b/src/ui/generated/WaypointView.h @@ -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); diff --git a/src/ui/generated/XMLCommProtocolWidget.h b/src/ui/generated/XMLCommProtocolWidget.h index c89d591f68ad193c50dea7c4ad2f9c745985f527..1ac464298be9d3c654d017899395f98c81355ac7 100644 --- a/src/ui/generated/XMLCommProtocolWidget.h +++ b/src/ui/generated/XMLCommProtocolWidget.h @@ -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); diff --git a/src/ui/map3D/Q3DWidget.cc b/src/ui/map3D/Q3DWidget.cc index 1ec2721d456d6a6fd3d366e5ce6fb5c296937a44..0e62366bd3e167d7b5a4db3773c75fee01a01ae2 100644 --- a/src/ui/map3D/Q3DWidget.cc +++ b/src/ui/map3D/Q3DWidget.cc @@ -55,7 +55,7 @@ Q3DWidget::Q3DWidget(QWidget* parent) fontImpl = new osgQt::QFontImplementation(QFont(":/general/vera.ttf")); #else osg::ref_ptr 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); diff --git a/src/ui/uas/UASView.cc b/src/ui/uas/UASView.cc index 530274a3b36ce4ea63f35a6c2e1dc2aff4e475de..aca094e142a96b6f07d4c6ced62d229e59f788b3 100644 --- a/src/ui/uas/UASView.cc +++ b/src/ui/uas/UASView.cc @@ -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; } }