diff options
author | Circle CI <circleci@navit-project.org> | 2017-10-30 00:23:00 +0000 |
---|---|---|
committer | Circle CI <circleci@navit-project.org> | 2017-10-30 00:23:00 +0000 |
commit | 82b0529430d6bbfa9d1ebe3c8706c2a37a033b12 (patch) | |
tree | a7d8c6e13a25a4add493f7ab74bbd45530d5bfb5 /navit/gui/qt5_qml/editor | |
parent | 3d234b7049c094314ae60de2779cd6672a04d90c (diff) | |
download | navit-82b0529430d6bbfa9d1ebe3c8706c2a37a033b12.tar.gz |
Update doc for commit c4e55b27cca91d761c9f4385cddb65b2eb5f8e3c
Diffstat (limited to 'navit/gui/qt5_qml/editor')
-rw-r--r-- | navit/gui/qt5_qml/editor/.gitignore | 73 | ||||
-rw-r--r-- | navit/gui/qt5_qml/editor/editor.pro | 29 | ||||
-rw-r--r-- | navit/gui/qt5_qml/editor/gui_qt5_qml.qml | 59 | ||||
-rw-r--r-- | navit/gui/qt5_qml/editor/main.cpp | 13 | ||||
-rw-r--r-- | navit/gui/qt5_qml/editor/main.qml | 59 | ||||
-rw-r--r-- | navit/gui/qt5_qml/editor/map.png | bin | 604456 -> 0 bytes | |||
-rw-r--r-- | navit/gui/qt5_qml/editor/qml.qrc | 42 | ||||
l--------- | navit/gui/qt5_qml/editor/skins | 1 |
8 files changed, 0 insertions, 276 deletions
diff --git a/navit/gui/qt5_qml/editor/.gitignore b/navit/gui/qt5_qml/editor/.gitignore deleted file mode 100644 index fab7372d7..000000000 --- a/navit/gui/qt5_qml/editor/.gitignore +++ /dev/null @@ -1,73 +0,0 @@ -# This file is used to ignore files which are generated -# ---------------------------------------------------------------------------- - -*~ -*.autosave -*.a -*.core -*.moc -*.o -*.obj -*.orig -*.rej -*.so -*.so.* -*_pch.h.cpp -*_resource.rc -*.qm -.#* -*.*# -core -!core/ -tags -.DS_Store -.directory -*.debug -Makefile* -*.prl -*.app -moc_*.cpp -ui_*.h -qrc_*.cpp -Thumbs.db -*.res -*.rc -/.qmake.cache -/.qmake.stash - -# qtcreator generated files -*.pro.user* - -# xemacs temporary files -*.flc - -# Vim temporary files -.*.swp - -# Visual Studio generated files -*.ib_pdb_index -*.idb -*.ilk -*.pdb -*.sln -*.suo -*.vcproj -*vcproj.*.*.user -*.ncb -*.sdf -*.opensdf -*.vcxproj -*vcxproj.* - -# MinGW generated files -*.Debug -*.Release - -# Python byte code -*.pyc - -# Binaries -# -------- -*.dll -*.exe - diff --git a/navit/gui/qt5_qml/editor/editor.pro b/navit/gui/qt5_qml/editor/editor.pro deleted file mode 100644 index d0d4cd297..000000000 --- a/navit/gui/qt5_qml/editor/editor.pro +++ /dev/null @@ -1,29 +0,0 @@ -QT += qml quick - -CONFIG += c++11 - -SOURCES += main.cpp - -RESOURCES += qml.qrc - -# Additional import path used to resolve QML modules in Qt Creator's code model -QML_IMPORT_PATH = - -# Additional import path used to resolve QML modules just for Qt Quick Designer -QML_DESIGNER_IMPORT_PATH = - -# The following define makes your compiler emit warnings if you use -# any feature of Qt which as been marked deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS - -# You can also make your code fail to compile if you use deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -# Default rules for deployment. -qnx: target.path = /tmp/$${TARGET}/bin -else: unix:!android: target.path = /opt/$${TARGET}/bin -!isEmpty(target.path): INSTALLS += target diff --git a/navit/gui/qt5_qml/editor/gui_qt5_qml.qml b/navit/gui/qt5_qml/editor/gui_qt5_qml.qml deleted file mode 100644 index f8c2daa4a..000000000 --- a/navit/gui/qt5_qml/editor/gui_qt5_qml.qml +++ /dev/null @@ -1,59 +0,0 @@ -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.0 - -ApplicationWindow { - id: applicationWindow - visible: true - width: 800 - height: 480 - title: qsTr("Navit Stub") - - MouseArea { - id: mouseArea - z: -1 - anchors.fill: parent - onClicked: { - mainMenu.source = "skins/modern/menu.qml" - mainMenu.state = 'visible' - console.log("showing menu") - } - - Image { - id: image - anchors.left: parent.left - anchors.rightMargin: 0 - anchors.bottom: parent.bottom - anchors.bottomMargin: 0 - source: "map.png" - } - - } - - Loader { - id: mainMenu - width: parent.width - height: parent.height - x: parent.width - opacity: 0 - - states: [ - State { - name: "visible" - PropertyChanges { - target: mainMenu - x: 0 - opacity: 1 - } - } - ] - transitions: [ - Transition { - NumberAnimation { - properties: "x,y,opacity";duration: 300 - } - } - ] - } - -} diff --git a/navit/gui/qt5_qml/editor/main.cpp b/navit/gui/qt5_qml/editor/main.cpp deleted file mode 100644 index 9089c5a29..000000000 --- a/navit/gui/qt5_qml/editor/main.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include <QGuiApplication> -#include <QQmlApplicationEngine> - -int main(int argc, char *argv[]) -{ - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QGuiApplication app(argc, argv); - - QQmlApplicationEngine engine; - engine.load(QUrl(QLatin1String("qrc:/gui_qt5_qml.qml"))); - - return app.exec(); -} diff --git a/navit/gui/qt5_qml/editor/main.qml b/navit/gui/qt5_qml/editor/main.qml deleted file mode 100644 index be7157513..000000000 --- a/navit/gui/qt5_qml/editor/main.qml +++ /dev/null @@ -1,59 +0,0 @@ -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.0 - -ApplicationWindow { - id: applicationWindow - visible: true - width: 800 - height: 480 - title: qsTr("Hello World 2") - - MouseArea { - id: mouseArea - z: -1 - anchors.fill: parent - onClicked: { - mainMenu.source = "skins/menu.qml" - mainMenu.state = 'visible' - console.log("showing menu") - } - - Image { - id: image - anchors.left: parent.left - anchors.rightMargin: 0 - anchors.bottom: parent.bottom - anchors.bottomMargin: 0 - source: "map.png" - } - - } - - Loader { - id: mainMenu - width: parent.width - height: parent.height - x: parent.width - opacity: 0 - - states: [ - State { - name: "visible" - PropertyChanges { - target: mainMenu - x: 0 - opacity: 1 - } - } - ] - transitions: [ - Transition { - NumberAnimation { - properties: "x,y,opacity";duration: 300 - } - } - ] - } - -} diff --git a/navit/gui/qt5_qml/editor/map.png b/navit/gui/qt5_qml/editor/map.png Binary files differdeleted file mode 100644 index 998b85eb3..000000000 --- a/navit/gui/qt5_qml/editor/map.png +++ /dev/null diff --git a/navit/gui/qt5_qml/editor/qml.qrc b/navit/gui/qt5_qml/editor/qml.qrc deleted file mode 100644 index a1db879a2..000000000 --- a/navit/gui/qt5_qml/editor/qml.qrc +++ /dev/null @@ -1,42 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>map.png</file> - <file>skins/modern/main.qml</file> - <file>skins/modern/menu.qml</file> - <file>skins/modern/MainMenu.qml</file> - <file>skins/modern/navit.svg</file> - <file>skins/modern/MainButton.qml</file> - <file>skins/modern/settings.qml</file> - <file>skins/modern/maps.qml</file> - <file>skins/modern/poi.qml</file> - <file>skins/modern/pois.qml</file> - <file>skins/modern/bookmark.qml</file> - <file>skins/modern/bookmarks.qml</file> - <file>skins/modern/icons/appbar.home.variant.svg</file> - <file>skins/modern/icons/appbar.rocket.svg</file> - <file>skins/modern/icons/appbar.power.svg</file> - <file>skins/modern/icons/appbar.cog.svg</file> - <file>skins/modern/icons/appbar.layer.svg</file> - <file>skins/modern/icons/appbar.layer.delete.svg</file> - <file>skins/modern/icons/appbar.map.svg</file> - <file>skins/modern/icons/appbar.information.circle.svg</file> - <file>skins/modern/icons/appbar.chevron.up.svg</file> - <file>skins/modern/icons/appbar.chevron.down.svg</file> - <file>skins/modern/icons/appbar.fullscreen.box.svg</file> - <file>skins/modern/icons/appbar.transit.car.svg</file> - <file>skins/modern/icons/appbar.location.checkin.svg</file> - <file>skins/modern/icons/appbar.cogs.svg</file> - <file>skins/modern/icons/bigcity.png</file> - <file>skins/modern/search.qml</file> - <file>skins/modern/destination.qml</file> - <file>skins/modern/icons/appbar.city.svg</file> - <file>skins/modern/icons/appbar.location.svg</file> - <file>skins/modern/icons/appbar.timer.rewind.svg</file> - <file>skins/modern/icons/appbar.book.list.svg</file> - <file>skins/modern/icons/smallcity.png</file> - <file>skins/modern/destination_address.qml</file> - <file>skins/modern/search_result_item.qml</file> - <file>skins/modern/vehicles.qml</file> - <file>skins/modern/vehicle.qml</file> - </qresource> -</RCC> diff --git a/navit/gui/qt5_qml/editor/skins b/navit/gui/qt5_qml/editor/skins deleted file mode 120000 index cdb8b4e07..000000000 --- a/navit/gui/qt5_qml/editor/skins +++ /dev/null @@ -1 +0,0 @@ -../skins/
\ No newline at end of file |