Changeset b459ccb in subsurface


Ignore:
Timestamp:
Jun 27, 2017, 10:18:26 PM (5 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
d644656
Parents:
344b9e3
git-author:
Dirk Hohndel <dirk@…> (06/27/17 21:45:17)
git-committer:
Dirk Hohndel <dirk@…> (06/27/17 22:18:26)
Message:

QML UI: DiveList?: make download from DC main action

Now that we support this for many dive computers, that seem reasonable.
I'm not happy with the icon, but couldn't figure out a better one in the
breeze icon set.

See #426

Signed-off-by: Dirk Hohndel <dirk@…>

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • mobile-widgets/qml/DiveList.qml

    rd93280f rb459ccb  
    275275                                title = qsTr("Cloud credentials")
    276276                        } else if(manager.credentialStatus === QMLManager.VALID || manager.credentialStatus === QMLManager.VALID_EMAIL || manager.credentialStatus === QMLManager.NOCLOUD) {
    277                                 page.actions.main = page.addDiveAction
    278                                 page.actions.right = null
     277                                page.actions.main = page.downloadFromDCAction
     278                                page.actions.right = page.addDiveAction
    279279                                title = qsTr("Dive list")
    280280                                if (diveListView.count === 0)
    281                                         showPassiveNotification(qsTr("Please tap the '+' button to add a dive"), 3000)
     281                                        showPassiveNotification(qsTr("Please tap the '+' button to add a dive (or download dives from a supported dive computer)"), 3000)
    282282                        } else {
    283283                                page.actions.main = null
     
    328328        }
    329329
     330        property QtObject downloadFromDCAction: Kirigami.Action {
     331                iconName: "document-import"
     332                onTriggered: {
     333                        downloadFromDc.dcImportModel.clearTable()
     334                        stackView.push(downloadFromDc)
     335                }
     336        }
     337
    330338        property QtObject addDiveAction: Kirigami.Action {
    331339                iconName: "list-add"
  • mobile-widgets/qml/mobile-resources.qrc

    rb1f7e3e rb459ccb  
    3232                <file alias="icons/distribute-horizontal-x.svg">kirigami/icons/distribute-horizontal-x.svg</file>
    3333                <file alias="icons/document-edit.svg">kirigami/icons/document-edit.svg</file>
     34                <file alias="icons/document-import.svg">kirigami/icons/document-import.svg</file>
    3435                <file alias="icons/document-save.svg">kirigami/icons/document-save.svg</file>
    3536                <file alias="icons/view-readermode.svg">kirigami/icons/view-readermode.svg</file>
  • scripts/mobilecomponents.sh

    r001ff1b9 rb459ccb  
    5858cp $BREEZE/icons/actions/24/distribute-horizontal-x.svg $MC/icons
    5959cp $BREEZE/icons/actions/24/document-edit.svg $MC/icons
     60cp $BREEZE/icons/actions/24/document-import.svg $MC/icons
    6061cp $BREEZE/icons/actions/24/document-save.svg $MC/icons
    6162cp $BREEZE/icons/actions/24/go-next.svg $MC/icons
Note: See TracChangeset for help on using the changeset viewer.