summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2022-03-07 15:58:03 -0500
committerScott Murray <scott.murray@konsulko.com>2022-03-07 16:01:38 -0500
commit70dfe121582cda2c82c794e5af6550b5c1a237c4 (patch)
tree88a79bcac0e13f5165041217e2a324019b6fcaf3
parent32596d1152e7a94bc62734dc222a3d99c14e1fe5 (diff)
Update for app framework removalmarlin_12.93.0marlin/12.93.012.93.0
Changes: - Remove the autobuild scripts and config.xml used by the app framework widget build. - Update the qmake files to just build a "tbtnavi" binary and install it into /usr/bin by default. - Remove the code in main.cpp that handled reading the WebSocket command-line arguments and passing them to binding related code. - Removed signal-composer wrapper instantiation in main.cpp, but the related QML has been left alone now, this will need to be revisited once something else is in place for vehicle signals (e.g. perhaps a simple VISS API wrapper in libqtappfw that leverages kuksa.val). Bug-AGL: SPEC-4283 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I9ea3b5aff37ad5013815afaab07823194350b26d
-rw-r--r--app/app.pri1
-rw-r--r--app/app.pro16
-rw-r--r--app/main.cpp32
-rwxr-xr-xautobuild/agl/autobuild110
-rw-r--r--autobuild/linux/autobuild110
-rw-r--r--package/config.xml20
-rw-r--r--package/icon.svg283
-rw-r--r--package/package.pro24
-rw-r--r--tbtnavi.pro3
9 files changed, 10 insertions, 589 deletions
diff --git a/app/app.pri b/app/app.pri
deleted file mode 100644
index 5dad652..0000000
--- a/app/app.pri
+++ /dev/null
@@ -1 +0,0 @@
-DESTDIR = $${OUT_PWD}/../package/root/bin
diff --git a/app/app.pro b/app/app.pro
index fbe53a4..8889208 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -1,17 +1,11 @@
-TARGET = tbtnavi
TEMPLATE = app
+TARGET = tbtnavi
QT = qml network quick positioning location widgets gui-private
-PKGCONFIG += qtappfw-navigation qtappfw-signal-composer wayland-client
+PKGCONFIG += qtappfw-navigation wayland-client
CONFIG += c++1z link_pkgconfig wayland-scanner
-CONFIG(release, debug|release) {
- QMAKE_POST_LINK = $(STRIP) --strip-unneeded $(TARGET)
-}
-
-include(app.pri)
-
SOURCES += \
main.cpp \
navigation_client.cpp \
@@ -37,3 +31,9 @@ RESOURCES += \
WAYLANDCLIENTSOURCES += \
protocol/agl-shell-desktop.xml
+
+target.path = /usr/bin
+target.files += $${OUT_PWD}/$${TARGET}
+target.CONFIG = no_check_exist executable
+
+INSTALLS += target
diff --git a/app/main.cpp b/app/main.cpp
index 645d2f7..1be4efa 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -8,7 +8,6 @@
#include <QtQml/QQmlContext>
#include <QtQuick/QQuickWindow>
#include <navigation.h>
-#include <signalcomposer.h>
#include <QScreen>
#include "navigation_client.h"
@@ -99,15 +98,6 @@ int main(int argc, char *argv[])
QCoreApplication::setApplicationVersion("0.1.0");
app.setDesktopFileName(graphic_role);
- QCommandLineParser parser;
- parser.addPositionalArgument("port", app.translate("main", "port for binding"));
- parser.addPositionalArgument("secret", app.translate("main", "secret for binding"));
- parser.addHelpOption();
- parser.addVersionOption();
- parser.process(app);
- QStringList positionalArguments = parser.positionalArguments();
- QUrl bindingAddress;
-
QPlatformNativeInterface *native = qApp->platformNativeInterface();
agl_shell_desktop = register_agl_shell_desktop(native);
if (!agl_shell_desktop) {
@@ -118,24 +108,6 @@ int main(int argc, char *argv[])
std::shared_ptr<struct agl_shell_desktop> shell{agl_shell_desktop, agl_shell_desktop_destroy};
Shell *aglShell = new Shell(shell, nullptr);
- int port = 0;
- QString token;
- if (positionalArguments.length() == 2) {
- port = positionalArguments.takeFirst().toInt();
- token = positionalArguments.takeFirst();
- bindingAddress.setScheme(QStringLiteral("ws"));
- bindingAddress.setHost(QStringLiteral("localhost"));
- bindingAddress.setPort(port);
- bindingAddress.setPath(QStringLiteral("/api"));
- QUrlQuery query;
- query.addQueryItem(QStringLiteral("token"), token);
- bindingAddress.setQuery(query);
- }
- fprintf(stderr, "[tbtnavi] app_name: %s, port: %d, token: %s.\n",
- graphic_role.toStdString().c_str(),
- port,
- token.toStdString().c_str());
-
/* inform the compositor that the window be placed on a different
* output */
QScreen *screen_to_put = find_qscreen(OUTPUT_ID);
@@ -160,9 +132,7 @@ int main(int argc, char *argv[])
File_Operation file;
context->setContextProperty("fileOperation", &file);
- Navigation *navigation = new Navigation(bindingAddress, context);
-
- context->setContextProperty("SignalComposer", new SignalComposer(bindingAddress, context));
+ Navigation *navigation = new Navigation(context);
engine.load(QUrl(QStringLiteral("qrc:qml/Main.qml")));
diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild
deleted file mode 100755
index bbbc13e..0000000
--- a/autobuild/agl/autobuild
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/make -f
-# Copyright (C) 2015 - 2018 "IoT.bzh"
-# Copyright (C) 2020 Konsulko Group
-# Author "Romain Forlot" <romain.forlot@iot.bzh>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-THISFILE := $(lastword $(MAKEFILE_LIST))
-ROOT_DIR := $(abspath $(dir $(THISFILE))/../..)
-
-# Build directories
-# Note that the debug directory is defined in relation to the release
-# directory (BUILD_DIR), this needs to be kept in mind if over-riding
-# it and building that widget types, the specific widget type variable
-# (e.g. BUILD_DIR_DEBUG) may also need to be specified to yield the
-# desired output hierarchy.
-BUILD_DIR = $(ROOT_DIR)/build
-BUILD_DIR_DEBUG = $(abspath $(BUILD_DIR)/../build-debug)
-
-# Output directory variable for use in pattern rules.
-# This is intended for internal use only, hence the explicit override
-# definition.
-override OUTPUT_DIR = $(BUILD_DIR)
-
-# Final install directory for widgets
-DEST = $(OUTPUT_DIR)
-
-# Default build type for release builds
-BUILD_TYPE = release
-
-.PHONY: all help update install distclean
-.PHONY: clean clean-release clean-debug clean-all
-.PHONY: configure configure-release configure-debug
-.PHONY: build build-release build-debug build-all
-.PHONY: package package-release package-debug package-all
-
-help:
- @echo "List of targets available:"
- @echo ""
- @echo "- all"
- @echo "- help"
- @echo "- clean"
- @echo "- distclean"
- @echo "- configure"
- @echo "- build: compilation, link and prepare files for package into a widget"
- @echo "- package: output a widget file '*.wgt'"
- @echo "- install: install in $(DEST) directory"
- @echo ""
- @echo "Usage: ./autobuild/agl/autobuild package DEST=${HOME}/opt"
- @echo "Don't use your build dir as DEST as wgt file is generated at this location"
-
-all: package-all
-
-# Target specific variable over-rides so static pattern rules can be
-# used for the various type-specific targets.
-
-configure-debug build-debug package-debug clean-debug: OUTPUT_DIR = $(BUILD_DIR_DEBUG)
-configure-debug build-debug package-debug: BUILD_TYPE = debug
-
-clean-release clean-debug:
- @if [ -d $(OUTPUT_DIR) ]; then \
- $(MAKE) -C $(OUTPUT_DIR) $(CLEAN_ARGS) clean; \
- else \
- echo Nothing to clean; \
- fi
-
-clean: clean-release
-
-clean-all: clean-release clean-debug
-
-distclean: clean-all
-
-configure-release configure-debug:
- @mkdir -p $(OUTPUT_DIR)
- @if [ ! -f $(OUTPUT_DIR)/Makefile ]; then \
- (cd $(OUTPUT_DIR) && qmake CONFIG+=$(BUILD_TYPE) $(CONFIGURE_ARGS) $(ROOT_DIR)); \
- fi
-
-configure: configure-release
-
-build-release build-debug: build-%: configure-%
- @$(MAKE) -C $(OUTPUT_DIR) $(BUILD_ARGS) all
-
-build: build-release
-
-build-all: build-release build-debug
-
-package-release package-debug: package-%: build-%
- @cp $(OUTPUT_DIR)/package/*.wgt $(OUTPUT_DIR)/
- @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \
- mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \
- fi
-
-
-package: package-release
-
-package-all: package-release package-debug
-
-install: build
- @$(MAKE) -C $(BUILD_DIR) $(INSTALL_ARGS) install
diff --git a/autobuild/linux/autobuild b/autobuild/linux/autobuild
deleted file mode 100644
index bbbc13e..0000000
--- a/autobuild/linux/autobuild
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/make -f
-# Copyright (C) 2015 - 2018 "IoT.bzh"
-# Copyright (C) 2020 Konsulko Group
-# Author "Romain Forlot" <romain.forlot@iot.bzh>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-THISFILE := $(lastword $(MAKEFILE_LIST))
-ROOT_DIR := $(abspath $(dir $(THISFILE))/../..)
-
-# Build directories
-# Note that the debug directory is defined in relation to the release
-# directory (BUILD_DIR), this needs to be kept in mind if over-riding
-# it and building that widget types, the specific widget type variable
-# (e.g. BUILD_DIR_DEBUG) may also need to be specified to yield the
-# desired output hierarchy.
-BUILD_DIR = $(ROOT_DIR)/build
-BUILD_DIR_DEBUG = $(abspath $(BUILD_DIR)/../build-debug)
-
-# Output directory variable for use in pattern rules.
-# This is intended for internal use only, hence the explicit override
-# definition.
-override OUTPUT_DIR = $(BUILD_DIR)
-
-# Final install directory for widgets
-DEST = $(OUTPUT_DIR)
-
-# Default build type for release builds
-BUILD_TYPE = release
-
-.PHONY: all help update install distclean
-.PHONY: clean clean-release clean-debug clean-all
-.PHONY: configure configure-release configure-debug
-.PHONY: build build-release build-debug build-all
-.PHONY: package package-release package-debug package-all
-
-help:
- @echo "List of targets available:"
- @echo ""
- @echo "- all"
- @echo "- help"
- @echo "- clean"
- @echo "- distclean"
- @echo "- configure"
- @echo "- build: compilation, link and prepare files for package into a widget"
- @echo "- package: output a widget file '*.wgt'"
- @echo "- install: install in $(DEST) directory"
- @echo ""
- @echo "Usage: ./autobuild/agl/autobuild package DEST=${HOME}/opt"
- @echo "Don't use your build dir as DEST as wgt file is generated at this location"
-
-all: package-all
-
-# Target specific variable over-rides so static pattern rules can be
-# used for the various type-specific targets.
-
-configure-debug build-debug package-debug clean-debug: OUTPUT_DIR = $(BUILD_DIR_DEBUG)
-configure-debug build-debug package-debug: BUILD_TYPE = debug
-
-clean-release clean-debug:
- @if [ -d $(OUTPUT_DIR) ]; then \
- $(MAKE) -C $(OUTPUT_DIR) $(CLEAN_ARGS) clean; \
- else \
- echo Nothing to clean; \
- fi
-
-clean: clean-release
-
-clean-all: clean-release clean-debug
-
-distclean: clean-all
-
-configure-release configure-debug:
- @mkdir -p $(OUTPUT_DIR)
- @if [ ! -f $(OUTPUT_DIR)/Makefile ]; then \
- (cd $(OUTPUT_DIR) && qmake CONFIG+=$(BUILD_TYPE) $(CONFIGURE_ARGS) $(ROOT_DIR)); \
- fi
-
-configure: configure-release
-
-build-release build-debug: build-%: configure-%
- @$(MAKE) -C $(OUTPUT_DIR) $(BUILD_ARGS) all
-
-build: build-release
-
-build-all: build-release build-debug
-
-package-release package-debug: package-%: build-%
- @cp $(OUTPUT_DIR)/package/*.wgt $(OUTPUT_DIR)/
- @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \
- mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \
- fi
-
-
-package: package-release
-
-package-all: package-release package-debug
-
-install: build
- @$(MAKE) -C $(BUILD_DIR) $(INSTALL_ARGS) install
diff --git a/package/config.xml b/package/config.xml
deleted file mode 100644
index 307d53a..0000000
--- a/package/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets" id="tbtnavi" version="0.1">
- <name>tbtnavi</name>
- <icon src="icon.svg"/>
- <content src="bin/tbtnavi" type="application/vnd.agl.native"/>
- <description>This is the turn-by-turn navigation application. </description>
- <author>TOYOTA</author>
- <license>APL 2.0</license>
- <feature name="urn:AGL:widget:required-api">
- <param name="navigation" value="ws"/>
- <param name="signal-composer" value="ws"/>
- </feature>
- <feature name="urn:AGL:widget:required-permission">
- <param name="urn:AGL:permission::public:no-htdocs" value="required" />
- <param name="urn:AGL:permission::public:display" value="required" />
- <param name="urn:AGL:permission::system:run-by-default" value="required"/>
- <param name="urn:AGL:permission::public:hidden" value="required" />
- <param name="http://tizen.org/privilege/internal/dbus" value="required"/>
- </feature>
-</widget>
diff --git a/package/icon.svg b/package/icon.svg
deleted file mode 100644
index 6628784..0000000
--- a/package/icon.svg
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-
-<svg
- xmlns:i="&amp;ns_ai;"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- x="0px"
- y="0px"
- viewBox="0 0 320 320"
- style="enable-background:new 0 0 320 320;"
- xml:space="preserve"
- id="svg2"
- inkscape:version="0.91 r13725"
- sodipodi:docname="icon.svg"><metadata
- id="metadata1292"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
- id="defs1290" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="2560"
- inkscape:window-height="1464"
- id="namedview1288"
- showgrid="false"
- inkscape:zoom="0.7375"
- inkscape:cx="-697.62712"
- inkscape:cy="160"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg2" /><style
- type="text/css"
- id="style4">
- .st0{display:none;}
- .st1{display:inline;}
- .st2{opacity:0.4;fill:url(#SVGID_1_);}
- .st3{fill:url(#SVGID_2_);}
- .st4{fill:#FFFFFF;}
- .st5{font-family:'Roboto-Regular';}
- .st6{font-size:25px;}
- .st7{letter-spacing:6;}
- .st8{fill:url(#SVGID_3_);}
- .st9{fill:url(#SVGID_4_);}
- .st10{fill:url(#SVGID_5_);}
- .st11{fill:url(#SVGID_6_);}
- .st12{fill:url(#SVGID_7_);}
- .st13{fill:url(#SVGID_8_);}
- .st14{fill:url(#SVGID_9_);}
- .st15{fill:url(#SVGID_10_);}
- .st16{fill:url(#SVGID_11_);}
- .st17{fill:url(#SVGID_12_);}
- .st18{fill:url(#SVGID_13_);}
- .st19{fill:url(#SVGID_14_);}
- .st20{fill:url(#SVGID_15_);}
- .st21{fill:url(#SVGID_16_);}
- .st22{fill:url(#SVGID_17_);}
- .st23{fill:url(#SVGID_18_);}
- .st24{opacity:0.29;}
- .st25{fill:url(#SVGID_19_);}
- .st26{fill:url(#SVGID_20_);}
- .st27{fill:url(#SVGID_21_);}
- .st28{fill:url(#SVGID_22_);}
- .st29{fill:url(#SVGID_23_);}
- .st30{fill:url(#SVGID_24_);}
- .st31{fill:url(#SVGID_25_);}
- .st32{fill:url(#SVGID_26_);}
- .st33{fill:url(#SVGID_27_);}
- .st34{fill:url(#SVGID_28_);}
- .st35{fill:url(#SVGID_29_);}
- .st36{fill:url(#SVGID_30_);}
- .st37{fill:url(#SVGID_31_);}
- .st38{fill:url(#SVGID_32_);}
- .st39{fill:url(#SVGID_33_);}
- .st40{fill:url(#SVGID_34_);}
- .st41{fill:url(#SVGID_35_);}
- .st42{fill:url(#SVGID_36_);}
- .st43{opacity:0.4;fill:url(#SVGID_37_);}
- .st44{fill:url(#SVGID_38_);}
- .st45{fill:url(#SVGID_39_);}
- .st46{fill:url(#SVGID_40_);}
- .st47{fill:url(#SVGID_41_);}
- .st48{fill:url(#SVGID_42_);}
- .st49{fill:url(#SVGID_43_);}
- .st50{fill:url(#SVGID_44_);}
- .st51{display:inline;opacity:0.29;}
- .st52{display:inline;fill:url(#SVGID_45_);}
- .st53{display:inline;fill:url(#SVGID_46_);}
- .st54{display:inline;fill:#FFFFFF;}
- .st55{display:inline;fill:url(#SVGID_47_);}
- .st56{display:inline;fill:url(#SVGID_48_);}
- .st57{display:inline;fill:url(#SVGID_49_);}
- .st58{display:inline;fill:url(#SVGID_50_);}
- .st59{display:inline;fill:url(#SVGID_51_);}
- .st60{display:inline;fill:url(#SVGID_52_);}
- .st61{opacity:0.4;fill:url(#SVGID_53_);}
- .st62{fill:url(#SVGID_54_);}
- .st63{fill:url(#SVGID_55_);}
- .st64{fill:url(#SVGID_56_);}
- .st65{fill:url(#SVGID_57_);}
- .st66{fill:url(#SVGID_58_);}
- .st67{opacity:0.4;fill:url(#SVGID_59_);}
- .st68{fill:url(#SVGID_60_);}
- .st69{fill:url(#SVGID_61_);}
- .st70{fill:url(#SVGID_62_);}
- .st71{fill:url(#SVGID_63_);}
- .st72{fill:url(#SVGID_64_);}
- .st73{fill:url(#SVGID_65_);}
- .st74{fill:url(#SVGID_66_);}
- .st75{fill:url(#SVGID_67_);}
- .st76{fill:url(#SVGID_68_);}
- .st77{fill:url(#SVGID_69_);}
- .st78{fill:url(#SVGID_70_);}
- .st79{fill:url(#SVGID_71_);}
- .st80{fill:url(#SVGID_72_);}
- .st81{fill:url(#SVGID_73_);}
- .st82{fill:url(#SVGID_74_);}
- .st83{fill:url(#SVGID_75_);}
- .st84{fill:url(#SVGID_76_);}
- .st85{fill:url(#SVGID_77_);}
- .st86{fill:url(#SVGID_78_);}
- .st87{fill:url(#SVGID_79_);}
- .st88{fill:url(#SVGID_80_);}
- .st89{fill:url(#SVGID_81_);}
- .st90{fill:url(#SVGID_82_);}
- .st91{fill:url(#SVGID_83_);}
- .st92{fill:url(#SVGID_84_);}
- .st93{fill:url(#SVGID_85_);}
- .st94{fill:url(#SVGID_86_);}
- .st95{opacity:0.4;fill:url(#SVGID_87_);}
- .st96{fill:url(#SVGID_88_);}
- .st97{fill:url(#SVGID_89_);}
- .st98{fill:url(#SVGID_90_);}
- .st99{display:inline;fill:url(#SVGID_91_);}
- .st100{display:inline;fill:url(#SVGID_92_);}
- .st101{fill:url(#SVGID_93_);}
- .st102{fill:url(#SVGID_94_);}
- .st103{opacity:0.4;fill:url(#SVGID_95_);}
- .st104{fill:url(#SVGID_96_);}
- .st105{fill:url(#SVGID_97_);}
- .st106{fill:url(#SVGID_98_);}
- .st107{fill:url(#SVGID_99_);}
- .st108{fill:url(#SVGID_100_);}
- .st109{fill:url(#SVGID_101_);}
- .st110{display:inline;fill:url(#SVGID_102_);}
- .st111{display:inline;fill:url(#SVGID_103_);}
- .st112{fill:url(#SVGID_104_);}
- .st113{fill:url(#SVGID_105_);}
- .st114{fill:url(#SVGID_106_);}
- .st115{fill:url(#SVGID_107_);}
- .st116{fill:url(#SVGID_108_);}
- .st117{opacity:0.4;fill:url(#SVGID_109_);}
- .st118{fill:url(#SVGID_110_);}
- .st119{fill:url(#SVGID_111_);}
- .st120{fill:url(#SVGID_112_);}
- .st121{fill:url(#SVGID_113_);}
- .st122{fill:url(#SVGID_114_);}
- .st123{opacity:0.4;fill:url(#SVGID_115_);}
- .st124{fill:url(#SVGID_116_);}
- .st125{fill:url(#SVGID_117_);}
- .st126{fill:url(#SVGID_118_);}
- .st127{fill:url(#SVGID_119_);}
- .st128{fill:url(#SVGID_120_);}
- .st129{fill:url(#SVGID_121_);}
- .st130{fill:url(#SVGID_122_);}
-</style><switch
- id="switch6"><g
- i:extraneous="self"
- id="g8"><g
- id="Settings_Active"><circle
- class="st24"
- cx="159.7"
- cy="133.4"
- r="101.9"
- id="circle1230" /><linearGradient
- id="SVGID_119_"
- gradientUnits="userSpaceOnUse"
- x1="115.9317"
- y1="254.1836"
- x2="256.3852"
- y2="-133.5267"><stop
- offset="0"
- style="stop-color:#8BC53F"
- id="stop1233" /><stop
- offset="2.015080e-02"
- style="stop-color:#7CCB56;stop-opacity:0.9678"
- id="stop1235" /><stop
- offset="6.089833e-02"
- style="stop-color:#62D67D;stop-opacity:0.9028"
- id="stop1237" /><stop
- offset="0.1057"
- style="stop-color:#4BDFA0;stop-opacity:0.8312"
- id="stop1239" /><stop
- offset="0.1543"
- style="stop-color:#38E7BE;stop-opacity:0.7537"
- id="stop1241" /><stop
- offset="0.2077"
- style="stop-color:#28EED6;stop-opacity:0.6684"
- id="stop1243" /><stop
- offset="0.2681"
- style="stop-color:#1CF3E8;stop-opacity:0.572"
- id="stop1245" /><stop
- offset="0.3394"
- style="stop-color:#13F6F5;stop-opacity:0.4581"
- id="stop1247" /><stop
- offset="0.4323"
- style="stop-color:#0EF8FD;stop-opacity:0.3098"
- id="stop1249" /><stop
- offset="0.6264"
- style="stop-color:#0DF9FF;stop-opacity:0"
- id="stop1251" /></linearGradient><circle
- class="st127"
- cx="159.7"
- cy="133.4"
- r="101.9"
- id="circle1253" /><linearGradient
- id="SVGID_120_"
- gradientUnits="userSpaceOnUse"
- x1="4.0481"
- y1="287.9492"
- x2="320.4859"
- y2="-15.4029"
- gradientTransform="matrix(1 5.464556e-03 -5.464556e-03 1 -2.0192 -3.0212)"><stop
- offset="0"
- style="stop-color:#59FF7F"
- id="stop1256" /><stop
- offset="1"
- style="stop-color:#6BFBFF"
- id="stop1258" /></linearGradient><path
- class="st128"
- d="M160,238.8c-0.2,0-0.4,0-0.6,0c-58-0.3-104.9-47.7-104.6-105.7C55.2,75.3,102.3,28.5,160,28.5 c0.2,0,0.4,0,0.6,0c58,0.3,104.9,47.7,104.6,105.7l0,0C264.8,192,217.7,238.8,160,238.8z M160,32.2 c-55.7,0-101.2,45.2-101.5,100.9c-0.3,55.9,45,101.7,100.9,102c0.2,0,0.4,0,0.6,0c55.7,0,101.2-45.2,101.5-100.9 c0.3-55.9-45-101.7-100.9-102C160.4,32.2,160.2,32.2,160,32.2z"
- id="path1260" /><g
- id="g1262"><text
- transform="matrix(1 0 0 1 75.4379 284.7129)"
- class="st4 st5 st6 st7"
- id="text1264">SETTINGS</text>
-<g
- id="g1266"><g
- id="g1268"><g
- id="g1270"><linearGradient
- id="SVGID_121_"
- gradientUnits="userSpaceOnUse"
- x1="79.1804"
- y1="226.0817"
- x2="282.752"
- y2="-4.8609"><stop
- offset="0"
- style="stop-color:#59FF7F"
- id="stop1273" /><stop
- offset="1"
- style="stop-color:#6BFBFF"
- id="stop1275" /></linearGradient><path
- class="st129"
- d="M159.9,163.9c-16.3,0-29.5-13.2-29.5-29.4s13.2-29.4,29.5-29.4v3.9c-14.1,0-25.5,11.4-25.5,25.5 c0,14,11.5,25.5,25.5,25.5c14.1,0,25.6-11.4,25.6-25.5h3.9C189.4,150.7,176.2,163.9,159.9,163.9z"
- id="path1277" /></g><g
- id="g1279"><linearGradient
- id="SVGID_122_"
- gradientUnits="userSpaceOnUse"
- x1="79.2457"
- y1="226.1393"
- x2="282.8174"
- y2="-4.8033"><stop
- offset="0"
- style="stop-color:#59FF7F"
- id="stop1282" /><stop
- offset="1"
- style="stop-color:#6BFBFF"
- id="stop1284" /></linearGradient><path
- class="st130"
- d="M171.7,197.4h-23.4c-2.2,0-4-1.8-4-3.9V181c-2-0.7-4-1.5-6-2.5l-8.8,8.8c-1.5,1.5-4,1.5-5.6-0.1 l-16.6-16.6c-1.6-1.6-1.6-4.1-0.1-5.6l8.7-8.7c-1-2-1.8-4-2.5-6.1h-12.3c-2.2,0-3.9-1.8-3.9-4v-23.4c0-2.2,1.8-4,3.9-4h12.3 c0.9-2.6,1.9-5.1,3.2-7.4l3.5,1.8c-1.4,2.6-2.5,5.3-3.4,8.1l-0.4,1.4h-15.2l0,23.5l15.2,0.1l0.4,1.4c0.9,2.8,2,5.5,3.4,8 l0.7,1.3L110,167.8l16.6,16.6l10.9-10.8l1.3,0.7c2.6,1.4,5.2,2.5,8,3.3l1.4,0.4v15.4l23.5,0l0.1-15.4l1.4-0.4 c2.7-0.8,5.4-1.9,7.9-3.3l1.3-0.7l10.9,10.9l16.6-16.6l-10.8-11l0.7-1.3c1.4-2.6,2.5-5.2,3.3-7.9l0.4-1.4h15.4l0-23.5 l-15.3-0.1l-0.4-1.4c-0.8-2.8-1.9-5.5-3.3-8l-0.7-1.3l10.8-10.8l-16.6-16.6l-10.8,10.7l-1.3-0.7c-2.6-1.4-5.3-2.5-8.1-3.4 l-1.4-0.4V75.6l-23.5,0l-0.1,15.1l-1.4,0.4c-2.8,0.9-5.6,2-8.1,3.4l-1.3,0.7l-10.7-10.7L107.2,104c-1.5-1.5-1.5-4,0.1-5.6 l16.5-16.5c0.8-0.8,1.8-1.3,2.9-1.2c1,0,2,0.4,2.7,1.1l8.7,8.6c2-1,4-1.8,6.2-2.5V75.6c0-2.2,1.8-3.9,4-3.9h23.4 c2.2,0,4,1.8,4,3.9v12.3c2.1,0.7,4.1,1.6,6.1,2.5l8.7-8.7c0.7-0.7,1.7-1.1,2.7-1.1h0c1.1,0,2.1,0.4,2.9,1.2l16.6,16.6 c0.8,0.8,1.2,1.8,1.2,2.9c0,1-0.4,2-1.1,2.7l-8.8,8.8c1,2,1.8,4,2.5,6h12.4c2.2,0,3.9,1.8,3.9,4v23.4c0,2.2-1.8,4-3.9,4 h-12.5c-0.7,2-1.5,4-2.5,6l8.9,8.9c1.5,1.5,1.5,4-0.1,5.6l-16.6,16.6c-0.8,0.8-1.8,1.2-2.9,1.2h0c-1,0-2-0.4-2.7-1.1 l-8.9-8.9c-1.9,1-3.9,1.8-5.9,2.5v12.5C175.7,195.6,173.9,197.4,171.7,197.4z"
- id="path1286" /></g></g></g></g></g></g></switch></svg> \ No newline at end of file
diff --git a/package/package.pro b/package/package.pro
deleted file mode 100644
index 907d59c..0000000
--- a/package/package.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-
-DISTFILES = icon.svg config.xml
-
-copy_icon.target = $$OUT_PWD/root/icon.svg
-copy_icon.depends = $$_PRO_FILE_PWD_/icon.svg
-copy_icon.commands = $(COPY_FILE) \"$$replace(copy_icon.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_icon.target, /, $$QMAKE_DIR_SEP)\"
-QMAKE_EXTRA_TARGETS += copy_icon
-PRE_TARGETDEPS += $$copy_icon.target
-
-copy_config.target = $$OUT_PWD/root/config.xml
-copy_config.depends = $$_PRO_FILE_PWD_/config.xml
-copy_config.commands = $(COPY_FILE) \"$$replace(copy_config.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_config.target, /, $$QMAKE_DIR_SEP)\"
-QMAKE_EXTRA_TARGETS += copy_config
-PRE_TARGETDEPS += $$copy_config.target
-
-WGT_TYPE =
-CONFIG(debug, debug|release) {
- WGT_TYPE = -debug
-}
-
-wgt.target = package
-wgt.commands = wgtpkg-pack -f -o tbtnavi$${WGT_TYPE}.wgt root
-
-QMAKE_EXTRA_TARGETS += wgt
diff --git a/tbtnavi.pro b/tbtnavi.pro
index 579a952..5cf7e78 100644
--- a/tbtnavi.pro
+++ b/tbtnavi.pro
@@ -1,3 +1,2 @@
TEMPLATE = subdirs
-SUBDIRS = app package
-package.depends += app
+SUBDIRS = app