diff options
Diffstat (limited to 'navit/gui')
37 files changed, 123 insertions, 123 deletions
diff --git a/navit/gui/internal/gui_internal_poi.h b/navit/gui/internal/gui_internal_poi.h index 665f44a70..4e6bed74b 100644 --- a/navit/gui/internal/gui_internal_poi.h +++ b/navit/gui/internal/gui_internal_poi.h @@ -13,28 +13,28 @@ struct poi_param { /** * Index to struct selector selectors[], shows what type of POIs is defined. - */ + */ unsigned char selnb; /** * Page number to display. - */ + */ unsigned char pagenb; /** * Radius (number of 10-kilometer intervals) to search for POIs. - */ + */ unsigned char dist; /** * Should filter phrase be compared to postal address of the POI. * =0 - name filter, =1 - address filter, =2 - address filter, including postal code - */ + */ unsigned char AddressFilterType; /** * Filter string, casefold()ed and divided into substrings at the spaces, which are replaced by ASCII 0*. - */ - char *filterstr; + */ + char *filterstr; /** * list of pointers to individual substrings of filterstr. - */ + */ GList *filter; /** * Number of POIs in this list diff --git a/navit/gui/internal/gui_internal_priv.h b/navit/gui/internal/gui_internal_priv.h index 37b09d62a..66b3e41fe 100644 --- a/navit/gui/internal/gui_internal_priv.h +++ b/navit/gui/internal/gui_internal_priv.h @@ -136,7 +136,7 @@ struct gui_priv { struct widget *container; } html[10]; -/* gestures */ +/* gestures */ struct gesture_elem { long long msec; diff --git a/navit/gui/qml/bookmarksProxy.h b/navit/gui/qml/bookmarksProxy.h index de48898a0..8063a2058 100644 --- a/navit/gui/qml/bookmarksProxy.h +++ b/navit/gui/qml/bookmarksProxy.h @@ -51,7 +51,7 @@ public slots: while ((item=bookmarks_get_item(mattr.u.bookmarks))) { QString label; QString path; - + if (item->type != type_bookmark && item->type != type_bookmark_folder) continue; if (!item_attr_get(item, attr_label, &attr)) continue; label=QString::fromLocal8Bit(attr.u.str); diff --git a/navit/gui/qml/guiProxy.h b/navit/gui/qml/guiProxy.h index 7648eb5b3..ca46af09e 100644 --- a/navit/gui/qml/guiProxy.h +++ b/navit/gui/qml/guiProxy.h @@ -48,7 +48,7 @@ public: //QDeclarativeExpression commandJS(this->object->guiWidget->rootContext(),QString(),qobject_cast<QObject*>(this->object->guiWidget->rootObject())); //commandJS.setSourceLocation("command.js",0); //this->function=function; - //commandJS.eval(qobject_cast<QObject*>(this->object->guiWidget->rootObject())); + //commandJS.eval(qobject_cast<QObject*>(this->object->guiWidget->rootObject())); } signals: void widthSignal(int); @@ -57,7 +57,7 @@ public slots: void pushPage(QString page) { returnPath.push_front(page); } - QString popPage() { + QString popPage() { if (!returnPath.empty()) { if (returnPath.length()>1) { returnPath.pop_front(); diff --git a/navit/gui/qml/navitProxy.h b/navit/gui/qml/navitProxy.h index 423863b0e..d3f8a0e86 100644 --- a/navit/gui/qml/navitProxy.h +++ b/navit/gui/qml/navitProxy.h @@ -51,7 +51,7 @@ public slots: while (getAttrFunc(attr_from_name(attr_name.toStdString().c_str()), &attr, iter) ) { QStandardItem* curItem=new QStandardItem(); - //Listed attributes are usualy have very complex structure + //Listed attributes are usualy have very complex structure if (attr.type==attr_layout) { curItem->setData(QVariant(counter),NGQStandardItemModel::ItemId); curItem->setData(QVariant(attr.u.layout->name),NGQStandardItemModel::ItemName); diff --git a/navit/gui/qml/ngqpoint.h b/navit/gui/qml/ngqpoint.h index b1e6312ff..14aaddc61 100644 --- a/navit/gui/qml/ngqpoint.h +++ b/navit/gui/qml/ngqpoint.h @@ -94,7 +94,7 @@ public: this->c.x = c->x; this->c.y = c->y; this->type=type; - + this->name=name; this->coord=this->_coordString(); } @@ -116,7 +116,7 @@ public slots: this->coord=this->_coordString(); } QString pointName() { - return this->name; + return this->name; } QString coordString() { return this->coord; @@ -311,12 +311,12 @@ protected: mr=map_rect_new(m, &sel); if (! mr) continue; - while ((item=map_rect_get_item(mr))) { + while ((item=map_rect_get_item(mr))) { data=street_get_data(item); - if (transform_within_dist_item(&co, item->type, data->c, data->count, dist)) { + if (transform_within_dist_item(&co, item->type, data->c, data->count, dist)) { if (item_attr_get(item, attr_label, &attr)) { label=map_convert_string(m, attr.u.str); - this->item=*item; + this->item=*item; this->_setUrl(item); if (QString(item_to_name(item->type)).startsWith(QString("poi_"))) { ret=QString::fromLocal8Bit(item_to_name(item->type)); diff --git a/navit/gui/qml/proxy.h b/navit/gui/qml/proxy.h index 72a696f00..ebdb0667a 100644 --- a/navit/gui/qml/proxy.h +++ b/navit/gui/qml/proxy.h @@ -35,7 +35,7 @@ public slots: QString getAttr(const QString &attr_name) { QString ret; struct attr attr; - + getAttrFunc(attr_from_name(attr_name.toStdString().c_str()), &attr, NULL); if (ATTR_IS_INT(attr.type)) { ret.setNum(attr.u.num); @@ -81,7 +81,7 @@ public slots: return; } - + int itemId() { return _itemId; } diff --git a/navit/gui/qml/routeProxy.h b/navit/gui/qml/routeProxy.h index f4c5f9911..fb76c492c 100644 --- a/navit/gui/qml/routeProxy.h +++ b/navit/gui/qml/routeProxy.h @@ -14,13 +14,13 @@ public slots: QList<struct attr> destinations=this->_routeDestinations(); struct pcoord *coords=(struct pcoord*)malloc(sizeof(struct pcoord)*(destinations.size()+1)); //Additional destination included - for (QList<struct attr>::const_iterator iter=destinations.begin();iter!=destinations.end();iter++) { + for (QList<struct attr>::const_iterator iter=destinations.begin();iter!=destinations.end();iter++) { coords[counter]=*(iter->u.pcoord); counter++; } //Add new one - coords[counter]=*(this->object->currentPoint->pc()); + coords[counter]=*(this->object->currentPoint->pc()); //Propagate to route engine route_set_destinations(navit_get_route(this->object->nav),coords,counter+1,1); diff --git a/navit/gui/qml/searchProxy.h b/navit/gui/qml/searchProxy.h index 16f79a2a3..3d76dc0dd 100644 --- a/navit/gui/qml/searchProxy.h +++ b/navit/gui/qml/searchProxy.h @@ -52,7 +52,7 @@ public: search_list_search(this->sl, &search_attr, 0); while((res=search_list_get_result(this->sl))); } - } + } } ~NGQProxySearch() { search_list_destroy(this->sl); @@ -131,7 +131,7 @@ public slots: } if (res->town->common.district_name) { entry.appendChild(this->_fieldValueHelper(retDoc,QString("name"), QString::fromLocal8Bit(res->town->common.district_name))); - } + } } if (this->search_context=="street") { entry.appendChild(this->_fieldValueHelper(retDoc,QString("id"), QString::number(counter))); @@ -150,8 +150,8 @@ public slots: this->country_name=countryName; struct attr attr; struct search_list_result *res; - - //We need to update ISO2 + + //We need to update ISO2 attr.type=attr_country_name; attr.u.str=countryName.toLocal8Bit().data(); search_list_search(this->sl,&attr,0); @@ -183,7 +183,7 @@ public slots: attr.type=attr_town_or_district_name; attr.u.str=townName.toLocal8Bit().data(); search_list_search(this->sl,&attr,0); - + //...and street this->street_name=""; diff --git a/navit/gui/qml/skins/navit/ButtonIcon.qml b/navit/gui/qml/skins/navit/ButtonIcon.qml index 9b5d6ae3a..6e0f8f032 100644 --- a/navit/gui/qml/skins/navit/ButtonIcon.qml +++ b/navit/gui/qml/skins/navit/ButtonIcon.qml @@ -19,7 +19,7 @@ Rectangle { } Text { - id: txtItem; text: container.text; anchors.top: imgItem.bottom; anchors.horizontalCenter: container.horizontalCenter; + id: txtItem; text: container.text; anchors.top: imgItem.bottom; anchors.horizontalCenter: container.horizontalCenter; color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter } diff --git a/navit/gui/qml/skins/navit/Cellar.qml b/navit/gui/qml/skins/navit/Cellar.qml index de4d3c146..89ecfc899 100644 --- a/navit/gui/qml/skins/navit/Cellar.qml +++ b/navit/gui/qml/skins/navit/Cellar.qml @@ -3,14 +3,14 @@ import "pagenavigation.js" as Navit Rectangle { - function onStartup(currentPage) { + function onStartup(currentPage) { btnBack.opacity=0; btnQuit.opacity=0; if ( gui.lengthPage() > 1 ) { btnBack.opacity=1; } if ( gui.lengthPage() == 1 && currentPage == "PageMain.qml" ) { - btnQuit.opacity=1; + btnQuit.opacity=1; } } diff --git a/navit/gui/qml/skins/navit/ListSelector.qml b/navit/gui/qml/skins/navit/ListSelector.qml index 09c927cf1..9480275be 100644 --- a/navit/gui/qml/skins/navit/ListSelector.qml +++ b/navit/gui/qml/skins/navit/ListSelector.qml @@ -17,8 +17,8 @@ Rectangle { listScroller.opacity=0.5; } } - - Component.onCompleted: startup(); + + Component.onCompleted: startup(); Text { id: labelTxt; text: listselector.text; color: "White"; font.pointSize: 22; @@ -37,7 +37,7 @@ Rectangle { clip: true highlightFollowsCurrentItem: true keyNavigationWraps: true - + Component.onCompleted: { list.currentIndex=listselector.itemId; } } Rectangle { diff --git a/navit/gui/qml/skins/navit/PageAbout.qml b/navit/gui/qml/skins/navit/PageAbout.qml index a96baabca..b026e73be 100644 --- a/navit/gui/qml/skins/navit/PageAbout.qml +++ b/navit/gui/qml/skins/navit/PageAbout.qml @@ -12,9 +12,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } diff --git a/navit/gui/qml/skins/navit/PageBookmarks.qml b/navit/gui/qml/skins/navit/PageBookmarks.qml index 15a5982b6..46da8d865 100644 --- a/navit/gui/qml/skins/navit/PageBookmarks.qml +++ b/navit/gui/qml/skins/navit/PageBookmarks.qml @@ -11,7 +11,7 @@ Rectangle { function bookmarkReload() { listModel.xml=bookmarks.getBookmarks(); listModel.query="/bookmarks/bookmark"; - listModel.reload(); + listModel.reload(); } function bookmarkClick(itemName,itemType,itemCoord) { @@ -31,9 +31,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -41,7 +41,7 @@ Rectangle { ButtonIcon { id: folderBtn; text: "New folder"; icon: "gui_active.svg"; onClicked: folderDialog.opacity=1 anchors.top: parent.top; anchors.topMargin: page.height/16; anchors.left: parent.left; anchors.leftMargin: page.width/16 } - ButtonIcon { id: pasteBtn; text: "Paste"; icon: "gui_active.svg"; onClicked: { bookmarks.Paste(); bookmarkReload(); } + ButtonIcon { id: pasteBtn; text: "Paste"; icon: "gui_active.svg"; onClicked: { bookmarks.Paste(); bookmarkReload(); } anchors.top: parent.top; anchors.topMargin: page.height/16; anchors.left: folderBtn.right; anchors.leftMargin: page.width/16 } @@ -109,7 +109,7 @@ Rectangle { } } - ListSelector { + ListSelector { id:layoutList; text: "" anchors.top: pasteBtn.bottom; anchors.left: parent.left; diff --git a/navit/gui/qml/skins/navit/PageBookmarksAdd.qml b/navit/gui/qml/skins/navit/PageBookmarksAdd.qml index 39694d2af..c02aea7c3 100644 --- a/navit/gui/qml/skins/navit/PageBookmarksAdd.qml +++ b/navit/gui/qml/skins/navit/PageBookmarksAdd.qml @@ -25,9 +25,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } diff --git a/navit/gui/qml/skins/navit/PageNavigate.qml b/navit/gui/qml/skins/navit/PageNavigate.qml index 3d4e04bc2..32e43841f 100644 --- a/navit/gui/qml/skins/navit/PageNavigate.qml +++ b/navit/gui/qml/skins/navit/PageNavigate.qml @@ -23,9 +23,9 @@ Rectangle { } page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } diff --git a/navit/gui/qml/skins/navit/PagePoi.qml b/navit/gui/qml/skins/navit/PagePoi.qml index 4ab9f5c0f..71f21bb2f 100644 --- a/navit/gui/qml/skins/navit/PagePoi.qml +++ b/navit/gui/qml/skins/navit/PagePoi.qml @@ -64,9 +64,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -138,7 +138,7 @@ Rectangle { } } - ListSelector { + ListSelector { id:layoutList; text: "" anchors.top: distanceSlider.bottom; anchors.left: parent.left; diff --git a/navit/gui/qml/skins/navit/PagePointInfo.qml b/navit/gui/qml/skins/navit/PagePointInfo.qml index 1014c63df..c33027e26 100644 --- a/navit/gui/qml/skins/navit/PagePointInfo.qml +++ b/navit/gui/qml/skins/navit/PagePointInfo.qml @@ -12,9 +12,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -68,7 +68,7 @@ Rectangle { } } - ListSelector { + ListSelector { id:layoutList; text: "Attributes"; anchors.top: urlTxt.bottom; anchors.left: parent.left; diff --git a/navit/gui/qml/skins/navit/PageRoute.qml b/navit/gui/qml/skins/navit/PageRoute.qml index a340eaa1b..ea71569b3 100644 --- a/navit/gui/qml/skins/navit/PageRoute.qml +++ b/navit/gui/qml/skins/navit/PageRoute.qml @@ -20,9 +20,9 @@ Rectangle { } route.getDestinations(); } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } diff --git a/navit/gui/qml/skins/navit/PageSearch.qml b/navit/gui/qml/skins/navit/PageSearch.qml index 3d9419920..bc93dce52 100644 --- a/navit/gui/qml/skins/navit/PageSearch.qml +++ b/navit/gui/qml/skins/navit/PageSearch.qml @@ -20,9 +20,9 @@ Rectangle { } page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -36,19 +36,19 @@ Rectangle { columns: 1;rows: 2; id: gridCountry; Text { - id: txtItemCountry; text: "Country"; + id: txtItemCountry; text: "Country"; color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter } ButtonIcon { id: btnCountry; text: search.countryName; icon: "country_"+search.countryISO2+".svgz"; onClicked: { search.searchContext="country"; Navit.load("PageSearchSelector.qml"); } - } + } } Grid { columns: 1; rows: 2; id: gridCity opacity: 0; Text { - id: txtItemCity; text: "Town"; + id: txtItemCity; text: "Town"; color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter } ButtonIcon { @@ -67,7 +67,7 @@ Rectangle { id: gridStreet opacity: 0; Text { - id: txtItemStreet; text: "Street"; + id: txtItemStreet; text: "Street"; color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter } ButtonIcon { @@ -79,7 +79,7 @@ Rectangle { id: gridAddress; opacity: 0; Text { - id: txtItemAddress; text: "Address"; + id: txtItemAddress; text: "Address"; color: "White"; font.pointSize: gui.height/32; horizontalAlignment: Qt.AlignHCenter } ButtonIcon { diff --git a/navit/gui/qml/skins/navit/PageSearchSelector.qml b/navit/gui/qml/skins/navit/PageSearchSelector.qml index ec1ca73dd..d47fcbc71 100644 --- a/navit/gui/qml/skins/navit/PageSearchSelector.qml +++ b/navit/gui/qml/skins/navit/PageSearchSelector.qml @@ -40,15 +40,15 @@ Rectangle { } page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } TextInput{ - id: searchTxt; + id: searchTxt; anchors.top: parent.top; anchors.left: parent.left; anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32 width: page.width; font.pointSize: 14; color: "White";focus: true; readOnly: false; cursorVisible: true; } @@ -78,8 +78,8 @@ Rectangle { id: imgIcon; source: gui.iconPath+itemIcon width: 20; height: 20; } - Text { - id: txtItemName; text: itemName; color: "White"; + Text { + id: txtItemName; text: itemName; color: "White"; anchors.left: imgIcon.right;anchors.leftMargin: 5 width: list.width-imgIcon.width } @@ -98,7 +98,7 @@ Rectangle { } } - ListSelector { + ListSelector { id:layoutList; text: search.searchContext; onChanged: setSearchResult() anchors.top: searchTxt.bottom; anchors.left: parent.left; anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32 width: page.width; height: page.height/2-cellar.height diff --git a/navit/gui/qml/skins/navit/PageSettings.qml b/navit/gui/qml/skins/navit/PageSettings.qml index f7efcacd5..2030fe56f 100644 --- a/navit/gui/qml/skins/navit/PageSettings.qml +++ b/navit/gui/qml/skins/navit/PageSettings.qml @@ -12,9 +12,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } diff --git a/navit/gui/qml/skins/navit/PageSettingsDisplay.qml b/navit/gui/qml/skins/navit/PageSettingsDisplay.qml index 61db6a385..9d0002d9d 100644 --- a/navit/gui/qml/skins/navit/PageSettingsDisplay.qml +++ b/navit/gui/qml/skins/navit/PageSettingsDisplay.qml @@ -34,9 +34,9 @@ Rectangle { } page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -60,9 +60,9 @@ Rectangle { } } - CommonHighlight { id: listHighlight} + CommonHighlight { id: listHighlight} - ListSelector { + ListSelector { id:layoutList; text: "Current layout"; itemId: navit.getAttrList("layout"); onChanged: navit.setObjectByName("layout",layoutList.value) anchors.top: parent.top; anchors.left: parent.left; diff --git a/navit/gui/qml/skins/navit/PageSettingsLocale.qml b/navit/gui/qml/skins/navit/PageSettingsLocale.qml index 441248484..ab4afa20d 100644 --- a/navit/gui/qml/skins/navit/PageSettingsLocale.qml +++ b/navit/gui/qml/skins/navit/PageSettingsLocale.qml @@ -12,9 +12,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -22,7 +22,7 @@ Rectangle { Grid { columns: 1;rows: 3 anchors.horizontalCenter: parent.horizontalCenter; - anchors.verticalCenter: parent.verticalCenter; + anchors.verticalCenter: parent.verticalCenter; Text { id: lang; text: gui.localeName; color: "White";font.pointSize: gui.height/24 } Text { id: langname; text: gui.langName; color: "White";font.pointSize: gui.height/24 } diff --git a/navit/gui/qml/skins/navit/PageSettingsRules.qml b/navit/gui/qml/skins/navit/PageSettingsRules.qml index 37b18c8d4..007f36c84 100644 --- a/navit/gui/qml/skins/navit/PageSettingsRules.qml +++ b/navit/gui/qml/skins/navit/PageSettingsRules.qml @@ -12,9 +12,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } diff --git a/navit/gui/qml/skins/navit/PageSettingsTools.qml b/navit/gui/qml/skins/navit/PageSettingsTools.qml index a4af1222e..717bdc9fd 100644 --- a/navit/gui/qml/skins/navit/PageSettingsTools.qml +++ b/navit/gui/qml/skins/navit/PageSettingsTools.qml @@ -12,9 +12,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -22,7 +22,7 @@ Rectangle { Grid { columns: 1;rows: 1 anchors.horizontalCenter: parent.horizontalCenter; - anchors.verticalCenter: parent.verticalCenter; + anchors.verticalCenter: parent.verticalCenter; ButtonIcon { id: btnDisplay; text: "Locale"; icon: "gui_actions.svg"; onClicked: Navit.load("PageSettingsLocale.qml"); } diff --git a/navit/gui/qml/skins/navit/PageSettingsVehicle.qml b/navit/gui/qml/skins/navit/PageSettingsVehicle.qml index 157afcb00..189b8fd1f 100644 --- a/navit/gui/qml/skins/navit/PageSettingsVehicle.qml +++ b/navit/gui/qml/skins/navit/PageSettingsVehicle.qml @@ -12,9 +12,9 @@ Rectangle { function pageOpen() { page.opacity = 1; } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -43,9 +43,9 @@ Rectangle { } } } - CommonHighlight { id: listHighlight} + CommonHighlight { id: listHighlight} - ListSelector { + ListSelector { id:vehicleList; text: "Current vehicle profile"; itemId: navit.itemId; onChanged: {navit.setObjectByName("vehicle",vehicleList.value) } anchors.top: parent.top; anchors.topMargin: gui.height/16; anchors.leftMargin: gui.width/32 anchors.left: parent.left; width: page.width/2;height: page.height/2 diff --git a/navit/gui/qml/skins/navit/Slider.qml b/navit/gui/qml/skins/navit/Slider.qml index e4d56e031..698a9f6e1 100644 --- a/navit/gui/qml/skins/navit/Slider.qml +++ b/navit/gui/qml/skins/navit/Slider.qml @@ -39,7 +39,7 @@ Rectangle { } MouseArea { anchors.fill: parent - onReleased: { knob.x=mouse.x-15; slider.value=Math.round(fromSlider(knob.x)); slider.changed(); } + onReleased: { knob.x=mouse.x-15; slider.value=Math.round(fromSlider(knob.x)); slider.changed(); } } radius: 8; opacity: 0.7 diff --git a/navit/gui/qml/skins/navit/ToggleButton.qml b/navit/gui/qml/skins/navit/ToggleButton.qml index 29d986601..30617644b 100644 --- a/navit/gui/qml/skins/navit/ToggleButton.qml +++ b/navit/gui/qml/skins/navit/ToggleButton.qml @@ -13,14 +13,14 @@ import Qt 4.7 function toggle() { if (togglebutton.state == "on") togglebutton.state = "off"; - else + else togglebutton.state = "on"; } function startup () { - if (togglebutton.stOn == "1" ) + if (togglebutton.stOn == "1" ) togglebutton.stOn = "true"; - else if (togglebutton.stOn == "0" ) + else if (togglebutton.stOn == "0" ) togglebutton.stOn = "false"; if (togglebutton.stOn == "true") togglebutton.state = "on"; @@ -38,7 +38,7 @@ import Qt 4.7 } Text { - id: txtItem; text: togglebutton.text; anchors.top: imgItem.bottom; anchors.horizontalCenter: togglebutton.horizontalCenter; + id: txtItem; text: togglebutton.text; anchors.top: imgItem.bottom; anchors.horizontalCenter: togglebutton.horizontalCenter; color: "White"; font.pointSize: gui.height/64; horizontalAlignment: Qt.AlignHCenter } diff --git a/navit/gui/qml/skins/navit/ToggleSwitch.qml b/navit/gui/qml/skins/navit/ToggleSwitch.qml index b1b262461..14bc7b0ba 100644 --- a/navit/gui/qml/skins/navit/ToggleSwitch.qml +++ b/navit/gui/qml/skins/navit/ToggleSwitch.qml @@ -15,9 +15,9 @@ import Qt 4.7 } function startup () { - if (toggleswitch.stOn == "1" ) + if (toggleswitch.stOn == "1" ) toggleswitch.stOn = "true"; - else if (toggleswitch.stOn == "0" ) + else if (toggleswitch.stOn == "0" ) toggleswitch.stOn = "false"; if (toggleswitch.stOn == "true") toggleswitch.state = "on"; diff --git a/navit/gui/qml/skins/navit/command.js b/navit/gui/qml/skins/navit/command.js index 071653acf..bcf0cf746 100644 --- a/navit/gui/qml/skins/navit/command.js +++ b/navit/gui/qml/skins/navit/command.js @@ -1,7 +1,7 @@ import Qt 4.7 Rectangle { - id: page + id: page function pageOpen(command) { if ( command=="menu") { @@ -11,10 +11,10 @@ Rectangle { if (command=="quit") { navit.quit(); } - + } - - Component.onCompleted: pageOpen(gui.commandFunction); - - Text { id: myText; anchors.centerIn: parent; text: "Hi, i'm Navit!"; color: "Black"; font.pointSize: gui.height/32 } + + Component.onCompleted: pageOpen(gui.commandFunction); + + Text { id: myText; anchors.centerIn: parent; text: "Hi, i'm Navit!"; color: "Black"; font.pointSize: gui.height/32 } } diff --git a/navit/gui/qml/skins/navit/main.qml b/navit/gui/qml/skins/navit/main.qml index 20b93d113..344dd182d 100644 --- a/navit/gui/qml/skins/navit/main.qml +++ b/navit/gui/qml/skins/navit/main.qml @@ -11,9 +11,9 @@ Rectangle { function pageOpen() { Navit.load("PageMain.qml"); } - - Component.onCompleted: pageOpen(); - + + Component.onCompleted: pageOpen(); + Behavior on opacity { NumberAnimation { id: opacityAnimation; duration: 300; alwaysRunToEnd: true } } @@ -25,7 +25,7 @@ Rectangle { height: gui.height-cellar.height; anchors.horizontalCenter: parent.horizontalCenter; anchors.verticalCenter: parent.verticalCenter; - } + } Cellar {id: cellar;anchors.bottom: main.bottom; anchors.horizontalCenter: main.horizontalCenter; width: main.width } } diff --git a/navit/gui/qt5_qml/skins/menu.qml b/navit/gui/qt5_qml/skins/menu.qml index 540a16032..0cb9ce38c 100644 --- a/navit/gui/qt5_qml/skins/menu.qml +++ b/navit/gui/qt5_qml/skins/menu.qml @@ -18,7 +18,7 @@ Rectangle { anchors.leftMargin: 0 anchors.right: parent.right anchors.rightMargin: 0 - + Loader { id: menucontent width: parent.width diff --git a/navit/gui/qt5_qml/skins/modern/main.qml b/navit/gui/qt5_qml/skins/modern/main.qml index 3c35a4dd0..5ffd1de3e 100644 --- a/navit/gui/qt5_qml/skins/modern/main.qml +++ b/navit/gui/qt5_qml/skins/modern/main.qml @@ -68,7 +68,7 @@ Rectangle { NumberAnimation { properties: "x,y,opacity";duration: 200 } - onRunningChanged: { + onRunningChanged: { if ((mainMenu.opacity == 0) && (!running)){ backend.resize(navit1.width, navit1.height); console.log("transition done, hiding menu window size " + navit1.width + " x " + navit1.height) diff --git a/navit/gui/qt5_qml/skins/modern/menu.qml b/navit/gui/qt5_qml/skins/modern/menu.qml index ee51f68a2..bcca54b0b 100644 --- a/navit/gui/qt5_qml/skins/modern/menu.qml +++ b/navit/gui/qt5_qml/skins/modern/menu.qml @@ -8,7 +8,7 @@ Item { width: parent.width y: topBar.height height: parent.height - ( topBar.height + bottomBar.height ) - + Loader { id: menucontent width: parent.width diff --git a/navit/gui/qt5_qml/skins/pois.qml b/navit/gui/qt5_qml/skins/pois.qml index bc083e1ed..a78260211 100644 --- a/navit/gui/qt5_qml/skins/pois.qml +++ b/navit/gui/qt5_qml/skins/pois.qml @@ -10,14 +10,14 @@ Item { color: "#ff0000" radius: 2 border.width: 1 - + Image { id: image1 height: parent.height - 4; source : model.modelData.active ? "icons/appbar.layer.svg" : "icons/appbar.layer.delete.svg" opacity: model.modelData.active ? 1 : 0.4 } - + Text { width: 128 id: distanceText @@ -27,7 +27,7 @@ Item { anchors.left: image1.right anchors.leftMargin: 8 } - + Text { text: name color: "#ffffff" @@ -35,7 +35,7 @@ Item { anchors.left: distanceText.right anchors.leftMargin: 8 } - + MouseArea{ anchors.fill: parent hoverEnabled: true @@ -44,7 +44,7 @@ Item { } } } - + Component.onCompleted: backend.get_pois() } diff --git a/navit/gui/win32/CMakeLists.txt b/navit/gui/win32/CMakeLists.txt index 16b653c9f..2c5dd0923 100644 --- a/navit/gui/win32/CMakeLists.txt +++ b/navit/gui/win32/CMakeLists.txt @@ -1,2 +1,2 @@ -module_add_library(gui_win32 gui_win32.c win32_gui_destination.c win32_gui_notify.c ceglue.c) +module_add_library(gui_win32 gui_win32.c win32_gui_destination.c win32_gui_notify.c ceglue.c) |