diff options
| author | <philippe colliot> | 2014-06-19 17:04:35 +0200 |
|---|---|---|
| committer | <philippe colliot> | 2014-06-19 17:04:35 +0200 |
| commit | 69d4f943a8c5682e64e93ae59058a167e9b8112c (patch) | |
| tree | 0516661bf9e54e65c3d2f66e8028f0a4ea5ab77f /src/hmi/qml/Core | |
| parent | da07e990ff2432376cf087cc2191f726fb59fff1 (diff) | |
| download | navigation-69d4f943a8c5682e64e93ae59058a167e9b8112c.tar.gz | |
Add a new HMI theme
Diffstat (limited to 'src/hmi/qml/Core')
96 files changed, 392 insertions, 368 deletions
diff --git a/src/hmi/qml/Core/HMIMenu.qml b/src/hmi/qml/Core/HMIMenu.qml index 923698a..f3c7f21 100644 --- a/src/hmi/qml/Core/HMIMenu.qml +++ b/src/hmi/qml/Core/HMIMenu.qml @@ -24,6 +24,7 @@ * @licence end@ */ import QtQuick 1.0 +import "style-sheets/style-constants.js" as Constants; Rectangle { property alias text: titleText.text @@ -33,8 +34,8 @@ Rectangle { id: menu property Item next property Item prev - width: 800; height: 480 - color: "#282828" + width: Constants.MENU_WIDTH; height: Constants.MENU_HEIGHT + color: Constants.MENU_BACKGROUND_COLOR focus: true anchors.fill: parent @@ -158,7 +159,7 @@ Rectangle { } Rectangle { id: headline - width: menu.width; height: 26 + width: menu.width; height: Constants.MENU_BANNER_HEIGHT color: "#0000ff" Text { id: titleText diff --git a/src/hmi/qml/Core/gimp/README b/src/hmi/qml/Core/gimp/README index 5d89a93..3d85348 100644 --- a/src/hmi/qml/Core/gimp/README +++ b/src/hmi/qml/Core/gimp/README @@ -4,3 +4,15 @@ Gimp version tested: 2.8 To load the script in python: sudo cp generate-style-sheet.py /usr/lib/gimp/2.0/plug-ins sudo chmod +x /usr/lib/gimp/2.0/plug-ins/generate-style-sheet.py + +For the time being, there's no batch so you need to open each xcf file +To generate a style sheet and the images: +Genivi/Generate style sheet +Choose the target (qml/Core) +Press OK +NB: No test banner by default, so, into style-constants.js the value is set to 0 +var MENU_BANNER_HEIGHT = 0; +It's used into HMIMenu.qml + + + diff --git a/src/hmi/qml/Core/gimp/generate-style-sheet.py b/src/hmi/qml/Core/gimp/generate-style-sheet.py index 4856fda..db0b0e2 100644 --- a/src/hmi/qml/Core/gimp/generate-style-sheet.py +++ b/src/hmi/qml/Core/gimp/generate-style-sheet.py @@ -36,10 +36,10 @@ from gimpfu import * from gimpenums import *
image_path = "Core/images/"
-y_offset = 26
+y_offset = 0
def format_color(color) :
- return "Qt.rgba(%i, %i, %i, %i)" % (color[0]/255.0,color[1]/255.0,color[2]/255.0,color[3]/255.0)
+ return "Qt.rgba(%.3f, %.3f, %.3f, %.3f)" % (color[0]/255.0,color[1]/255.0,color[2]/255.0,color[3]/255.0)
def get_js_header():
header = ['/* This file is generated */','.pragma library','Qt.include("style-constants.js");','']
@@ -93,13 +93,18 @@ def generate_style_text_layer(layer): return_list.append(str)
return return_list
-def generate_style_sheet(image, drawable, select_visible_layers, target_directory, generate_xml_log) :
+def generate_style_sheet(image, drawable, select_visible_layers, target_directory, generate_xml_log, test_banner) :
# transmit error messages to gimp console
gimp.pdb.gimp_message_set_handler( ERROR_CONSOLE )
sc_js_data = []
layers = image.layers
sc_name = target_directory+os.sep+'style-sheets'+os.sep+image.name;
sc_name = string.replace(sc_name, '.xcf', '')
+
+ if (test_banner):
+ y_offset = 26
+ else:
+ y_offset = 0
if (generate_xml_log):
#configure the XML document
@@ -187,7 +192,8 @@ register( [
(PF_TOGGLE, "select_visible_layers_toggle", "Save only visible layers", True),
(PF_DIRNAME, "target_directory_name", "Target directory (ex qml/Core)", os.getcwd()),
- (PF_TOGGLE, "generate_xml_log_toggle", "Generate xml log file", False)
+ (PF_TOGGLE, "generate_xml_log_toggle", "Generate xml log file", False),
+ (PF_TOGGLE, "test_banner_toggle", "With test banner", False)
],
[],
generate_style_sheet )
diff --git a/src/hmi/qml/Core/gimp/green-theme/button-keyboard.xcf b/src/hmi/qml/Core/gimp/green-theme/button-keyboard.xcf Binary files differnew file mode 100644 index 0000000..873ea94 --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/button-keyboard.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/fsa-main-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/fsa-main-menu.xcf Binary files differnew file mode 100644 index 0000000..b24e0ae --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/fsa-main-menu.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/fsa-poi-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/fsa-poi-menu.xcf Binary files differnew file mode 100644 index 0000000..5dc1c76 --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/fsa-poi-menu.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/navigation-calculated-route-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/navigation-calculated-route-menu.xcf Binary files differnew file mode 100644 index 0000000..801b2eb --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/navigation-calculated-route-menu.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/navigation-route-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/navigation-route-menu.xcf Binary files differnew file mode 100644 index 0000000..2b09b09 --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/navigation-route-menu.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/navigation-search-address-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/navigation-search-address-menu.xcf Binary files differnew file mode 100644 index 0000000..0111920 --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/navigation-search-address-menu.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/navigation-search-coordinates-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/navigation-search-coordinates-menu.xcf Binary files differnew file mode 100644 index 0000000..183d5bc --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/navigation-search-coordinates-menu.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/navigation-search-freetext-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/navigation-search-freetext-menu.xcf Binary files differnew file mode 100644 index 0000000..669b75f --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/navigation-search-freetext-menu.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/navigation-search-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/navigation-search-menu.xcf Binary files differnew file mode 100644 index 0000000..32e9614 --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/navigation-search-menu.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/navigation-settings-language-and-units-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/navigation-settings-language-and-units-menu.xcf Binary files differnew file mode 100644 index 0000000..43e65a3 --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/navigation-settings-language-and-units-menu.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/navigation-settings-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/navigation-settings-menu.xcf Binary files differnew file mode 100644 index 0000000..bfcfb63 --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/navigation-settings-menu.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/navigation-settings-preference-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/navigation-settings-preference-menu.xcf Binary files differnew file mode 100644 index 0000000..8ad7b6e --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/navigation-settings-preference-menu.xcf diff --git a/src/hmi/qml/Core/gimp/green-theme/trip-computer-menu.xcf b/src/hmi/qml/Core/gimp/green-theme/trip-computer-menu.xcf Binary files differnew file mode 100644 index 0000000..64180aa --- /dev/null +++ b/src/hmi/qml/Core/gimp/green-theme/trip-computer-menu.xcf diff --git a/src/hmi/qml/Core/images/allow-ferries.png b/src/hmi/qml/Core/images/allow-ferries.png Binary files differindex c09d86e..ce81436 100644 --- a/src/hmi/qml/Core/images/allow-ferries.png +++ b/src/hmi/qml/Core/images/allow-ferries.png diff --git a/src/hmi/qml/Core/images/allow-motorways.png b/src/hmi/qml/Core/images/allow-motorways.png Binary files differindex c09d86e..ce81436 100644 --- a/src/hmi/qml/Core/images/allow-motorways.png +++ b/src/hmi/qml/Core/images/allow-motorways.png diff --git a/src/hmi/qml/Core/images/allow-tollRoads.png b/src/hmi/qml/Core/images/allow-tollRoads.png Binary files differindex f8fa31e..ce81436 100644 --- a/src/hmi/qml/Core/images/allow-tollRoads.png +++ b/src/hmi/qml/Core/images/allow-tollRoads.png diff --git a/src/hmi/qml/Core/images/avoid-ferries.png b/src/hmi/qml/Core/images/avoid-ferries.png Binary files differindex f5fb297..35b0cba 100644 --- a/src/hmi/qml/Core/images/avoid-ferries.png +++ b/src/hmi/qml/Core/images/avoid-ferries.png diff --git a/src/hmi/qml/Core/images/avoid-motorways.png b/src/hmi/qml/Core/images/avoid-motorways.png Binary files differindex f5fb297..35b0cba 100644 --- a/src/hmi/qml/Core/images/avoid-motorways.png +++ b/src/hmi/qml/Core/images/avoid-motorways.png diff --git a/src/hmi/qml/Core/images/avoid-tollRoads.png b/src/hmi/qml/Core/images/avoid-tollRoads.png Binary files differindex f5fb297..35b0cba 100644 --- a/src/hmi/qml/Core/images/avoid-tollRoads.png +++ b/src/hmi/qml/Core/images/avoid-tollRoads.png diff --git a/src/hmi/qml/Core/images/back.png b/src/hmi/qml/Core/images/back.png Binary files differindex 94f2e1e..faf7c77 100644 --- a/src/hmi/qml/Core/images/back.png +++ b/src/hmi/qml/Core/images/back.png diff --git a/src/hmi/qml/Core/images/button-keyboard.png b/src/hmi/qml/Core/images/button-keyboard.png Binary files differindex 166b681..9234791 100644 --- a/src/hmi/qml/Core/images/button-keyboard.png +++ b/src/hmi/qml/Core/images/button-keyboard.png diff --git a/src/hmi/qml/Core/images/calculate_curr.png b/src/hmi/qml/Core/images/calculate_curr.png Binary files differindex 47bf949..6d957e0 100644 --- a/src/hmi/qml/Core/images/calculate_curr.png +++ b/src/hmi/qml/Core/images/calculate_curr.png diff --git a/src/hmi/qml/Core/images/cost-model.png b/src/hmi/qml/Core/images/cost-model.png Binary files differindex 136abe9..dbb5bce 100644 --- a/src/hmi/qml/Core/images/cost-model.png +++ b/src/hmi/qml/Core/images/cost-model.png diff --git a/src/hmi/qml/Core/images/french-flag.png b/src/hmi/qml/Core/images/french-flag.png Binary files differindex 3650f4b..5a595b6 100644 --- a/src/hmi/qml/Core/images/french-flag.png +++ b/src/hmi/qml/Core/images/french-flag.png diff --git a/src/hmi/qml/Core/images/fsa-main-menu-background.png b/src/hmi/qml/Core/images/fsa-main-menu-background.png Binary files differindex daa1677..c8914cb 100644 --- a/src/hmi/qml/Core/images/fsa-main-menu-background.png +++ b/src/hmi/qml/Core/images/fsa-main-menu-background.png diff --git a/src/hmi/qml/Core/images/fsa-poi-menu-background.png b/src/hmi/qml/Core/images/fsa-poi-menu-background.png Binary files differindex 175aa66..be03e0a 100644 --- a/src/hmi/qml/Core/images/fsa-poi-menu-background.png +++ b/src/hmi/qml/Core/images/fsa-poi-menu-background.png diff --git a/src/hmi/qml/Core/images/german-flag.png b/src/hmi/qml/Core/images/german-flag.png Binary files differindex 16ddf20..119facf 100644 --- a/src/hmi/qml/Core/images/german-flag.png +++ b/src/hmi/qml/Core/images/german-flag.png diff --git a/src/hmi/qml/Core/images/guidance-start.png b/src/hmi/qml/Core/images/guidance-start.png Binary files differindex e9680e1..c8ea8c9 100644 --- a/src/hmi/qml/Core/images/guidance-start.png +++ b/src/hmi/qml/Core/images/guidance-start.png diff --git a/src/hmi/qml/Core/images/guidance-stop.png b/src/hmi/qml/Core/images/guidance-stop.png Binary files differindex e9680e1..c8ea8c9 100644 --- a/src/hmi/qml/Core/images/guidance-stop.png +++ b/src/hmi/qml/Core/images/guidance-stop.png diff --git a/src/hmi/qml/Core/images/history.png b/src/hmi/qml/Core/images/history.png Binary files differindex 0aad58f..0ff0d2c 100644 --- a/src/hmi/qml/Core/images/history.png +++ b/src/hmi/qml/Core/images/history.png diff --git a/src/hmi/qml/Core/images/japanese-flag.png b/src/hmi/qml/Core/images/japanese-flag.png Binary files differindex fb42faf..1f5ec07 100644 --- a/src/hmi/qml/Core/images/japanese-flag.png +++ b/src/hmi/qml/Core/images/japanese-flag.png diff --git a/src/hmi/qml/Core/images/keyboard.png b/src/hmi/qml/Core/images/keyboard.png Binary files differindex de70099..90ecbb9 100644 --- a/src/hmi/qml/Core/images/keyboard.png +++ b/src/hmi/qml/Core/images/keyboard.png diff --git a/src/hmi/qml/Core/images/languageAndUnit.png b/src/hmi/qml/Core/images/languageAndUnit.png Binary files differindex 7e916f8..b0af847 100644 --- a/src/hmi/qml/Core/images/languageAndUnit.png +++ b/src/hmi/qml/Core/images/languageAndUnit.png diff --git a/src/hmi/qml/Core/images/navigation-calculated-route-menu-background.png b/src/hmi/qml/Core/images/navigation-calculated-route-menu-background.png Binary files differindex 1f710b0..11f727f 100644 --- a/src/hmi/qml/Core/images/navigation-calculated-route-menu-background.png +++ b/src/hmi/qml/Core/images/navigation-calculated-route-menu-background.png diff --git a/src/hmi/qml/Core/images/navigation-route-menu-background.png b/src/hmi/qml/Core/images/navigation-route-menu-background.png Binary files differindex 844066b..47e3d70 100644 --- a/src/hmi/qml/Core/images/navigation-route-menu-background.png +++ b/src/hmi/qml/Core/images/navigation-route-menu-background.png diff --git a/src/hmi/qml/Core/images/navigation-search-by-address-menu-background.png b/src/hmi/qml/Core/images/navigation-search-by-address-menu-background.png Binary files differindex fb508d9..00cb831 100644 --- a/src/hmi/qml/Core/images/navigation-search-by-address-menu-background.png +++ b/src/hmi/qml/Core/images/navigation-search-by-address-menu-background.png diff --git a/src/hmi/qml/Core/images/navigation-search-by-coordinates-menu-background.png b/src/hmi/qml/Core/images/navigation-search-by-coordinates-menu-background.png Binary files differindex 08543f7..0964d8b 100644 --- a/src/hmi/qml/Core/images/navigation-search-by-coordinates-menu-background.png +++ b/src/hmi/qml/Core/images/navigation-search-by-coordinates-menu-background.png diff --git a/src/hmi/qml/Core/images/navigation-search-by-freetext-menu-background.png b/src/hmi/qml/Core/images/navigation-search-by-freetext-menu-background.png Binary files differindex aa138cd..74a83c3 100644 --- a/src/hmi/qml/Core/images/navigation-search-by-freetext-menu-background.png +++ b/src/hmi/qml/Core/images/navigation-search-by-freetext-menu-background.png diff --git a/src/hmi/qml/Core/images/navigation-search-menu-background.png b/src/hmi/qml/Core/images/navigation-search-menu-background.png Binary files differindex 720024f..3716fb6 100644 --- a/src/hmi/qml/Core/images/navigation-search-menu-background.png +++ b/src/hmi/qml/Core/images/navigation-search-menu-background.png diff --git a/src/hmi/qml/Core/images/navigation-settings-background.png b/src/hmi/qml/Core/images/navigation-settings-background.png Binary files differindex 429b2d0..cd49210 100644 --- a/src/hmi/qml/Core/images/navigation-settings-background.png +++ b/src/hmi/qml/Core/images/navigation-settings-background.png diff --git a/src/hmi/qml/Core/images/navigation-settings-language-and-units-menu-background.png b/src/hmi/qml/Core/images/navigation-settings-language-and-units-menu-background.png Binary files differindex 6bc9d8d..4f5e82e 100644 --- a/src/hmi/qml/Core/images/navigation-settings-language-and-units-menu-background.png +++ b/src/hmi/qml/Core/images/navigation-settings-language-and-units-menu-background.png diff --git a/src/hmi/qml/Core/images/navigation-settings-preference-menu-background.png b/src/hmi/qml/Core/images/navigation-settings-preference-menu-background.png Binary files differindex bf95c1c..54af8ba 100644 --- a/src/hmi/qml/Core/images/navigation-settings-preference-menu-background.png +++ b/src/hmi/qml/Core/images/navigation-settings-preference-menu-background.png diff --git a/src/hmi/qml/Core/images/ok.png b/src/hmi/qml/Core/images/ok.png Binary files differindex 98af990..e740411 100644 --- a/src/hmi/qml/Core/images/ok.png +++ b/src/hmi/qml/Core/images/ok.png diff --git a/src/hmi/qml/Core/images/pause.png b/src/hmi/qml/Core/images/pause.png Binary files differindex c930191..a7c5653 100644 --- a/src/hmi/qml/Core/images/pause.png +++ b/src/hmi/qml/Core/images/pause.png diff --git a/src/hmi/qml/Core/images/play.png b/src/hmi/qml/Core/images/play.png Binary files differindex ba62452..9d227bf 100644 --- a/src/hmi/qml/Core/images/play.png +++ b/src/hmi/qml/Core/images/play.png diff --git a/src/hmi/qml/Core/images/preferences.png b/src/hmi/qml/Core/images/preferences.png Binary files differindex 7e916f8..b0af847 100644 --- a/src/hmi/qml/Core/images/preferences.png +++ b/src/hmi/qml/Core/images/preferences.png diff --git a/src/hmi/qml/Core/images/quit.png b/src/hmi/qml/Core/images/quit.png Binary files differindex 012f4ae..05cb47d 100644 --- a/src/hmi/qml/Core/images/quit.png +++ b/src/hmi/qml/Core/images/quit.png diff --git a/src/hmi/qml/Core/images/reset.png b/src/hmi/qml/Core/images/reset.png Binary files differindex c08b8bc..2bc5767 100644 --- a/src/hmi/qml/Core/images/reset.png +++ b/src/hmi/qml/Core/images/reset.png diff --git a/src/hmi/qml/Core/images/route.png b/src/hmi/qml/Core/images/route.png Binary files differindex 47bf949..6d957e0 100644 --- a/src/hmi/qml/Core/images/route.png +++ b/src/hmi/qml/Core/images/route.png diff --git a/src/hmi/qml/Core/images/search-by-address.png b/src/hmi/qml/Core/images/search-by-address.png Binary files differindex 16c5395..d368380 100644 --- a/src/hmi/qml/Core/images/search-by-address.png +++ b/src/hmi/qml/Core/images/search-by-address.png diff --git a/src/hmi/qml/Core/images/search-by-coordinates.png b/src/hmi/qml/Core/images/search-by-coordinates.png Binary files differindex 01a5f4d..6e2a57f 100644 --- a/src/hmi/qml/Core/images/search-by-coordinates.png +++ b/src/hmi/qml/Core/images/search-by-coordinates.png diff --git a/src/hmi/qml/Core/images/search-by-freetext.png b/src/hmi/qml/Core/images/search-by-freetext.png Binary files differindex ccffe17..da3d020 100644 --- a/src/hmi/qml/Core/images/search-by-freetext.png +++ b/src/hmi/qml/Core/images/search-by-freetext.png diff --git a/src/hmi/qml/Core/images/search-by-poi.png b/src/hmi/qml/Core/images/search-by-poi.png Binary files differindex ed2a7a6..a2e89ab 100644 --- a/src/hmi/qml/Core/images/search-by-poi.png +++ b/src/hmi/qml/Core/images/search-by-poi.png diff --git a/src/hmi/qml/Core/images/select-configuration.png b/src/hmi/qml/Core/images/select-configuration.png Binary files differindex 3ba1c02..04e6d8a 100644 --- a/src/hmi/qml/Core/images/select-configuration.png +++ b/src/hmi/qml/Core/images/select-configuration.png diff --git a/src/hmi/qml/Core/images/select-display-on-map.png b/src/hmi/qml/Core/images/select-display-on-map.png Binary files differindex 0fb7b3a..ceae8b9 100644 --- a/src/hmi/qml/Core/images/select-display-on-map.png +++ b/src/hmi/qml/Core/images/select-display-on-map.png diff --git a/src/hmi/qml/Core/images/select-instant.png b/src/hmi/qml/Core/images/select-instant.png Binary files differindex 3110c19..b54f734 100644 --- a/src/hmi/qml/Core/images/select-instant.png +++ b/src/hmi/qml/Core/images/select-instant.png diff --git a/src/hmi/qml/Core/images/select-mapview.png b/src/hmi/qml/Core/images/select-mapview.png Binary files differindex 167b607..1e49f00 100644 --- a/src/hmi/qml/Core/images/select-mapview.png +++ b/src/hmi/qml/Core/images/select-mapview.png diff --git a/src/hmi/qml/Core/images/select-navigation.png b/src/hmi/qml/Core/images/select-navigation.png Binary files differindex 89bf760..8cd607d 100644 --- a/src/hmi/qml/Core/images/select-navigation.png +++ b/src/hmi/qml/Core/images/select-navigation.png diff --git a/src/hmi/qml/Core/images/select-poi.png b/src/hmi/qml/Core/images/select-poi.png Binary files differindex 8cb7fd6..02b6b85 100644 --- a/src/hmi/qml/Core/images/select-poi.png +++ b/src/hmi/qml/Core/images/select-poi.png diff --git a/src/hmi/qml/Core/images/select-reroute.png b/src/hmi/qml/Core/images/select-reroute.png Binary files differindex a011121..e35f26b 100644 --- a/src/hmi/qml/Core/images/select-reroute.png +++ b/src/hmi/qml/Core/images/select-reroute.png diff --git a/src/hmi/qml/Core/images/select-search-for-refill.png b/src/hmi/qml/Core/images/select-search-for-refill.png Binary files differindex 7725f73..a20370a 100644 --- a/src/hmi/qml/Core/images/select-search-for-refill.png +++ b/src/hmi/qml/Core/images/select-search-for-refill.png diff --git a/src/hmi/qml/Core/images/select-trip.png b/src/hmi/qml/Core/images/select-trip.png Binary files differindex 832e774..2bdd80c 100644 --- a/src/hmi/qml/Core/images/select-trip.png +++ b/src/hmi/qml/Core/images/select-trip.png diff --git a/src/hmi/qml/Core/images/select-trip1.png b/src/hmi/qml/Core/images/select-trip1.png Binary files differindex 3fc55f9..16c38e1 100644 --- a/src/hmi/qml/Core/images/select-trip1.png +++ b/src/hmi/qml/Core/images/select-trip1.png diff --git a/src/hmi/qml/Core/images/select-trip2.png b/src/hmi/qml/Core/images/select-trip2.png Binary files differindex c3b6d18..83ea0c4 100644 --- a/src/hmi/qml/Core/images/select-trip2.png +++ b/src/hmi/qml/Core/images/select-trip2.png diff --git a/src/hmi/qml/Core/images/set-as-destination.png b/src/hmi/qml/Core/images/set-as-destination.png Binary files differindex 2872692..4fce31b 100644 --- a/src/hmi/qml/Core/images/set-as-destination.png +++ b/src/hmi/qml/Core/images/set-as-destination.png diff --git a/src/hmi/qml/Core/images/set-as-position.png b/src/hmi/qml/Core/images/set-as-position.png Binary files differindex c5425d3..4fce31b 100644 --- a/src/hmi/qml/Core/images/set-as-position.png +++ b/src/hmi/qml/Core/images/set-as-position.png diff --git a/src/hmi/qml/Core/images/show-location-on-map.png b/src/hmi/qml/Core/images/show-location-on-map.png Binary files differindex b4704df..c4f29f0 100644 --- a/src/hmi/qml/Core/images/show-location-on-map.png +++ b/src/hmi/qml/Core/images/show-location-on-map.png diff --git a/src/hmi/qml/Core/images/show-route-in-list.png b/src/hmi/qml/Core/images/show-route-in-list.png Binary files differindex 47a59ec..5fde701 100644 --- a/src/hmi/qml/Core/images/show-route-in-list.png +++ b/src/hmi/qml/Core/images/show-route-in-list.png diff --git a/src/hmi/qml/Core/images/show-route-on-map.png b/src/hmi/qml/Core/images/show-route-on-map.png Binary files differindex 8627776..f2d5ee9 100644 --- a/src/hmi/qml/Core/images/show-route-on-map.png +++ b/src/hmi/qml/Core/images/show-route-on-map.png diff --git a/src/hmi/qml/Core/images/simulation-off.png b/src/hmi/qml/Core/images/simulation-off.png Binary files differindex dc645d8..33bd368 100644 --- a/src/hmi/qml/Core/images/simulation-off.png +++ b/src/hmi/qml/Core/images/simulation-off.png diff --git a/src/hmi/qml/Core/images/simulation-on.png b/src/hmi/qml/Core/images/simulation-on.png Binary files differindex feb66b7..c5dfe3b 100644 --- a/src/hmi/qml/Core/images/simulation-on.png +++ b/src/hmi/qml/Core/images/simulation-on.png diff --git a/src/hmi/qml/Core/images/speed-down.png b/src/hmi/qml/Core/images/speed-down.png Binary files differindex b18fa09..9c40613 100644 --- a/src/hmi/qml/Core/images/speed-down.png +++ b/src/hmi/qml/Core/images/speed-down.png diff --git a/src/hmi/qml/Core/images/speed-up.png b/src/hmi/qml/Core/images/speed-up.png Binary files differindex 6cc48c8..6de91ff 100644 --- a/src/hmi/qml/Core/images/speed-up.png +++ b/src/hmi/qml/Core/images/speed-up.png diff --git a/src/hmi/qml/Core/images/trip-instant-background.png b/src/hmi/qml/Core/images/trip-instant-background.png Binary files differindex 41ea8f0..b8a3865 100644 --- a/src/hmi/qml/Core/images/trip-instant-background.png +++ b/src/hmi/qml/Core/images/trip-instant-background.png diff --git a/src/hmi/qml/Core/images/trip1-background.png b/src/hmi/qml/Core/images/trip1-background.png Binary files differindex ded4963..3082916 100644 --- a/src/hmi/qml/Core/images/trip1-background.png +++ b/src/hmi/qml/Core/images/trip1-background.png diff --git a/src/hmi/qml/Core/images/trip2-background.png b/src/hmi/qml/Core/images/trip2-background.png Binary files differindex 825d14f..2948e9d 100644 --- a/src/hmi/qml/Core/images/trip2-background.png +++ b/src/hmi/qml/Core/images/trip2-background.png diff --git a/src/hmi/qml/Core/images/unit-km.png b/src/hmi/qml/Core/images/unit-km.png Binary files differindex 12ec63f..2763628 100644 --- a/src/hmi/qml/Core/images/unit-km.png +++ b/src/hmi/qml/Core/images/unit-km.png diff --git a/src/hmi/qml/Core/images/unit-mile.png b/src/hmi/qml/Core/images/unit-mile.png Binary files differindex 20d276f..92c12a5 100644 --- a/src/hmi/qml/Core/images/unit-mile.png +++ b/src/hmi/qml/Core/images/unit-mile.png diff --git a/src/hmi/qml/Core/images/usa-flag.png b/src/hmi/qml/Core/images/usa-flag.png Binary files differindex 1c17494..d57707b 100644 --- a/src/hmi/qml/Core/images/usa-flag.png +++ b/src/hmi/qml/Core/images/usa-flag.png diff --git a/src/hmi/qml/Core/style-sheets/button-keyboard-css.js b/src/hmi/qml/Core/style-sheets/button-keyboard-css.js index f868e52..1444087 100644 --- a/src/hmi/qml/Core/style-sheets/button-keyboard-css.js +++ b/src/hmi/qml/Core/style-sheets/button-keyboard-css.js @@ -5,7 +5,7 @@ Qt.include("style-constants.js"); var button_keyboard=new Object; button_keyboard[SOURCE]="Core/images/button-keyboard.png"; button_keyboard[X]=0; -button_keyboard[Y]=-26; +button_keyboard[Y]=0; button_keyboard[WIDTH]=51; button_keyboard[HEIGHT]=51; diff --git a/src/hmi/qml/Core/style-sheets/fsa-main-menu-css.js b/src/hmi/qml/Core/style-sheets/fsa-main-menu-css.js index 0bb9b13..ead1ecc 100644 --- a/src/hmi/qml/Core/style-sheets/fsa-main-menu-css.js +++ b/src/hmi/qml/Core/style-sheets/fsa-main-menu-css.js @@ -4,52 +4,52 @@ Qt.include("style-constants.js"); var quitText=new Object; quitText[X]=645; -quitText[Y]=383; +quitText[Y]=409; quitText[WIDTH]=98; quitText[HEIGHT]=46; -quitText[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -quitText[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +quitText[TEXTCOLOR]=Qt.rgba(0.043, 0.643, 0.580, 1.000); +quitText[STYLECOLOR]=Qt.rgba(0.043, 0.643, 0.580, 1.000); quitText[PIXELSIZE]=38; var quit=new Object; quit[SOURCE]="Core/images/quit.png"; quit[X]=601; -quit[Y]=374; +quit[Y]=400; quit[WIDTH]=180; quit[HEIGHT]=60; var select_mapview=new Object; select_mapview[SOURCE]="Core/images/select-mapview.png"; select_mapview[X]=560; -select_mapview[Y]=30; +select_mapview[Y]=56; select_mapview[WIDTH]=140; select_mapview[HEIGHT]=100; var select_poi=new Object; select_poi[SOURCE]="Core/images/select-poi.png"; select_poi[X]=100; -select_poi[Y]=224; +select_poi[Y]=250; select_poi[WIDTH]=140; select_poi[HEIGHT]=100; var select_trip=new Object; select_trip[SOURCE]="Core/images/select-trip.png"; select_trip[X]=330; -select_trip[Y]=127; +select_trip[Y]=153; select_trip[WIDTH]=140; select_trip[HEIGHT]=100; var select_configuration=new Object; select_configuration[SOURCE]="Core/images/select-configuration.png"; select_configuration[X]=560; -select_configuration[Y]=224; +select_configuration[Y]=250; select_configuration[WIDTH]=140; select_configuration[HEIGHT]=100; var select_navigation=new Object; select_navigation[SOURCE]="Core/images/select-navigation.png"; select_navigation[X]=100; -select_navigation[Y]=30; +select_navigation[Y]=56; select_navigation[WIDTH]=140; select_navigation[HEIGHT]=100; @@ -58,5 +58,5 @@ fsa_main_menu_background[SOURCE]="Core/images/fsa-main-menu-background.png"; fsa_main_menu_background[X]=0; fsa_main_menu_background[Y]=0; fsa_main_menu_background[WIDTH]=800; -fsa_main_menu_background[HEIGHT]=454; +fsa_main_menu_background[HEIGHT]=480; diff --git a/src/hmi/qml/Core/style-sheets/fsa-poi-menu-css.js b/src/hmi/qml/Core/style-sheets/fsa-poi-menu-css.js index ba10e0f..d4964a5 100644 --- a/src/hmi/qml/Core/style-sheets/fsa-poi-menu-css.js +++ b/src/hmi/qml/Core/style-sheets/fsa-poi-menu-css.js @@ -4,110 +4,110 @@ Qt.include("style-constants.js"); var searchResultValue=new Object; searchResultValue[X]=56; -searchResultValue[Y]=60; +searchResultValue[Y]=86; searchResultValue[WIDTH]=306; searchResultValue[HEIGHT]=30; -searchResultValue[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -searchResultValue[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +searchResultValue[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +searchResultValue[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); searchResultValue[PIXELSIZE]=25; var searchResultList=new Object; searchResultList[X]=56; -searchResultList[Y]=60; +searchResultList[Y]=86; searchResultList[WIDTH]=306; searchResultList[HEIGHT]=270; -searchResultList[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -searchResultList[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +searchResultList[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +searchResultList[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); searchResultList[PIXELSIZE]=25; var selectedStationValue=new Object; selectedStationValue[X]=479; -selectedStationValue[Y]=65; +selectedStationValue[Y]=91; selectedStationValue[WIDTH]=187; selectedStationValue[HEIGHT]=120; -selectedStationValue[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -selectedStationValue[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +selectedStationValue[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +selectedStationValue[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); selectedStationValue[PIXELSIZE]=25; var selectedStationTitle=new Object; selectedStationTitle[X]=469; -selectedStationTitle[Y]=16; +selectedStationTitle[Y]=42; selectedStationTitle[WIDTH]=252; selectedStationTitle[HEIGHT]=30; -selectedStationTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -selectedStationTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +selectedStationTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +selectedStationTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); selectedStationTitle[PIXELSIZE]=25; var searchResultTitle=new Object; searchResultTitle[X]=120; -searchResultTitle[Y]=15; +searchResultTitle[Y]=41; searchResultTitle[WIDTH]=210; searchResultTitle[HEIGHT]=30; -searchResultTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -searchResultTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +searchResultTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +searchResultTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); searchResultTitle[PIXELSIZE]=25; var rerouteTitle=new Object; rerouteTitle[X]=517; -rerouteTitle[Y]=312; +rerouteTitle[Y]=338; rerouteTitle[WIDTH]=119; rerouteTitle[HEIGHT]=30; -rerouteTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -rerouteTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +rerouteTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +rerouteTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); rerouteTitle[PIXELSIZE]=25; var displayTitle=new Object; displayTitle[X]=657; -displayTitle[Y]=312; +displayTitle[Y]=338; displayTitle[WIDTH]=108; displayTitle[HEIGHT]=30; -displayTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -displayTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +displayTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +displayTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); displayTitle[PIXELSIZE]=25; var select_display_on_map=new Object; select_display_on_map[SOURCE]="Core/images/select-display-on-map.png"; select_display_on_map[X]=659; -select_display_on_map[Y]=247; +select_display_on_map[Y]=273; select_display_on_map[WIDTH]=100; select_display_on_map[HEIGHT]=60; var searchTitle=new Object; searchTitle[X]=406; -searchTitle[Y]=311; +searchTitle[Y]=337; searchTitle[WIDTH]=103; searchTitle[HEIGHT]=30; -searchTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -searchTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +searchTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +searchTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); searchTitle[PIXELSIZE]=25; var backText=new Object; backText[X]=645; -backText[Y]=382; +backText[Y]=408; backText[WIDTH]=105; backText[HEIGHT]=46; -backText[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -backText[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +backText[TEXTCOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); +backText[STYLECOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); backText[PIXELSIZE]=38; var back=new Object; back[SOURCE]="Core/images/back.png"; -back[X]=601; -back[Y]=374; +back[X]=600; +back[Y]=400; back[WIDTH]=180; back[HEIGHT]=60; var select_reroute=new Object; select_reroute[SOURCE]="Core/images/select-reroute.png"; select_reroute[X]=534; -select_reroute[Y]=247; +select_reroute[Y]=273; select_reroute[WIDTH]=100; select_reroute[HEIGHT]=60; var select_search_for_refill=new Object; select_search_for_refill[SOURCE]="Core/images/select-search-for-refill.png"; select_search_for_refill[X]=409; -select_search_for_refill[Y]=247; +select_search_for_refill[Y]=273; select_search_for_refill[WIDTH]=100; select_search_for_refill[HEIGHT]=60; @@ -116,5 +116,5 @@ fsa_poi_menu_background[SOURCE]="Core/images/fsa-poi-menu-background.png"; fsa_poi_menu_background[X]=0; fsa_poi_menu_background[Y]=0; fsa_poi_menu_background[WIDTH]=800; -fsa_poi_menu_background[HEIGHT]=454; +fsa_poi_menu_background[HEIGHT]=480; diff --git a/src/hmi/qml/Core/style-sheets/navigation-calculated-route-menu-css.js b/src/hmi/qml/Core/style-sheets/navigation-calculated-route-menu-css.js index c92d52e..b522cde 100644 --- a/src/hmi/qml/Core/style-sheets/navigation-calculated-route-menu-css.js +++ b/src/hmi/qml/Core/style-sheets/navigation-calculated-route-menu-css.js @@ -4,117 +4,117 @@ Qt.include("style-constants.js"); var stopText=new Object; stopText[X]=629; -stopText[Y]=86; +stopText[Y]=112; stopText[WIDTH]=74; stopText[HEIGHT]=46; -stopText[TEXTCOLOR]=Qt.rgba(0, 0, 1, 1); -stopText[STYLECOLOR]=Qt.rgba(0, 0, 1, 1); +stopText[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +stopText[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); stopText[PIXELSIZE]=38; var startText=new Object; startText[X]=505; -startText[Y]=86; +startText[Y]=112; startText[WIDTH]=58; startText[HEIGHT]=46; -startText[TEXTCOLOR]=Qt.rgba(0, 0, 1, 1); -startText[STYLECOLOR]=Qt.rgba(0, 0, 1, 1); +startText[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +startText[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); startText[PIXELSIZE]=38; var backText=new Object; backText[X]=645; -backText[Y]=382; +backText[Y]=408; backText[WIDTH]=105; backText[HEIGHT]=46; -backText[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -backText[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +backText[TEXTCOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); +backText[STYLECOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); backText[PIXELSIZE]=38; var timeTitle=new Object; timeTitle[X]=51; -timeTitle[Y]=110; +timeTitle[Y]=136; timeTitle[WIDTH]=62; timeTitle[HEIGHT]=30; -timeTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -timeTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +timeTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +timeTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); timeTitle[PIXELSIZE]=25; var timeValue=new Object; timeValue[X]=55; -timeValue[Y]=153; +timeValue[Y]=179; timeValue[WIDTH]=192; timeValue[HEIGHT]=42; -timeValue[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -timeValue[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +timeValue[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +timeValue[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); timeValue[PIXELSIZE]=35; var distanceValue=new Object; distanceValue[X]=55; -distanceValue[Y]=54; +distanceValue[Y]=80; distanceValue[WIDTH]=192; distanceValue[HEIGHT]=42; -distanceValue[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -distanceValue[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +distanceValue[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +distanceValue[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); distanceValue[PIXELSIZE]=35; var distanceTitle=new Object; distanceTitle[X]=50; -distanceTitle[Y]=16; +distanceTitle[Y]=42; distanceTitle[WIDTH]=130; distanceTitle[HEIGHT]=30; -distanceTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -distanceTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +distanceTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +distanceTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); distanceTitle[PIXELSIZE]=25; var guidanceTitle=new Object; guidanceTitle[X]=532; -guidanceTitle[Y]=30; +guidanceTitle[Y]=56; guidanceTitle[WIDTH]=135; guidanceTitle[HEIGHT]=30; -guidanceTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -guidanceTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +guidanceTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +guidanceTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); guidanceTitle[PIXELSIZE]=25; var displayRouteTitle=new Object; displayRouteTitle[X]=498; -displayRouteTitle[Y]=198; +displayRouteTitle[Y]=224; displayRouteTitle[WIDTH]=202; displayRouteTitle[HEIGHT]=30; -displayRouteTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -displayRouteTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +displayRouteTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +displayRouteTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); displayRouteTitle[PIXELSIZE]=25; var show_route_on_map=new Object; show_route_on_map[SOURCE]="Core/images/show-route-on-map.png"; show_route_on_map[X]=482; -show_route_on_map[Y]=246; +show_route_on_map[Y]=272; show_route_on_map[WIDTH]=100; show_route_on_map[HEIGHT]=60; var show_route_in_list=new Object; show_route_in_list[SOURCE]="Core/images/show-route-in-list.png"; show_route_in_list[X]=613; -show_route_in_list[Y]=246; +show_route_in_list[Y]=272; show_route_in_list[WIDTH]=100; show_route_in_list[HEIGHT]=60; var guidance_stop=new Object; guidance_stop[SOURCE]="Core/images/guidance-stop.png"; guidance_stop[X]=484; -guidance_stop[Y]=79; +guidance_stop[Y]=105; guidance_stop[WIDTH]=100; guidance_stop[HEIGHT]=60; var guidance_start=new Object; guidance_start[SOURCE]="Core/images/guidance-start.png"; guidance_start[X]=613; -guidance_start[Y]=79; +guidance_start[Y]=105; guidance_start[WIDTH]=100; guidance_start[HEIGHT]=60; var back=new Object; back[SOURCE]="Core/images/back.png"; back[X]=601; -back[Y]=374; +back[Y]=400; back[WIDTH]=180; back[HEIGHT]=60; @@ -123,5 +123,5 @@ navigation_calculated_route_menu_background[SOURCE]="Core/images/navigation-calc navigation_calculated_route_menu_background[X]=0; navigation_calculated_route_menu_background[Y]=0; navigation_calculated_route_menu_background[WIDTH]=800; -navigation_calculated_route_menu_background[HEIGHT]=454; +navigation_calculated_route_menu_background[HEIGHT]=480; diff --git a/src/hmi/qml/Core/style-sheets/navigation-route-menu-css.js b/src/hmi/qml/Core/style-sheets/navigation-route-menu-css.js index 767ce29..f4eb811 100644 --- a/src/hmi/qml/Core/style-sheets/navigation-route-menu-css.js +++ b/src/hmi/qml/Core/style-sheets/navigation-route-menu-css.js @@ -4,124 +4,124 @@ Qt.include("style-constants.js"); var locationTitle=new Object; locationTitle[X]=50; -locationTitle[Y]=16; +locationTitle[Y]=42; locationTitle[WIDTH]=259; locationTitle[HEIGHT]=30; -locationTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -locationTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +locationTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +locationTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); locationTitle[PIXELSIZE]=25; var locationValue=new Object; locationValue[X]=56; -locationValue[Y]=54; +locationValue[Y]=80; locationValue[WIDTH]=594; locationValue[HEIGHT]=31; -locationValue[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -locationValue[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +locationValue[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +locationValue[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); locationValue[PIXELSIZE]=26; var positionTitle=new Object; positionTitle[X]=51; -positionTitle[Y]=110; +positionTitle[Y]=136; positionTitle[WIDTH]=126; positionTitle[HEIGHT]=30; -positionTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -positionTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +positionTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +positionTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); positionTitle[PIXELSIZE]=25; var destinationValue=new Object; destinationValue[X]=59; -destinationValue[Y]=247; +destinationValue[Y]=273; destinationValue[WIDTH]=594; destinationValue[HEIGHT]=31; -destinationValue[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -destinationValue[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +destinationValue[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +destinationValue[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); destinationValue[PIXELSIZE]=26; var positionValue=new Object; positionValue[X]=58; -positionValue[Y]=154; +positionValue[Y]=180; positionValue[WIDTH]=594; positionValue[HEIGHT]=31; -positionValue[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -positionValue[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +positionValue[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +positionValue[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); positionValue[PIXELSIZE]=26; var destinationTitle=new Object; destinationTitle[X]=53; -destinationTitle[Y]=204; +destinationTitle[Y]=230; destinationTitle[WIDTH]=177; destinationTitle[HEIGHT]=30; -destinationTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -destinationTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +destinationTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +destinationTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); destinationTitle[PIXELSIZE]=25; var show_location_on_map=new Object; show_location_on_map[SOURCE]="Core/images/show-location-on-map.png"; show_location_on_map[X]=659; -show_location_on_map[Y]=40; +show_location_on_map[Y]=66; show_location_on_map[WIDTH]=100; show_location_on_map[HEIGHT]=60; var set_as_destination=new Object; set_as_destination[SOURCE]="Core/images/set-as-destination.png"; set_as_destination[X]=657; -set_as_destination[Y]=235; +set_as_destination[Y]=261; set_as_destination[WIDTH]=100; set_as_destination[HEIGHT]=60; var calculate_currText=new Object; calculate_currText[X]=245; -calculate_currText[Y]=382; +calculate_currText[Y]=408; calculate_currText[WIDTH]=125; calculate_currText[HEIGHT]=46; -calculate_currText[TEXTCOLOR]=Qt.rgba(0, 0, 1, 1); -calculate_currText[STYLECOLOR]=Qt.rgba(0, 0, 1, 1); +calculate_currText[TEXTCOLOR]=Qt.rgba(0.000, 0.000, 0.000, 1.000); +calculate_currText[STYLECOLOR]=Qt.rgba(0.000, 0.000, 0.000, 1.000); calculate_currText[PIXELSIZE]=38; var calculate_curr=new Object; calculate_curr[SOURCE]="Core/images/calculate_curr.png"; calculate_curr[X]=216; -calculate_curr[Y]=374; +calculate_curr[Y]=400; calculate_curr[WIDTH]=180; calculate_curr[HEIGHT]=60; var routeText=new Object; routeText[X]=45; -routeText[Y]=379; +routeText[Y]=405; routeText[WIDTH]=131; routeText[HEIGHT]=46; -routeText[TEXTCOLOR]=Qt.rgba(0, 0, 1, 1); -routeText[STYLECOLOR]=Qt.rgba(0, 0, 1, 1); +routeText[TEXTCOLOR]=Qt.rgba(0.000, 0.000, 0.000, 1.000); +routeText[STYLECOLOR]=Qt.rgba(0.000, 0.000, 0.000, 1.000); routeText[PIXELSIZE]=38; var route=new Object; route[SOURCE]="Core/images/route.png"; route[X]=20; -route[Y]=374; +route[Y]=400; route[WIDTH]=180; route[HEIGHT]=60; var backText=new Object; backText[X]=645; -backText[Y]=382; +backText[Y]=408; backText[WIDTH]=105; backText[HEIGHT]=46; -backText[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -backText[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +backText[TEXTCOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); +backText[STYLECOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); backText[PIXELSIZE]=38; var back=new Object; back[SOURCE]="Core/images/back.png"; back[X]=601; -back[Y]=374; +back[Y]=400; back[WIDTH]=180; back[HEIGHT]=60; var set_as_position=new Object; set_as_position[SOURCE]="Core/images/set-as-position.png"; set_as_position[X]=657; -set_as_position[Y]=142; +set_as_position[Y]=168; set_as_position[WIDTH]=100; set_as_position[HEIGHT]=60; @@ -130,5 +130,5 @@ navigation_route_menu_background[SOURCE]="Core/images/navigation-route-menu-back navigation_route_menu_background[X]=0; navigation_route_menu_background[Y]=0; navigation_route_menu_background[WIDTH]=800; -navigation_route_menu_background[HEIGHT]=454; +navigation_route_menu_background[HEIGHT]=480; diff --git a/src/hmi/qml/Core/style-sheets/navigation-search-address-menu-css.js b/src/hmi/qml/Core/style-sheets/navigation-search-address-menu-css.js index a2fc0ba..e00bd7d 100644 --- a/src/hmi/qml/Core/style-sheets/navigation-search-address-menu-css.js +++ b/src/hmi/qml/Core/style-sheets/navigation-search-address-menu-css.js @@ -4,112 +4,112 @@ Qt.include("style-constants.js"); var numberValue=new Object; numberValue[X]=463; -numberValue[Y]=232; +numberValue[Y]=258; numberValue[WIDTH]=192; numberValue[HEIGHT]=42; -numberValue[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -numberValue[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +numberValue[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +numberValue[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); numberValue[PIXELSIZE]=35; var streetValue=new Object; streetValue[X]=463; -streetValue[Y]=81; +streetValue[Y]=107; streetValue[WIDTH]=192; streetValue[HEIGHT]=42; -streetValue[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -streetValue[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +streetValue[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +streetValue[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); streetValue[PIXELSIZE]=35; var cityValue=new Object; cityValue[X]=100; -cityValue[Y]=232; +cityValue[Y]=258; cityValue[WIDTH]=192; cityValue[HEIGHT]=42; -cityValue[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -cityValue[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +cityValue[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +cityValue[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); cityValue[PIXELSIZE]=35; var countryValue=new Object; countryValue[X]=100; -countryValue[Y]=80; +countryValue[Y]=106; countryValue[WIDTH]=192; countryValue[HEIGHT]=42; -countryValue[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -countryValue[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +countryValue[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +countryValue[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); countryValue[PIXELSIZE]=35; var numberTitle=new Object; numberTitle[X]=463; -numberTitle[Y]=177; +numberTitle[Y]=203; numberTitle[WIDTH]=152; numberTitle[HEIGHT]=46; -numberTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -numberTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +numberTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +numberTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); numberTitle[PIXELSIZE]=38; var cityTitle=new Object; cityTitle[X]=102; -cityTitle[Y]=176; +cityTitle[Y]=202; cityTitle[WIDTH]=74; cityTitle[HEIGHT]=46; -cityTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -cityTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +cityTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +cityTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); cityTitle[PIXELSIZE]=38; var streetTitle=new Object; streetTitle[X]=461; -streetTitle[Y]=26; +streetTitle[Y]=52; streetTitle[WIDTH]=118; streetTitle[HEIGHT]=46; -streetTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -streetTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +streetTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +streetTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); streetTitle[PIXELSIZE]=38; var countryTitle=new Object; countryTitle[X]=101; -countryTitle[Y]=24; +countryTitle[Y]=50; countryTitle[WIDTH]=151; countryTitle[HEIGHT]=46; -countryTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -countryTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +countryTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +countryTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); countryTitle[PIXELSIZE]=38; var keyboard=new Object; keyboard[SOURCE]="Core/images/keyboard.png"; keyboard[X]=300; -keyboard[Y]=74; +keyboard[Y]=100; keyboard[WIDTH]=80; keyboard[HEIGHT]=60; var backText=new Object; backText[X]=630; -backText[Y]=378; +backText[Y]=404; backText[WIDTH]=128; backText[HEIGHT]=49; -backText[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -backText[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +backText[TEXTCOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); +backText[STYLECOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); backText[PIXELSIZE]=38; var back=new Object; back[SOURCE]="Core/images/back.png"; back[X]=601; -back[Y]=374; +back[Y]=400; back[WIDTH]=180; back[HEIGHT]=60; var okText=new Object; okText[X]=85; -okText[Y]=380; +okText[Y]=406; okText[WIDTH]=128; okText[HEIGHT]=49; -okText[TEXTCOLOR]=Qt.rgba(0, 0, 1, 1); -okText[STYLECOLOR]=Qt.rgba(0, 0, 1, 1); +okText[TEXTCOLOR]=Qt.rgba(0.000, 0.000, 0.000, 1.000); +okText[STYLECOLOR]=Qt.rgba(0.000, 0.000, 0.000, 1.000); okText[PIXELSIZE]=38; var ok=new Object; ok[SOURCE]="Core/images/ok.png"; ok[X]=20; -ok[Y]=374; +ok[Y]=400; ok[WIDTH]=180; ok[HEIGHT]=60; @@ -118,5 +118,5 @@ navigation_search_by_address_menu_background[SOURCE]="Core/images/navigation-sea navigation_search_by_address_menu_background[X]=0; navigation_search_by_address_menu_background[Y]=0; navigation_search_by_address_menu_background[WIDTH]=800; -navigation_search_by_address_menu_background[HEIGHT]=454; +navigation_search_by_address_menu_background[HEIGHT]=480; diff --git a/src/hmi/qml/Core/style-sheets/navigation-search-coordinates-menu-css.js b/src/hmi/qml/Core/style-sheets/navigation-search-coordinates-menu-css.js index be047e3..cd9e41e 100644 --- a/src/hmi/qml/Core/style-sheets/navigation-search-coordinates-menu-css.js +++ b/src/hmi/qml/Core/style-sheets/navigation-search-coordinates-menu-css.js @@ -4,83 +4,83 @@ Qt.include("style-constants.js"); var longitudeTitle=new Object; longitudeTitle[X]=100; -longitudeTitle[Y]=175; +longitudeTitle[Y]=201; longitudeTitle[WIDTH]=188; longitudeTitle[HEIGHT]=46; -longitudeTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -longitudeTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +longitudeTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +longitudeTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); longitudeTitle[PIXELSIZE]=38; var longitudeValue=new Object; longitudeValue[X]=100; -longitudeValue[Y]=230; +longitudeValue[Y]=256; longitudeValue[WIDTH]=288; longitudeValue[HEIGHT]=42; -longitudeValue[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -longitudeValue[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +longitudeValue[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +longitudeValue[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); longitudeValue[PIXELSIZE]=35; var latitudeValue=new Object; latitudeValue[X]=100; -latitudeValue[Y]=82; +latitudeValue[Y]=108; latitudeValue[WIDTH]=288; latitudeValue[HEIGHT]=42; -latitudeValue[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -latitudeValue[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +latitudeValue[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +latitudeValue[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); latitudeValue[PIXELSIZE]=35; var latitudeTitle=new Object; latitudeTitle[X]=101; -latitudeTitle[Y]=24; +latitudeTitle[Y]=50; latitudeTitle[WIDTH]=155; latitudeTitle[HEIGHT]=46; -latitudeTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -latitudeTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +latitudeTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +latitudeTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); latitudeTitle[PIXELSIZE]=38; var keyboard=new Object; keyboard[SOURCE]="Core/images/keyboard.png"; keyboard[X]=400; -keyboard[Y]=74; +keyboard[Y]=100; keyboard[WIDTH]=80; keyboard[HEIGHT]=60; var backText=new Object; backText[X]=630; -backText[Y]=378; +backText[Y]=404; backText[WIDTH]=128; backText[HEIGHT]=49; -backText[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -backText[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +backText[TEXTCOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); +backText[STYLECOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); backText[PIXELSIZE]=38; var back=new Object; back[SOURCE]="Core/images/back.png"; back[X]=601; -back[Y]=374; +back[Y]=400; back[WIDTH]=180; back[HEIGHT]=60; var okText=new Object; okText[X]=85; -okText[Y]=380; +okText[Y]=406; okText[WIDTH]=128; okText[HEIGHT]=49; -okText[TEXTCOLOR]=Qt.rgba(0, 0, 1, 1); -okText[STYLECOLOR]=Qt.rgba(0, 0, 1, 1); +okText[TEXTCOLOR]=Qt.rgba(0.000, 0.000, 0.000, 1.000); +okText[STYLECOLOR]=Qt.rgba(0.000, 0.000, 0.000, 1.000); okText[PIXELSIZE]=38; var ok=new Object; ok[SOURCE]="Core/images/ok.png"; ok[X]=20; -ok[Y]=374; +ok[Y]=400; ok[WIDTH]=180; ok[HEIGHT]=60; var navigation_search_by_coordinates_menu_background=new Object; navigation_search_by_coordinates_menu_background[SOURCE]="Core/images/navigation-search-by-coordinates-menu-background.png"; navigation_search_by_coordinates_menu_background[X]=0; -navigation_search_by_coordinates_menu_background[Y]=0; +navigation_search_by_coordinates_menu_background[Y]=-1; navigation_search_by_coordinates_menu_background[WIDTH]=800; -navigation_search_by_coordinates_menu_background[HEIGHT]=454; +navigation_search_by_coordinates_menu_background[HEIGHT]=480; diff --git a/src/hmi/qml/Core/style-sheets/navigation-search-freetext-menu-css.js b/src/hmi/qml/Core/style-sheets/navigation-search-freetext-menu-css.js index de63eb6..6610cb3 100644 --- a/src/hmi/qml/Core/style-sheets/navigation-search-freetext-menu-css.js +++ b/src/hmi/qml/Core/style-sheets/navigation-search-freetext-menu-css.js @@ -4,58 +4,58 @@ Qt.include("style-constants.js"); var textTitle=new Object; textTitle[X]=101; -textTitle[Y]=24; +textTitle[Y]=50; textTitle[WIDTH]=83; textTitle[HEIGHT]=46; -textTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -textTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +textTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +textTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); textTitle[PIXELSIZE]=38; var keyboard=new Object; keyboard[SOURCE]="Core/images/keyboard.png"; keyboard[X]=300; -keyboard[Y]=74; +keyboard[Y]=100; keyboard[WIDTH]=80; keyboard[HEIGHT]=60; var backText=new Object; backText[X]=630; -backText[Y]=378; +backText[Y]=404; backText[WIDTH]=128; backText[HEIGHT]=49; -backText[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -backText[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +backText[TEXTCOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); +backText[STYLECOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); backText[PIXELSIZE]=38; -var back=new Object; -back[SOURCE]="Core/images/back.png"; -back[X]=601; -back[Y]=374; -back[WIDTH]=180; -back[HEIGHT]=60; - var textValue=new Object; textValue[X]=100; -textValue[Y]=82; +textValue[Y]=108; textValue[WIDTH]=192; textValue[HEIGHT]=42; -textValue[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -textValue[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +textValue[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +textValue[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); textValue[PIXELSIZE]=35; var okText=new Object; okText[X]=85; -okText[Y]=380; +okText[Y]=406; okText[WIDTH]=128; okText[HEIGHT]=49; -okText[TEXTCOLOR]=Qt.rgba(0, 0, 1, 1); -okText[STYLECOLOR]=Qt.rgba(0, 0, 1, 1); +okText[TEXTCOLOR]=Qt.rgba(0.000, 0.000, 0.000, 1.000); +okText[STYLECOLOR]=Qt.rgba(0.000, 0.000, 0.000, 1.000); okText[PIXELSIZE]=38; +var back=new Object; +back[SOURCE]="Core/images/back.png"; +back[X]=601; +back[Y]=400; +back[WIDTH]=180; +back[HEIGHT]=60; + var ok=new Object; ok[SOURCE]="Core/images/ok.png"; ok[X]=20; -ok[Y]=374; +ok[Y]=400; ok[WIDTH]=180; ok[HEIGHT]=60; @@ -64,5 +64,5 @@ navigation_search_by_freetext_menu_background[SOURCE]="Core/images/navigation-se navigation_search_by_freetext_menu_background[X]=0; navigation_search_by_freetext_menu_background[Y]=0; navigation_search_by_freetext_menu_background[WIDTH]=800; -navigation_search_by_freetext_menu_background[HEIGHT]=454; +navigation_search_by_freetext_menu_background[HEIGHT]=480; diff --git a/src/hmi/qml/Core/style-sheets/navigation-search-menu-css.js b/src/hmi/qml/Core/style-sheets/navigation-search-menu-css.js index 6b653a5..3b6506a 100644 --- a/src/hmi/qml/Core/style-sheets/navigation-search-menu-css.js +++ b/src/hmi/qml/Core/style-sheets/navigation-search-menu-css.js @@ -4,70 +4,70 @@ Qt.include("style-constants.js"); var searchTitle=new Object; searchTitle[X]=274; -searchTitle[Y]=149; +searchTitle[Y]=175; searchTitle[WIDTH]=272; searchTitle[HEIGHT]=44; -searchTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -searchTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +searchTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +searchTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); searchTitle[PIXELSIZE]=36; var backText=new Object; backText[X]=645; -backText[Y]=382; +backText[Y]=408; backText[WIDTH]=105; backText[HEIGHT]=46; -backText[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -backText[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +backText[TEXTCOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); +backText[STYLECOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); backText[PIXELSIZE]=38; var back=new Object; back[SOURCE]="Core/images/back.png"; back[X]=601; -back[Y]=374; +back[Y]=400; back[WIDTH]=180; back[HEIGHT]=60; var search_by_coordinates=new Object; search_by_coordinates[SOURCE]="Core/images/search-by-coordinates.png"; search_by_coordinates[X]=560; -search_by_coordinates[Y]=30; +search_by_coordinates[Y]=56; search_by_coordinates[WIDTH]=140; search_by_coordinates[HEIGHT]=100; var search_by_poi=new Object; search_by_poi[SOURCE]="Core/images/search-by-poi.png"; search_by_poi[X]=100; -search_by_poi[Y]=224; +search_by_poi[Y]=250; search_by_poi[WIDTH]=140; search_by_poi[HEIGHT]=100; var historyText=new Object; historyText[X]=69; -historyText[Y]=380; +historyText[Y]=406; historyText[WIDTH]=174; historyText[HEIGHT]=46; -historyText[TEXTCOLOR]=Qt.rgba(0, 0, 1, 1); -historyText[STYLECOLOR]=Qt.rgba(0, 0, 1, 1); +historyText[TEXTCOLOR]=Qt.rgba(0.000, 0.000, 0.000, 1.000); +historyText[STYLECOLOR]=Qt.rgba(0.000, 0.000, 0.000, 1.000); historyText[PIXELSIZE]=38; var history=new Object; history[SOURCE]="Core/images/history.png"; history[X]=20; -history[Y]=374; +history[Y]=400; history[WIDTH]=260; history[HEIGHT]=60; var search_by_freetext=new Object; search_by_freetext[SOURCE]="Core/images/search-by-freetext.png"; search_by_freetext[X]=560; -search_by_freetext[Y]=224; +search_by_freetext[Y]=250; search_by_freetext[WIDTH]=140; search_by_freetext[HEIGHT]=100; var search_by_address=new Object; search_by_address[SOURCE]="Core/images/search-by-address.png"; search_by_address[X]=100; -search_by_address[Y]=30; +search_by_address[Y]=56; search_by_address[WIDTH]=140; search_by_address[HEIGHT]=100; @@ -76,5 +76,5 @@ navigation_search_menu_background[SOURCE]="Core/images/navigation-search-menu-ba navigation_search_menu_background[X]=0; navigation_search_menu_background[Y]=0; navigation_search_menu_background[WIDTH]=800; -navigation_search_menu_background[HEIGHT]=454; +navigation_search_menu_background[HEIGHT]=480; diff --git a/src/hmi/qml/Core/style-sheets/navigation-settings-language-and-units-menu-css.js b/src/hmi/qml/Core/style-sheets/navigation-settings-language-and-units-menu-css.js index eef8d42..23584a1 100644 --- a/src/hmi/qml/Core/style-sheets/navigation-settings-language-and-units-menu-css.js +++ b/src/hmi/qml/Core/style-sheets/navigation-settings-language-and-units-menu-css.js @@ -4,77 +4,77 @@ Qt.include("style-constants.js"); var languagesTitle=new Object; languagesTitle[X]=100; -languagesTitle[Y]=21; +languagesTitle[Y]=47; languagesTitle[WIDTH]=156; languagesTitle[HEIGHT]=30; -languagesTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -languagesTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +languagesTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +languagesTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); languagesTitle[PIXELSIZE]=25; var unitsTitle=new Object; unitsTitle[X]=331; -unitsTitle[Y]=21; +unitsTitle[Y]=47; unitsTitle[WIDTH]=79; unitsTitle[HEIGHT]=30; -unitsTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -unitsTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +unitsTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +unitsTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); unitsTitle[PIXELSIZE]=25; var backText=new Object; backText[X]=645; -backText[Y]=382; +backText[Y]=408; backText[WIDTH]=105; backText[HEIGHT]=46; -backText[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -backText[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +backText[TEXTCOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); +backText[STYLECOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); backText[PIXELSIZE]=38; var unit_km=new Object; unit_km[SOURCE]="Core/images/unit-km.png"; unit_km[X]=330; -unit_km[Y]=68; +unit_km[Y]=94; unit_km[WIDTH]=100; unit_km[HEIGHT]=60; var unit_mile=new Object; unit_mile[SOURCE]="Core/images/unit-mile.png"; unit_mile[X]=330; -unit_mile[Y]=141; +unit_mile[Y]=167; unit_mile[WIDTH]=100; unit_mile[HEIGHT]=60; var german_flag=new Object; german_flag[SOURCE]="Core/images/german-flag.png"; german_flag[X]=98; -german_flag[Y]=138; +german_flag[Y]=164; german_flag[WIDTH]=104; german_flag[HEIGHT]=64; var usa_flag=new Object; usa_flag[SOURCE]="Core/images/usa-flag.png"; usa_flag[X]=98; -usa_flag[Y]=208; +usa_flag[Y]=234; usa_flag[WIDTH]=104; usa_flag[HEIGHT]=64; var french_flag=new Object; french_flag[SOURCE]="Core/images/french-flag.png"; french_flag[X]=98; -french_flag[Y]=65; +french_flag[Y]=91; french_flag[WIDTH]=104; french_flag[HEIGHT]=64; var japanese_flag=new Object; japanese_flag[SOURCE]="Core/images/japanese-flag.png"; japanese_flag[X]=98; -japanese_flag[Y]=278; +japanese_flag[Y]=304; japanese_flag[WIDTH]=104; japanese_flag[HEIGHT]=64; var back=new Object; back[SOURCE]="Core/images/back.png"; back[X]=600; -back[Y]=374; +back[Y]=400; back[WIDTH]=180; back[HEIGHT]=60; @@ -83,5 +83,5 @@ navigation_settings_language_and_units_menu_background[SOURCE]="Core/images/navi navigation_settings_language_and_units_menu_background[X]=0; navigation_settings_language_and_units_menu_background[Y]=0; navigation_settings_language_and_units_menu_background[WIDTH]=800; -navigation_settings_language_and_units_menu_background[HEIGHT]=454; +navigation_settings_language_and_units_menu_background[HEIGHT]=480; diff --git a/src/hmi/qml/Core/style-sheets/navigation-settings-menu-css.js b/src/hmi/qml/Core/style-sheets/navigation-settings-menu-css.js index 69f0a6e..0ccca59 100644 --- a/src/hmi/qml/Core/style-sheets/navigation-settings-menu-css.js +++ b/src/hmi/qml/Core/style-sheets/navigation-settings-menu-css.js @@ -5,126 +5,126 @@ Qt.include("style-constants.js"); var simulation_off=new Object; simulation_off[SOURCE]="Core/images/simulation-off.png"; simulation_off[X]=261; -simulation_off[Y]=103; +simulation_off[Y]=129; simulation_off[WIDTH]=100; simulation_off[HEIGHT]=60; var simulation_on=new Object; simulation_on[SOURCE]="Core/images/simulation-on.png"; simulation_on[X]=261; -simulation_on[Y]=103; +simulation_on[Y]=129; simulation_on[WIDTH]=100; simulation_on[HEIGHT]=60; var simulationTitle=new Object; simulationTitle[X]=38; -simulationTitle[Y]=46; +simulationTitle[Y]=72; simulationTitle[WIDTH]=161; simulationTitle[HEIGHT]=30; -simulationTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -simulationTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +simulationTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +simulationTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); simulationTitle[PIXELSIZE]=25; var speedValue=new Object; -speedValue[X]=108; -speedValue[Y]=105; +speedValue[X]=106; +speedValue[Y]=130; speedValue[WIDTH]=30; speedValue[HEIGHT]=53; -speedValue[TEXTCOLOR]=Qt.rgba(0, 0, 0, 1); -speedValue[STYLECOLOR]=Qt.rgba(0, 0, 0, 1); +speedValue[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +speedValue[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); speedValue[PIXELSIZE]=44; var speedTitle=new Object; speedTitle[X]=83; -speedTitle[Y]=175; -speedTitle[WIDTH]=82; +speedTitle[Y]=201; +speedTitle[WIDTH]=83; speedTitle[HEIGHT]=30; -speedTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -speedTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +speedTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +speedTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); speedTitle[PIXELSIZE]=25; var modeTitle=new Object; modeTitle[X]=329; -modeTitle[Y]=174; -modeTitle[WIDTH]=77; +modeTitle[Y]=200; +modeTitle[WIDTH]=76; modeTitle[HEIGHT]=30; -modeTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -modeTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +modeTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +modeTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); modeTitle[PIXELSIZE]=25; var speed_up=new Object; speed_up[SOURCE]="Core/images/speed-up.png"; speed_up[X]=161; -speed_up[Y]=111; +speed_up[Y]=137; speed_up[WIDTH]=37; speed_up[HEIGHT]=42; var speed_down=new Object; speed_down[SOURCE]="Core/images/speed-down.png"; speed_down[X]=41; -speed_down[Y]=110; +speed_down[Y]=136; speed_down[WIDTH]=37; speed_down[HEIGHT]=42; var play=new Object; play[SOURCE]="Core/images/play.png"; play[X]=397; -play[Y]=103; +play[Y]=129; play[WIDTH]=100; play[HEIGHT]=60; var pause=new Object; pause[SOURCE]="Core/images/pause.png"; pause[X]=397; -pause[Y]=103; +pause[Y]=129; pause[WIDTH]=100; pause[HEIGHT]=60; var backText=new Object; backText[X]=630; -backText[Y]=378; +backText[Y]=404; backText[WIDTH]=128; backText[HEIGHT]=49; -backText[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -backText[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +backText[TEXTCOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); +backText[STYLECOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); backText[PIXELSIZE]=38; var back=new Object; back[SOURCE]="Core/images/back.png"; back[X]=601; -back[Y]=374; +back[Y]=400; back[WIDTH]=180; back[HEIGHT]=60; var preferencesText=new Object; preferencesText[X]=25; -preferencesText[Y]=382; +preferencesText[Y]=408; preferencesText[WIDTH]=248; preferencesText[HEIGHT]=46; -preferencesText[TEXTCOLOR]=Qt.rgba(0, 0, 1, 1); -preferencesText[STYLECOLOR]=Qt.rgba(0, 0, 1, 1); +preferencesText[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +preferencesText[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); preferencesText[PIXELSIZE]=38; var preferences=new Object; preferences[SOURCE]="Core/images/preferences.png"; preferences[X]=20; -preferences[Y]=374; +preferences[Y]=400; preferences[WIDTH]=260; preferences[HEIGHT]=60; var languageAndUnitText=new Object; languageAndUnitText[X]=312; -languageAndUnitText[Y]=379; +languageAndUnitText[Y]=405; languageAndUnitText[WIDTH]=253; languageAndUnitText[HEIGHT]=46; -languageAndUnitText[TEXTCOLOR]=Qt.rgba(0, 0, 1, 1); -languageAndUnitText[STYLECOLOR]=Qt.rgba(0, 0, 1, 1); +languageAndUnitText[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +languageAndUnitText[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); languageAndUnitText[PIXELSIZE]=38; var languageAndUnit=new Object; languageAndUnit[SOURCE]="Core/images/languageAndUnit.png"; languageAndUnit[X]=310; -languageAndUnit[Y]=374; +languageAndUnit[Y]=400; languageAndUnit[WIDTH]=260; languageAndUnit[HEIGHT]=60; @@ -133,5 +133,5 @@ navigation_settings_background[SOURCE]="Core/images/navigation-settings-backgrou navigation_settings_background[X]=0; navigation_settings_background[Y]=0; navigation_settings_background[WIDTH]=800; -navigation_settings_background[HEIGHT]=454; +navigation_settings_background[HEIGHT]=480; diff --git a/src/hmi/qml/Core/style-sheets/navigation-settings-preference-menu-css.js b/src/hmi/qml/Core/style-sheets/navigation-settings-preference-menu-css.js index fd316ed..f4718ba 100644 --- a/src/hmi/qml/Core/style-sheets/navigation-settings-preference-menu-css.js +++ b/src/hmi/qml/Core/style-sheets/navigation-settings-preference-menu-css.js @@ -4,120 +4,120 @@ Qt.include("style-constants.js"); var costModelValue=new Object; costModelValue[X]=119; -costModelValue[Y]=108; +costModelValue[Y]=134; costModelValue[WIDTH]=147; costModelValue[HEIGHT]=38; -costModelValue[TEXTCOLOR]=Qt.rgba(0, 0, 1, 1); -costModelValue[STYLECOLOR]=Qt.rgba(0, 0, 1, 1); +costModelValue[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +costModelValue[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); costModelValue[PIXELSIZE]=31; var ferriesText=new Object; ferriesText[X]=330; -ferriesText[Y]=111; +ferriesText[Y]=137; ferriesText[WIDTH]=136; ferriesText[HEIGHT]=38; -ferriesText[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -ferriesText[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +ferriesText[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +ferriesText[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); ferriesText[PIXELSIZE]=31; var motorWaysText=new Object; motorWaysText[X]=330; -motorWaysText[Y]=261; +motorWaysText[Y]=287; motorWaysText[WIDTH]=207; motorWaysText[HEIGHT]=38; -motorWaysText[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -motorWaysText[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +motorWaysText[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +motorWaysText[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); motorWaysText[PIXELSIZE]=31; var tollRoadsText=new Object; tollRoadsText[X]=330; -tollRoadsText[Y]=182; +tollRoadsText[Y]=208; tollRoadsText[WIDTH]=200; tollRoadsText[HEIGHT]=38; -tollRoadsText[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -tollRoadsText[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +tollRoadsText[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +tollRoadsText[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); tollRoadsText[PIXELSIZE]=31; var routingPreferencesTitle=new Object; routingPreferencesTitle[X]=331; -routingPreferencesTitle[Y]=21; +routingPreferencesTitle[Y]=47; routingPreferencesTitle[WIDTH]=307; routingPreferencesTitle[HEIGHT]=30; -routingPreferencesTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -routingPreferencesTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +routingPreferencesTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +routingPreferencesTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); routingPreferencesTitle[PIXELSIZE]=25; var costModelTitle=new Object; costModelTitle[X]=100; -costModelTitle[Y]=21; +costModelTitle[Y]=47; costModelTitle[WIDTH]=168; costModelTitle[HEIGHT]=30; -costModelTitle[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -costModelTitle[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +costModelTitle[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +costModelTitle[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); costModelTitle[PIXELSIZE]=25; var cost_model=new Object; cost_model[SOURCE]="Core/images/cost-model.png"; cost_model[X]=100; -cost_model[Y]=98; +cost_model[Y]=124; cost_model[WIDTH]=180; cost_model[HEIGHT]=60; var allow_tollRoads=new Object; allow_tollRoads[SOURCE]="Core/images/allow-tollRoads.png"; allow_tollRoads[X]=560; -allow_tollRoads[Y]=173; +allow_tollRoads[Y]=199; allow_tollRoads[WIDTH]=50; allow_tollRoads[HEIGHT]=60; var avoid_tollRoads=new Object; avoid_tollRoads[SOURCE]="Core/images/avoid-tollRoads.png"; avoid_tollRoads[X]=610; -avoid_tollRoads[Y]=173; +avoid_tollRoads[Y]=199; avoid_tollRoads[WIDTH]=50; avoid_tollRoads[HEIGHT]=60; var allow_motorways=new Object; allow_motorways[SOURCE]="Core/images/allow-motorways.png"; allow_motorways[X]=560; -allow_motorways[Y]=249; +allow_motorways[Y]=275; allow_motorways[WIDTH]=50; allow_motorways[HEIGHT]=60; -var allow_ferries=new Object; -allow_ferries[SOURCE]="Core/images/allow-ferries.png"; -allow_ferries[X]=560; -allow_ferries[Y]=99; -allow_ferries[WIDTH]=50; -allow_ferries[HEIGHT]=60; - var avoid_motorways=new Object; avoid_motorways[SOURCE]="Core/images/avoid-motorways.png"; avoid_motorways[X]=610; -avoid_motorways[Y]=249; +avoid_motorways[Y]=275; avoid_motorways[WIDTH]=50; avoid_motorways[HEIGHT]=60; +var allow_ferries=new Object; +allow_ferries[SOURCE]="Core/images/allow-ferries.png"; +allow_ferries[X]=560; +allow_ferries[Y]=125; +allow_ferries[WIDTH]=50; +allow_ferries[HEIGHT]=60; + var avoid_ferries=new Object; avoid_ferries[SOURCE]="Core/images/avoid-ferries.png"; avoid_ferries[X]=610; -avoid_ferries[Y]=99; +avoid_ferries[Y]=125; avoid_ferries[WIDTH]=50; avoid_ferries[HEIGHT]=60; var backText=new Object; backText[X]=645; -backText[Y]=382; +backText[Y]=408; backText[WIDTH]=105; backText[HEIGHT]=46; -backText[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -backText[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +backText[TEXTCOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); +backText[STYLECOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); backText[PIXELSIZE]=38; var back=new Object; back[SOURCE]="Core/images/back.png"; back[X]=601; -back[Y]=374; +back[Y]=400; back[WIDTH]=180; back[HEIGHT]=60; @@ -126,5 +126,5 @@ navigation_settings_preference_menu_background[SOURCE]="Core/images/navigation-s navigation_settings_preference_menu_background[X]=0; navigation_settings_preference_menu_background[Y]=0; navigation_settings_preference_menu_background[WIDTH]=800; -navigation_settings_preference_menu_background[HEIGHT]=454; +navigation_settings_preference_menu_background[HEIGHT]=480; diff --git a/src/hmi/qml/Core/style-sheets/style-constants.js b/src/hmi/qml/Core/style-sheets/style-constants.js index a8e54b6..9adce72 100644 --- a/src/hmi/qml/Core/style-sheets/style-constants.js +++ b/src/hmi/qml/Core/style-sheets/style-constants.js @@ -33,3 +33,8 @@ var TEXTCOLOR = 5; var PIXELSIZE = 6; var STYLE = 7; var STYLECOLOR = 8; +var MENU_HEIGHT = 480; +var MENU_WIDTH = 800; +//var MENU_BANNER_HEIGHT = 26; +var MENU_BANNER_HEIGHT = 0; +var MENU_BACKGROUND_COLOR = Qt.rgba(0, 0, 0, 1); diff --git a/src/hmi/qml/Core/style-sheets/trip-computer-menu-css.js b/src/hmi/qml/Core/style-sheets/trip-computer-menu-css.js index 4919c0a..a1a9b95 100644 --- a/src/hmi/qml/Core/style-sheets/trip-computer-menu-css.js +++ b/src/hmi/qml/Core/style-sheets/trip-computer-menu-css.js @@ -4,216 +4,216 @@ Qt.include("style-constants.js"); var predictive_tank_distance_value=new Object; predictive_tank_distance_value[X]=552; -predictive_tank_distance_value[Y]=13; +predictive_tank_distance_value[Y]=39; predictive_tank_distance_value[WIDTH]=150; predictive_tank_distance_value[HEIGHT]=100; -predictive_tank_distance_value[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -predictive_tank_distance_value[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +predictive_tank_distance_value[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +predictive_tank_distance_value[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); predictive_tank_distance_value[PIXELSIZE]=86; var predictive_tank_distance_unit=new Object; predictive_tank_distance_unit[X]=592; -predictive_tank_distance_unit[Y]=107; +predictive_tank_distance_unit[Y]=133; predictive_tank_distance_unit[WIDTH]=66; predictive_tank_distance_unit[HEIGHT]=51; -predictive_tank_distance_unit[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -predictive_tank_distance_unit[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +predictive_tank_distance_unit[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +predictive_tank_distance_unit[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); predictive_tank_distance_unit[PIXELSIZE]=42; var predictive_tank_distance_title=new Object; predictive_tank_distance_title[X]=539; -predictive_tank_distance_title[Y]=281; +predictive_tank_distance_title[Y]=307; predictive_tank_distance_title[WIDTH]=207; predictive_tank_distance_title[HEIGHT]=60; -predictive_tank_distance_title[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -predictive_tank_distance_title[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +predictive_tank_distance_title[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +predictive_tank_distance_title[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); predictive_tank_distance_title[PIXELSIZE]=25; var tank_distance_value=new Object; tank_distance_value[X]=286; -tank_distance_value[Y]=13; +tank_distance_value[Y]=39; tank_distance_value[WIDTH]=150; tank_distance_value[HEIGHT]=100; -tank_distance_value[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -tank_distance_value[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +tank_distance_value[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +tank_distance_value[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); tank_distance_value[PIXELSIZE]=86; var tank_distance_unit=new Object; tank_distance_unit[X]=340; -tank_distance_unit[Y]=105; +tank_distance_unit[Y]=131; tank_distance_unit[WIDTH]=66; tank_distance_unit[HEIGHT]=51; -tank_distance_unit[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -tank_distance_unit[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +tank_distance_unit[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +tank_distance_unit[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); tank_distance_unit[PIXELSIZE]=42; var tank_distance_title=new Object; tank_distance_title[X]=286; -tank_distance_title[Y]=294; +tank_distance_title[Y]=320; tank_distance_title[WIDTH]=207; tank_distance_title[HEIGHT]=30; -tank_distance_title[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -tank_distance_title[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +tank_distance_title[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +tank_distance_title[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); tank_distance_title[PIXELSIZE]=25; var fuel_value=new Object; fuel_value[X]=90; -fuel_value[Y]=13; +fuel_value[Y]=39; fuel_value[WIDTH]=100; fuel_value[HEIGHT]=100; -fuel_value[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -fuel_value[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +fuel_value[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +fuel_value[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); fuel_value[PIXELSIZE]=86; var fuel_unit=new Object; fuel_unit[X]=131; -fuel_unit[Y]=105; +fuel_unit[Y]=131; fuel_unit[WIDTH]=24; fuel_unit[HEIGHT]=49; -fuel_unit[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -fuel_unit[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +fuel_unit[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +fuel_unit[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); fuel_unit[PIXELSIZE]=42; var fuel_title=new Object; fuel_title[X]=77; -fuel_title[Y]=289; +fuel_title[Y]=315; fuel_title[WIDTH]=148; fuel_title[HEIGHT]=30; -fuel_title[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -fuel_title[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +fuel_title[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +fuel_title[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); fuel_title[PIXELSIZE]=25; var distance_value=new Object; distance_value[X]=552; -distance_value[Y]=13; +distance_value[Y]=39; distance_value[WIDTH]=150; distance_value[HEIGHT]=100; -distance_value[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -distance_value[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +distance_value[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +distance_value[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); distance_value[PIXELSIZE]=86; var distance_unit=new Object; distance_unit[X]=592; -distance_unit[Y]=107; +distance_unit[Y]=133; distance_unit[WIDTH]=66; distance_unit[HEIGHT]=51; -distance_unit[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -distance_unit[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +distance_unit[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +distance_unit[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); distance_unit[PIXELSIZE]=42; var distance_title=new Object; distance_title[X]=562; -distance_title[Y]=288; +distance_title[Y]=314; distance_title[WIDTH]=130; distance_title[HEIGHT]=30; -distance_title[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -distance_title[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +distance_title[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +distance_title[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); distance_title[PIXELSIZE]=25; var avg_fuel_value=new Object; avg_fuel_value[X]=307; -avg_fuel_value[Y]=13; +avg_fuel_value[Y]=39; avg_fuel_value[WIDTH]=132; avg_fuel_value[HEIGHT]=100; -avg_fuel_value[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -avg_fuel_value[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +avg_fuel_value[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +avg_fuel_value[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); avg_fuel_value[PIXELSIZE]=86; var avg_fuel_unit=new Object; avg_fuel_unit[X]=312; -avg_fuel_unit[Y]=107; +avg_fuel_unit[Y]=133; avg_fuel_unit[WIDTH]=123; avg_fuel_unit[HEIGHT]=51; -avg_fuel_unit[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -avg_fuel_unit[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +avg_fuel_unit[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +avg_fuel_unit[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); avg_fuel_unit[PIXELSIZE]=42; var avg_fuel_title=new Object; avg_fuel_title[X]=305; -avg_fuel_title[Y]=288; +avg_fuel_title[Y]=314; avg_fuel_title[WIDTH]=124; avg_fuel_title[HEIGHT]=30; -avg_fuel_title[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -avg_fuel_title[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +avg_fuel_title[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +avg_fuel_title[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); avg_fuel_title[PIXELSIZE]=25; var avg_speed_value=new Object; avg_speed_value[X]=74; -avg_speed_value[Y]=13; +avg_speed_value[Y]=39; avg_speed_value[WIDTH]=100; avg_speed_value[HEIGHT]=100; -avg_speed_value[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -avg_speed_value[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +avg_speed_value[TEXTCOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); +avg_speed_value[STYLECOLOR]=Qt.rgba(1.000, 1.000, 1.000, 1.000); avg_speed_value[PIXELSIZE]=86; var avg_speed_unit=new Object; avg_speed_unit[X]=65; -avg_speed_unit[Y]=105; +avg_speed_unit[Y]=131; avg_speed_unit[WIDTH]=112; avg_speed_unit[HEIGHT]=51; -avg_speed_unit[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -avg_speed_unit[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +avg_speed_unit[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +avg_speed_unit[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); avg_speed_unit[PIXELSIZE]=42; var avg_speed_title=new Object; avg_speed_title[X]=77; -avg_speed_title[Y]=289; +avg_speed_title[Y]=315; avg_speed_title[WIDTH]=145; avg_speed_title[HEIGHT]=30; -avg_speed_title[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -avg_speed_title[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +avg_speed_title[TEXTCOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); +avg_speed_title[STYLECOLOR]=Qt.rgba(0.412, 0.412, 0.412, 1.000); avg_speed_title[PIXELSIZE]=25; var resetText=new Object; resetText[X]=43; -resetText[Y]=378; +resetText[Y]=404; resetText[WIDTH]=128; resetText[HEIGHT]=49; -resetText[TEXTCOLOR]=Qt.rgba(1, 0, 0, 1); -resetText[STYLECOLOR]=Qt.rgba(1, 0, 0, 1); +resetText[TEXTCOLOR]=Qt.rgba(0.000, 0.000, 0.000, 1.000); +resetText[STYLECOLOR]=Qt.rgba(0.000, 0.000, 0.000, 1.000); resetText[PIXELSIZE]=38; var reset=new Object; reset[SOURCE]="Core/images/reset.png"; reset[X]=20; -reset[Y]=374; +reset[Y]=400; reset[WIDTH]=180; reset[HEIGHT]=60; var backText=new Object; backText[X]=630; -backText[Y]=378; +backText[Y]=404; backText[WIDTH]=128; backText[HEIGHT]=49; -backText[TEXTCOLOR]=Qt.rgba(1, 1, 1, 1); -backText[STYLECOLOR]=Qt.rgba(1, 1, 1, 1); +backText[TEXTCOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); +backText[STYLECOLOR]=Qt.rgba(0.000, 0.627, 0.565, 1.000); backText[PIXELSIZE]=38; var back=new Object; back[SOURCE]="Core/images/back.png"; back[X]=601; -back[Y]=374; +back[Y]=400; back[WIDTH]=180; back[HEIGHT]=60; var select_instant=new Object; select_instant[SOURCE]="Core/images/select-instant.png"; select_instant[X]=476; -select_instant[Y]=374; +select_instant[Y]=400; select_instant[WIDTH]=100; select_instant[HEIGHT]=60; var select_trip2=new Object; select_trip2[SOURCE]="Core/images/select-trip2.png"; select_trip2[X]=351; -select_trip2[Y]=374; +select_trip2[Y]=400; select_trip2[WIDTH]=100; select_trip2[HEIGHT]=60; var select_trip1=new Object; select_trip1[SOURCE]="Core/images/select-trip1.png"; select_trip1[X]=225; -select_trip1[Y]=374; +select_trip1[Y]=400; select_trip1[WIDTH]=100; select_trip1[HEIGHT]=60; @@ -222,19 +222,19 @@ trip1_background[SOURCE]="Core/images/trip1-background.png"; trip1_background[X]=0; trip1_background[Y]=0; trip1_background[WIDTH]=800; -trip1_background[HEIGHT]=454; +trip1_background[HEIGHT]=480; var trip2_background=new Object; trip2_background[SOURCE]="Core/images/trip2-background.png"; trip2_background[X]=0; trip2_background[Y]=0; trip2_background[WIDTH]=800; -trip2_background[HEIGHT]=454; +trip2_background[HEIGHT]=480; var trip_instant_background=new Object; trip_instant_background[SOURCE]="Core/images/trip-instant-background.png"; trip_instant_background[X]=0; trip_instant_background[Y]=0; trip_instant_background[WIDTH]=800; -trip_instant_background[HEIGHT]=454; +trip_instant_background[HEIGHT]=480; |
