From 82b0529430d6bbfa9d1ebe3c8706c2a37a033b12 Mon Sep 17 00:00:00 2001 From: Circle CI Date: Mon, 30 Oct 2017 00:23:00 +0000 Subject: Update doc for commit c4e55b27cca91d761c9f4385cddb65b2eb5f8e3c --- navit/gui/qt5_qml/editor/.gitignore | 73 ------------------------------- navit/gui/qt5_qml/editor/editor.pro | 29 ------------ navit/gui/qt5_qml/editor/gui_qt5_qml.qml | 59 ------------------------- navit/gui/qt5_qml/editor/main.cpp | 13 ------ navit/gui/qt5_qml/editor/main.qml | 59 ------------------------- navit/gui/qt5_qml/editor/map.png | Bin 604456 -> 0 bytes navit/gui/qt5_qml/editor/qml.qrc | 42 ------------------ navit/gui/qt5_qml/editor/skins | 1 - 8 files changed, 276 deletions(-) delete mode 100644 navit/gui/qt5_qml/editor/.gitignore delete mode 100644 navit/gui/qt5_qml/editor/editor.pro delete mode 100644 navit/gui/qt5_qml/editor/gui_qt5_qml.qml delete mode 100644 navit/gui/qt5_qml/editor/main.cpp delete mode 100644 navit/gui/qt5_qml/editor/main.qml delete mode 100644 navit/gui/qt5_qml/editor/map.png delete mode 100644 navit/gui/qt5_qml/editor/qml.qrc delete mode 120000 navit/gui/qt5_qml/editor/skins (limited to 'navit/gui/qt5_qml/editor') 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 -#include - -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 deleted file mode 100644 index 998b85eb3..000000000 Binary files a/navit/gui/qt5_qml/editor/map.png and /dev/null differ 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 @@ - - - map.png - skins/modern/main.qml - skins/modern/menu.qml - skins/modern/MainMenu.qml - skins/modern/navit.svg - skins/modern/MainButton.qml - skins/modern/settings.qml - skins/modern/maps.qml - skins/modern/poi.qml - skins/modern/pois.qml - skins/modern/bookmark.qml - skins/modern/bookmarks.qml - skins/modern/icons/appbar.home.variant.svg - skins/modern/icons/appbar.rocket.svg - skins/modern/icons/appbar.power.svg - skins/modern/icons/appbar.cog.svg - skins/modern/icons/appbar.layer.svg - skins/modern/icons/appbar.layer.delete.svg - skins/modern/icons/appbar.map.svg - skins/modern/icons/appbar.information.circle.svg - skins/modern/icons/appbar.chevron.up.svg - skins/modern/icons/appbar.chevron.down.svg - skins/modern/icons/appbar.fullscreen.box.svg - skins/modern/icons/appbar.transit.car.svg - skins/modern/icons/appbar.location.checkin.svg - skins/modern/icons/appbar.cogs.svg - skins/modern/icons/bigcity.png - skins/modern/search.qml - skins/modern/destination.qml - skins/modern/icons/appbar.city.svg - skins/modern/icons/appbar.location.svg - skins/modern/icons/appbar.timer.rewind.svg - skins/modern/icons/appbar.book.list.svg - skins/modern/icons/smallcity.png - skins/modern/destination_address.qml - skins/modern/search_result_item.qml - skins/modern/vehicles.qml - skins/modern/vehicle.qml - - 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 -- cgit v1.2.1