← Back to branch summary

~rpadovani/ubuntu-weather-app/1198544

« back to all changes in this revision

Viewing changes to components/LocationTab.qml

  • Committer: Tarmac
  • Author(s): Martin Borho
  • Date: 2013-07-04 19:18:13 UTC
  • mfrom: (53.1.5 ToolbarItemsTrunk)
  • Revision ID: tarmac-20130704191813-bdiqtcgngnaegesh
Replaced deprecated ToolbarAction with new ToolbarItems with named ToolbarButton components.

Approved by Raúl Yeguas, Ubuntu Phone Apps Jenkins Bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
components/LocationTab.qml
55
55
 
56
56
    // Menu for options
57
57
    page: Page {
58
 
 
59
 
        tools: ToolbarActions {
60
 
            Action {
61
 
                id: refreshAction
62
 
                iconSource: Qt.resolvedUrl("../resources/images/refresh_icon.png")
63
 
                text: i18n.tr("Refresh")
64
 
 
65
 
                onTriggered: {
66
 
                    mainView.refreshData(false, true);
67
 
                }
68
 
            }
69
 
            Action {
70
 
                id: editLocationAction
71
 
                iconSource: Qt.resolvedUrl("../resources/images/add_icon.png")
72
 
                text: i18n.tr("Edit")
73
 
 
74
 
                onTriggered: {
75
 
                    mainView.showLocationManager()
76
 
                }
77
 
            }
78
 
            Action {
79
 
                id: configAction
80
 
                iconSource: Qt.resolvedUrl("../resources/images/refresh_icon.png")
81
 
                text: i18n.tr("Settings")
82
 
 
83
 
                onTriggered: {
84
 
                    mainView.showSettingsPage();
 
58
        id: locationPage
 
59
        tools: ToolbarItems {
 
60
            id: pageTools
 
61
            ToolbarButton {
 
62
                objectName: "RefreshButton"
 
63
                action:Action {
 
64
                    id: refreshAction
 
65
                    objectName: "RefreshAction"
 
66
                    iconSource: Qt.resolvedUrl("../resources/images/refresh_icon.png")
 
67
                    text: i18n.tr("Refresh")
 
68
 
 
69
                    onTriggered: {
 
70
                        mainView.refreshData(false, true);
 
71
                    }
 
72
                }
 
73
            }
 
74
            ToolbarButton {
 
75
                objectName: "EditButton"
 
76
                action:Action {
 
77
                    id: editLocationAction
 
78
                    iconSource: Qt.resolvedUrl("../resources/images/add_icon.png")
 
79
                    text: i18n.tr("Edit")
 
80
 
 
81
                    onTriggered: {
 
82
                        mainView.showLocationManager()
 
83
                    }
 
84
                }
 
85
            }
 
86
            ToolbarButton {
 
87
                objectName: "SettingsButton"
 
88
                action:Action {
 
89
                    id: configAction
 
90
                    iconSource: Qt.resolvedUrl("../resources/images/refresh_icon.png")
 
91
                    text: i18n.tr("Settings")
 
92
 
 
93
                    onTriggered: {
 
94
                        mainView.showSettingsPage();
 
95
                    }
85
96
                }
86
97
            }
87
98
        }