Changeset d9e1860


Ignore:
Timestamp:
03/14/12 02:21:46 (2 years ago)
Author:
xkolman2 <xkolman2@…>
Branches:
master
Children:
768c39c
Parents:
29be11d
git-author:
xkolman2 <xkolman2@…> (03/14/12 02:21:46)
git-committer:
xkolman2 <xkolman2@…> (03/14/12 02:21:46)
Message:

don't use separate color for back button (for now)
add map icon to main menu
add preliminary map menu

git-svn-id: https://nlp.fi.muni.cz/svn/gps_navigace/trunk@689 0858a4d0-ffff-46e5-938e-62b5ecb34222

Location:
modules/gui_modules/gui_qml/qml
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • modules/gui_modules/gui_qml/qml/IconGridPage.qml

    r2f66fbc rd9e1860  
    6464        iconName : "left_arrow_black.png" 
    6565        text : "back" 
    66         normalColor : "blue" 
    67         toggledColor: "#92aaf3" 
     66        //normalColor : "blue" 
     67        //toggledColor: "#92aaf3" 
    6868        opacity : gridView.atYBeginning ? 1.0 : 0.55 
    6969        onClicked : { 
  • modules/gui_modules/gui_qml/qml/MenuPage.qml

    r726cabe rd9e1860  
    2626        } 
    2727        ListElement { 
     28            caption : "Map" 
     29            icon : "map.png" 
     30            menu : "mapMenu" 
     31        } 
     32        ListElement { 
    2833            caption : "Mode" 
    2934            icon : "mode.png" 
  • modules/gui_modules/gui_qml/qml/main.qml

    r726cabe rd9e1860  
    2222    } 
    2323 
     24    MapMenuPage { 
     25        id : mapMenu 
     26    } 
     27 
    2428    /* looks like object ids can't be stored in ListElements, 
    2529     so we need this function to return corresponding menu pages 
     
    3034        "mainMenu" : mainMenu, 
    3135        "optionsMenu" : optionsMenu, 
    32         "infoMenu" : infoMenu 
     36        "infoMenu" : infoMenu, 
     37        "mapMenu" : mapMenu 
    3338    } 
    3439 
Note: See TracChangeset for help on using the changeset viewer.