- Friends will be added to the People app and linked with existing contacts
- VK groups will be added to the Calendar app
- VK posts and notifications will be added to the Feeds view.
- Photos from VK will be available from the Gallery app
Some of this data will be cached to make it available when offline. This cache can be cleared by deleting the account.
Adding a VK account on your device means that you agree to VK's Terms of Service." - legaleseText: qsTrId("jolla_settings_accounts_extensions-la-vk_consent_text") - - //: Button which the user presses to view VK Terms Of Service webpage - //% "VKontakte Terms of Service" - externalUrlText: qsTrId("jolla_settings_accounts_extensions-bt-vk_terms") - externalUrlLink: "http://vk.com/terms" + //: The text explaining how user's Facebook data will be used on the device + //% "When you add a Facebook account, information from this account will be added " + //% "to the device to provide a faster and better experience:
" + //% " - Facebook events will be added to the Calendar app
" + //% " - Facebook photos will be available from the Gallery app, " + //% "and you will be able to share photos on Facebook.
" + //% "Some of this data will be cached to make it available when offline. " + //% "This cache can be cleared at any time by disabling the relevant services " + //% "on the account settings page.
" + //% "Adding a Facebook account on your device means that you agree to " + //% "Facebook's Terms of Service." + legaleseText: qsTrId("jolla_settings_accounts_extensions-la-facebook_consent_text") + + //: Button which the user presses to view Facebook Terms Of Service webpage + //% "Facebook Terms of Service" + externalUrlText: qsTrId("jolla_settings_accounts_extensions-bt-facebook_terms") + externalUrlLink: "https://m.facebook.com/legal/terms" onStatusChanged: { - if (status == PageStatus.Active && !_oauthPage) { + if ((_oauthPage != null && status == PageStatus.Active) + || (_oauthPage != null && status == PageStatus.Deactivating && result == DialogResult.Rejected)) { + // OAuth pages can't be reused as user must be taken back to initial sign-in page. + _oauthPage.cancelSignIn() + _oauthPage.destroy() + _oauthPage = null + } + if (status == PageStatus.Active) { _oauthPage = oAuthComponent.createObject(root) acceptDestination = _oauthPage } } - - onPageContainerChanged: { - if (pageContainer == null && _oauthPage) { - _oauthPage.cancelSignIn() - } - } } AccountFactory { @@ -72,13 +82,10 @@ AccountCreationAgent { OAuthAccountSetupPage { Component.onCompleted: { var sessionData = { - "Display": "touch", - "V": "5.21", - "ClientId": keyProvider.storedKey("vk", "vk-sync", "client_id"), - "ClientSecret": keyProvider.storedKey("vk", "vk-sync", "client_secret"), - "ResponseType": "token" + "Display": "popup", + "ClientId": keyProvider.storedKey("facebook", "facebook-sync", "client_id") } - prepareAccountCreation(root.accountProvider, "vk-sync", sessionData) + prepareAccountCreation(root.accountProvider, "facebook-sync", sessionData) } onAccountCreated: { root._handleAccountCreated(accountId, responseData) @@ -98,8 +105,8 @@ AccountCreationAgent { QtObject { id: accountSetup property string accessToken - property int accountId property bool hasSetName + property int accountId signal done() signal error() @@ -109,7 +116,8 @@ AccountCreationAgent { onStatusChanged: { if (status == Account.Initialized || status == Account.Synced) { if (!accountSetup.hasSetName) { - getProfileInfo() + var queryItems = {"access_token": accountSetup.accessToken} + sni.arbitraryRequest(SocialNetwork.Get, "https://graph.facebook.com/v2.2/me?fields=name,id", queryItems) } else { accountSetup.done() } @@ -118,56 +126,35 @@ AccountCreationAgent { } } } - - function getProfileInfo() { - var doc = new XMLHttpRequest() - doc.onreadystatechange = function() { - if (doc.readyState === XMLHttpRequest.DONE) { - if (doc.status === 200) { - var users = JSON.parse(doc.responseText) - if (users.response.length > 0) { - var name = users.response[0].first_name - var lastName = users.response[0].last_name - if (name !== "" && lastName !== "") { - name += " " - } - name += lastName - - var screenName = users.response[0].screen_name - if (accountFactory.findAccount( - "vk", - "", - "default_credentials_screen_name", - screenName) !== 0) { - // this account already exists. show error dialog. - hasSetName = true - root._existingUserName = name - newAccount.remove() - accountSetup.error() - return - } - - newAccount.setConfigurationValue("", "default_credentials_username", name) - newAccount.setConfigurationValue("", "default_credentials_screen_name", screenName) - newAccount.displayName = name + property SocialNetwork sni: SocialNetwork { + onArbitraryRequestResponseReceived: { + var name = data["name"] + var fbid = data["id"] + if ((name == undefined || name == "") && (fbid == undefined || fbid == "")) { + accountSetup.done() + } else { + if (name != undefined && name != "") { + newAccount.setConfigurationValue("", "default_credentials_username", name) + newAccount.displayName = name + root._existingUserName = name + } + if (fbid != undefined && fbid != "") { + if (accountFactory.findAccount( + "facebook", + "", + "facebook_id", + fbid) !== 0) { + // this account already exists. display error dialog. accountSetup.hasSetName = true - newAccount.sync() - } else { - console.log("Empty VK user query response") - accountSetup.done() + newAccount.remove() + return } - } else { - console.log("Failed to query VK users, error: " + doc.status) - accountSetup.done() + newAccount.setConfigurationValue("", "facebook_id", fbid) } + accountSetup.hasSetName = true + newAccount.sync() } } - - var postData = "access_token=" + accessToken - var url = "https://api.vk.com/method/users.get?access_token="+accessToken+"&v=5.21&fields=screen_name" - doc.open("GET", url) - doc.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded') - doc.send() } } } @@ -196,7 +183,7 @@ AccountCreationAgent { id: header } - VkSettingsDisplay { + FacebookSettingsDisplay { id: settingsDisplay anchors.top: header.bottom accountManager: root.accountManager diff --git a/usr/share/accounts/ui/jolla-settings.qml b/usr/share/accounts/ui/jolla-settings.qml index 1c34b553..7295d921 100644 --- a/usr/share/accounts/ui/jolla-settings.qml +++ b/usr/share/accounts/ui/jolla-settings.qml @@ -1,6 +1,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.Accounts 1.0 +import Sailfish.Store 1.0 import com.jolla.settings.accounts 1.0 AccountSettingsAgent { @@ -116,6 +117,17 @@ AccountSettingsAgent { text: qsTrId("settings_accounts-he-account_jolla_com_webpage") onClicked: Qt.openUrlExternally("https://account.jolla.com/") } + + Button { + anchors.horizontalCenter: parent.horizontalCenter + preferredWidth: Theme.buttonWidthLarge + visible: StoreClient.isAvailable + + //% "My Add-Ons" + text: qsTrId("settings_accounts-he-add_ons") + enabled: settingsDisplay.accountValid + onClicked: pageStack.animatorPush("com.jolla.settings.accounts.JollaAccountAddOnsPage") + } } } diff --git a/usr/share/accounts/ui/jolla.qml b/usr/share/accounts/ui/jolla.qml index e3f256ae..d4706f53 100644 --- a/usr/share/accounts/ui/jolla.qml +++ b/usr/share/accounts/ui/jolla.qml @@ -1,7 +1,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import com.jolla.settings.accounts 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 AccountCreationAgent { id: root diff --git a/usr/share/accounts/ui/nextcloud.qml b/usr/share/accounts/ui/nextcloud.qml index 1f2e712c..98bd5f76 100644 --- a/usr/share/accounts/ui/nextcloud.qml +++ b/usr/share/accounts/ui/nextcloud.qml @@ -23,6 +23,13 @@ OnlineSyncAccountCreationAgent { accountManager.service("nextcloud-sharing") ] + sharedScheduleServices: [ + accountManager.service("nextcloud-carddav"), + accountManager.service("nextcloud-caldav"), + accountManager.service("nextcloud-images"), + accountManager.service("nextcloud-posts"), + ] + webdavPath: AccountsUtil.joinServerPathInAddress(serverAddress, "/remote.php/dav/files/" + username) imagesPath: AccountsUtil.joinServerPathInAddress(serverAddress, "/remote.php/dav/files/" + username + "/Photos") backupsPath: AccountsUtil.joinServerPathInAddress(serverAddress, "/remote.php/dav/files/" + username + "/Sailfish OS/Backups") diff --git a/usr/share/accounts/ui/sailfisheas-oauth-settings.qml b/usr/share/accounts/ui/sailfisheas-oauth-settings.qml new file mode 100644 index 00000000..3857e11a --- /dev/null +++ b/usr/share/accounts/ui/sailfisheas-oauth-settings.qml @@ -0,0 +1,155 @@ +/* + * Copyright (C) 2022 Jolla Ltd. + * + * License: Proprietary + */ +import QtQuick 2.6 +import Sailfish.Silica 1.0 +import Sailfish.Accounts 1.0 +import com.jolla.settings.accounts 1.0 +import com.jolla.sailfisheas 1.0 +import com.jolla.settings.system 1.0 +import "SailfishEasSettings.js" as ServiceSettings + +AccountSettingsAgent { + id: root + + property Item connectionSettingsPage + property bool serverSettingsActive + property bool saveConnectionSettings + + Component.onCompleted: { + if (!connectionSettingsPage) { + connectionSettingsPage = connectionSettingsComponent.createObject(root) + } + } + + initialPage: Page { + onPageContainerChanged: { + if (pageContainer == null && !credentialsUpdater.running) { + root.delayDeletion = true + settingsDisplay.saveAccount(false, saveConnectionSettings) + } + } + + Component.onDestruction: { + if (status == PageStatus.Active || root.serverSettingsActive) { + // app closed while settings are open, so save settings synchronously + settingsDisplay.saveAccount(true, saveConnectionSettings) + } + } + + AccountCredentialsUpdater { + id: credentialsUpdater + } + + SilicaFlickable { + anchors.fill: parent + contentHeight: header.height + settingsDisplay.height + Theme.paddingLarge + + StandardAccountSettingsPullDownMenu { + allowCredentialsUpdate: root.accountNotSignedIn + allowDelete: !root.accountIsReadOnly + allowDeleteLimited: !root.accountIsLimited + + onCredentialsUpdateRequested: credentialsUpdater.replaceWithCredentialsUpdatePage(root.accountId) + onAccountDeletionRequested: { + root.accountDeletionRequested() + pageStack.pop() + } + onSyncRequested: { + settingsDisplay.saveAccountAndTriggerSync(saveConnectionSettings) + saveConnectionSettings = false + } + + MenuItem { + visible: !root.accountIsReadOnly + enabled: settingsDisplay.accountEnabled + //: Opens server settings page + //% "Edit server settings" + text: qsTrId("accounts-me-edit_server_settings") + onClicked: { + root.serverSettingsActive = true + root.saveConnectionSettings = true + pageStack.animatorPush(root.connectionSettingsPage) + } + } + } + + PageHeader { + id: header + title: root.accountsHeaderText + } + + SailfishEasSettingsDisplay { + id: settingsDisplay + oauthEnabled: true + anchors.top: header.bottom + accountManager: root.accountManager + accountProvider: root.accountProvider + accountId: root.accountId + connectionSettings: root.connectionSettingsPage.settings + + onAccountSaveCompleted: { + root.delayDeletion = false + } + } + VerticalScrollDecorator {} + } + } + + Component { + id: connectionSettingsComponent + Page { + property alias settings: activesyncConnectionSettings + + onPageContainerChanged: { + if (pageContainer == null) { + root.serverSettingsActive = false + if (!credentialsUpdater.running) { + root.delayDeletion = true + settingsDisplay.saveAccount(false, saveConnectionSettings) + } + } + } + + SilicaFlickable { + anchors.fill: parent + contentHeight: contentColumn.height + Column { + id: contentColumn + width: parent.width + bottomPadding: Theme.paddingMedium + + PageHeader { + id: header + //: Server settings page + //% "Server settings" + title: qsTrId("accounts-he-server_settings") + } + + DisabledByMdmBanner { + id: disabledByMdmBanner + active: root.accountIsLimited + limited: true + } + + SailfishEasConnectionSettings { + id: activesyncConnectionSettings + oauthEnabled: true + checkMandatoryFields: true + editMode: true + limitedMode: root.accountIsLimited + onCertificateDataSaved: { + // increase credentials counter so daemon side knows to reload. + // would be saved later, but let's already avoid different settings getting out of sync + settingsDisplay.increaseCredentialsCounter() + settingsDisplay.saveAccount(false, true) + } + } + } + VerticalScrollDecorator {} + } + } + } +} diff --git a/usr/share/accounts/ui/sailfisheas-oauth-update.qml b/usr/share/accounts/ui/sailfisheas-oauth-update.qml new file mode 100644 index 00000000..0915f664 --- /dev/null +++ b/usr/share/accounts/ui/sailfisheas-oauth-update.qml @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2022 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Accounts 1.0 +import com.jolla.settings.accounts 1.0 + +AccountCredentialsAgent { + id: accountCreationAgent + + function _start() { + if (initialPage.status != PageStatus.Active || account.status != Account.Initialized) { + return + } + var sessionData = { + "ClientId": keyProvider.clientId(), + "ExtraParams": { + // Require email address to match the previous address + "login_hint": account.configurationValue("", "connection/emailaddress"), + "hsu": "1" // Prevent selecting another account instead + } + } + initialPage.prepareAccountCredentialsUpdate(account, accountCreationAgent.accountProvider, + "sailfisheas-oauth-email", sessionData) + } + + Account { + id: account + identifier: accountCreationAgent.accountId + + onStatusChanged: { + accountCreationAgent._start() + } + } + + StoredKeyProvider { + id: keyProvider + + function clientId() { + return keyProvider.storedKey("sailfisheas", "", "client_id") + } + } + + initialPage: OAuthAccountSetupPage { + onStatusChanged: { + accountCreationAgent._start() + } + + onAccountCredentialsUpdated: { + accountCreationAgent.credentialsUpdated(accountCreationAgent.accountId) + accountCreationAgent.goToEndDestination() + } + + onAccountCredentialsUpdateError: { + accountCreationAgent.credentialsUpdateError(errorMessage) + } + } +} + diff --git a/usr/share/accounts/ui/sailfisheas-oauth.qml b/usr/share/accounts/ui/sailfisheas-oauth.qml new file mode 100644 index 00000000..ecda550a --- /dev/null +++ b/usr/share/accounts/ui/sailfisheas-oauth.qml @@ -0,0 +1,500 @@ +/* + * Copyright (C) 2022 Jolla Ltd. + * + * License: Proprietary + */ +import QtQuick 2.0 +import QtQml 2.2 +import Sailfish.Silica 1.0 +import Sailfish.Accounts 1.0 +import com.jolla.settings.accounts 1.0 +import com.jolla.sailfisheas 1.0 +import Nemo.Connectivity 1.0 +import "SailfishEasSettings.js" as ServiceSettings + +AccountCreationAgent { + id: accountCreationAgent + + property Item _oauthPage + property Item busyPageInstance + property Item settingsDialog + + StoredKeyProvider { + id: keyProvider + + function clientId() { + return keyProvider.storedKey("sailfisheas", "", "client_id") + } + } + + Component { + id: oAuthComponent + OAuthAccountSetupPage { + function getEmailFromIdToken(token) { + // Note that this does not attempt to check the signature + // Split payload + var sep1 = token.indexOf('.') + var sep2 = token.indexOf('.', sep1 + 1) + var payload = token.substring(sep1, sep2) + // Replace a few characters to convert from base64url to normal base64 + // See also https://stackoverflow.com/a/51838635 + payload = payload.replace(/-/g, '+').replace(/_/g, '/') + // and also determine padding to add + var padding = payload.length % 4 + if (padding > 1) { + // If padding length was 1, the encoded string would be invalid + payload += new Array(5 - padding).join('=') + } + // Now decode with regular base64 decoder + payload = Qt.atob(payload) + var content = JSON.parse(payload) + return content["email"] || "" + } + + Component.onCompleted: { + var sessionData = { + "ClientId": keyProvider.clientId(), + "Scope": ["https://outlook.office.com/.default", "offline_access", "openid", "email"], + "ExtraParams": { + "prompt": "select_account" // Ask to select account + } + } + prepareAccountCreation(accountCreationAgent.accountProvider, "sailfisheas-oauth-email", sessionData) + } + onAccountCreated: { + var idToken = responseData["IdToken"] + if (idToken !== undefined) { + settings.emailaddress = getEmailFromIdToken(idToken) + } + var accessToken = responseData["AccessToken"] + account.identifier = accountId + pageStack.replace(accountCreationDialog, { "accessToken": accessToken }) + } + onAccountCreationError: { + accountCreationAgent.accountCreationError(errorMessage) + } + } + } + + initialPage: AccountCreationLegaleseDialog { + //% "Adding a Microsoft 365 account on your device means that you agree to Microsoft 365's Terms of Service." + legaleseText: qsTrId("components_accounts-la-microsoft_365_consent_text") + + //: Button which the user presses to view Microsoft 365 Terms Of Service webpage + //% "Microsoft 365 Terms of Service" + externalUrlText: qsTrId("components_accounts-bt-microsoft_365_terms") + externalUrlLink: "https://www.microsoft.com/en-us/servicesagreement/" + + acceptDestinationAction: PageStackAction.Push + onStatusChanged: { + if (status == PageStatus.Active) { + if (_oauthPage != null) { + _oauthPage.destroy() + } + _oauthPage = oAuthComponent.createObject(root) + acceptDestination = _oauthPage + } + } + } + + ConnectionHelper { + id: connectionHelper + + onOnlineChanged: { + if (online && accountCreationDialog.delayTask) { + delayedTask() + } + } + + function delayedTask() { + accountCreationDialog.delayTask = false + if (connectionHelper.online) { + accountCreationAgent.busyPageInstance.runAccountCreation() + } else { + if (accountCreationAgent.busyPageInstance.currentTask === "checkCredentials") { + ServiceSettings.saveConnectionSettings(settings, "sailfisheas-oauth") + account.displayName = settings.emailaddress + account.sync() + } else { + accountCreationAgent.busyPageInstance.cancelAccountCreation() + } + } + } + + Component.onCompleted: { + connectionHelper.requestNetwork() + } + } + + Dialog { + id: accountCreationDialog + + property string accessToken // For autodiscovery + property string defaultServiceName: accountProvider.serviceNames[0] + property bool _serverAddressRequired: showManualSettings ? settings.server != "" : true + property bool _knownCredentials: accDbCheckService.knownEmail(settings.emailaddress) || + accDbCheckService.alreadyCreated(settings.username, settings.server, settings.domain) + property bool showManualSettings + property bool showSettingsDiscoveryError + property bool delayTask + + acceptDestinationAction: PageStackAction.Push + canAccept: settings.emailaddress != "" && _serverAddressRequired && !_knownCredentials + onRejected: { + if (account.status < Account.Error) { + account.remove() + } + } + + onAcceptBlocked: settings.checkMandatoryFields = true + + onShowManualSettingsChanged: { + if (status === PageStatus.Active) { + accountCreationAgent.busyPageInstance.currentTask = showManualSettings ? "checkCredentials" : "autodiscovery" + } + } + + function acceptInitialSetup() { + autoDiscoveryService.startAutoDiscoveryOAuth(settings.emailaddress, accessToken) + } + + function save() { + ServiceSettings.saveConnectionSettings(settings, "sailfisheas-oauth") + account.displayName = settings.emailaddress + account.sync() + } + + function taskFailed(error) { + // force main page to show all connection settings + accountCreationDialog.showManualSettings = true + if (accountCreationAgent.busyPageInstance !== null) { + accountCreationAgent.busyPageInstance.operationFailed(error) + } + } + + onStatusChanged: { + if (status === PageStatus.Active) { + accountCreationAgent.busyPageInstance = busyPageComponent.createObject(accountCreationAgent) + accountCreationDialog.acceptDestination = accountCreationAgent.busyPageInstance + accountCreationAgent.busyPageInstance.currentTask = showManualSettings ? "checkCredentials" : "autodiscovery" + } + } + + SilicaFlickable { + anchors.fill: parent + contentHeight: contentColumn.height + detailsButton.height + 2*Theme.paddingLarge + + Column { + id: contentColumn + width: parent.width + + DialogHeader { + dialog: accountCreationDialog + } + + Item { + x: Theme.paddingLarge + width: parent.width - x*2 + height: icon.height + Theme.paddingLarge + + Image { + id: icon + width: Theme.iconSizeLarge + height: width + anchors.top: parent.top + source: accountProvider.iconName + } + Label { + anchors { + left: icon.right + leftMargin: Theme.paddingLarge + right: parent.right + verticalCenter: icon.verticalCenter + } + text: accountProvider.displayName + color: Theme.highlightColor + font.pixelSize: Theme.fontSizeLarge + truncationMode: TruncationMode.Fade + } + } + + Label { + x: Theme.paddingLarge + visible: opacity > 0.0 + opacity: accountCreationDialog._knownCredentials ? 1.0 : 0.0 + height: opacity * implicitHeight + Behavior on opacity { FadeAnimation{} } + width: parent.width - x*2 + wrapMode: Text.Wrap + font.pixelSize: Theme.fontSizeExtraSmall + color: Theme.highlightColor + //: Information label displayed when settings entered for this account are used in another configured one + //% "Account for entered credentials already exists." + text: qsTrId("components_accounts-la-activesync_settings_already_exists") + } + + Label { + x: Theme.paddingLarge + visible: opacity > 0.0 + opacity: (accountCreationDialog.showSettingsDiscoveryError + && !accountCreationDialog._knownCredentials) ? 1.0 : 0.0 + height: opacity * implicitHeight + Behavior on opacity { FadeAnimation{} } + width: parent.width - x*2 + wrapMode: Text.Wrap + font.pixelSize: Theme.fontSizeExtraSmall + color: Theme.highlightColor + //: Information label displayed when settings for this account could not be discovered + //% "Couldn't find the settings for your account. Please complete the settings in the fields below." + text: qsTrId("components_accounts-la-activesync_settings_discovery_failed") + } + + SailfishEasConnectionSettings { + id: settings + oauthEnabled: true + editMode: accountCreationDialog.showManualSettings + onCertificateDataSaved: { + ServiceSettings.saveConnectionSettings(settings, "sailfisheas-oauth") + console.log("certificate data saved with id", sslCredentialsId) + account.finishCheckCredentials = true + account.sync() + } + } + } + + Button { + id: detailsButton + anchors { + horizontalCenter: parent.horizontalCenter + top: contentColumn.bottom + topMargin: Theme.paddingLarge + } + //% "Less" + text: accountCreationDialog.showManualSettings ? qsTrId("components_accounts-bt-activesync_less") + //% "More" + : qsTrId("components_accounts-bt-activesync_more") + onClicked: { + accountCreationDialog.showManualSettings = !accountCreationDialog.showManualSettings + accountCreationDialog.focus = true + } + } + + VerticalScrollDecorator {} + } + } + + CheckExistence { + id: accDbCheckService + } + + AutoDiscovery { + id: autoDiscoveryService + onAutoDiscoveryDone: { + console.log("[jsa-eas] AutoDiscovery DONE: server == " + autoDiscoveryService.server) + settings.server = autoDiscoveryService.server + settings.port = autoDiscoveryService.port + settings.secureConnection = autoDiscoveryService.secureConnection + settings.username = autoDiscoveryService.userName + settings.domain = autoDiscoveryService.domain + accountCreationAgent.busyPageInstance.settingsRetrieved = true + accountCreationAgent.busyPageInstance.operationSucceeded() + accountCreationDialog.save() + } + onAutoDiscoveryFailed: { + console.log("[jsa-eas] AutoDiscovery FAILED: error == " + error) + accountCreationAgent.busyPageInstance.settingsRetrieved = false + accountCreationDialog.showSettingsDiscoveryError = true + accountCreationDialog.showManualSettings = true + // Don't emit error here, just show manual config page + accountCreationAgent.busyPageInstance.operationSucceeded() + } + } + + CheckCredentials { + id: checkCredentialsService + + function finishCredentials() { + var component = Qt.createComponent(Qt.resolvedUrl("SailfishEasSettingsDialog.qml")) + if (component.status === Component.Ready) { + accountCreationAgent.settingsDialog = component.createObject(accountCreationAgent, + { + "accountId": account.identifier, + "connectionSettings": settings, + "oauthEnabled": true + }) + accountCreationAgent.busyPageInstance.operationSucceeded() + } else { + console.log(component.errorString()) + } + } + + onCheckCredentialsDone: { + console.log("[jsa-eas] Credentials OK!") + // create the settings dialog after certificate data is handled too + if (settings.hasSslCertificate) { + settings.storeCertificateData() + } else { + finishCredentials() + } + account.credentialsChecked = true + } + onCheckCredentialsFailed: { + console.log("[jsa-eas] Credentials check FAILED: error == " + error) + if (error === CheckCredentials.CHECKCREDENTIALS_ERROR_SLL_HANDSHAKE) { + accountCreationDialog.taskFailed("SSL failed") + } else if (error !== CheckCredentials.CHECKCREDENTIALS_ERROR_CANCELED) { + accountCreationDialog.taskFailed("CC failed") + } + } + } + + Component { + id: busyPageComponent + SailfishEasBusyPage { + property bool _skipping + property bool settingsRetrieved + backNavigation: (state == "info") || accountCreationDialog.delayTask + + function operationSucceeded() { + _errorOccured = false + if (currentTask === "checkCredentials") { + pageStack.animatorReplace(settingsDialog) + currentTask = "creatingAccount" + } else if (currentTask === "autodiscovery") { + if (settingsRetrieved) { + currentTask = "checkCredentials" + } else { + pageStack.pop() + } + } else if (currentTask === "checkProvisioning") { + accountCreationAgent.goToEndDestination() + } + } + + function runAccountCreation() { + if (currentTask === "autodiscovery") { + accountCreationDialog.acceptInitialSetup() + } else if (currentTask === "checkCredentials") { + accountCreationDialog.save() + } else if (currentTask === "checkProvisioning") { + settingsDialog.accountSaveSync() + } else if (currentTask === "savingAccount") { + settingsDialog.accountSaveSync() + accountCreationAgent.goToEndDestination() + } + } + + function cancelAccountCreation() { + accountCreationAgent.busyPageInstance.settingsRetrieved = false + accountCreationDialog.showSettingsDiscoveryError = true + // Don't emit error here, just show manual config page + accountCreationAgent.busyPageInstance.operationSucceeded() + } + + onStatusChanged: { + if (status === PageStatus.Active) { + if (connectionHelper.online) { + runAccountCreation() + } else { + accountCreationDialog.delayTask = true + connectionHelper.attemptToConnectNetwork() + } + } else if (status === PageStatus.Inactive) { + accountCreationDialog.delayTask = false + } + } + + onInfoButtonClicked: { + _skipping = true + // we are in skip mode, so remove the account + account.remove() + accountCreationAgent.goToEndDestination() + } + + onPageContainerChanged: { + if (pageContainer == null && !_skipping) { + accountCreationDialog.focus = true + + if (currentTask == "checkCredentials" && _errorOccured) { + // We are coming back from check credentials error + // Reset everything + accountCreationDialog.showSettingsDiscoveryError = false + accountCreationDialog.showManualSettings = true + } else if (currentTask == "checkProvisioning" && _errorOccured) { + state = "busy" + } + } + } + + Component.onDestruction: { + if (status == PageStatus.Active) { + // app closed while setup is in progress, remove account + account.remove() + } + } + } + } + + Account { + id: account + + property bool finishCheckCredentials + property bool incomingCredentialsCreated + property bool credentialsChecked + property string _accessToken // For repeated credentials check + + onStatusChanged: { + if (status === Account.Synced) { + if (finishCheckCredentials) { + console.log("finishing credentials from account") + finishCheckCredentials = false + checkCredentialsService.finishCredentials() + } else if (!incomingCredentialsCreated) { + console.log("creating sign in credentials for account") + incomingCredentialsCreated = true + var params = account.signInParameters(accountCreationDialog.defaultServiceName) + params.setParameter("ClientId", keyProvider.clientId()); + account.createSignInCredentials("Jolla", "ActiveSync", params) + } else if (!credentialsChecked && _accessToken !== "") { + console.log("checking credentials for account") + checkCredentials() + } else { + console.log("create profiles for account") + accountSyncManager.createProfile("sailfisheas.Email", identifier, "sailfisheas-oauth-email") + accountSyncManager.createProfile("sailfisheas.Calendars", identifier, "sailfisheas-oauth-calendars") + accountSyncManager.createProfile("sailfisheas.Contacts", identifier, "sailfisheas-oauth-contacts") + } + } else if (status === Account.Error) { + console.log("ActiveSync provider account error:", errorMessage) + accountCreationAgent.accountCreationError(errorMessage) + } + } + + function checkCredentials() { + if (settings.hasSslCertificate) { + checkCredentialsService.checkOAuthCredentials(_accessToken, settings.server, settings.port, + settings.secureConnection, settings.acceptSSLCertificates, + settings.sslCertificatePath, settings.sslCertificatePassword) + } else { + checkCredentialsService.checkOAuthCredentials(_accessToken, settings.server, settings.port, + settings.secureConnection, settings.acceptSSLCertificates) + } + } + + onSignInCredentialsCreated: { + accountCreationAgent.accountCreated(account.identifier) + _accessToken = data["AccessToken"] + checkCredentials() + } + + onSignInError: { + console.log("ActiveSync provider account error:", message) + accountCreationAgent.accountCreationError(message) + account.remove() + } + } + + AccountSyncManager { + id: accountSyncManager + } +} diff --git a/usr/share/accounts/ui/sip-settings.qml b/usr/share/accounts/ui/sip-settings.qml new file mode 100644 index 00000000..e192be00 --- /dev/null +++ b/usr/share/accounts/ui/sip-settings.qml @@ -0,0 +1,62 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Accounts 1.0 +import com.jolla.settings.accounts 1.0 + +AccountSettingsAgent { + id: root + + initialPage: Page { + onPageContainerChanged: { + if (pageContainer == null) { + root.delayDeletion = true + settingsDisplay.saveAccount() + } + } + + Component.onDestruction: { + if (status == PageStatus.Active && !credentialsUpdater.running) { + // app closed while settings are open, so save settings synchronously + settingsDisplay.saveAccount(true) + } + } + + SilicaFlickable { + anchors.fill: parent + contentHeight: header.height + settingsDisplay.height + Theme.paddingLarge + + StandardAccountSettingsPullDownMenu { + allowSync: false + allowCredentialsUpdate: root.accountNotSignedIn + + onCredentialsUpdateRequested: credentialsUpdater.replaceWithCredentialsUpdatePage(root.accountId) + onAccountDeletionRequested: { + root.accountDeletionRequested() + pageStack.pop() + } + } + + PageHeader { + id: header + title: root.accountsHeaderText + } + + SIPSettingsDisplay { + id: settingsDisplay + anchors.top: header.bottom + accountProvider: root.accountProvider + accountId: root.accountId + + onAccountSaveCompleted: { + root.delayDeletion = false + } + } + + VerticalScrollDecorator {} + } + + AccountCredentialsUpdater { + id: credentialsUpdater + } + } +} diff --git a/usr/share/accounts/ui/sip-update.qml b/usr/share/accounts/ui/sip-update.qml new file mode 100644 index 00000000..131f9db3 --- /dev/null +++ b/usr/share/accounts/ui/sip-update.qml @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2015 - 2020 Jolla Ltd. + * Copyright (c) 2020 Open Mobile Platform LLC. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import com.jolla.settings.accounts 1.0 + +AccountCredentialsAgent { + id: root + + canCancelUpdate: true + + initialPage: CredentialsUpdateDialog { + serviceName: "sip" + applicationName: "Jolla" + credentialsName: "Jolla" + account.identifier: root.accountId + providerIcon: root.accountProvider.iconName + providerName: root.accountProvider.displayName + + onCredentialsUpdated: { + root.credentialsUpdated(identifier) + root.goToEndDestination() + } + + onCredentialsUpdateError: root.credentialsUpdateError(message) + } +} diff --git a/usr/share/accounts/ui/sip.qml b/usr/share/accounts/ui/sip.qml new file mode 100644 index 00000000..00ad55e7 --- /dev/null +++ b/usr/share/accounts/ui/sip.qml @@ -0,0 +1,162 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Accounts 1.0 +import com.jolla.settings.accounts 1.0 + +AccountCreationAgent { + id: root + + property Item _settingsDialog + + initialPage: Dialog { + canAccept: settings.acceptableInput + acceptDestination: busyComponent + + SilicaFlickable { + anchors.fill: parent + contentHeight: contentColumn.height + Theme.paddingLarge + + Column { + id: contentColumn + width: parent.width + + DialogHeader { + dialog: initialPage + } + + Item { + x: Theme.horizontalPageMargin + width: parent.width - x*2 + height: icon.height + Theme.paddingLarge + + Image { + id: icon + width: Theme.iconSizeLarge + height: width + anchors.top: parent.top + source: root.accountProvider.iconName + } + Label { + anchors { + left: icon.right + leftMargin: Theme.paddingLarge + right: parent.right + verticalCenter: icon.verticalCenter + } + text: root.accountProvider.displayName + color: Theme.highlightColor + font.pixelSize: Theme.fontSizeLarge + truncationMode: TruncationMode.Fade + } + } + + SIPCommon { + id: settings + } + } + + VerticalScrollDecorator {} + } + } + + Component { + id: busyComponent + AccountBusyPage { + onStatusChanged: { + if (status == PageStatus.Active) { + accountFactory.beginCreation() + } + } + } + } + + AccountFactory { + id: accountFactory + function beginCreation() { + var configuration = {} + + for (var i = 0; i < settings.children.length; i++) { + var item = settings.children[i] + var value + + if (!item._tpType) continue + + if (item._tpType == 's') + value = item.text == item._tpDefault || item.text === '' ? null : item.text + else if (item._tpType == 'b') + value = item.checked == item._tpDefault ? null : item.checked + else if (item._tpType == 'e') + value = item.currentItem._tpValue == item._tpDefault ? null : item.currentItem._tpValue + + if (value !== null) { + var tpParam = 'telepathy/' + item._tpParam + + console.log(tpParam + ' = ' + value) + configuration[tpParam] = value + } + } + + createAccount(root.accountProvider.name, + root.accountProvider.serviceNames[0], + settings.account, settings.password, + settings.account, + { "sip": configuration }, // configuration map + "Jolla", // applicationName + "", // symmetricKey + "Jolla") // credentialsName + } + + onError: { + console.log("SIP creation error:", message) + initialPage.acceptDestinationInstance.state = "info" + initialPage.acceptDestinationInstance.infoExtraDescription = message + root.accountCreationError(message) + } + + onSuccess: { + root._settingsDialog = settingsComponent.createObject(root, {"accountId": newAccountId}) + pageStack.animatorPush(root._settingsDialog) + root.accountCreated(newAccountId) + } + } + + Component { + id: settingsComponent + Dialog { + property alias accountId: settingsDisplay.accountId + + acceptDestination: root.endDestination + acceptDestinationAction: root.endDestinationAction + acceptDestinationProperties: root.endDestinationProperties + acceptDestinationReplaceTarget: root.endDestinationReplaceTarget + backNavigation: false + + onAccepted: { + root.delayDeletion = true + settingsDisplay.saveAccount() + } + + SilicaFlickable { + anchors.fill: parent + contentHeight: header.height + settingsDisplay.height + Theme.paddingLarge + + DialogHeader { + id: header + } + + SIPSettingsDisplay { + id: settingsDisplay + anchors.top: header.bottom + accountProvider: root.accountProvider + autoEnableAccount: true + + onAccountSaveCompleted: { + root.delayDeletion = false + } + } + + VerticalScrollDecorator {} + } + } + } +} diff --git a/usr/share/booster-silica-media/preload.qml b/usr/share/booster-silica-media/preload.qml index 2e00c179..a39faa81 100644 --- a/usr/share/booster-silica-media/preload.qml +++ b/usr/share/booster-silica-media/preload.qml @@ -3,10 +3,10 @@ import Sailfish.Silica 1.0 import Sailfish.Gallery 1.0 import QtMultimedia 5.4 import QtDocGallery 5.0 -import org.nemomobile.ngf 1.0 -import org.nemomobile.dbus 2.0 -import org.nemomobile.policy 1.0 -import org.nemomobile.thumbnailer 1.0 +import Nemo.Ngf 1.0 +import Nemo.DBus 2.0 +import Nemo.Policy 1.0 +import Nemo.Thumbnailer 1.0 ApplicationWindow { cover: null // don't create a cover - the switcher will try to show it diff --git a/usr/share/cameragallery/qml/cameragallery.qml b/usr/share/cameragallery/qml/cameragallery.qml deleted file mode 100644 index 31bb0b56..00000000 --- a/usr/share/cameragallery/qml/cameragallery.qml +++ /dev/null @@ -1,211 +0,0 @@ -/* -Copyright (c) 2021 Jolla Ltd. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name of the Jolla Ltd. nor the names of - its contributors may be used to endorse or promote products - derived from this software without specific prior written - permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL JOLLA LTD OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -import QtQuick 2.0 -import Sailfish.Silica 1.0 -import QtMultimedia 5.6 -import CameraGallery 1.0 -import Nemo.KeepAlive 1.2 -import "pages" - -ApplicationWindow { - id: mainWindow - - background.color: "black" - cover: Qt.resolvedUrl("cover/CameraTestCover.qml") - allowedOrientations: Orientation.All - _defaultPageOrientations: Orientation.All - - initialPage: Component { - Page { - id: mainPage - - property bool pushAttached: status === PageStatus.Active - onPushAttachedChanged: { - pageStack.pushAttached(Qt.resolvedUrl("pages/SettingsPage.qml"), { 'camera': camera }) - pushAttached = false - } - - DisplayBlanking { - preventBlanking: camera.videoRecorder.recorderState == CameraRecorder.RecordingState - } - - Binding { - target: CameraConfigs - property: "camera" - value: camera - } - - VideoOutput { - id: videoOutput - - z: -1 - width: parent.width - height: parent.height - fillMode: VideoOutput.PreserveAspectFit - source: Camera { - id: camera - - imageCapture.onImageSaved: preview.source = path - videoRecorder { - frameRate: 30 - audioChannels: 2 - audioSampleRate: 48000 - audioCodec: "audio/mpeg, mpegversion=(int)4" - audioEncodingMode: CameraRecorder.AverageBitRateEncoding - videoCodec: "video/x-h264" - mediaContainer: "video/quicktime, variant=(string)iso" - resolution: "1280x720" - videoBitRate: 12000000 - } - } - - // When another camera app is opened - // the camera here goes to unloaded state. - // Make sure the camera becomes active again - Connections { - target: Qt.application - onActiveChanged: { - if (Qt.application.active) { - camera.cameraState = previousState - } else { - previousState = camera.cameraState - } - } - property int previousState: camera.cameraState - } - - MouseArea { - anchors.fill: parent - onClicked: { - if (videoOutput.state == "miniature") { - pageStack.navigateBack() - } else { - pageStack.navigateForward() - } - } - } - - states: State { - name: "miniature" - when: mainPage.status === PageStatus.Inactive || mainPage.status === PageStatus.Activating - PropertyChanges { - target: videoOutput - parent: pageStack - z: 1000 - width: Theme.itemSizeExtraLarge - height: width - x: parent.width - width - Theme.paddingLarge - y: parent.height - height - Theme.paddingLarge - } - } - } - - PageHeader { - z: 1 - title: "Camera settings" - interactive: true - } - - MouseArea { - width: Theme.itemSizeExtraLarge - height: Theme.itemSizeExtraLarge - - anchors { - horizontalCenter: parent.horizontalCenter - bottom: parent.bottom - bottomMargin: Theme.paddingLarge - } - - onPressed: camera.searchAndLock() - onReleased: { - if (camera.captureMode === Camera.CaptureVideo) { - if (camera.videoRecorder.recorderState == CameraRecorder.RecordingState) { - camera.videoRecorder.stop() - } else { - camera.videoRecorder.record() - } - } else { - if (containsMouse) { - camera.imageCapture.capture() - } else { - camera.unlock() - } - } - } - onCanceled: camera.unlockAutoFocus() - - Rectangle { - id: backgroundCircle - - radius: width / 2 - width: image.width - height: width - - anchors.centerIn: parent - - color: Theme.secondaryHighlightColor - } - - Image { - id: image - anchors.centerIn: parent - source: camera.videoRecorder.recorderState == CameraRecorder.RecordingState - ? "image://theme/icon-camera-video-shutter-off" - : (camera.captureMode == Camera.CaptureVideo - ? "image://theme/icon-camera-video-shutter-on" - : "image://theme/icon-camera-shutter") - } - } - - MouseArea { - - onClicked: Qt.openUrlExternally(preview.source) - - anchors { - left: parent.left - bottom: parent.bottom - margins: Theme.paddingLarge - } - - width: Theme.itemSizeExtraLarge - height: Theme.itemSizeExtraLarge - opacity: containsMouse && pressed ? 0.6 : 1.0 - - Image { - id: preview - z: -1 - anchors.fill: parent - fillMode: Image.PreserveAspectFit - } - } - } - } -} diff --git a/usr/share/cameragallery/qml/cover/CameraTestCover.qml b/usr/share/cameragallery/qml/cover/CameraTestCover.qml deleted file mode 100644 index 0a75d900..00000000 --- a/usr/share/cameragallery/qml/cover/CameraTestCover.qml +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright (c) 2021 Jolla Ltd. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name of the Jolla Ltd. nor the names of - its contributors may be used to endorse or promote products - derived from this software without specific prior written - permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL JOLLA LTD OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -import QtQuick 2.0 -import Sailfish.Silica 1.0 - -CoverBackground { - CoverPlaceholder { - text: "Camera Gallery" - icon.source: "image://theme/icon-launcher-camera" - } -} diff --git a/usr/share/cameragallery/qml/pages/SettingsPage.qml b/usr/share/cameragallery/qml/pages/SettingsPage.qml deleted file mode 100644 index bd9c718d..00000000 --- a/usr/share/cameragallery/qml/pages/SettingsPage.qml +++ /dev/null @@ -1,1119 +0,0 @@ -/* -Copyright (c) 2021 Jolla Ltd. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name of the Jolla Ltd. nor the names of - its contributors may be used to endorse or promote products - derived from this software without specific prior written - permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL JOLLA LTD OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -import QtQuick 2.6 -import Sailfish.Silica 1.0 -import QtMultimedia 5.4 -import CameraGallery 1.0 - -Page { - function formatResolution(size) { - if (size.width == -1) { - return "Unselected" - } else { - return size.width + "x" + size.height - } - } - - property Camera camera - - backgroundColor: "black" - - SilicaFlickable { - anchors.fill: parent - contentHeight: column.height - - Column { - id: column - - width: parent.width - bottomPadding: Theme.paddingLarge - - PageHeader { - title: "Camera settings" - } - - Label { - x: Theme.horizontalPageMargin - width: parent.width - 2*x - text: "Note not all the image processing modes exposed by QtMultimedia are supported." - font.pixelSize: Theme.fontSizeSmall - color: Theme.secondaryHighlightColor - wrapMode: Text.Wrap - } - - ComboBox { - id: cameraMenu - label: "Camera" - menu: ContextMenu { - Repeater { - model: QtMultimedia.availableCameras.length - MenuItem { - text: QtMultimedia.availableCameras[model.index].displayName - onDelayedClick: { - camera.imageCapture.resolution = "-1x-1" - camera.videoRecorder.resolution = "-1x-1" - cameraMenu.currentIndex = model.index - cameraMenu.value = text - camera.deviceId = QtMultimedia.availableCameras[model.index].deviceId - } - } - } - } - } - - ComboBox { - id: cameraState - - function name(state) { - switch (state) { - case Camera.UnloadedState: - return "Unloaded" - case Camera.LoadedState: - return "Loaded" - case Camera.ActiveState: - return "Active" - default: - return "Unknown" - } - } - label: "State" - value: name(camera.cameraState) - menu: ContextMenu { - Repeater { - model: [Camera.UnloadedState, Camera.LoadedState, Camera.ActiveState] - - MenuItem { - text: cameraState.name(modelData) - onDelayedClick: camera.cameraState = modelData - } - } - } - } - - DetailItem { - label: "Status" - value: { - switch (camera.cameraStatus) { - case Camera.ActiveStatus: - return "Active" - case Camera.StartingStatus: - return "Starting" - case Camera.StoppingStatus: - return "Stopping" - case Camera.StandbyStatus: - return "Stand-by" - case Camera.LoadedStatus: - return "Loaded" - case Camera.LoadingStatus: - return "Loading" - case Camera.UnloadingStatus: - return "Unloading" - case Camera.UnloadedStatus: - return "Unloaded" - case Camera.UnavailableStatus: - return "Unavailable" - default: - return "Unknown" - } - } - } - - DetailItem { - label: "Lock status" - value: { - switch (camera.lockStatus) { - case Camera.Unlocked: - return "Unlocked" - case Camera.Searching: - return "Searching" - case Camera.Locked: - return "Locked" - default: - return "Unknown" - } - } - } - - DetailItem { - id: filePathItem - label: "Availability" - value: { - switch (camera.availability) { - case Camera.Available: - return "Available" - case Camera.Unavailable: - return "Unavailable" - case Camera.ResourceMissing: - return "Resource missing" - } - } - } - - DetailItem { - label: "Position" - value: { - switch (camera.position) { - case Camera.UnspecifiedPosition: - return "Unspecified" - case Camera.BackFace: - return "Back-facing" - case Camera.FrontFace: - return "Front-facing" - default: - return "Unknown" - } - } - } - - DetailItem { - label: "Orientation" - value: camera.orientation + "°" - } - - ComboBox { - label: "Resolution" - value: formatResolution(camera.viewfinder.resolution) - - menu: ContextMenu { - Repeater { - model: CameraConfigs.supportedViewfinderResolutions - MenuItem { - text: formatResolution(modelData) - onClicked: camera.viewfinder.resolution = modelData - } - } - } - } - - DetailItem { - label: "Last error code" - value: camera.errorCode - } - - DetailItem { - label: "Error description" - value: camera.errorString == "" ? "No error" - : camera.errorString - } - - SectionHeader { - text: "Zoom" - } - - Slider { - minimumValue: 1.0 - maximumValue: camera.maximumDigitalZoom - value: camera.digitalZoom - label: "Zoom" - width: parent.width - onValueChanged: camera.digitalZoom = value - } - - SectionHeader { - text: "Flash" - } - - DetailItem { - label: "Ready" - value: camera.flash.isFlashReady ? "True" : "False" - } - - ComboBox { - id: flashMode - - function name(mode) { - switch (mode) { - case Camera.FlashAuto: - return "Auto" - case Camera.FlashOff: - return "Off" - case Camera.FlashOn: - return "On" - case Camera.FlashRedEyeReduction: - return "Red-eye reduction" - case Camera.FlashFill: - return "Fill" - case Camera.FlashTorch: - return "Torch" - case Camera.FlashVideoLight: - return "Video light" - case Camera.FlashSlowSyncFrontCurtain: - return "Slow sync front curtain" - case Camera.FlashSlowSyncRearCurtain: - return "Slow sync rear curtain" - case Camera.FlashManual: - return "Manual" - default: - return "Unknown" - } - } - - label: "Mode" - enabled: CameraConfigs.supportedFlashModes.length > 0 - value: name(camera.flash.mode) - - menu: ContextMenu { - Repeater { - model: CameraConfigs.supportedFlashModes - - MenuItem { - text: flashMode.name(modelData) - onClicked: camera.flash.mode = modelData - } - } - } - } - - SectionHeader { - text: "Capture mode" - } - - ComboBox { - id: captureMenu - label: "Capture mode" - currentIndex: camera.captureMode - menu: ContextMenu { - MenuItem { - text: "Viewfinder" - onDelayedClick: camera.captureMode = Camera.CaptureViewfinder - } - MenuItem { - text: "Still Image" - onDelayedClick: camera.captureMode = Camera.CaptureStillImage - } - MenuItem { - text: "Video" - onDelayedClick: camera.captureMode = Camera.CaptureVideo - } - } - } - - Column { - width: parent.width - visible: camera.captureMode === Camera.CaptureStillImage - - DetailItem { - label: "Ready" - value: camera.imageCapture.ready ? "True" : "False" - } - - ComboBox { - label: "Resolution" - value: formatResolution(camera.imageCapture.resolution) - - menu: ContextMenu { - Repeater { - model: CameraConfigs.supportedImageResolutions - MenuItem { - text: formatResolution(modelData) - onClicked: camera.imageCapture.resolution = modelData - } - } - } - } - - DetailItem { - label: "Last image path" - value: camera.imageCapture.capturedImagePath - } - - DetailItem { - label: "Description" - value: camera.imageCapture.errorString == "" ? "No error" - : camera.errorString - } - } - - Column { - width: parent.width - visible: camera.captureMode === Camera.CaptureVideo - - DetailItem { - label: "State" - value: { - switch (camera.videoRecorder.recorderState) { - case CameraRecorder.StoppedState: - return "Stopped" - case CameraRecorder.RecordingState: - return "Recording" - default: - return "Unknown" - } - } - } - - DetailItem { - label: "Status" - value: { - switch (camera.videoRecorder.recorderStatus) { - case CameraRecorder.ActiveStatus: - return "Active" - case CameraRecorder.StartingStatus: - return "Starting" - case CameraRecorder.RecordingStatus: - return "Recording" - case CameraRecorder.PausedStatus: - return "Paused" - case CameraRecorder.FinalizingStatus: - return "Finalizing" - case CameraRecorder.LoadedStatus: - return "Loaded" - case CameraRecorder.LoadingStatus: - return "Loading" - case CameraRecorder.UnloadedStatus: - return "Unloaded" - case CameraRecorder.UnavailableStatus: - return "Unavailable" - default: - return "Unknown" - } - } - } - - ComboBox { - label: "Resolution" - value: formatResolution(camera.videoRecorder.resolution) - - menu: ContextMenu { - Repeater { - model: CameraConfigs.supportedVideoResolutions - MenuItem { - text: formatResolution(modelData) - onClicked: camera.videoRecorder.resolution = modelData - } - } - } - } - - DetailItem { - label: "Actual location" - value: camera.videoRecorder.actualLocation - } - - DetailItem { - label: "Output location" - value: camera.videoRecorder.outputLocation - } - - DetailItem { - label: "Video bit rate" - value: camera.videoRecorder.videoBitRate + "b/s" - } - - DetailItem { - label: "Video codec" - value: camera.videoRecorder.videoCodec - } - - DetailItem { - label: "Video encoding mode" - value: { - switch (camera.videoRecorder.videoEncodingMode) { - case CameraRecorder.ConstantQualityEncoding: - return "Constant quality" - case CameraRecorder.ConstantBitRateEncoding: - return "Constant bit rate" - case CameraRecorder.AverageBitRateEncoding: - return "Average bit rate" - default: - return "Unknown" - } - } - } - - DetailItem { - label: "Audio bit rate" - value: camera.videoRecorder.audioBitRate + "b/s" - } - - DetailItem { - label: "Audio channels" - value: camera.videoRecorder.audioChannels - } - - DetailItem { - label: "Audio codec" - value: camera.videoRecorder.audioCodec - } - - DetailItem { - label: "Audio encoding mode" - value: { - switch (camera.videoRecorder.audioEncodingMode) { - case CameraRecorder.ConstantQualityEncoding: - return "Constant quality" - case CameraRecorder.ConstantBitRateEncoding: - return "Constant bit rate" - case CameraRecorder.AverageBitRateEncoding: - return "Average bit rate" - default: - return "Unknown" - } - } - } - - DetailItem { - label: "Audio sample rate" - value: camera.videoRecorder.audioSampleRate - } - - DetailItem { - label: "Duration" - value: camera.videoRecorder.duration - } - - DetailItem { - label: "Framerate" - value: camera.videoRecorder.frameRate.toFixed(1) - } - - DetailItem { - label: "Media container" - value: camera.videoRecorder.mediaContainer - } - - DetailItem { - label: "Muted" - value: camera.videoRecorder.muted ? "True" : "False" - } - DetailItem { - label: "Last error code" - value: camera.videoRecorder.errorCode - } - - DetailItem { - label: "Error description" - value: camera.videoRecorder.errorString == "" ? "No error" - : camera.errorString - } - } - - SectionHeader { - text: "Focus" - } - - ComboBox { - id: focusMode - - function name(mode) { - switch (mode) { - case Camera.FocusManual: - return "Manual" - case Camera.FocusHyperfocal: - return "Hyperfocal" - case Camera.FocusInfinity: - return "Infinity" - case Camera.FocusAuto: - return "Auto" - case Camera.FocusContinuous: - return "Continuous" - case Camera.FocusMacro: - return "Macro" - default: - return "Unknown" - } - } - label: "Mode" - enabled: CameraConfigs.supportedFocusModes.length > 0 - value: name(camera.focus.focusMode) - - menu: ContextMenu { - Repeater { - model: CameraConfigs.supportedFocusModes - - MenuItem { - text: focusMode.name(modelData) - onClicked: camera.focus.focusMode = modelData - } - } - } - } - - ComboBox { - id: pointMode - - function name(mode) { - switch (mode) { - case Camera.FocusPointAuto: - return "Auto" - case Camera.FocusPointCenter: - return "Center" - case Camera.FocusPointFaceDetection: - return "Face detection" - case Camera.FocusPointCustom: - return "Custom" - default: - return "Unknown" - } - } - label: "Point mode" - enabled: CameraConfigs.supportedFocusPointModes.length > 0 - value: name(camera.focus.focusPointMode) - menu: ContextMenu { - Repeater { - model: CameraConfigs.supportedFocusPointModes - MenuItem { - text: pointMode.name(modelData) - onClicked: camera.focus.focusPointMode = modelData - } - } - } - } - - DetailItem { - label: "Custom focus point" - value: camera.focus.customFocusPoint.x + ", " + camera.focus.customFocusPoint.y - } - - SectionHeader { - text: "Exposure" - } - - ComboBox { - id: exposureMode - - function name(mode) { - switch (mode) { - case Camera.ExposureManual: - return "Manual" - case Camera.ExposureAuto: - return "Auto" - case Camera.ExposureNight: - return "Night" - case Camera.ExposureBacklight: - return "Backlight" - case Camera.ExposureSpotlight: - return "Spotlight" - case Camera.ExposureSports: - return "Sports" - case Camera.ExposureSnow: - return "Snow" - case Camera.ExposureBeach: - return "Beach" - case Camera.ExposureLargeAperture: - return "Large aperture" - case Camera.ExposureSmallAperture: - return "Small aperture" - case Camera.ExposurePortrait: - return "Portrait" - case Camera.ExposureAction: - return "Action" - case Camera.ExposureLandscape: - return "Landscape" - case Camera.ExposureNightPortrait: - return "Night portrait" - case Camera.ExposureTheatre: - return "Theatre" - case Camera.ExposureSunset: - return "Sunset" - case Camera.ExposureSteadyPhoto: - return "Steady photo" - case Camera.ExposureFireworks: - return "Fireworks" - case Camera.ExposureParty: - return "Party" - case Camera.ExposureCandlelight: - return "Candlelight" - case Camera.ExposureBarcode: - return "Barcode" - case Camera.ExposureFlowers: - return "Flowers" - case Camera.ExposureAR: - return "AR" - case Camera.ExposureCloseup: - return "Closeup" - case Camera.ExposureHDR: - return "HDR" - case Camera.ExposureModeVendor: - return "Mode vendor" - default: - return "Unknown" - } - } - label: "Mode" - enabled: CameraConfigs.supportedExposureModes.length > 0 - value: name(camera.exposure.exposureMode) - menu: ContextMenu { - Repeater { - model: CameraConfigs.supportedExposureModes - MenuItem { - text: exposureMode.name(modelData) - onClicked: camera.exposure.exposureMode = modelData - } - } - } - } - - - /* - Uncomment when works - DetailItem { - label: "Shutter speed" - value: camera.exposure.shutterSpeed.toFixed(2) - } - - TextField { - label: "Manual shutter speed" - inputMethodHints: Qt.ImhFormattedNumbersOnly - text: camera.exposure.manualShutterSpeed.toFixed(2) - onTextChanged: camera.exposure.manualShutterSpeed = parseFloat(text) - } - */ - - Slider { - minimumValue: -4.0 - maximumValue: 4.0 - stepSize: 1.0 - value: camera.exposure.exposureCompensation - label: "Compensation" - valueText: camera.exposure.exposureCompensation.toFixed(1) - width: parent.width - onValueChanged: camera.exposure.exposureCompensation = value - } - - DetailItem { - label: "ISO" - value: camera.exposure.iso - } - - ComboBox { - label: "Manual ISO" - enabled: CameraConfigs.supportedIsoSensitivities.length > 0 - value: camera.exposure.manualIso.toString() - - menu: ContextMenu { - Repeater { - model: CameraConfigs.supportedIsoSensitivities - - MenuItem { - text: modelData.toString() - onClicked: camera.exposure.manualIso = modelData - } - } - } - } - - DetailItem { - label: "Aperture" - value: camera.exposure.aperture.toFixed(2) - } - - ComboBox { - id: meteringMode - - function name(mode) { - switch (mode) { - case Camera.MeteringMatrix: - return "Matrix" - case Camera.MeteringAverage: - return "Average" - case Camera.MeteringSpot: - return "Spot" - default: - return "Unknown" - } - } - label: "Metering mode" - enabled: CameraConfigs.supportedMeteringModes.length > 0 - value: name(camera.exposure.meteringMode) - menu: ContextMenu { - Repeater { - model: CameraConfigs.supportedMeteringModes - - MenuItem { - text: meteringMode.name(modelData) - onClicked: camera.exposure.meteringMode = modelData - } - } - } - } - - DetailItem { - label: "Spot metering point" - value: camera.exposure.spotMeteringPoint.x + ", " + camera.exposure.spotMeteringPoint.y - } - - SectionHeader { - text: "Image processing" - } - - ComboBox { - id: whiteBalanceMode - - function name(mode) { - switch (mode) { - case CameraImageProcessing.WhiteBalanceManual: - return "Manual" - case CameraImageProcessing.WhiteBalanceAuto: - return "Auto" - case CameraImageProcessing.WhiteBalanceSunlight: - return "Sunlight" - case CameraImageProcessing.WhiteBalanceCloudy: - return "Cloudy" - case CameraImageProcessing.WhiteBalanceShade: - return "Shade" - case CameraImageProcessing.WhiteBalanceTungsten: - return "Tungsten" - case CameraImageProcessing.WhiteBalanceFluorescent: - return "Fluorescent" - case CameraImageProcessing.WhiteBalanceFlash: - return "Flash" - case CameraImageProcessing.WhiteBalanceSunset: - return "Sunset" - case CameraImageProcessing.WhiteBalanceWarmFluorescent: - return "Warm fluorescent" - case CameraImageProcessing.WhiteBalanceVendor: - return "Vendor" - default: - return "Unknown" - } - } - - label: "White balance mode" - enabled: CameraConfigs.supportedWhiteBalanceModes.length > 0 - value: name(camera.imageProcessing.whiteBalanceMode) - - menu: ContextMenu { - Repeater { - model: CameraConfigs.supportedWhiteBalanceModes - - MenuItem { - - text: whiteBalanceMode.name(modelData) - onClicked: camera.imageProcessing.whiteBalanceMode = modelData - } - } - } - } - - Slider { - visible: camera.imageProcessing.whiteBalanceMode === CameraImageProcessing.WhiteBalanceManual - minimumValue: 2000 - maximumValue: 9000 - value: camera.imageProcessing.manualWhiteBalance - label: "Manual white balance" - valueText: camera.imageProcessing.manualWhiteBalance.toFixed(0) - width: parent.width - onValueChanged: camera.imageProcessing.manualWhiteBalance = value - } - - ComboBox { - id: colorFilter - - function name(filter) { - switch (filter) { - case CameraImageProcessing.ColorFilterNone: - return "None" - case CameraImageProcessing.ColorFilterGrayscale: - return "Grayscale" - case CameraImageProcessing.ColorFilterNegative: - return "Negative" - case CameraImageProcessing.ColorFilterSolarize: - return "Solarize" - case CameraImageProcessing.ColorFilterSepia: - return "Sepia" - case CameraImageProcessing.ColorFilterPosterize: - return "Posterize" - case CameraImageProcessing.ColorFilterWhiteboard: - return "Whiteboard" - case CameraImageProcessing.ColorFilterBlackboard: - return "Blackboard" - case CameraImageProcessing.ColorFilterAqua: - return "Aqua" - case CameraImageProcessing.ColorFilterEmboss: - return "Emboss" - case CameraImageProcessing.ColorFilterSketch: - return "Sketch" - case CameraImageProcessing.ColorFilterNeon: - return "Neon" - case CameraImageProcessing.ColorFilterVendor: - return "Vendor" - default: - return "Unknown" - } - } - label: "Color filter" - value: name(camera.imageProcessing.colorFilter) - menu: ContextMenu { - Repeater { - model: [CameraImageProcessing.ColorFilterNone, CameraImageProcessing.ColorFilterGrayscale, CameraImageProcessing.ColorFilterNegative, CameraImageProcessing.ColorFilterSolarize, CameraImageProcessing.ColorFilterSepia, CameraImageProcessing.ColorFilterPosterize, CameraImageProcessing.ColorFilterWhiteboard, CameraImageProcessing.ColorFilterBlackboard, CameraImageProcessing.ColorFilterAqua, CameraImageProcessing.ColorFilterEmboss, CameraImageProcessing.ColorFilterSketch, CameraImageProcessing.ColorFilterNeon, CameraImageProcessing.ColorFilterVendor] - - MenuItem { - text: colorFilter.name(modelData) - onClicked: camera.imageProcessing.colorFilter = modelData - } - } - } - } - - /* - Uncomment when works - Slider { - minimumValue: -1.0 - maximumValue: 1.0 - value: camera.imageProcessing.contrast - label: "Contrast" - valueText: camera.imageProcessing.contrast.toFixed(2) - width: parent.width - onValueChanged: camera.imageProcessing.contrast = value - } - - Slider { - minimumValue: -1.0 - maximumValue: 1.0 - value: camera.imageProcessing.denoisingLevel - label: "Denoising level" - valueText: camera.imageProcessing.denoisingLevel.toFixed(2) - width: parent.width - onValueChanged: camera.imageProcessing.denoisingLevel = value - } - - Slider { - minimumValue: -1.0 - maximumValue: 1.0 - value: camera.imageProcessing.saturation - label: "Saturation" - valueText: camera.imageProcessing.saturation.toFixed(2) - width: parent.width - onValueChanged: camera.imageProcessing.saturation = value - } - - Slider { - minimumValue: -1.0 - maximumValue: 1.0 - value: camera.imageProcessing.sharpeningLevel - label: "Sharpening level" - valueText: camera.imageProcessing.sharpeningLevel.toFixed(2) - width: parent.width - onValueChanged: camera.imageProcessing.sharpeningLevel = value - }*/ - - SectionHeader { - text: "Metadata" - } - - Label { - x: Theme.horizontalPageMargin - width: parent.width - 2*x - text: "Metadata is write-only API to define metadata baked into the captured photos and videos" - font.pixelSize: Theme.fontSizeSmall - color: Theme.secondaryHighlightColor - wrapMode: Text.Wrap - } - - Item { - width: 1 - height: Theme.paddingMedium - } - - TextField { - label: "Manufacturer" - onTextChanged: camera.metaData.cameraManufacturer = text - EnterKey.iconSource: "image://theme/icon-m-enter-next" - EnterKey.onClicked: modelField.focus = true - } - - TextField { - id: modelField - - label: "Model" - onTextChanged: camera.metaData.cameraModel = text - - EnterKey.iconSource: "image://theme/icon-m-enter-next" - EnterKey.onClicked: eventField.focus = true - } - - TextField { - id: eventField - - label: "Event" - onTextChanged: camera.metaData.event = text - - EnterKey.iconSource: "image://theme/icon-m-enter-next" - EnterKey.onClicked: subjectField.focus = true - } - - TextField { - id: subjectField - - label: "Subject" - onTextChanged: camera.metaData.subject = text - - EnterKey.iconSource: "image://theme/icon-m-enter-next" - EnterKey.onClicked: latitudeField.focus = true - } - - ComboBox { - id: orientationComboBox - label: "Orientation" - value: "Not defined" - menu: ContextMenu { - Repeater { - model: [0, 90, 180, 270] - - MenuItem { - text: modelData.toString() - onClicked: { - camera.metaData.orientation = modelData - orientationComboBox.value = modelData.toString() - } - } - } - } - } - - DetailItem { - id: dateTimeOriginal - label: "Date time original" - value: "Not defined" - } - - Item { - width: 1 - height: Theme.paddingMedium - } - - Button { - text: "Update" - anchors.horizontalCenter: parent.horizontalCenter - onClicked: { - var now = new Date() - camera.metaData.dateTimeOriginal = now - dateTimeOriginal.value = now - } - } - - SectionHeader { - text: "Location metadata" - } - - TextField { - id: latitudeField - - label: "Latitude" - inputMethodHints: Qt.ImhFormattedNumbersOnly - text: camera.metaData.gpsLatitude ? camera.metaData.gpsLatitude : "" - onTextChanged: camera.metaData.gpsLatitude = parseFloat(text) - - EnterKey.iconSource: "image://theme/icon-m-enter-next" - EnterKey.onClicked: longitudeField.focus = true - } - - TextField { - id: longitudeField - - label: "Longitude" - inputMethodHints: Qt.ImhFormattedNumbersOnly - onTextChanged: camera.metaData.gpsLongitude = parseFloat(text) - - EnterKey.iconSource: "image://theme/icon-m-enter-next" - EnterKey.onClicked: altitudeField.focus = true - } - - TextField { - id: altitudeField - - label: "Altitude" - inputMethodHints: Qt.ImhFormattedNumbersOnly - onTextChanged: camera.metaData.gpsAltitude = parseFloat(text) - - EnterKey.iconSource: "image://theme/icon-m-enter-next" - EnterKey.onClicked: speedField.focus = true - } - - TextField { - id: speedField - - label: "Speed" - inputMethodHints: Qt.ImhFormattedNumbersOnly - onTextChanged: camera.metaData.gpsSpeed = parseFloat(text) - - EnterKey.iconSource: "image://theme/icon-m-enter-next" - EnterKey.onClicked: trackField.focus = true - } - - DetailItem { - id: gpsTimestamp - label: "GPS timestamp" - value: "Not defined" - } - - Item { - width: 1 - height: Theme.paddingMedium - } - - Button { - anchors.horizontalCenter: parent.horizontalCenter - text: "Update time" - onClicked: { - var now = new Date - camera.metaData.gpsTimestamp = now - gpsTimestamp.value = now - } - } - - TextField { - id: trackField - - label: "GPS track" - description: "Measured in degrees clockwise from north" - inputMethodHints: Qt.ImhFormattedNumbersOnly - onTextChanged: camera.metaData.gpsTrack = parseFloat(text) - - EnterKey.iconSource: "image://theme/icon-m-enter-next" - EnterKey.onClicked: imgeDirectionField.focus = true - } - - TextField { - id: imgeDirectionField - - label: "GPS image direction" - description: "Direction the camera is facing at the time of capture" - inputMethodHints: Qt.ImhFormattedNumbersOnly - onTextChanged: camera.metaData.gpsImgDirection = parseFloat(text) - - EnterKey.iconSource: "image://theme/icon-m-enter-next" - EnterKey.onClicked: processingMethodField.focus = true - } - - TextField { - id: processingMethodField - label: "GPS processing method" - description: "Method for determining the GPS position" - onTextChanged: camera.metaData.gpsProcessingMethod = text - - EnterKey.iconSource: "image://theme/icon-m-enter-close" - EnterKey.onClicked: focus = false - } - } - } -} diff --git a/usr/share/contextkit/providers/Alarm.qml b/usr/share/contextkit/providers/Alarm.qml new file mode 100644 index 00000000..b3a80032 --- /dev/null +++ b/usr/share/contextkit/providers/Alarm.qml @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2020 Open Mobile Platform LLC. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + * + * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + */ + +import Nemo.DBus 2.0 +import org.freedesktop.contextkit 1.0 + +ContextPropertyBase { + id: root + + property bool _alarmPresent + property var _alarmTriggers: ({}) + + propertyValue: { + switch (propertyName) { + case "Present": + return _alarmPresent + case "Triggers": + return _alarmTriggers + default: + return undefined + } + } + + DBusInterface { + bus: DBus.SystemBus + service: "com.nokia.time" + path: "/com/nokia/time" + iface: "com.nokia.time" + signalsEnabled: root.subscribed + watchServiceStatus: root.subscribed + + function alarm_present_changed(value) { + root._alarmPresent = value + } + + function alarm_triggers_changed(value) { + root._alarmTriggers = value + } + + onStatusChanged: { + if (status === DBusInterface.Available) { + call("get_alarm_present", [], function(value) { + root._alarmPresent = value + }) + call("get_alarm_triggers", [], function(value) { + root._alarmTriggers = value + }) + } + } + } +} diff --git a/usr/share/contextkit/providers/Battery.qml b/usr/share/contextkit/providers/Battery.qml new file mode 100644 index 00000000..d75e489b --- /dev/null +++ b/usr/share/contextkit/providers/Battery.qml @@ -0,0 +1,158 @@ +/* + * Copyright (c) 2020 Open Mobile Platform LLC. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + * + * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + */ + +import Nemo.Mce 1.0 +import org.freedesktop.contextkit 1.0 +import org.freedesktop.contextkit.providers.battery 1.0 + +ContextPropertyBase { + id: root + + propertyValue: { + switch (propertyName) { + case "ChargePercentage": + return mceBatteryLevel.percent + case "Capacity": + return batteryContext.capacity + case "Energy": + return batteryContext.energy + case "EnergyFull": + return batteryContext.energyFull + case "OnBattery": + return !mceCableState.connected + case "LowBattery": + return mceBatteryStatus.status === MceBatteryStatus.Low + case "TimeUntilLow": + return batteryContext.timeUntilLow + case "TimeUntilFull": + return batteryContext.timeUntilFull + case "IsCharging": + return mceBatteryState === MceBatteryState.Charging + case "Temperature": + return batteryContext.temperature + case "Power": + return batteryContext.power + case "State": + switch (mceBatteryStatus.status) { + case MceBatteryStatus.Full: + return "full" + case MceBatteryStatus.Low: + return "low" + case MceBatteryStatus.Empty: + return "empty" + default: + return mceBatteryState.text + } + case "Voltage": + return batteryContext.voltage + case "Current": + return batteryContext.current + case "Level": + return mceBatteryStatus.text + case "ChargerType": + return mceChargerType.text + case "ChargingState": + return mceBatteryState.text + + default: + return undefined + } + } + + BatteryContextPropertyProvider { + id: batteryContext + + active: root.subscribed + } + + MceBatteryLevel { + id: mceBatteryLevel + } + + MceBatteryState { + id: mceBatteryState + + readonly property string text: { + if (valid) { + switch (value) { + case MceBatteryState.Charging: + return "charging" + case MceBatteryState.Discharging: + return "discharging" + case MceBatteryState.NotCharging: + return "unknown" + case MceBatteryState.Full: + return "idle" + } + } + return "unknown" + } + } + + MceBatteryStatus { + id: mceBatteryStatus + + readonly property string text: { + if (valid) { + switch (status) { + case MceBatteryStatus.Full: + case MceBatteryStatus.Ok: + return "normal" + case MceBatteryStatus.Low: + return "low" + case MceBatteryStatus.Empty: + return "empty" + } + } + return "unknown" + } + } + + MceChargerType { + id: mceChargerType + + readonly property string text: { + if (valid) { + switch (type) { + case MceChargerType.None: + return "None" + case MceChargerType.USB: + return "USB" + case MceChargerType.DCP: + return "DCP" + case MceChargerType.HVDCP: + return "HVDCP" + case MceChargerType.CDP: + return "CDP" + case MceChargerType.Wireless: + return "Wireless" + case MceChargerType.Other: + return "Other" + } + } + return "unknown" + } + } + + MceCableState { + id: mceCableState + } +} diff --git a/usr/share/contextkit/providers/Bluetooth.qml b/usr/share/contextkit/providers/Bluetooth.qml new file mode 100644 index 00000000..76e7d656 --- /dev/null +++ b/usr/share/contextkit/providers/Bluetooth.qml @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2020 Open Mobile Platform LLC. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + * + * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + */ + +import org.freedesktop.contextkit 1.0 +import org.kde.bluezqt 1.0 as BluezQt + +ContextPropertyBase { + id: root + + property var _adapter: BluezQt.Manager.usableAdapter + readonly property bool _valid: !!adapter + + propertyValue: { + switch (propertyName) { + case "Enabled": + return _valid && _adapter.powered + case "Visible": + return _valid && _adapter.discoverable + case "Connected": + return _valid && _adapter.connected + case "Address": + return _valid ? _adapter.address : "" + default: + console.log("Unknown property:", propertyName) + return undefined + } + } +} diff --git a/usr/share/contextkit/providers/Cellular.qml b/usr/share/contextkit/providers/Cellular.qml new file mode 100644 index 00000000..440d5a9a --- /dev/null +++ b/usr/share/contextkit/providers/Cellular.qml @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2020 Open Mobile Platform LLC. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + * + * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + */ + +import org.freedesktop.contextkit 1.0 +import "ofono" + +CellularBase { + modemPath: telephonySimManager.availableModems[0] || "" +} diff --git a/usr/share/contextkit/providers/Cellular_1.qml b/usr/share/contextkit/providers/Cellular_1.qml new file mode 100644 index 00000000..c2129d16 --- /dev/null +++ b/usr/share/contextkit/providers/Cellular_1.qml @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2020 Open Mobile Platform LLC. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + * + * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + */ + +import org.freedesktop.contextkit 1.0 +import "ofono" + +CellularBase { + modemPath: telephonySimManager.availableModems[1] || "" +} diff --git a/usr/share/contextkit/providers/Internet.qml b/usr/share/contextkit/providers/Internet.qml new file mode 100644 index 00000000..e386b886 --- /dev/null +++ b/usr/share/contextkit/providers/Internet.qml @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2020 Open Mobile Platform LLC. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + * + * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + */ + +import Connman 0.2 +import org.freedesktop.contextkit 1.0 + +ContextPropertyBase { + id: root + + property var _networkService: networkManager.defaultRoute + + function _networkTypeString(networkType) { + switch (networkType) { + case "wifi": + return "WLAN" + case "gprs": + case "cellular": + case "edge": + case "umts": + return "GPRS" + case "ethernet": + return "ethernet" + } + return "" + } + + function _networkStateString(networkState) { + switch (networkState) { + case "offline": + case "idle": + return "disconnected" + case "online": + case "ready": + return "connected" + } + return "" + } + + propertyValue: { + switch (propertyName) { + case "NetworkType": + return _networkService ? _networkTypeString(_networkService.type) : "" + case "NetworkState": + return _networkService ? _networkStateString(_networkService.state) : "disconnected" + case "NetworkName": + return _networkService ? _networkService.name : "" + case "SignalStrength": + return _networkService ? _networkService.strength : 0 + case "Tethering": + return wlanNetworkTechnology.tethering + + default: + return undefined + } + } + + NetworkManager { + id: networkManager + } + + NetworkTechnology { + id: wlanNetworkTechnology + + path: networkManager.WifiTechnology + } +} diff --git a/usr/share/contextkit/providers/Profile.qml b/usr/share/contextkit/providers/Profile.qml new file mode 100644 index 00000000..ea81ef7f --- /dev/null +++ b/usr/share/contextkit/providers/Profile.qml @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2020 Open Mobile Platform LLC. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + * + * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + */ + +import Nemo.DBus 2.0 +import org.freedesktop.contextkit 1.0 + +ContextPropertyBase { + id: root + + property string _profileName + + propertyValue: { + switch (propertyName) { + case "Name": + return _profileName + default: + return undefined + } + } + + DBusInterface { + bus: DBus.SessionBus + service: "com.nokia.profiled" + path: "/com/nokia/profiled" + iface: "com.nokia.profiled" + signalsEnabled: root.subscribed + watchServiceStatus: root.subscribed + + function profile_changed(arg, forActiveProfile, profileName) { + if (forActiveProfile) { + root._profileName = profileName + } + } + + onStatusChanged: { + if (status === DBusInterface.Available) { + call("get_profile", [], function(value) { + root._profileName = value + }) + } + } + } +} diff --git a/usr/share/contextkit/providers/Screen.qml b/usr/share/contextkit/providers/Screen.qml new file mode 100644 index 00000000..a9c59801 --- /dev/null +++ b/usr/share/contextkit/providers/Screen.qml @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2020 Open Mobile Platform LLC. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + * + * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + */ + +import Nemo.Mce 1.0 +import org.freedesktop.contextkit 1.0 + +ContextPropertyBase { + id: root + + propertyValue: { + switch (propertyName) { + case "Blanked": + return mceDisplay.valid && mceDisplay.state === MceDisplay.DisplayOff + default: + return undefined + } + } + + MceDisplay { + id: mceDisplay + } +} diff --git a/usr/share/contextkit/providers/Sensors.qml b/usr/share/contextkit/providers/Sensors.qml new file mode 100644 index 00000000..c4e0db14 --- /dev/null +++ b/usr/share/contextkit/providers/Sensors.qml @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2020 Open Mobile Platform LLC. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + * + * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + */ + +import QtSensors 5.2 +import org.freedesktop.contextkit 1.0 + +ContextPropertyBase { + id: root + + readonly property var _orientationNames: [ + "unknown", "top", "bottom", "left", "right", "face", "back" + ] + + propertyValue: { + switch (propertyName) { + case "Orientation": + var orientation = sensor.reading.orientation + if (orientation >= 0 && orientation < root._orientationNames.length) { + return root._orientationNames[orientation] + } + return "unknown" + default: + return undefined + } + } + + OrientationSensor { + id: sensor + + active: root.subscribed + } +} diff --git a/usr/share/contextkit/providers/System.qml b/usr/share/contextkit/providers/System.qml new file mode 100644 index 00000000..084c1c23 --- /dev/null +++ b/usr/share/contextkit/providers/System.qml @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2020 Open Mobile Platform LLC. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + * + * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + */ + +import Nemo.DBus 2.0 +import org.freedesktop.contextkit 1.0 + +ContextPropertyBase { + id: root + + property bool _powerSaveMode + property int _radioState: -1 + property bool _keyboard_available + + // from mce-dev
Y: %2
Z: %3" - text: { - if (gyroTest.running) { - return qsTrId("csd-la-gyro_output").arg(gyroTest.sensorX).arg(gyroTest.sensorY).arg(gyroTest.sensorZ) - } else { - return qsTrId("csd-la-gyro_output").arg(gyroTest.valueX).arg(gyroTest.valueY).arg(gyroTest.valueZ) - } - } + text: qsTrId("csd-la-gyro_output").arg(rounded(gyroTest.curX)).arg(rounded(gyroTest.curY)).arg(rounded(gyroTest.curZ)) } Label { @@ -137,16 +135,14 @@ CsdTestPage { visible: gyroTest.done x: Theme.horizontalPageMargin - //% "Pass" - text: gyroResultLabel.result ? qsTrId("csd-la-pass") + "\n" + - "X: " + gyroTest.sensorX + "\n" + - "Y: " + gyroTest.sensorY + "\n" + - "Z: " + gyroTest.sensorZ : - //% "Fail" - qsTrId("csd-la-fail")+ "\n" + - "X: " + gyroTest.sensorX + "\n" + - "Y: " + gyroTest.sensorY + "\n" + - "Z: " + gyroTest.sensorZ + text: (gyroResultLabel.result + //% "Pass" + ? qsTrId("csd-la-pass") + //% "Fail" + : qsTrId("csd-la-fail")) + + "\nX: %1".arg(rounded(gyroTest.avgX)) + + "\nY: %1".arg(rounded(gyroTest.avgY)) + + "\nZ: %1".arg(rounded(gyroTest.avgZ)) } Label { @@ -187,11 +183,11 @@ CsdTestPage { width: parent.width - 2*x wrapMode: Text.Wrap text: //% "Gx: %0 (min: %1, max: %2)" - qsTrId("csd-la-accelerometer_readings_x").arg(Math.round(gSensorTest.gsensorX * 1000) / 1000).arg(gSensorTest.minX).arg(gSensorTest.maxX) + "\n" + + qsTrId("csd-la-accelerometer_readings_x").arg(rounded(gSensorTest.curX)).arg(gSensorTest.minX).arg(gSensorTest.maxX) + "\n" + //% "Gy: %0 (min: %1, max: %2)" - qsTrId("csd-la-accelerometer_readings_y").arg(Math.round(gSensorTest.gsensorY * 1000) / 1000).arg(gSensorTest.minY).arg(gSensorTest.maxY) + "\n" + + qsTrId("csd-la-accelerometer_readings_y").arg(rounded(gSensorTest.curY)).arg(gSensorTest.minY).arg(gSensorTest.maxY) + "\n" + //% "Gz: %0 (min: %1, max: %2)" - qsTrId("csd-la-accelerometer_readings_z").arg(Math.round(gSensorTest.gsensorZ * 1000) / 1000).arg(gSensorTest.minZ).arg(gSensorTest.maxZ) + qsTrId("csd-la-accelerometer_readings_z").arg(rounded(gSensorTest.curZ)).arg(gSensorTest.minZ).arg(gSensorTest.maxZ) } @@ -201,22 +197,17 @@ CsdTestPage { visible: gSensorTest.done x: Theme.horizontalPageMargin - //% "Pass" - text: gSensorResultLabel.result ? qsTrId("csd-la-pass") + "\n" + - //% "Gx: %0 (min: %1, max: %2)" - qsTrId("csd-la-accelerometer_readings_x").arg(gSensorTest.averageGsensorX).arg(gSensorTest.minX).arg(gSensorTest.maxX) + "\n" + - //% "Gy: %0 (min: %1, max: %2)" - qsTrId("csd-la-accelerometer_readings_y").arg(gSensorTest.averageGsensorY).arg(gSensorTest.minY).arg(gSensorTest.maxY) + "\n" + - //% "Gz: %0 (min: %1, max: %2)" - qsTrId("csd-la-accelerometer_readings_z").arg(gSensorTest.averageGsensorZ).arg(gSensorTest.minZ).arg(gSensorTest.maxZ) : - //% "Fail" - qsTrId("csd-la-fail") + "\n" + - //% "Gx: %0 (min: %1, max: %2)" - qsTrId("csd-la-accelerometer_readings_x").arg(gSensorTest.averageGsensorX).arg(gSensorTest.minX).arg(gSensorTest.maxX) + "\n" + - //% "Gy: %0 (min: %1, max: %2)" - qsTrId("csd-la-accelerometer_readings_y").arg(gSensorTest.averageGsensorY).arg(gSensorTest.minY).arg(gSensorTest.maxY) + "\n" + - //% "Gz: %0 (min: %1, max: %2)" - qsTrId("csd-la-accelerometer_readings_z").arg(gSensorTest.averageGsensorZ).arg(gSensorTest.minZ).arg(gSensorTest.maxZ) + text: (gSensorResultLabel.result + //% "Pass" + ? qsTrId("csd-la-pass") + //% "Fail" + : qsTrId("csd-la-fail")) + //% "Gx: %0 (min: %1, max: %2)" + + "\n" + qsTrId("csd-la-accelerometer_readings_x").arg(rounded(gSensorTest.avgX)).arg(gSensorTest.minX).arg(gSensorTest.maxX) + //% "Gy: %0 (min: %1, max: %2)" + + "\n" + qsTrId("csd-la-accelerometer_readings_y").arg(rounded(gSensorTest.avgY)).arg(gSensorTest.minY).arg(gSensorTest.maxY) + //% "Gz: %0 (min: %1, max: %2)" + + "\n" + qsTrId("csd-la-accelerometer_readings_z").arg(rounded(gSensorTest.avgZ)).arg(gSensorTest.minZ).arg(gSensorTest.maxZ) } Label { diff --git a/usr/share/csd/pages/testToolPages/VerificationHallDetect.qml b/usr/share/csd/pages/testToolPages/VerificationHallDetect.qml index 3d0de22a..59cb4b4a 100644 --- a/usr/share/csd/pages/testToolPages/VerificationHallDetect.qml +++ b/usr/share/csd/pages/testToolPages/VerificationHallDetect.qml @@ -7,7 +7,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Csd 1.0 -import org.nemomobile.dbus 2.0 +import Nemo.DBus 2.0 import ".." CsdTestPage { @@ -60,7 +60,7 @@ CsdTestPage { mce.originalValue = r }) mce.typedCall("set_config", [ { type: "s", value: "/system/osso/dsm/locks/lid_sensor_enabled"}, {type: "v", value: false} ]) - _ngfEffect = Qt.createQmlObject("import org.nemomobile.ngf 1.0; NonGraphicalFeedback { event: 'unlock_device' }", + _ngfEffect = Qt.createQmlObject("import Nemo.Ngf 1.0; NonGraphicalFeedback { event: 'unlock_device' }", page, 'NonGraphicalFeedback'); } diff --git a/usr/share/csd/pages/testToolPages/VerificationKey.qml b/usr/share/csd/pages/testToolPages/VerificationKey.qml index 4e94f03d..7bb0340f 100644 --- a/usr/share/csd/pages/testToolPages/VerificationKey.qml +++ b/usr/share/csd/pages/testToolPages/VerificationKey.qml @@ -9,8 +9,8 @@ import Sailfish.Silica 1.0 import Sailfish.Silica.private 1.0 as Private import Sailfish.Media 1.0 import Csd 1.0 -import org.nemomobile.policy 1.0 -import org.nemomobile.dbus 2.0 +import Nemo.Policy 1.0 +import Nemo.DBus 2.0 import ".." CsdTestPage { diff --git a/usr/share/csd/pages/testToolPages/VerificationLED.qml b/usr/share/csd/pages/testToolPages/VerificationLED.qml index 772cece4..4546f197 100644 --- a/usr/share/csd/pages/testToolPages/VerificationLED.qml +++ b/usr/share/csd/pages/testToolPages/VerificationLED.qml @@ -6,7 +6,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import org.nemomobile.dbus 2.0 +import Nemo.DBus 2.0 import Csd 1.0 import ".." diff --git a/usr/share/csd/pages/testToolPages/VerificationLcd.qml b/usr/share/csd/pages/testToolPages/VerificationLcd.qml index e5d9162a..58aa8859 100644 --- a/usr/share/csd/pages/testToolPages/VerificationLcd.qml +++ b/usr/share/csd/pages/testToolPages/VerificationLcd.qml @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 - 2019 Jolla Ltd. + * Copyright (c) 2016 - 2022 Jolla Ltd. * * License: Proprietary */ @@ -11,56 +11,51 @@ import ".." CsdTestPage { id: page + readonly property var testData: [ + //% "Showing: Color gradient" + [qsTrId("csd-la-lcd_show_gradient"), "black"], + //% "Showing: Black" + [qsTrId("csd-la-lcd_show_black"), "black"], + //% "Showing: White" + [qsTrId("csd-la-lcd_show_white"), "white"], + //% "Showing: Red" + [qsTrId("csd-la-lcd_show_red"), "red"], + //% "Showing: Green" + [qsTrId("csd-la-lcd_show_green"), "green"], + //% "Showing: Blue" + [qsTrId("csd-la-lcd_show_blue"), "blue"], + // Sentinel + ["", Theme.overlayBackgroundColor]] property int testCase + readonly property string testLabel: testData[testCase][0] + readonly property string testColor: testData[testCase][1] + readonly property bool testEnded: testLabel == "" + readonly property string textColor: testColor == "white" ? "black" : "yellow" function progressTest() { testCase++ - - rect.visible = true - - switch (testCase) { - case 1: - rect.color = "white" - break - case 2: - rect.color = "black" - break - case 3: - rect.color = "red" - break - case 4: - rect.color = "green" - break - case 5: - rect.color = "blue" - break - default: - rect.color = Theme.overlayBackgroundColor - buttonText.visible = true - buttonRow.visible = true - ma.enabled = false - break - } } Image { + id: image + visible: testCase == 0 anchors.fill: parent source: "/usr/share/csd/testdata/lcdtest.png" } Rectangle { id: rect - color: "white" + color: testColor anchors.fill: parent - visible: false + visible: !image.visible Label { id: buttonText anchors.centerIn: parent width: parent.width - (Theme.paddingLarge * 2) wrapMode: Text.Wrap - visible: false + visible: testEnded font.pixelSize: Theme.fontSizeLarge //% "Does it show RGB?" @@ -69,7 +64,7 @@ CsdTestPage { ButtonLayout { id: buttonRow - visible: false + visible: testEnded anchors { top: buttonText.bottom @@ -93,11 +88,37 @@ CsdTestPage { } } + Label { + id: showingColorLabel + color: textColor + visible: !buttonRow.visible + anchors { + left: tapToProceedLabel.left + bottom: tapToProceedLabel.top + } + text: testLabel + } + + Label { + id: tapToProceedLabel + color: textColor + visible: showingColorLabel.visible + anchors { + left: parent.left + leftMargin: Theme.paddingLarge + bottom: parent.bottom + bottomMargin: Theme.paddingLarge + } + //% "Tap screen to proceed" + text: qsTrId("csd-la-lcd_tap_to_proceed") + } + MouseArea { id: ma anchors.fill: parent onClicked: progressTest() + enabled: !testEnded } Timer { diff --git a/usr/share/csd/pages/testToolPages/VerificationLcdBacklight.qml b/usr/share/csd/pages/testToolPages/VerificationLcdBacklight.qml index f12610f6..a54ce98e 100644 --- a/usr/share/csd/pages/testToolPages/VerificationLcdBacklight.qml +++ b/usr/share/csd/pages/testToolPages/VerificationLcdBacklight.qml @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 - 2019 Jolla Ltd. + * Copyright (c) 2016 - 2022 Jolla Ltd. * * License: Proprietary */ @@ -14,20 +14,52 @@ CsdTestPage { property bool ambientLightSensorEnabled property int originalBrightness + property bool originalValuesSaved + property bool testStarted + property bool testStopped + readonly property bool testRunning: testStarted && !testStopped function resetOriginalValues() { - displaySettings.ambientLightSensorEnabled = ambientLightSensorEnabled - displaySettings.brightness = originalBrightness + if (originalValuesSaved) { + displaySettings.ambientLightSensorEnabled = ambientLightSensorEnabled + displaySettings.brightness = originalBrightness + } + } + + function setupTest() { + // Save original backlight settings + if (!originalValuesSaved) { + ambientLightSensorEnabled = displaySettings.ambientLightSensorEnabled + originalBrightness = displaySettings.brightness + originalValuesSaved = true + } + + // Max out the brightness before test + displaySettings.brightness = displaySettings.maximumBrightness + // Also disable the ambient light sensor. + displaySettings.ambientLightSensorEnabled = false + + if (runInTests) { + startTest() + } } function startTest() { - hintText.visible = false - okButton.visible = false - rect.color = "white" + testStarted = true + testStartTimer.start() + } - displaySettings.brightness = 1 + function stopTest() { + testStopped = true + resetOriginalValues() + if (runInTests) { + completeTest(true) + } + } - testTimer.start() + function completeTest(result) { + setTestResult(result) + testCompleted(true) } onStatusChanged: { @@ -41,10 +73,8 @@ CsdTestPage { } Rectangle { - id: rect - anchors.fill: parent - color: Theme.overlayBackgroundColor + color: testRunning ? "white" : Theme.overlayBackgroundColor } Column { @@ -55,14 +85,15 @@ CsdTestPage { title: qsTrId("csd-he-lcd_backlight") } DescriptionItem { - id: hintText + visible: !testStarted //% "This test will display a white screen, after which the screen should become visibly dimmer. Press 'Start' to test." text: qsTrId("csd-la-verification_lcd_backglight_operation_hint_description") } } BottomButton { - id: okButton + visible: !testStarted + enabled: originalValuesSaved //% "Start" text: qsTrId("csd-la-start") onClicked: startTest() @@ -71,7 +102,7 @@ CsdTestPage { Label { id: buttonText - visible: false + visible: testStopped font.pixelSize: Theme.fontSizeLarge x: Theme.paddingLarge width: parent.width - 2*x @@ -83,58 +114,47 @@ CsdTestPage { } ButtonLayout { - id: buttonRow anchors { top: buttonText.bottom topMargin: Theme.paddingLarge horizontalCenter: parent.horizontalCenter } rowSpacing: Theme.paddingMedium - visible: false + visible: testStopped PassButton { - onClicked: { - setTestResult(true) - testCompleted(true) - } + onClicked: completeTest(true) } FailButton { - onClicked: { - setTestResult(false) - testCompleted(true) - } + onClicked: completeTest(false) } } Timer { - id: testTimer - interval: 4000 + // Hold white screen at maximum brightness for a while to + // calm things down and thus highlight the dimming when it + // actually commences. + id: testStartTimer + interval: 1000 onTriggered: { - rect.color = Theme.overlayBackgroundColor - buttonText.visible = true - buttonRow.visible = true - resetOriginalValues() - if (runInTests) { - setTestResult(true) - testCompleted(true) - } + displaySettings.brightness = 1 + testStopTimer.start() } } + Timer { + // When there are brightness setting changes (like what we have + // here), mce drives the fade in/out through in 600 ms. + // + // Waiting a bit longer than that yields stable state also at + // the minimum brightness end. + id: testStopTimer + interval: 600 + 1000 + onTriggered: stopTest() + } + DisplaySettings { id: displaySettings - onPopulatedChanged: { - // Save existing backlight settings - page.ambientLightSensorEnabled = displaySettings.ambientLightSensorEnabled - originalBrightness = displaySettings.brightness - // Max out the brightness before test - displaySettings.brightness = displaySettings.maximumBrightness - // Also disable the ambient light sensor. - displaySettings.ambientLightSensorEnabled = false - - if (runInTests) { - startTest() - } - } + onPopulatedChanged: setupTest() } } diff --git a/usr/share/csd/pages/testToolPages/VerificationLightSensor.qml b/usr/share/csd/pages/testToolPages/VerificationLightSensor.qml index c59bfb9b..2c193ec3 100644 --- a/usr/share/csd/pages/testToolPages/VerificationLightSensor.qml +++ b/usr/share/csd/pages/testToolPages/VerificationLightSensor.qml @@ -18,32 +18,66 @@ CsdTestPage { property int valueLow: -1 property int valueHigh: -1 property int currentLightValue - - Column { - width: parent.width - spacing: Theme.paddingLarge - CsdPageHeader { - //% "Light sensor" - title: qsTrId("csd-he-light_sensor") - } - DescriptionItem { - id: guideText - //% "1. Cover the light sensor
2. Uncover the sensor and put light source over it
" - text: qsTrId("csd-la-verification_light_sensor_description") - } - Label { - x: Theme.paddingLarge - //% "Lowest sensor value: %1
Highest sensor value: %2
Difference pass criteria: %3
Difference: %4
Current light value: %5" - text: qsTrId("csd-la-verification_light_sensor_value").arg(valueLow).arg(valueHigh).arg(passCriteria).arg(sensorDifference).arg(currentLightValue) - } - ResultLabel { - id: passText - x: Theme.paddingLarge - visible: false - result: true + readonly property int columnWidth: orientation == Orientation.Landscape ? width/2 : width + + SilicaFlickable { + anchors.fill: parent + contentHeight: contentColumn.height + Theme.paddingLarge + + VerticalScrollDecorator {} + + Column { + id: contentColumn + + width: parent.width + CsdPageHeader { + //% "Light sensor" + title: qsTrId("csd-he-light_sensor") + } + + Flow { + width: parent.width + Column { + width: columnWidth + spacing: Theme.paddingLarge + + DescriptionItem { + id: guideText + //% "1. Cover the light sensor
2. Uncover the sensor and put light source over it
" + text: qsTrId("csd-la-verification_light_sensor_description") + } + Label { + x: Theme.paddingLarge + //% "Lowest sensor value: %1
Highest sensor value: %2
Difference pass criteria: %3
Difference: %4
Current light value: %5" + text: qsTrId("csd-la-verification_light_sensor_value").arg(valueLow).arg(valueHigh).arg(passCriteria).arg(sensorDifference).arg(currentLightValue) + } + } + Column { + width: columnWidth + spacing: Theme.paddingLarge + + ResultLabel { + id: passText + x: Theme.paddingLarge + visible: false + result: true + } + + FailBottomButton { + id: failButton + anchors.bottom: undefined + anchors.bottomMargin: 0 + onClicked: { + setTestResult(false) + testCompleted(true) + } + } + } + } } } + LightSensor { id: lightSensor active: true @@ -73,12 +107,4 @@ CsdTestPage { } } } - - FailBottomButton { - id: failButton - onClicked: { - setTestResult(false) - testCompleted(true) - } - } } diff --git a/usr/share/csd/pages/testToolPages/VerificationMacAddresses.qml b/usr/share/csd/pages/testToolPages/VerificationMacAddresses.qml index 62f95315..52be6c75 100644 --- a/usr/share/csd/pages/testToolPages/VerificationMacAddresses.qml +++ b/usr/share/csd/pages/testToolPages/VerificationMacAddresses.qml @@ -13,8 +13,15 @@ import ".." CsdTestPage { id: page - property bool wlanValid: macValidator.isMacValid("wireless", aboutSettings.wlanMacAddress) - property bool bluetoothValid: macValidator.isMacValid("bluetooth", macValidator.getMac("bluetooth")) + property bool wlanSupported: Features.supported("Wifi") + property bool bluetoothSupported: Features.supported("Bluetooth") + + property string wlanMac: wlanSupported ? aboutSettings.wlanMacAddress : "" + property string bluetoothMac: bluetoothSupported ? macValidator.getMac("bluetooth") : "" + + property bool wlanValid: !wlanSupported || macValidator.isMacValid("wireless", wlanMac) + property bool bluetoothValid: !bluetoothSupported || macValidator.isMacValid("bluetooth", bluetoothMac) + property bool allMacsOk: wlanValid && bluetoothValid Component.onDestruction: { @@ -40,12 +47,14 @@ CsdTestPage { SectionHeader { //% "Wireless MAC" text: qsTrId("csd-he-wireless-mac") + visible: wlanSupported } Label { x: Theme.paddingLarge width: page.width - (2 * Theme.paddingLarge) wrapMode: Text.Wrap + visible: wlanSupported color: wlanValid ? "green" @@ -62,9 +71,10 @@ CsdTestPage { x: Theme.paddingLarge width: page.width - (2 * Theme.paddingLarge) wrapMode: Text.Wrap + visible: wlanSupported //% "Value: %1" - text: qsTrId("csd-la-value").arg(aboutSettings.wlanMacAddress) + text: qsTrId("csd-la-value").arg(wlanMac) } Label { @@ -81,12 +91,14 @@ CsdTestPage { SectionHeader { //% "Bluetooth MAC" text: qsTrId("csd-he-bluetooth-mac") + visible: bluetoothSupported } Label { x: Theme.paddingLarge width: page.width - (2 * Theme.paddingLarge) wrapMode: Text.Wrap + visible: bluetoothSupported color: bluetoothValid ? "green" @@ -103,9 +115,10 @@ CsdTestPage { x: Theme.paddingLarge width: page.width - (2 * Theme.paddingLarge) wrapMode: Text.Wrap + visible: bluetoothSupported //% "Value: %1" - text: qsTrId("csd-la-value").arg(macValidator.getMac("bluetooth")) + text: qsTrId("csd-la-value").arg(bluetoothMac) } Label { diff --git a/usr/share/csd/pages/testToolPages/VerificationMultiTouch.qml b/usr/share/csd/pages/testToolPages/VerificationMultiTouch.qml index 6e5a97fd..5009a6f9 100644 --- a/usr/share/csd/pages/testToolPages/VerificationMultiTouch.qml +++ b/usr/share/csd/pages/testToolPages/VerificationMultiTouch.qml @@ -13,6 +13,7 @@ import ".." CsdTestPage { id: page backNavigation: false + onOrientationChanged: canvas.clear() Private.WindowGestureOverride { id: windowGestureOverride diff --git a/usr/share/csd/pages/testToolPages/VerificationSim.qml b/usr/share/csd/pages/testToolPages/VerificationSim.qml index ab4528b6..71914993 100644 --- a/usr/share/csd/pages/testToolPages/VerificationSim.qml +++ b/usr/share/csd/pages/testToolPages/VerificationSim.qml @@ -7,7 +7,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import org.nemomobile.ofono 1.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 import Csd 1.0 import ".." diff --git a/usr/share/csd/pages/testToolPages/VerificationSimAutoTest.qml b/usr/share/csd/pages/testToolPages/VerificationSimAutoTest.qml index 0005b515..fa1dbdc3 100644 --- a/usr/share/csd/pages/testToolPages/VerificationSimAutoTest.qml +++ b/usr/share/csd/pages/testToolPages/VerificationSimAutoTest.qml @@ -7,7 +7,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import org.nemomobile.ofono 1.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 import Csd 1.0 import ".." diff --git a/usr/share/csd/pages/testToolPages/VerificationTechnologyModel.qml b/usr/share/csd/pages/testToolPages/VerificationTechnologyModel.qml index 76840520..a0cea386 100644 --- a/usr/share/csd/pages/testToolPages/VerificationTechnologyModel.qml +++ b/usr/share/csd/pages/testToolPages/VerificationTechnologyModel.qml @@ -5,7 +5,7 @@ */ import QtQml 2.2 -import MeeGo.Connman 0.2 +import Connman 0.2 import Sailfish.Policy 1.0 TechnologyModel { diff --git a/usr/share/csd/pages/testToolPages/VerificationToh.qml b/usr/share/csd/pages/testToolPages/VerificationToh.qml deleted file mode 100644 index 9bf7177e..00000000 --- a/usr/share/csd/pages/testToolPages/VerificationToh.qml +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright (c) 2016 - 2019 Jolla Ltd. - * - * License: Proprietary - */ - -import QtQuick 2.0 -import Sailfish.Silica 1.0 -import Csd 1.0 -import ".." - -CsdTestPage { - id: page - - Column { - width: page.width - - CsdPageHeader { - //% "TOH" - title: qsTrId("csd-he-toh") - } - - Label { - wrapMode: Text.Wrap - x: Theme.paddingLarge - width: parent.width - 2*Theme.paddingLarge - color: Theme.highlightColor - //% "Tests TOH cover detection and identification. Attach a TOH enabled cover." - text: qsTrId("csd-la-toh_instructions") - } - - Label { - x: Theme.paddingLarge - width: parent.width - 2*Theme.paddingLarge - wrapMode: Text.Wrap - text: { - if (!toh.docked) { - //% "Cover is not attached" - return qsTrId("csd-la-cover_not_attached") - } else if (!toh.ready) { - //% "Scanning..." - return qsTrId("csd-la-scanning") - } else if (toh.tohId === "") { - //% "No tag found" - return qsTrId("csd-la-tag_not_found") - } else { - //% "TOH detected and identified" - return qsTrId("csd-la-toh_identified") - } - } - } - - Label { - x: Theme.paddingLarge - color: toh.passed ? "green" : "red" - //% "Pass" - text: toh.passed ? qsTrId("csd-la-pass") - //% "Fail" - : qsTrId("csd-la-fail") - } - - SectionHeader { - //% "TOH status information" - text: qsTrId("csd-he-toh_status_information") - } - - Row { - x: Theme.paddingLarge - spacing: Theme.paddingSmall - - Label { - //% "Cover state:" - text: qsTrId("csd-la-cover_state") - } - - Label { - //% "attached" - text: toh.docked ? qsTrId("csd-la-attached") - //% "detached" - : qsTrId("csd-la-detached") - } - } - - Row { - x: Theme.paddingLarge - spacing: Theme.paddingSmall - - Label { - //% "TOH state:" - text: qsTrId("csd-la-toh_state") - } - - Label { - //% "ready" - text: toh.ready ? qsTrId("csd-la-ready") - //% "not ready" - : qsTrId("csd-la-not_ready") - } - } - - Label { - x: Theme.paddingLarge - //% "TOH Id: %1" - text: qsTrId("csd-la-toh_id").arg(toh.tohId) - } - } - - - Toh { - id: toh - - property bool passed: toh.docked && toh.ready && toh.tohId !== "" - onPassedChanged: check() - - function check() { - setTestResult(toh.passed) - testCompleted(false) - } - } - - Timer { - id: timer - interval: 1000 - running: true - onTriggered: toh.check() - } -} diff --git a/usr/share/csd/pages/testToolPages/VerificationTouch.qml b/usr/share/csd/pages/testToolPages/VerificationTouch.qml index 502b035f..40a9c114 100644 --- a/usr/share/csd/pages/testToolPages/VerificationTouch.qml +++ b/usr/share/csd/pages/testToolPages/VerificationTouch.qml @@ -16,10 +16,10 @@ CsdTestPage { backNavigation: false property int targetCellSize: 60 * Theme.pixelRatio - property int horizontalCells: Math.floor(Screen.width / targetCellSize) - property int verticalCells: Math.floor(Screen.height / targetCellSize) - property real cellWidth: Screen.width / horizontalCells - property real cellHeight: Screen.height / verticalCells + property int horizontalCells: Math.floor(width / targetCellSize) + property int verticalCells: Math.floor(height / targetCellSize) + property real cellWidth: width / horizontalCells + property real cellHeight: height / verticalCells Private.WindowGestureOverride { id: windowGestureOverride @@ -98,7 +98,7 @@ CsdTestPage { Rectangle { width: cellWidth height: cellHeight - color: index % 2 == 0 ? "white" : "grey" + color: index % 2 == 0 ? "grey" : "white" } } } diff --git a/usr/share/csd/pages/testToolPages/VerificationVideoPlayback.qml b/usr/share/csd/pages/testToolPages/VerificationVideoPlayback.qml index 53d74bb8..e40027f5 100644 --- a/usr/share/csd/pages/testToolPages/VerificationVideoPlayback.qml +++ b/usr/share/csd/pages/testToolPages/VerificationVideoPlayback.qml @@ -22,12 +22,6 @@ CsdTestPage { property int minimumPlayingTime: runInTests ? page.parameters["RunInTestTime"] * 60*1000 : 15000 - - allowedOrientations: firstVideoLoaded ? ((video.contentRect.height > video.contentRect.width) ? - Orientation.Portrait : Orientation.Landscape) : - Orientation.Portrait - orientation: allowedOrientations - property bool originalAmbientLightSensor property int originalBrightness diff --git a/usr/share/csd/pages/testToolPages/VerificationWifi.qml b/usr/share/csd/pages/testToolPages/VerificationWifi.qml index fe418ec3..436dc3fe 100644 --- a/usr/share/csd/pages/testToolPages/VerificationWifi.qml +++ b/usr/share/csd/pages/testToolPages/VerificationWifi.qml @@ -9,7 +9,7 @@ import Sailfish.Silica 1.0 import Sailfish.Policy 1.0 import com.jolla.settings.system 1.0 import Sailfish.Settings.Networking 1.0 -import MeeGo.Connman 0.2 +import Connman 0.2 import ".." CsdTestPage { @@ -142,19 +142,29 @@ CsdTestPage { } } - Column { - id: contentColumn - anchors.top: mdmBanner.active ? mdmBanner.bottom : header.bottom - anchors.topMargin: mdmBanner.active ? Theme.paddingLarge : 0 - x: Theme.horizontalPageMargin - width: parent.width - 2*x - height: parent.height - header.height - (mdmBanner.active ? (mdmBanner.height+Theme.paddingLarge) : 0) - (buttonSet.height + buttonSet.anchors.bottomMargin) - spacing: Theme.paddingLarge + + SilicaFlickable { + anchors { + top: mdmBanner.active ? mdmBanner.bottom : header.bottom + topMargin: mdmBanner.active ? Theme.paddingLarge : 0 + bottom: buttonSet.top + bottomMargin: Theme.paddingLarge + left: parent.left + right: parent.right + } + contentHeight: contentColumn.height clip: true + VerticalScrollDecorator { + Component.onCompleted: showDecorator() + } + Column { - id: topInfoColumn - width: parent.width + id: contentColumn + + x: Theme.horizontalPageMargin + width: parent.width - 2*x + spacing: Theme.paddingLarge Label { width: parent.width @@ -181,70 +191,58 @@ CsdTestPage { text: qsTrId("csd-la-wifi_networks") visible: wifiTechModel.count > 0 } - } - - SilicaFlickable { - id: results - width: parent.width - height: parent.height - topInfoColumn.height - contentHeight: foundNetworks.height - clip: true - Column { - id: foundNetworks - width: parent.width - Repeater { - model: wifiTechModel - delegate: Column { + Repeater { + model: wifiTechModel + delegate: Column { + width: parent.width + Item { width: parent.width - Item { - width: parent.width - height: wifiName.height - - Label { - id: wifiName - anchors { - left: parent.left - right: icon.right - } - text: networkService.name - ? networkService.name - //% "Hidden network" - : qsTrId("csd-la-hidden_network") - color: Theme.highlightColor - } + height: wifiName.height - Image { - id: icon - anchors { - right: parent.right - } - source: "image://theme/icon-m-wlan-" + WlanUtils.getStrengthString(modelData.strength) + "?" + Theme.highlightColor + Label { + id: wifiName + anchors { + left: parent.left + right: icon.right } + text: networkService.name + ? networkService.name + //% "Hidden network" + : qsTrId("csd-la-hidden_network") + color: Theme.highlightColor } - Label { - text: networkService.frequency + " MHz" - color: Theme.secondaryHighlightColor - font.pixelSize: Theme.fontSizeSmall + Image { + id: icon + anchors { + right: parent.right + } + source: "image://theme/icon-m-wlan-" + WlanUtils.getStrengthString(modelData.strength) + "?" + Theme.highlightColor } + } - Label { - text: networkService.strength + " %" - color: Theme.secondaryHighlightColor - font.pixelSize: Theme.fontSizeSmall - } + Label { + text: networkService.frequency + " MHz" + color: Theme.secondaryHighlightColor + font.pixelSize: Theme.fontSizeSmall + } - Label { - text: networkService.security - color: Theme.secondaryHighlightColor - font.pixelSize: Theme.fontSizeSmall - } + Label { + text: networkService.strength + " %" + color: Theme.secondaryHighlightColor + font.pixelSize: Theme.fontSizeSmall + } - Item { - width: parent.width - height: Theme.paddingLarge - } + Label { + text: networkService.security + color: Theme.secondaryHighlightColor + font.pixelSize: Theme.fontSizeSmall + } + + Item { + width: parent.width + height: Theme.paddingLarge } } } @@ -253,6 +251,7 @@ CsdTestPage { Column { id: buttonSet + visible: timerLabel.visible || restartButton.visible || exitButton.visible anchors { left: parent.left leftMargin: Theme.horizontalPageMargin @@ -268,6 +267,7 @@ CsdTestPage { width: parent.width wrapMode: Text.Wrap font.bold: true + visible: opacity > 0 opacity: timeoutTimer.running ? 1 : 0 Behavior on opacity { FadeAnimation { } } diff --git a/usr/share/doc/qt5/global/template/scripts/extras.js b/usr/share/doc/qt5/global/template/scripts/extras.js new file mode 100644 index 00000000..ba7a4a50 --- /dev/null +++ b/usr/share/doc/qt5/global/template/scripts/extras.js @@ -0,0 +1,80 @@ +var vOffset_init = 65; +var vOffset = vOffset_init; +var c = 'collapsed'; + +function toggleList(toggle, content, maxItems) { + if (toggle.css('display') == 'none') { + vOffset = vOffset_init; + toggle.removeClass(c); + content.show(); + return; + } else + vOffset = 8; + + if (maxItems > content.children().length) + return; + content.hide(); + toggle.addClass(c); +} + +$(function () { + $('a[href*=#]:not([href=#])').on('click', function (e) { + if (e.which == 2 || e.metaKey || e.ctrlKey || e.shiftKey) + return true; + var target = $(this.hash.replace(/(\.)/g, "\\$1")); + target = target.length ? target : $('[name=' + this.hash.slice(1) + ']'); + if (target.length) { + setTimeout(function () { + $('html, body').animate({scrollTop: target.offset().top - vOffset}, 50);}, 50); + } + }); +}); + +$(window).load(function () { + var hashChanged = function() { + var h = window.location.hash; + var re = /[^a-z0-9_\.\#\-]/i + if (h.length > 1 && !re.test(h)) { + setTimeout(function () { + var tgt = $(h.replace(/(\.)/g, "\\$1")); + tgt = tgt.length ? tgt : $('[name=' + h.slice(1) + ']'); + $(window).scrollTop(tgt.offset().top - vOffset); + }, 0); + } + } + $(window).bind('hashchange', hashChanged); + hashChanged.call(); + + if (!$('.sidebar toc').is(':empty')) { + $('').prependTo('.sidebar .toc'); + var toc = $('.sidebar .toc ul'); + var tocToggle = $('#toc-toggle'); + var tocCallback = function() { toggleList(tocToggle, toc, 4); }; + + $('#toc-toggle').on('click', function(e) { + e.stopPropagation(); + toc.toggle(); + tocToggle.toggleClass(c); + }); + + tocCallback.call(); + $(window).resize(tocCallback); + } + + if (!$('#sidebar-content').is(':empty')) { + $('#sidebar-content h2').first().clone().prependTo('#sidebar-content'); + $('').prependTo('#sidebar-content'); + var sb = $('#sidebar-content .sectionlist'); + var sbToggle = $('#sidebar-toggle'); + var sbCallback = function() { toggleList(sbToggle, sb, 0); }; + + $('#sidebar-toggle').on('click', function(e) { + e.stopPropagation(); + sb.toggle(); + sbToggle.toggleClass(c); + }); + + sbCallback.call(); + $(window).resize(sbCallback); + } +}); diff --git a/usr/share/doc/qt5/global/template/scripts/main.js b/usr/share/doc/qt5/global/template/scripts/main.js new file mode 100644 index 00000000..823cebec --- /dev/null +++ b/usr/share/doc/qt5/global/template/scripts/main.js @@ -0,0 +1,241 @@ +"use strict"; + +function createCookie(name, value, days) { + var expires; + if (days) { + var date = new Date(); + date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)); + expires = "; expires=" + date.toGMTString(); + } else { + expires = ""; + } + document.cookie = escape(name) + "=" + escape(value) + expires + "; path=/"; + $('.cookies_yum').click(function() { + $(this).fadeOut() + }); +} +function readCookie(name) { + var nameEQ = escape(name) + "="; + var ca = document.cookie.split(';'); + for (var i = 0; i < ca.length; i++) { + var c = ca[i]; + while (c.charAt(0) === ' ') c = c.substring(1, c.length); + if (c.indexOf(nameEQ) === 0) return unescape(c.substring(nameEQ.length, c.length)); + } + return null; +} +function eraseCookie(name) { + createCookie(name, "", -1); +} +function load_sdk(s, id, src) { + var js, fjs = document.getElementsByTagName(s)[0]; + if (document.getElementById(id)) return; + js = document.createElement(s); + js.id = id; + js.src = src; + fjs.parentNode.insertBefore(js, fjs); +} +$(document).ready(function($) { + if (document.documentElement.clientWidth < 1280) { + oneQt.extraLinksToMain(); + } + + $('#menuextras .search').click(function(e){ + e.preventDefault(); + $('.big_bar.account').slideUp(); + $('.big_bar.search').slideToggle(); + $('.big_bar_search').focus(); + $(this).toggleClass('open'); + }); + $('.cookies_yum').click(function() { + $('.cookies_yum').fadeOut(); + createCookie("cookies_nom", "yum", 180); + var cookie_added = 1; + }); + if (!(readCookie('cookies_nom') == 'yum')) { + $('.cookies_yum').fadeIn(); + } else { + var cookie_added = 1; + } + + Modernizr.load({test: Modernizr.input.placeholder, + nope: wpThemeFolder + '/js/placeholders.min.js'}); + + $('#navbar .navbar-toggle').click(function(e) { + e.preventDefault(); + if ($(this).hasClass('opened')) { + $(this).removeClass('opened'); + $('#navbar .navbar-menu').css('max-height', '0px'); + } + else { + $(this).addClass('opened'); + $('#navbar .navbar-menu').css('max-height', $('#navbar .navbar-menu ul').outerHeight() + 'px'); + } + }); + + $(window).resize(function() { + oneQt.stickySidebar(); + oneQt.footerPosition(); + if (document.documentElement.clientWidth < 1280) { + oneQt.extraLinksToMain(); + } else { + oneQt.mainLinkstoExtra(); + } + }); + + $(window).scroll(function() { + oneQt.stickySidebar(); + oneQt.stickyHeader(); + }); + + oneQt.stickySidebar(); + oneQt.footerPosition(); + oneQt.tabContents(); +}); + +$( window ).load(function() { + load_sdk('script', 'facebook-jssdk','//connect.facebook.net/en_US/sdk.js#xfbml=1&appId=207346529386114&version=v2.0'); + load_sdk('script', 'twitter-wjs', '//platform.twitter.com/widgets.js'); + $.getScript("//www.google.com/jsapi", function(){ + google.load("feeds", "1", {"callback": oneQt.liveFeeds}); + }); +}); + +var oneQt = { + stickySidebar: function() { + if ($('#sidebar').length && $('#sidebar').outerHeight() > 20) { + var $sidebar = $('#sidebar'); + var $win = $(window); + var $sidebarContainer = $sidebar.parent(); + var headerHeight = $('#navbar').outerHeight(); + if ($win.outerHeight() - headerHeight > $sidebar.innerHeight() && + $win.scrollTop() > $sidebarContainer.offset().top) { + var newTop = headerHeight + $win.scrollTop() - $sidebarContainer.offset().top; + if (newTop + $sidebar.innerHeight() > $sidebarContainer.innerHeight()) + newTop = $sidebarContainer.innerHeight() - $sidebar.innerHeight(); + + $sidebar.css({top: newTop +'px'}) + } + else { + $sidebar.css({top: '0'}) + } + } + }, + + footerPosition: function () { + $('#footerbar').removeClass('fixed'); + if (($('.hbspt-form').length > 0) || ($('#customerInfo').length > 0) || ($('.purchase_bar').length > 0)) { + var footerBottomPos = $('#footerbar').offset().top + $('#footerbar').outerHeight(); + if (footerBottomPos < $(window).height()) + $('#footerbar').addClass('fixed'); + } + }, + + stickyHeader: function () { + var originalHeaderHeight = 79; + if ($(window).scrollTop() > originalHeaderHeight) { + $('#navbar').addClass('fixed'); + $('#bottom_header').fadeOut(); + + if (!(cookie_added == 1)) { + $('.cookies_yum').fadeOut(); + createCookie("cookies_nom", "yum", 180); + var cookie_added = 1; + } + } + else { + $('#navbar').removeClass('fixed'); + $('#bottom_header').fadeIn(); + } + }, + + tabContents: function () { + $('.tab-container').each(function(i) { + var $el = $(this); + $el.find('.tab-titles li:eq(0)').addClass('active'); + $el.find('.tab-contents .tab:eq(0)').addClass('active'); + $el.find('.tab-titles a').click(function(e) { + e.preventDefault(); + var index = $(this).parent().index(); + $el.find('.tab-titles li').removeClass('active'); + $el.find('.tab-contents .tab').removeClass('active'); + $(this).parent().addClass('active'); + $el.find('.tab-contents .tab').eq(index).addClass('active'); + }) + }); + }, + + liveFeeds: function () { + $('.feed-container').each(function(i) { + var feedUrl = $(this).data('url'); + if (feedUrl != "") oneQt.blogFeed($(this), feedUrl); + }); + }, + + blogFeed: function ($container, feedUrl) { + var feed = new google.feeds.Feed(feedUrl); + feed.setNumEntries(3); + feed.load(function(result) { + $container.html(''); + if (!result.error) { + for (var i = 0; i < result.feed.entries.length; i++) { + var entry = result.feed.entries[i]; + var $article = $(''); + $container.append($article); + var html = '
';
+ html += ' 
';
+ html += '
';
+ html += ' ';
+ $article.append(html);
+ $article.find('h4 a').text(result.feed.title);
+ $article.find('h3 a').text(entry.title);
+ $article.find('p a').text(entry.author);
+ try {
+ for (var j=0; j';
+ html += ' ". + //% "Unread
email(s)" + text: qsTrId("jolla-email-la-unread-emails", unreadMailCount).replace("
", "\n") + font.pixelSize: Theme.fontSizeExtraSmall + visible: !app.syncInProgress + maximumLineCount: 2 + wrapMode: Text.Wrap + fontSizeMode: Text.HorizontalFit + lineHeight: 0.8 + height: implicitHeight/0.8 + verticalAlignment: Text.AlignVCenter + anchors { + right: parent.right + left: unreadCount.right + leftMargin: Theme.paddingMedium + baseline: unreadCount.baseline + baselineOffset: lineCount > 1 ? -implicitHeight/2 : -(height-implicitHeight)/2 + } + } + OpacityRampEffect { + offset: 0.5 + sourceItem: unreadLabel + enabled: unreadLabel.implicitWidth > Math.ceil(unreadLabel.width) + } + + CoverLabel { + id: statusLabel + + //: Updating label + //% "Updating..." + text: app.syncInProgress ? qsTrId("jolla-email-la-updating") : + app.errorOccurred ? app.lastErrorText : app.lastAccountUpdate + anchors { top: unreadCount.baseline; topMargin: Theme.paddingLarge } + height: parent.height - coverActionArea.height - statusLabel.y - Theme.paddingMedium + fontSizeMode: Text.VerticalFit + font.pixelSize: Theme.fontSizeLarge + wrapMode: app.syncInProgress ? Text.NoWrap : Text.Wrap + width: parent.width - Theme.paddingLarge + color: Theme.highlightColor + elide: Text.ElideNone + maximumLineCount: 3 + Timer { + property bool keepVisible + + repeat: true + interval: 500 + running: app.syncInProgress && emailCover.status === Cover.Active + onRunningChanged: if (!running) root.opacity = 1.0 + onTriggered: { + if (keepVisible) { + keepVisible = false + } else { + keepVisible = root.opacity < Theme.opacityLow + root.opacity = (root.opacity > Theme.opacityLow ? 0.0 : 1.0) + } + } + } + } + OpacityRampEffect { + offset: 0.5 + sourceItem: statusLabel + enabled: statusLabel.implicitWidth > statusLabel.width - Theme.paddingLarge + } + CoverActionList { + enabled: app.numberOfAccounts > 0 + CoverAction { + iconSource: "image://theme/icon-cover-sync" + onTriggered: { + emailAgent.accountsSyncInbox() + } + } + } +} diff --git a/usr/share/jolla-email/email.qml b/usr/share/jolla-email/email.qml new file mode 100644 index 00000000..b6a9998c --- /dev/null +++ b/usr/share/jolla-email/email.qml @@ -0,0 +1,374 @@ +/* + * Copyright (c) 2012 – 2019 Jolla Ltd. + * Copyright (c) 2019 Open Mobile Platform LLC. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.WebEngine 1.0 +import Nemo.Email 0.1 +import Nemo.Notifications 1.0 +import com.jolla.email 1.1 +import com.jolla.settings.accounts 1.0 +import com.jolla.signonuiservice 1.0 +import Nemo.Time 1.0 +import Nemo.Connectivity 1.0 +import Nemo.DBus 2.0 +import "pages" +import "pages/utils.js" as Utils + +ApplicationWindow { + id: app + + allowedOrientations: defaultAllowedOrientations + _defaultPageOrientations: Orientation.All + _defaultLabelFormat: Text.PlainText + + property alias numberOfAccounts: mailAccountListModel.numberOfAccounts + property alias syncInProgress: emailAgent.synchronizing + property bool refreshSyncTime + readonly property string lastAccountUpdate: { + // Cheating a bit as needsUpdate is always true but property changes are + // of our interest here. + var needsUpdate = Qt.application.active || refreshSyncTime || true + if (mailAccountListModel.persistentConnectionActive) { + return qsTrId("email-la_up_to_date") + } else if (needsUpdate) { + return Utils.lastSyncTime(mailAccountListModel.lastUpdateTime) + } + } + property bool accountsManagerActive + readonly property int defaultMessageListLimit: 100 + + // State for cover + property string coverMode: "mainView" + property bool errorOccurred + property string lastErrorText + property string viewerSender + property string viewerSubject + property string editorTo + property string editorBody + property int inboxUnreadCount + property int combinedInboxUnreadCount + + property Page _mainPage + property Component _messageViewerComponent + property bool _hasCombinedInbox + property var today: new Date() + + signal movingToMainPage() + + cover: Qt.resolvedUrl("cover/EmailCover.qml") + + Component.onCompleted: { + _updateMainPage() + } + + WallClock { + id: wallClock + + enabled: Qt.application.state === Qt.ApplicationActive + updateFrequency: WallClock.Minute + + onTimeChanged: { + var now = wallClock.time + if (now.getDate() !== app.today.getDate() + || now.getMonth() !== app.today.getMonth() + || now.getYear() !== app.today.getYear()) { + app.today = now + } + } + } + + DBusAdaptor { + service: "com.jolla.email.ui" + path: "/share" + iface: "org.sailfishos.share" + + function share(shareActionConfiguration) { + _navigateToMainPage() + if (app.numberOfAccounts) { + pageStack.animatorPush(Qt.resolvedUrl("pages/ShareComposerPage.qml"), + { "shareActionConfiguration": shareActionConfiguration }, + PageStackAction.Immediate) + } + app.activate() + } + } + + Connections { + target: EmailService + + onShowCompose: { + _navigateToMainPage() + if (app.numberOfAccounts) { + var obj = pageStack.animatorPush(Qt.resolvedUrl("pages/ComposerPage.qml"), { + emailTo: emailTo, + emailSubject: emailSubject, + emailCc: emailCc, + emailBcc: emailBcc, + emailBody: emailBody}, + PageStackAction.Immediate) + obj.pageCompleted.connect(function(page) { + for (var attachment in attachments) { + page.attachmentsModel.append({ + "url": attachments[attachment]["url"], + "title": attachments[attachment]["name"], + "mimeType": attachments[attachment]["mime"], + "FromOriginalMessage": "false" + }) + } + }) + } + app.activate() + } + + onShowCombinedInbox: { + _navigateToMainPage() + app.activate() + } + + onShowInbox: { + _navigateToAccountInbox(accountId) + app.activate() + } + + onShowMessage: { + if (emailAgent.isMessageValid(messageId)) { + _navigateToAccountInbox(emailAgent.accountIdForMessage(messageId)) + pageStack.animatorPush(app.getMessageViewerComponent(), + { + "messageId": messageId, + "removeCallback": pageStack.currentPage.removeMessage, + "messageAction": messageAction, + }, + PageStackAction.Immediate) + } else { + _navigateToMainPage() + console.log("Message is not valid:", messageId) + } + app.activate() + } + + onShowWindow: app.activate() + } + + function _navigateToMainPage() { + movingToMainPage() + if (pageStack.currentPage != _mainPage) { + pageStack.pop(_mainPage, PageStackAction.Immediate) + } + } + + function _navigateToAccountInbox(accountId) { + _navigateToMainPage() + if (emailAgent.isAccountValid(accountId)) { + if (numberOfAccounts > 1) { + pushAccountInbox(accountId, true) + } + } else { + console.log("Account is not valid:", accountId) + } + } + + function _updateMainPage() { + if (numberOfAccounts === 0) { + _navigateToMainPage() + _mainPage = pageStack.replace(Qt.resolvedUrl("pages/NoAccountsPage.qml"), {}, PageStackAction.Immediate) + } else if (numberOfAccounts === 1) { + _navigateToMainPage() + var accountId = mailAccountListModel.accountId(0) + var inbox = emailAgent.inboxFolderId(accountId) + + if (inbox > 0) { + var accessor = emailAgent.accessorFromFolderId(inbox) + _mainPage = pageStack.replace(Qt.resolvedUrl("pages/MessageListPage.qml"), { folderAccessor: accessor }, + PageStackAction.Immediate) + } else { + _mainPage = pageStack.replace(Qt.resolvedUrl("pages/PendingInboxPage.qml"), { accountId: accountId }, + PageStackAction.Immediate) + emailAgent.synchronizeInbox(accountId) + } + + _hasCombinedInbox = false // remove this fellow + } else if (!_hasCombinedInbox && numberOfAccounts > 1) { + _navigateToMainPage() + _mainPage = pageStack.replace(Qt.resolvedUrl("pages/CombinedInbox.qml"), {}, PageStackAction.Immediate) + _hasCombinedInbox = true + } + } + + function pushAccountInbox(accountId, immediate) { + var inbox = emailAgent.inboxFolderId(accountId) + if (inbox > 0) { + var accessor = emailAgent.accessorFromFolderId(inbox) + pageStack.animatorPush(Qt.resolvedUrl("pages/MessageListPage.qml"), { folderAccessor: accessor }, + immediate ? PageStackAction.Immediate : PageStackAction.Animated) + } else { + pageStack.animatorPush(Qt.resolvedUrl("pages/PendingInboxPage.qml"), { accountId: accountId }, + immediate ? PageStackAction.Immediate : PageStackAction.Animated) + emailAgent.synchronizeInbox(accountId) + } + } + + function showAccountsCreationDialog() { + app.accountsManagerActive = true + accountCreationLoader.setSource(pageStack.resolveImportPage("com.jolla.email.AccountCreation"), { endDestination: app._mainPage }) + accountCreationLoader.active = true + } + + function getMessageViewerComponent() { + if (componentCompiler.running) { + componentCompiler.triggered() + } + + return _messageViewerComponent + } + + function showSingleLineNotification(text) { + if (text.length > 0) { + var n = notificationComponent.createObject(null, { 'summary': text, + 'appIcon': "image://theme/icon-system-warning" }) + n.publish() + } + } + + Component { + id: notificationComponent + Notification { + isTransient: true + } + } + + EmailAgent { + id: emailAgent + + onSynchronizingChanged: { + if (synchronizing) { + errorOccurred = false + } + } + + onNetworkConnectionRequested: { + connectionHelper.attemptToConnectNetwork() + } + + // Global status used for the cover + onError: { + errorOccurred = true + lastErrorText = Utils.syncErrorText(syncError) + } + + onCalendarInvitationResponded: { + if (!success) { + var text = "" + switch (response) { + case EmailAgent.InvitationResponseAccept: + //: Failed to send invitation response (accept) + //% "Failed to accept invitation" + text = qsTrId("jolla-email-la-response_failed_body_accept") + break + case EmailAgent.InvitationResponseTentative: + //: Failed to send invitation response (tentative) + //% "Failed to tentatively accept invitation" + text = qsTrId("jolla-email-la-response_failed_body_tentative") + break + case EmailAgent.InvitationResponseDecline: + //: Failed to send invitation response (decline) + //% "Failed to decline invitation" + text = qsTrId("jolla-email-la-response_failed_body_decline") + break + default: + break + } + showSingleLineNotification(text) + } + } + + onOnlineFolderActionCompleted: { + if (!success) { + var text = "" + switch (action) { + case EmailAgent.ActionOnlineCreateFolder: + //% "Folder creation failed" + text = qsTrId("jolla-email-la-fa_failed_body_create") + break + case EmailAgent.ActionOnlineDeleteFolder: + //% "Folder deletion failed" + text = qsTrId("jolla-email-la-fa_failed_body_delete") + break + case EmailAgent.ActionOnlineRenameFolder: + //% "Folder rename failed" + text = qsTrId("jolla-email-la-fa_failed_body_rename") + break + case EmailAgent.ActionOnlineMoveFolder: + //% "Folder move failed" + text = qsTrId("jolla-email-la-fa_failed_body_move") + break + default: + break + } + showSingleLineNotification(text) + } + } + } + + EmailAccountListModel { + id: mailAccountListModel + + onAccountsAdded: { + // Don't try to modify pages while accounts configuration manager is running + if (!accountsManagerActive) { + _updateMainPage() + } + } + onAccountsRemoved: { + if (!accountsManagerActive) { + _updateMainPage() + } + } + } + + Timer { + id: lastAccountUpdateRefreshTimer + interval: 60000 + running: !syncInProgress + repeat: true + onTriggered: refreshSyncTime = !refreshSyncTime + } + + ConnectionHelper { + id: connectionHelper + } + + Loader { + id: accountCreationLoader + active: false + anchors.fill: parent + + Connections { + target: accountCreationLoader.item + ignoreUnknownSignals: true + + onCreationCompleted: { + _updateMainPage() + app.accountsManagerActive = false + accountCreationLoader.active = false + } + } + } + + Timer { + // do some compilation ahead of time, but avoid delaying startup + id: componentCompiler + running: true + interval: 500 + onTriggered: { + running = false + _messageViewerComponent = Qt.createComponent(Qt.resolvedUrl("pages/MessageView.qml")) + Qt.createComponent(Qt.resolvedUrl("pages/ComposerPage.qml"), Component.Asynchronous) + } + } +} diff --git a/usr/share/jolla-email/pages/AccountList.qml b/usr/share/jolla-email/pages/AccountList.qml new file mode 100644 index 00000000..e822a944 --- /dev/null +++ b/usr/share/jolla-email/pages/AccountList.qml @@ -0,0 +1,166 @@ +/* + * Copyright (c) 2013 – 2019 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Nemo.Email 0.1 +import "utils.js" as Utils + +Column { + id: root + + width: parent.width + + Repeater { + model: mailAccountListModel + + delegate: ListItem { + id: accountItem + property bool errorOccurred + property string lastErrorText + property bool updating + + width: root.width + contentHeight: Theme.itemSizeExtraLarge + menu: Component { + ContextMenu { + id: contextMenu + MenuItem { + //: Update account + //% "Sync" + text: qsTrId("jolla-email-me-sync") + onClicked: emailAgent.synchronize(mailAccountId) + } + } + } + + Label { + id: unreadCountLabel + color: highlighted ? Theme.highlightColor : Theme.primaryColor + text: unreadCount ? unreadCount : "" + font.pixelSize: Theme.fontSizeLarge + anchors { + left: accountItem.contentItem.left + leftMargin: Screen.sizeCategory >= Screen.Large ? Theme.horizontalPageMargin : 0 + right: accountIcon.left + rightMargin: Theme.paddingLarge + verticalCenter: parent.verticalCenter + } + horizontalAlignment: Text.AlignRight + } + + Image { + id: accountIcon + + property string fixedIconPath: iconPath + + x: Screen.sizeCategory >= Screen.Large + ? 6 * Theme.paddingLarge + : 5 * Theme.paddingLarge + width: Screen.sizeCategory >= Screen.Large + ? 90 * Theme.pixelRatio + : Screen.width / 5 + height: width + sourceSize.width: width + sourceSize.height: height + anchors.verticalCenter: parent.verticalCenter + source: fixedIconPath !== "" ? fixedIconPath : "image://theme/graphic-service-generic-mail" + + onStatusChanged: if (accountIcon.status == Image.Error) fixedIconPath = "image://theme/graphic-service-generic-mail" + } + + Column { + anchors { + left: accountIcon.right + leftMargin: Theme.paddingLarge + right: parent.right + rightMargin: Theme.horizontalPageMargin + verticalCenter: parent.verticalCenter + verticalCenterOffset: -Math.round(Theme.paddingSmall/2) + } + + Label { + width: parent.width + text: displayName !== "" ? displayName : emailAddress + font.pixelSize: accountItem.errorOccurred ? Theme.fontSizeMedium : Theme.fontSizeLarge + color: unreadCountLabel.text !== "" ? (highlighted ? Theme.highlightColor : Theme.primaryColor) + : (highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor) + truncationMode: TruncationMode.Fade + } + + Item { + width: parent.width + height: statusLabel.height + + Icon { + id: errorIcon + + y: (statusLabel.firstLineHeight - height) / 2 + + visible: accountItem.errorOccurred + source: "image://theme/icon-s-warning" + } + + Label { + id: statusLabel + + property real firstLineHeight + + x: accountItem.errorOccurred ? errorIcon.width + Theme.paddingSmall : 0 + width: parent.width - x + font.pixelSize: Theme.fontSizeExtraSmall + color: highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor + wrapMode: Text.Wrap + text: { + // Cheating a bit as needsUpdate is always true but property changes are + // of our interest here. + var needsUpdate = Qt.application.active || accountItem.visible || app.refreshSyncTime || true + if (accountItem.updating) { + //: Updating account label + //% "Updating account..." + return qsTrId("jolla-email-la-updating_account") + } else if (accountItem.errorOccurred) { + return lastErrorText + } else if (needsUpdate) { + return hasPersistentConnection ? qsTrId("email-la_up_to_date") : Utils.lastSyncTime(lastSynchronized) + } + return "" + } + + onLineLaidOut: { + if (line.number === 0) { + firstLineHeight = line.height + } + } + } + } + } + onClicked: { + app.pushAccountInbox(mailAccountId, false) + } + + Connections { + target: emailAgent + + onCurrentSynchronizingAccountIdChanged: { + if (emailAgent.currentSynchronizingAccountId === mailAccountId) { + accountItem.updating = true + accountItem.errorOccurred = false + } else { + accountItem.updating = false + } + } + + onError: { + if (accountId === 0 || accountId === mailAccountId) { + accountItem.errorOccurred = true + accountItem.lastErrorText = Utils.syncErrorText(syncError) + } + } + } + } + } +} diff --git a/usr/share/jolla-email/pages/AttachmentDelegate.qml b/usr/share/jolla-email/pages/AttachmentDelegate.qml new file mode 100644 index 00000000..c143bc9b --- /dev/null +++ b/usr/share/jolla-email/pages/AttachmentDelegate.qml @@ -0,0 +1,125 @@ +/* + * Copyright (c) 2013 – 2019 Jolla Ltd. + * Copyright (c) 2019 Open Mobile Platform LLC. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Nemo.Thumbnailer 1.0 +import Nemo.Email 0.1 +import Nemo.FileManager 1.0 + +BackgroundItem { + id: attachmentItem + + readonly property bool activated: statusInfo === EmailAgent.Downloading || statusInfo === EmailAgent.Queued + readonly property bool downloaded: statusInfo === EmailAgent.Downloaded && url !== "" + readonly property int downloadedSize: progressInfo * size + property bool openOnDownload + property real attachmentNameFontSize: Theme.fontSizeMedium + property real attachmentStatusFontSize: Theme.fontSizeSmall + + property real leftMargin: Theme.horizontalPageMargin + property real rightMargin: Theme.horizontalPageMargin + + function triggerAction(url) { + // Attachment is considered as downloaded when attachment body has been + // downloaded. The url is only valid when attachment exists also in file system. + if (url && statusInfo === EmailAgent.Downloaded) { + if (mimeType.toLowerCase() == "message/rfc822") { + pageStack.animatorPush(app.getMessageViewerComponent(), { "pathToLoad": FileEngine.urlToPath(url) }) + } else { + Qt.openUrlExternally(url) + } + return true + } else { + return false + } + } + + onClicked: { + if (activated) { + openOnDownload = false + emailAgent.cancelAttachmentDownload(contentLocation) + } else if (!triggerAction(url)) { + // maybe downloaded but not saved as file + var saved = emailAgent.downloadAttachment(messageId, contentLocation) + if (saved) { + triggerAction(url) + } else { + openOnDownload = true + } + } + } + + onDownloadedChanged: { + if (downloaded && openOnDownload) { + openOnDownload = false + + triggerAction(url) + } + } + + Thumbnail { + id: icon + x: attachmentItem.leftMargin + y: (attachmentItem.contentHeight - height) / 2 + height: Theme.iconSizeMedium + width: Theme.iconSizeMedium + + sourceSize.width: width + sourceSize.height: height + source: url + mimeType: mimeType + } + + Icon { + visible: icon.status !== Thumbnail.Ready + anchors.centerIn: icon + source: activated ? "image://theme/icon-m-clear" : Theme.iconForMimeType(mimeType) + + Loader { + active: attachmentItem.activated + anchors.centerIn: parent + sourceComponent: ProgressCircle { + value: statusInfo === EmailAgent.Downloading ? progressInfo : 0 + height: attachmentItem.contentHeight - 2*Theme.paddingSmall + width: height + progressColor: Theme.highlightDimmerColor + backgroundColor: attachmentItem.pressed ? Theme.secondaryHighlightColor : Theme.highlightColor + } + } + } + + Label { + id: attachmentName + + x: icon.x + icon.width + Theme.paddingMedium + y: Math.max(Theme.paddingLarge, (attachmentItem.contentHeight - height) / 2) + width: sizeLabel.x - x - Theme.paddingMedium + + font.pixelSize: attachmentItem.attachmentNameFontSize + + text: type === AttachmentListModel.Email + //: Attached email with unknown title => use placeholder name + //% "Forwarded email" + ? title || qsTrId("jolla-email-la-forwarded_email") + : displayName + truncationMode: TruncationMode.Fade + } + + Label { + id: sizeLabel + x: attachmentItem.width - width - attachmentItem.rightMargin + y: Math.max(Theme.paddingLarge, (attachmentItem.contentHeight - height) / 2) + + text: statusInfo === EmailAgent.Downloading + ? (Format.formatFileSize(downloadedSize, 2) + + "/" + + Format.formatFileSize(size, 2)) + : Format.formatFileSize(size, 2) + font.pixelSize: attachmentStatusFontSize + } +} diff --git a/usr/share/jolla-email/pages/AttachmentListPage.qml b/usr/share/jolla-email/pages/AttachmentListPage.qml new file mode 100644 index 00000000..e79b42db --- /dev/null +++ b/usr/share/jolla-email/pages/AttachmentListPage.qml @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2013 – 2019 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 + +Page { + property int messageId + property alias attachmentsModel: attachmentListView.model + + objectName: "attachmentsListPage" + + SilicaListView { + id: attachmentListView + anchors.fill: parent + + header: PageHeader { + //% "Attachments" + title: qsTrId("jolla-email-he-attachments_list_page") + } + + delegate: AttachmentDelegate { } + VerticalScrollDecorator {} + } +} diff --git a/usr/share/jolla-email/pages/AttachmentRow.qml b/usr/share/jolla-email/pages/AttachmentRow.qml new file mode 100644 index 00000000..b90f9f73 --- /dev/null +++ b/usr/share/jolla-email/pages/AttachmentRow.qml @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2018 – 2019 Jolla Ltd. + * Copyright (c) 2020 Open Mobile Platform LLC. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Nemo.Email 0.1 +import Nemo.Thumbnailer 1.0 + +Row { + id: root + + property var emailMessage + property AttachmentListModel attachmentsModel + + readonly property int _maximumVisibleAttachments: { + if (Screen.sizeCategory < Screen.Large) { + return 2 + } else if (portrait) { + return 3 + } else { + return 4 + } + } + + height: Theme.itemSizeExtraSmall + + Repeater { + model: emailMessage && emailMessage.numberOfAttachments > 0 && + emailMessage.numberOfAttachments <= _maximumVisibleAttachments + ? attachmentsModel + : null + delegate: AttachmentDelegate { + id: attachmentItem + + leftMargin: attachmentItem.Positioner.isFirstItem + ? Theme.horizontalPageMargin + : Theme.paddingMedium + rightMargin: attachmentItem.Positioner.isLastItem + ? Theme.horizontalPageMargin + : Theme.paddingMedium + + width: ((root.width - (2 * (Theme.horizontalPageMargin - Theme.paddingMedium))) / emailMessage.numberOfAttachments) + + (leftMargin - Theme.paddingMedium) + + (rightMargin - Theme.paddingMedium) + + contentHeight: Theme.itemSizeExtraSmall + + attachmentNameFontSize: Theme.fontSizeExtraSmall + attachmentStatusFontSize: Theme.fontSizeExtraSmall + } + } + + BackgroundItem { + id: attachmentsLink + visible: emailMessage && emailMessage.numberOfAttachments > root._maximumVisibleAttachments + contentHeight: Theme.itemSizeExtraSmall + + onClicked: { + pageStack.animatorPush("AttachmentListPage.qml", { + messageId: emailMessage.messageId, + attachmentsModel: root.attachmentsModel + }) + } + + Label { + //: Number of email attachments (only used when number of attachments greater than 2) + //% "%n attachments" + text: qsTrId("jolla-email-la-attachments_summary", emailMessage ? emailMessage.numberOfAttachments : 0) + anchors { + verticalCenter: parent.verticalCenter + left: parent.left + right: parent.right + margins: Theme.horizontalPageMargin + } + } + } +} diff --git a/usr/share/jolla-email/pages/CalendarDelegate.qml b/usr/share/jolla-email/pages/CalendarDelegate.qml new file mode 100644 index 00000000..841ef0d0 --- /dev/null +++ b/usr/share/jolla-email/pages/CalendarDelegate.qml @@ -0,0 +1,155 @@ +/* + * Copyright (c) 2015 - 2019 Jolla Ltd. + * Copyright (c) 2020 - 2021 Open Mobile Platform LLC. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Nemo.Email 0.1 +import org.nemomobile.calendar 1.0 + +BackgroundItem { + id: root + + property EmailMessage email + property real leftMargin: Theme.paddingMedium + property real rightMargin: Theme.paddingMedium + property real iconSize: Theme.iconSizeMedium + + contentHeight: Theme.itemSizeExtraSmall + height: contentItem.height + + InvitationQuery { + id: invitationQuery + invitationFile: !!email ? email.calendarInvitationUrl : "" + property bool triggerInvitationWhenFinished + onQueryFinished: { + if (triggerInvitationWhenFinished) { + triggerInvitation() + } + } + function triggerInvitation() { + invitationQuery.triggerInvitationWhenFinished = false + if (invitationQuery.instanceId.length > 0 && invitationQuery.startTime.length > 0) { + // the invitation has already been synced or imported. + var obj = pageStack.animatorPush(Qt.resolvedUrl("CalendarEventPage.qml"), { + instanceId: invitationQuery.instanceId, + startTime: invitationQuery.startTime, + cancellation: email.hasCalendarCancellation + }) + obj.pageCompleted.connect(function(page) { + page.eventRemovePressed.connect(function() { + invitationQuery.query() + }) + }) + } else { + // the invitation doesn't yet exist in the calendar. + pageStack.animatorPush(Qt.resolvedUrl("CalendarEventPreviewPage.qml"), { + icsString: email.calendarInvitationBody, + cancellation: email.hasCalendarCancellation + }) + } + } + } + + onClicked: { + if ((email.calendarInvitationStatus != EmailMessage.Downloading + && email.calendarInvitationStatus != EmailMessage.Downloaded + && email.calendarInvitationStatus != EmailMessage.Saved) + || email.calendarInvitationUrl === "") { + email.getCalendarInvitation() + } else if (invitationQuery.busy) { + invitationQuery.triggerInvitationWhenFinished = true + } else { + invitationQuery.triggerInvitation() + } + } + + Icon { + id: defaultIcon + x: leftMargin + height: iconSize + width: height + anchors.verticalCenter: parent.verticalCenter + sourceSize.width: width + sourceSize.height: height + source: email.hasCalendarInvitation + ? "image://theme/icon-l-date" + : "image://theme/icon-l-calendar-cancelled" + } + + Item { + anchors { + verticalCenter: parent.verticalCenter + left: defaultIcon.right + leftMargin: Theme.paddingMedium + right: parent.right + rightMargin: root.rightMargin + } + + height: calendarInvitationLabel.height + statusLabel.height + + Label { + id: calendarInvitationLabel + width: parent.width + font.pixelSize: Theme.fontSizeExtraSmall + text: email.hasCalendarInvitation + //: Calendar invitation label + //% "Calendar invitation" + ? qsTrId("jolla-email-la-calendar_invitation") + //: Calendar cancellation label + //% "Calendar cancellation" + : qsTrId("jolla-email-la-calendar_cancellation") + truncationMode: TruncationMode.Fade + } + + Label { + id: statusLabel + visible: email && email.calendarInvitationStatus != EmailMessage.Downloading + width: parent.width + anchors.top: calendarInvitationLabel.bottom + font.pixelSize: Theme.fontSizeTiny + + text: email ? statusText(email.calendarInvitationStatus) : "" + truncationMode: TruncationMode.Fade + } + + ProgressBar { + visible: email && email.calendarInvitationStatus === EmailMessage.Downloading + indeterminate: true + width: parent.width + leftMargin: Theme.paddingMedium + rightMargin: Theme.paddingMedium + anchors.top: calendarInvitationLabel.bottom + highlighted: root.highlighted + } + } + + function statusText(status) { + if (status === EmailMessage.Unknown) { + //: Calendar invitation download state - Not Downloaded + //% "Not Downloaded" + return qsTrId("jolla-email-la-calendar_invitation_not_downloaded") + } else if (status === EmailMessage.Downloaded || status === EmailMessage.Saved) { + //: Calendar invitation download state - Downloaded + //% "Downloaded" + return qsTrId("jolla-email-la-calendar_invitation_downloaded") + } else if (status === EmailMessage.Downloading) { + //: Calendar invitation download state - Downloading + //% "Downloading" + return qsTrId("jolla-email-la-calendar_invitation_downloading") + } else if (status === EmailMessage.Failed) { + //: Calendar invitation download state - Failed + //% "Failed" + return qsTrId("jolla-email-la-calendar_invitation_failed") + } else if (status === EmailMessage.FailedToSave) { + //: Calendar invitation - Failed to save file + //% "Failed to save file" + return qsTrId("jolla-email-la-calendar_invitation_failed_save") + } else { + return "" + } + } +} diff --git a/usr/share/jolla-email/pages/CalendarEventPage.qml b/usr/share/jolla-email/pages/CalendarEventPage.qml new file mode 100644 index 00000000..caad6b01 --- /dev/null +++ b/usr/share/jolla-email/pages/CalendarEventPage.qml @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2017 – 2019 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Calendar 1.0 + +CalendarEventViewPage { + +} diff --git a/usr/share/jolla-email/pages/CalendarEventPreviewPage.qml b/usr/share/jolla-email/pages/CalendarEventPreviewPage.qml new file mode 100644 index 00000000..fe3bd50c --- /dev/null +++ b/usr/share/jolla-email/pages/CalendarEventPreviewPage.qml @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2017 - 2019 Jolla Ltd. + * Copyright (c) 2020 - 2021 Open Mobile Platform LLC. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Calendar 1.0 +import org.nemomobile.calendar 1.0 +import Nemo.DBus 2.0 + +Page { + id: root + property alias icsString: importModel.icsString + property alias event: eventDetails.event + property alias occurrence: eventDetails.occurrence + property alias cancellation: eventDetails.cancellation + + ImportModel { + id: importModel + onCountChanged: { + if (count > 0) { + eventDetails.event = getEvent(0) + eventDetails.occurrence = eventDetails.event ? eventDetails.event.nextOccurrence() : null + } else { + eventDetails.event = null + eventDetails.occurrence = null + } + } + } + + DBusInterface { + id: calendarDBusInterface + service: "com.jolla.calendar.ui" + path: "/com/jolla/calendar/ui" + iface: "com.jolla.calendar.ui" + } + + SilicaFlickable { + anchors.fill: parent + contentHeight: column.height + Theme.paddingLarge + + PullDownMenu { + visible: icsString !== "" && !cancellation + MenuItem { + //% "Import into Calendar" + text: qsTrId("sailfish_calendar-me-import_event_in_calendar") + onClicked: { + calendarDBusInterface.call("importIcsData", [root.icsString]) + pageStack.pop() + } + } + } + + Column { + id: column + + width: parent.width + spacing: Theme.paddingMedium + + PageHeader { + width: parent.width + title: eventDetails.event ? eventDetails.event.displayLabel : "" + wrapMode: Text.Wrap + } + + CalendarEventView { + id: eventDetails + showHeader: false + showSelector: false + } + } + VerticalScrollDecorator {} + } +} diff --git a/usr/share/jolla-email/pages/CalendarInvite.qml b/usr/share/jolla-email/pages/CalendarInvite.qml new file mode 100644 index 00000000..79864633 --- /dev/null +++ b/usr/share/jolla-email/pages/CalendarInvite.qml @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2020 Open Mobile Platform LLC. + * + * License: Proprietary + */ + +import QtQuick 2.6 +import Sailfish.Silica 1.0 +import Sailfish.Calendar 1.0 +import Nemo.Email 0.1 +import org.nemomobile.calendar 1.0 + +SilicaControl { + id: invite + + property QtObject event + property QtObject occurrence + property alias preferredButtonWidth: responseButtons.preferredButtonWidth + + property int pixelSize: Theme.fontSizeSmall + + readonly property bool twoLineDates: !startDate.fitsOneLine || (multiDay && !endDate.fitsOneLine) + readonly property bool multiDay: { + if (!invite.occurrence) { + return false + } + + var start = invite.occurrence.startTime + var end = invite.occurrence.endTime + return start.getFullYear() !== end.getFullYear() + || start.getMonth() !== end.getMonth() + || start.getDate() !== end.getDate() + } + + + implicitHeight: timesFlow.height + responseButtons.implicitHeight + Theme.paddingLarge + palette.colorScheme: Theme.DarkOnLight + + Rectangle { + width: invite.width + height: invite.height + + color: "#f3f0f0" + } + + // Ideally put these side by side aligned to each end but if there's not enough space break over + // two lines and left align. + Flow { + id: timesFlow + + x: Theme.horizontalPageMargin + + width: invite.width - (2 * x) + + spacing: Math.max(Theme.paddingSmall, width - startDate.width - endDateOrDuration.width) + + CalendarEventDate { + id: startDate + + eventDate: invite.occurrence ? invite.occurrence.startTime : new Date(-1) + showTime: invite.multiDay && (invite.event && !invite.event.allDay) + timeContinued: invite.multiDay + useTwoLines: invite.twoLineDates + color: invite.palette.highlightColor + font.pixelSize: invite.pixelSize + maximumWidth: timesFlow.width / (invite.multiDay ? 2 : 1) + } + + Row { + id: endDateOrDuration + + CalendarEventDate { + id: endDate + + visible: invite.multiDay + eventDate: invite.occurrence ? invite.occurrence.endTime : new Date(-1) + showTime: invite.event && !invite.event.allDay + useTwoLines: invite.twoLineDates + color: invite.palette.highlightColor + font.pixelSize: invite.pixelSize + maximumWidth: timesFlow.width / 2 + } + + Text { + height: startDate.height + + color: invite.palette.highlightColor + font.pixelSize: invite.pixelSize + visible: !invite.multiDay + verticalAlignment: Text.AlignVCenter + + //% "All day" + text: !invite.event ? "" : (invite.event.allDay + ? qsTrId("jolla-email-la-all_day") + : (Format.formatDate(invite.occurrence.startTime, Formatter.TimeValue) + + " - " + + Format.formatDate(invite.occurrence.endTime, Formatter.TimeValue))) + } + } + } + + InvitationResponseButtons { + id: responseButtons + + y: timesFlow.height + Math.min(Theme.paddingLarge, (invite.height - timesFlow.height - height - Theme.paddingMedium) / 2) + + subject: invite.event ? invite.event.displayLabel : "" + width: parent.width + labelFont.pixelSize: invite.pixelSize + _backgroundColor: "white" + onCalendarInvitationResponded: { + var emailResponse = EmailAgent.InvitationResponseUnspecified + switch (response) { + case CalendarEvent.ResponseAccept: + emailResponse = EmailAgent.InvitationResponseAccept + break + case CalendarEvent.ResponseTentative: + emailResponse = EmailAgent.InvitationResponseTentative + break + case CalendarEvent.ResponseDecline: + emailResponse = EmailAgent.InvitationResponseDecline + break + default: + return + } + emailAgent.respondToCalendarInvitation(email.messageId, emailResponse, responseSubject) + pageStack.pop() + } + } +} diff --git a/usr/share/jolla-email/pages/CombinedInbox.qml b/usr/share/jolla-email/pages/CombinedInbox.qml new file mode 100644 index 00000000..97691579 --- /dev/null +++ b/usr/share/jolla-email/pages/CombinedInbox.qml @@ -0,0 +1,177 @@ +/* + * Copyright (c) 2013 – 2019 Jolla Ltd. + * Copyright (c) 2019 Open Mobile Platform LLC. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Nemo.Email 0.1 +import com.jolla.email 1.1 +import "utils.js" as Utils + +Page { + id: root + + onStatusChanged: { + if (status === PageStatus.Active) { + app.coverMode = "mainView" + } + } + + EmailMessageListModel { + id: combinedInboxModel + + folderAccessor: emailAgent.combinedInboxAccessor() + } + + Binding { + target: app + property: "combinedInboxUnreadCount" + value: combinedInboxModel.count + } + + RemorsePopup { + id: removeSingleRemorse + + function startRemoveSingle(messageId) { + //% "Deleting mail" + execute(qsTrId("jolla-email-me-deleting-mail"), function() { + emailAgent.deleteMessage(messageId) + }) + } + } + + MessageRemorsePopup { + id: multiItemRemoveRemorse + } + + SilicaListView { + id: messageListView + + anchors.fill: parent + + PullDownMenu { + busy: app.syncInProgress + + MenuItem { + // Defined in message list page + text: qsTrId("jolla-email-me-select_messages") + visible: messageListView.count > 0 + onClicked: { + pageStack.animatorPush(Qt.resolvedUrl("MultiSelectionPage.qml"), { + removeRemorse: multiItemRemoveRemorse, + selectionModel: combinedInboxModel, + deletionModel: deletionModel + }) + } + } + + MenuItem { + //: Synchronize inbox of all enabled accounts + //% "Synchronize all" + text: qsTrId("jolla-email-me-sync_all") + onClicked: { + emailAgent.accountsSyncAllFolders() + } + } + + MenuItem { + //: New message menu item + //% "New Message" + text: qsTrId("jolla-email-me-new_message") + onClicked: { + pageStack.animatorPush(Qt.resolvedUrl("ComposerPage.qml")) + } + } + } + + header: Column { + width: parent.width + PageHeader { + id: pageHeader + //: Email page header + //% "Mail" + title: qsTrId("email-he-email") + } + AccountList { + id: accountList + } + Item { + height: Theme.itemSizeLarge + width: parent.width + visible: messageListView.count > 0 + Label { + //: Shows overall number of unread messages in the Inboxes of all accounts. + //: Takes number of unread messages as a parameter. + //% "Inboxes (%1)" + text: qsTrId("email-la_unread_messages_in_inboxes").arg(messageListView.count) + color: Theme.highlightColor + font.pixelSize: Theme.fontSizeMedium + + anchors { + baseline: parent.bottom + // If possible drop this bottom margin when first item is section header + baselineOffset: -Theme.paddingLarge + horizontalCenter: parent.horizontalCenter + } + } + } + Item { + height: Math.max(emptyStateText.height + Theme.paddingLarge, + messageListView.height - accountList.height - pageHeader.height - Theme.paddingLarge) + width: parent.width + visible: messageListView.count === 0 + Text { + id: emptyStateText + width: parent.width - 2 * Theme.horizontalPageMargin + anchors.centerIn: parent + horizontalAlignment: Text.AlignHCenter + wrapMode: Text.Wrap + //: Empty state string for the combined Inboxes list view. + //: Shown when none of the Inboxes contain unread messages. + //% "No unread emails in Inboxes" + text: qsTrId("email-la_no_unread_messages_in_inboxes") + font { + pixelSize: Theme.fontSizeExtraLarge + family: Theme.fontFamilyHeading + } + color: Theme.secondaryHighlightColor + } + } + } + + footer: Item { + width: messageListView.width + height: Theme.paddingLarge + } + + section { + property: 'timeSection' + + delegate: SectionHeader { + text: Format.formatDate(section, Formatter.TimepointSectionRelative) + height: text === "" ? 0 : Theme.itemSizeExtraSmall + horizontalAlignment: Text.AlignHCenter + } + } + + model: DeletionDelegateModel { + id: deletionModel + + model: combinedInboxModel + + delegate: MessageItem { + onEmailViewerRequested: { + pageStack.animatorPush(app.getMessageViewerComponent(), { + "messageId": messageId, + "removeCallback": removeSingleRemorse.startRemoveSingle + }) + } + } + } + + VerticalScrollDecorator {} + } +} diff --git a/usr/share/jolla-email/pages/ComposerPage.qml b/usr/share/jolla-email/pages/ComposerPage.qml new file mode 100644 index 00000000..b7762248 --- /dev/null +++ b/usr/share/jolla-email/pages/ComposerPage.qml @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2017 – 2019 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import com.jolla.email 1.1 + +Page { + id: composerPage + + property alias attachmentsModel: composer.attachmentsModel + property alias emailSubject: composer.emailSubject + property alias emailTo: composer.emailTo + property alias emailCc: composer.emailCc + property alias emailBcc: composer.emailBcc + property alias emailBody: composer.emailBody + property alias messageId: composer.messageId + property alias maximumAttachmentsSize: composer.maximumAttachmentsSize + + property alias action: composer.action + property alias originalMessageId: composer.originalMessageId + property alias accountId: composer.accountId + + property alias popDestination: composer.popDestination + property alias draft: composer.draft + property var draftRemoveCallback + + highContrast: true + + // Lazy load cover + onStatusChanged: { + if (status === PageStatus.Active) { + app.coverMode = "mailEditor" + // Check if all content is available for FWD + if (composer.action === 'forward' && !composer.discardUndownloadedAttachments) { + composer.forwardContentAvailable() + } + } + } + + Connections { + target: app + onMovingToMainPage: { + if (composer.messageContentModified()) { + composer.saveDraft() + } + } + } + + Binding { + target: app + property: "editorTo" + value: composer._toSummary + } + + Binding { + target: app + property: "editorBody" + value: composer._bodyText + } + + EmailComposer { + id: composer + + autoSaveDraft: true + onRequestDraftRemoval: { + if (composerPage.draftRemoveCallback) { + composerPage.draftRemoveCallback() + } + } + } +} diff --git a/usr/share/jolla-email/pages/DecryptItem.qml b/usr/share/jolla-email/pages/DecryptItem.qml new file mode 100644 index 00000000..d3c70442 --- /dev/null +++ b/usr/share/jolla-email/pages/DecryptItem.qml @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2023 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Nemo.Email 0.1 + +// Can become a BackgroundItem when decrypt capability will be available +Item { + property EmailMessage email + readonly property int encryptionStatus: email ? email.encryptionStatus : EmailMessage.NoDigitalEncryption + + height: Theme.itemSizeExtraSmall + visible: encryptionStatus != EmailMessage.NoDigitalEncryption + + Icon { + id: icon + x: Theme.horizontalPageMargin + anchors.verticalCenter: parent.verticalCenter + source: "image://theme/icon-m-device-lock" + } + + Label { + anchors { + left: icon.right + right: parent.right + leftMargin: Theme.paddingMedium + rightMargin: Theme.horizontalPageMargin + } + height: parent.height + + //% "Encrypted content" + text: qsTrId("jolla-email-la-encrypted_content") + font.pixelSize: Theme.fontSizeSmall + verticalAlignment: Text.AlignVCenter + truncationMode: TruncationMode.Fade + } +} diff --git a/usr/share/jolla-email/pages/DeletionDelegateModel.qml b/usr/share/jolla-email/pages/DeletionDelegateModel.qml new file mode 100644 index 00000000..62d4f8e2 --- /dev/null +++ b/usr/share/jolla-email/pages/DeletionDelegateModel.qml @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2013 – 2019 Jolla Ltd. + * Copyright (c) 2019 Open Mobile Platform LLC. + * + * License: Proprietary + */ + +import QtQml.Models 2.1 + +DelegateModel { + property alias allItems: allItemsGroup + property alias selectedItems: selectedItemsGroup + property alias hiddenItems: hiddenItemsGroup + + function hideSelected() { + if (selectedItemsGroup.count > 0) { + selectedItemsGroup.setGroups(0, selectedItemsGroup.count, ["hidden", "all"]) + } + } + + function selectAll() { + if (allItems.count > 0) { + allItems.addGroups(0, allItems.count, ["selected"]) + } + } + + function clearSelected() { + if (selectedItemsGroup.count > 0) { + selectedItemsGroup.remove(0, selectedItemsGroup.count) + } + } + + function clearHidden() { + if (hiddenItemsGroup.count > 0) { + hiddenItemsGroup.setGroups(0, hiddenItemsGroup.count, ["items", "all"]) + } + } + + function selectItem(index) { + allItems.addGroups(index, 1, ["selected"]) + } + + function deselectItem(index) { + allItems.removeGroups(index, 1, ["selected"]) + } + + groups: [ + DelegateModelGroup { + id: allItemsGroup + + name: "all" + includeByDefault: true + }, + DelegateModelGroup { + id: selectedItemsGroup + + name: "selected" + }, + DelegateModelGroup { + id: hiddenItemsGroup + + name: "hidden" + } + ] +} diff --git a/usr/share/jolla-email/pages/FolderAccessHint.qml b/usr/share/jolla-email/pages/FolderAccessHint.qml new file mode 100644 index 00000000..cfc7750f --- /dev/null +++ b/usr/share/jolla-email/pages/FolderAccessHint.qml @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2014 – 2019 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 + +Loader { + id: root + + property bool pageActive + + anchors.fill: parent + active: counter.active && app.numberOfAccounts > 0 + sourceComponent: Component { + Item { + anchors.fill: parent + + Connections { + target: root + onPageActiveChanged: { + if (root.pageActive) { + touchInteractionHint.restart() + counter.increase() + root.pageActive = false + } + } + } + + InteractionHintLabel { + //: Swipe left to access your Email folders + //% "Swipe left to access your Email folders" + text: qsTrId("email-la-folder_access_hint") + anchors.bottom: parent.bottom + opacity: touchInteractionHint.running ? 1.0 : 0.0 + Behavior on opacity { FadeAnimation { duration: 1000 } } + } + TouchInteractionHint { + id: touchInteractionHint + + direction: TouchInteraction.Left + anchors.verticalCenter: parent.verticalCenter + } + } + } + FirstTimeUseCounter { + id: counter + limit: 3 + defaultValue: 1 // display hint twice for existing users + key: "/sailfish/email/folder_access_hint_count" + } +} diff --git a/usr/share/jolla-email/pages/FolderItem.qml b/usr/share/jolla-email/pages/FolderItem.qml new file mode 100644 index 00000000..561d2703 --- /dev/null +++ b/usr/share/jolla-email/pages/FolderItem.qml @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2013 – 2019 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Nemo.Email 0.1 +import "utils.js" as Utils + +ListItem { + id: folderItem + + property bool enableFolderActions + property bool showUnreadCount + property string folderDisplayName: (typeof(isRoot) === 'undefined' || !isRoot) + ? Utils.standardFolderName(folderType, folderName) + : //: No parent folder + //% "None" + qsTrId("jolla-email-la-none_folder") + property bool isCurrentItem + + opacity: enabled ? 1 : (isCurrentItem ? Theme.opacityHigh : Theme.opacityLow) + contentHeight: Screen.sizeCategory >= Screen.Large ? Theme.itemSizeMedium : Theme.itemSizeSmall + + Label { + anchors { + left: parent.left + leftMargin: Theme.horizontalPageMargin + Theme.paddingLarge * folderNestingLevel + right: folderItemUnreadCount.left + rightMargin: Theme.paddingMedium + verticalCenter: parent.verticalCenter + } + text: folderDisplayName + font.pixelSize: Theme.fontSizeMedium + color: (highlighted || isCurrentItem) + ? Theme.highlightColor + : Theme.primaryColor + truncationMode: TruncationMode.Fade + } + + Label { + id: folderItemUnreadCount + visible: folderUnreadCount && showUnreadCount + anchors { + right: parent.right + rightMargin: Theme.horizontalPageMargin + verticalCenter: parent.verticalCenter + } + text: folderUnreadCount + font.pixelSize: Theme.fontSizeLarge + color: Theme.highlightColor + } +} diff --git a/usr/share/jolla-email/pages/FolderListPage.qml b/usr/share/jolla-email/pages/FolderListPage.qml new file mode 100644 index 00000000..9ee6768e --- /dev/null +++ b/usr/share/jolla-email/pages/FolderListPage.qml @@ -0,0 +1,140 @@ +/* + * Copyright (c) 2013 – 2019 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Nemo.Email 0.1 + +Page { + id: folderListPage + + property alias accountKey: folderModel.accountKey + + signal folderClicked(var accessor) + signal deletingFolder(int id) + + FolderListModel { + id: folderModel + + onResyncNeeded: { + emailAgent.retrieveFolderList(accountKey) + } + } + + Connections { + target: emailAgent + onOnlineFolderActionCompleted: { + if (!success) { + emailAgent.retrieveFolderList(accountKey) // refresh folders list in case of error + } + } + } + + SilicaListView { + anchors.fill: parent + model: folderModel + header: PageHeader { + //: Folder List page title + //% "Folders" + title: qsTrId("jolla-email-he-folder_list_title") + } + + delegate: FolderItem { + enabled: canHaveMessages + showUnreadCount: true + onClicked: folderListPage.folderClicked(folderModel.folderAccessor(index)) + menu: ((canCreateChild || canRename || canMove || canDelete) && !preDeletionTimer.running) + ? contextMenuComponent : null + visible: !preDeletionTimer.running + Component { + id: contextMenuComponent + ContextMenu { + MenuItem { + visible: canCreateChild + //% "New subfolder" + text: qsTrId("jolla-email-fi-new_subfolder") + onClicked: { + pageStack.animatorPush(Qt.resolvedUrl("NewFolderDialog.qml"), { + parentFolderId: folderId, + parentFolderName: folderDisplayName, + folderModel: folderModel + }) + } + } + MenuItem { + visible: canRename + //% "Rename" + text: qsTrId("jolla-email-fi-rename_folder") + onClicked: { + pageStack.animatorPush(Qt.resolvedUrl("RenameFolderDialog.qml"), { + folderName: folderName, + folderId: folderId + }) + } + } + MenuItem { + visible: canMove + //% "Move" + text: qsTrId("jolla-email-fi-move_folder") + onClicked: { + pageStack.animatorPush(Qt.resolvedUrl("MoveFolderPage.qml"), { + folderModel: folderModel, + folderName: model.folderName, + folderId: model.folderId, + parentFolderId: model.parentFolderId + }) + } + } + MenuItem { + visible: canDelete + //% "Delete" + text: qsTrId("jolla-email-fi-delete_folder") + onClicked: _remove() + } + } + } + Timer { + id: preDeletionTimer + interval: 3000 // to avoid delegate flicking when remove is executed pretty fast + repeat: false + } + + function _remove() { + remorseDelete(function() { + folderListPage.deletingFolder(folderId) + preDeletionTimer.start() + emailAgent.deleteFolder(folderId) + }) + } + } + + PullDownMenu { + busy: emailAgent.currentSynchronizingAccountId === folderModel.accountKey + visible: folderModel.supportsFolderActions + MenuItem { + //% "Refresh folder list" + text: qsTrId("jolla-email-folder_list_refresh") + onClicked: emailAgent.retrieveFolderList(folderModel.accountKey) + } + MenuItem { + //% "New folder" + text: qsTrId("jolla-email-folder_new") + visible: folderModel.canCreateTopLevelFolders + onClicked: { + pageStack.animatorPush(Qt.resolvedUrl("NewFolderDialog.qml"), { + parentFolderId: 0, + //: No parent folder + //% "None" + parentFolderName: qsTrId("jolla-email-la-none_folder"), + folderModel: folderModel + }) + } + } + } + + VerticalScrollDecorator {} + } +} diff --git a/usr/share/jolla-email/pages/HtmlLoader.qml b/usr/share/jolla-email/pages/HtmlLoader.qml new file mode 100644 index 00000000..fcbe6c5e --- /dev/null +++ b/usr/share/jolla-email/pages/HtmlLoader.qml @@ -0,0 +1,199 @@ +/* + * Copyright (c) 2014 – 2019 Jolla Ltd. + * Copyright (c) 2019 Open Mobile Platform LLC. + * + * License: Proprietary + */ + +import QtQuick 2.2 +import Sailfish.Silica 1.0 +import Sailfish.Silica.private 1.0 +import Nemo.Email 0.1 +import Sailfish.WebView 1.0 +import Sailfish.WebEngine 1.0 +import Nemo.Configuration 1.0 + +Loader { + id: htmlLoader + + property bool showLoadProgress: true + readonly property int pageStatus: messageViewPage.status + property bool portrait + property bool isOutgoing + property bool isLocalFile + property string initialAction + readonly property bool showImages: app.accountsManagerActive || downloadImagesConfig.value + + property bool _wasLoaded + property var _html + property var _email + property AttachmentListModel attachmentsModel + + signal removeRequested + signal needToSendReadReceipt + + function load(email) { + if (email.contentType === EmailMessage.Plain) { + parser.text = email.body + _html = Qt.binding(plainTextAsHtml) + } else { + _html = email.htmlBody + parser.text = "" + } + + _email = email + + if (initialAction) { + _openComposer(initialAction, email, true) + initialAction = "" + } + + _finishLoad() + } + + function _finishLoad() { + if (!item) { + // Show progress indicator when we don't have an item. + showLoadProgress = true + messageViewPage.loaded = false + active = true + } else { + if (!_html.length) + return + + _wasLoaded = true + loadingTimer.restart() + } + } + + function markAsRead() { + if (_email) { + if (!_email.read && _email.requestReadReceipt) { + needToSendReadReceipt() + } + _email.read = true + } + } + + function resurrect() { + // Don't resurrect if item was not never loaded or we already + // have an item (nothing was released). + if (!_wasLoaded || item) { + return + } + + if (!item) { + active = true + } + + _finishLoad() + } + + function plainTextAsHtml() { + return "
" + parser.linkedText + "
"
+ }
+
+ function _openComposer(action, immediately) {
+ pageStack.animatorPush(
+ Qt.resolvedUrl("ComposerPage.qml"),
+ { popDestination: previousPage, action: action, originalMessageId: _email.messageId },
+ immediately ? PageStackAction.Immediate : PageStackAction.Animated)
+ }
+
+ Component.onCompleted: {
+ WebEngineSettings.autoLoadImages = Qt.binding(function() {
+ return showImages
+ })
+ }
+
+ sourceComponent: HtmlViewer {
+ anchors.fill: parent
+ interactive: messageViewPage.loaded
+ portrait: htmlLoader.portrait
+ attachmentsModel: htmlLoader.attachmentsModel
+ isOutgoing: htmlLoader.isOutgoing
+ isLocalFile: htmlLoader.isLocalFile
+ email: htmlLoader._email
+ htmlBody: htmlLoader._html
+ showImages: htmlLoader.showImages
+
+ onVisuallyCommittedChanged: {
+ if (visuallyCommitted) {
+ showLoadProgress = false
+ if (pageStatus == PageStatus.Active && (!loadingTimer.running || loaded)) {
+ messageViewPage.loaded = true
+ loadingTimer.stop()
+ }
+ }
+ }
+
+ onComposerRequested: htmlLoader._openComposer(action, false)
+ onRemoveRequested: htmlLoader.removeRequested()
+ }
+
+ // Activated from load()
+ active: false
+ onActiveChanged: {
+ if (!active) {
+ messageViewPage.loaded = false
+ }
+ }
+
+ onItemChanged: {
+ if (item) {
+ _finishLoad()
+ }
+ }
+
+ asynchronous: true
+
+
+ LinkParser {
+ id: parser
+ }
+
+ ConfigurationValue {
+ id: downloadImagesConfig
+ key: "/apps/jolla-email/settings/downloadImages"
+ defaultValue: false
+ }
+
+ Timer {
+ id: loadingTimer
+ interval: 800
+ onTriggered: {
+ if (pageStatus == PageStatus.Active) {
+ messageViewPage.loaded = true
+ }
+ }
+ }
+
+ Timer {
+ id: backgroundTimer
+
+ readonly property bool canRelease: !Qt.application.active && htmlLoader.item
+
+ interval: 1000 * 10 // 10sec
+ onTriggered: {
+ if (canRelease) {
+ htmlLoader.active = false
+ }
+ }
+
+ onCanReleaseChanged: {
+ if (canRelease) {
+ restart()
+ }
+ }
+ }
+
+ Connections {
+ target: Qt.application
+ onActiveChanged: {
+ if (Qt.application.active) {
+ backgroundTimer.stop()
+ htmlLoader.resurrect()
+ }
+ }
+ }
+}
diff --git a/usr/share/jolla-email/pages/HtmlViewer.qml b/usr/share/jolla-email/pages/HtmlViewer.qml
new file mode 100644
index 00000000..ea262470
--- /dev/null
+++ b/usr/share/jolla-email/pages/HtmlViewer.qml
@@ -0,0 +1,273 @@
+/*
+ * Copyright (c) 2013 – 2019 Jolla Ltd.
+ * Copyright (c) 2019 - 2020 Open Mobile Platform LLC.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Sailfish.Silica.private 1.0
+import Sailfish.TextLinking 1.0
+import Sailfish.WebEngine 1.0
+import Sailfish.WebView 1.0
+import Nemo.Email 0.1
+
+Item {
+ id: view
+
+ property EmailMessage email
+ property string htmlBody
+
+ // Avoid blocking webview content during accounts creation
+ property bool showImages
+ property bool showImagesButton
+ property bool portrait
+ property AttachmentListModel attachmentsModel
+ property bool isOutgoing
+ property bool isLocalFile
+ property bool hasImages
+ property bool orientationTransitionRunning: flickable.webView.webViewPage
+ && flickable.webView.webViewPage.orientationTransitionRunning
+
+ property bool pageActive: flickable.webView.webViewPage
+ && flickable.webView.webViewPage.status === PageStatus.Active
+
+ property alias interactive: flickable.interactive
+
+ property bool visuallyCommitted
+ property bool complete
+
+ signal removeRequested
+ signal composerRequested(string action)
+
+ Component.onCompleted: {
+ complete = true
+ }
+
+ onEmailChanged: showImagesButton = false
+
+ onHtmlBodyChanged: {
+ if (!htmlBody) {
+ return
+ }
+ visuallyCommitted = false
+ view.showImagesButton = false
+ view.hasImages = false
+
+ // Change the preference before loading new html body
+ flickable.webView.loadHtml(htmlBody)
+ }
+
+ onPageActiveChanged: {
+ if (!pageActive) {
+ flickable.webView.clearSelection()
+ }
+ }
+
+ WebViewFlickable {
+ id: flickable
+
+ width: view.width
+ height: view.height
+ // Don't resize the web view when the keyboard is open.
+ contentHeight: view.portrait ? Screen.height : Screen.width
+
+ webView {
+ x: view.width - webView.width
+ width: view.width - landscapeInviteContainer.implicitWidth
+
+ footerMargin: footer.open && !view.isLocalFile ? footer.height : 0
+
+ // Hide the web view while the width changes as there's a lag time between when the
+ // QQuickItem resizes and the view refreshes and in the interim the content will appear
+ // stretched.
+ Behavior on width {
+ enabled: view.complete && !view.orientationTransitionRunning
+ SequentialAnimation {
+ id: widthChangeAnimation
+ FadeAnimation {
+ target: resizeWhiteout
+ to: 1
+ duration: 100
+ }
+ PropertyAction {}
+ PauseAnimation {
+ duration: 200
+ }
+ FadeAnimation {
+ target: resizeWhiteout
+ to: 0
+ duration: 100
+ }
+ }
+ }
+
+ Behavior on footerMargin {
+ enabled: view.complete && !view.orientationTransitionRunning
+
+ NumberAnimation {
+ id: footerAnimation
+
+ easing.type: Easing.InOutQuad
+ duration: 100
+ }
+ }
+
+ onFirstPaint: visuallyCommitted = true
+
+ onViewInitialized: {
+ webView.loadFrameScript(Qt.resolvedUrl("webviewframescript.js"));
+ webView.addMessageListener("JollaEmail:DocumentHasImages")
+ webView.addMessageListener("embed:OpenLink")
+ }
+
+ onChromeChanged: {
+ if (webView.chrome === footer.open) {
+ // Ignore the change if the values are equal.
+ } else if (webView.chrome) {
+ footer.open = true
+ } else {
+ footer.open = false
+ }
+ }
+
+
+ onTextSelectionActiveChanged: {
+ if (webView.textSelectionActive) {
+ footer.open = true
+ }
+ }
+
+ onRecvAsyncMessage: {
+ switch (message) {
+ case "JollaEmail:DocumentHasImages":
+ if (!view.hasImages) {
+ view.hasImages = true
+ view.showImagesButton = !view.showImages
+ }
+ break
+ case "embed:OpenLink":
+ linkHandler.handleLink(data.uri)
+ break
+ default:
+ break
+ }
+ }
+ }
+
+ header: MessageViewHeader {
+ id: messageHeader
+
+ width: view.width
+ email: view.email
+
+ contentX: landscapeInviteContainer.width
+
+ isOutgoing: view.isOutgoing
+ attachmentsModel: view.attachmentsModel
+ showLoadImages: view.showImagesButton
+ heightBehaviorEnabled: view.complete && !view.orientationTransitionRunning
+
+ onClicked: pageStack.navigateForward()
+
+ onLoadImagesClicked: {
+ if (showLoadImages) {
+ view.showImagesButton = false
+ WebEngineSettings.autoLoadImages = true
+ flickable.webView.reload()
+ }
+ }
+
+ onLoadImagesCloseClicked: {
+ view.showImagesButton = false
+ }
+
+ Loader {
+ id: inviteLoader
+
+ parent: view.portrait ? messageHeader.contentItem : landscapeInviteContainer
+
+ active: messageHeader.inlineInvitation
+
+ sourceComponent: CalendarInvite {
+ width: view.portrait ? view.width : Theme.buttonWidthLarge
+ height: view.portrait ? undefined : view.height - messageHeader.contentY
+
+ preferredButtonWidth: view.portrait
+ ? Theme.buttonWidthExtraSmall
+ : Theme.buttonWidthSmall
+
+ event: messageHeader.event
+ occurrence: messageHeader.occurrence
+ }
+ }
+ }
+
+ VerticalScrollDecorator { color: Theme.highlightBackgroundColor }
+ HorizontalScrollDecorator { color: Theme.highlightBackgroundColor }
+
+ Column {
+ id: landscapeInviteContainer
+
+ y: flickable.webView.y
+ }
+
+ Rectangle {
+ x: landscapeInviteContainer.x
+ y: flickable.webView.y
+ z: -100
+ width: view.width - x
+ height: view.height - y
+
+ color: flickable.webView.backgroundColor
+ visible: widthChangeAnimation.running
+ }
+
+ Rectangle {
+ id: resizeWhiteout
+
+ x: landscapeInviteContainer.width
+ y: flickable.webView.y
+ width: view.width - x
+ height: flickable.webView.height
+
+ color: flickable.webView.backgroundColor
+
+ opacity: 0
+ }
+
+ LinkHandler {
+ id: linkHandler
+ }
+
+ MessageViewFooter {
+ id: footer
+
+ x: landscapeInviteContainer.width
+ y: flickable.contentHeight - flickable.webView.footerMargin
+ portrait: view.portrait
+
+ width: view.width - x
+
+ textSelectionController: flickable.webView.textSelectionController
+ showReplyAll: view.email.multipleRecipients
+
+ open: true
+
+ onOpenChanged: {
+ if (flickable.webView.chrome !== open) {
+ flickable.webView.chrome = open
+ }
+ }
+
+ onForward: view.composerRequested('forward')
+ onReplyAll: view.composerRequested('replyAll')
+ onReply: view.composerRequested('reply')
+ onDeleteEmail: {
+ pageStack.pop()
+ view.removeRequested()
+ }
+ }
+ }
+}
diff --git a/usr/share/jolla-email/pages/LoadImagesItem.qml b/usr/share/jolla-email/pages/LoadImagesItem.qml
new file mode 100644
index 00000000..fde28778
--- /dev/null
+++ b/usr/share/jolla-email/pages/LoadImagesItem.qml
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2018 – 2019 Jolla Ltd.
+ * Copyright (c) 2020 Open Mobile Platform LLC.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+
+BackgroundItem {
+ id: loadImagesArea
+
+ signal closeClicked()
+
+ height: Theme.itemSizeExtraSmall
+
+ Icon {
+ id: fileImage
+ x: Theme.horizontalPageMargin
+ anchors.verticalCenter: parent.verticalCenter
+ source: "image://theme/icon-m-file-image"
+ }
+
+ Label {
+ anchors {
+ left: fileImage.right
+ right: closeButton.left
+ margins: Theme.paddingMedium
+ }
+ height: loadImagesArea.height
+
+ //% "Load images"
+ text: qsTrId("jolla-email-la-load_images")
+ font.pixelSize: Theme.fontSizeSmall
+ verticalAlignment: Text.AlignVCenter
+ truncationMode: TruncationMode.Fade
+ }
+
+ IconButton {
+ id: closeButton
+
+ icon.source: "image://theme/icon-m-input-remove"
+
+ width: loadImagesArea.height
+ height: loadImagesArea.height
+
+ x: loadImagesArea.width - width - Theme.horizontalPageMargin
+
+ onClicked: loadImagesArea.closeClicked()
+ }
+}
diff --git a/usr/share/jolla-email/pages/MessageInfo.qml b/usr/share/jolla-email/pages/MessageInfo.qml
new file mode 100644
index 00000000..d8c4f414
--- /dev/null
+++ b/usr/share/jolla-email/pages/MessageInfo.qml
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2013 – 2019 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+import org.nemomobile.calendar 1.0
+import Sailfish.TextLinking 1.0
+
+Page {
+ id: root
+
+ property EmailMessage message
+ readonly property var messageToAddresses: message ? message.to : []
+ readonly property var messageCcAddresses: message ? message.cc : []
+ property QtObject calendarEvent
+ property bool isLocalFile
+
+ ImportModel {
+ icsString: message && message.calendarInvitationSupportsEmailResponses
+ ? message.calendarInvitationBody : ""
+ onCountChanged: {
+ if (count > 0) {
+ root.calendarEvent = getEvent(0)
+ } else {
+ root.calendarEvent = null
+ }
+ }
+ }
+
+ SilicaFlickable {
+ anchors.fill: parent
+ contentHeight: content.height + Theme.paddingLarge
+
+ Column {
+ id: content
+
+ width: parent.width
+ spacing: Theme.paddingLarge
+
+ PageHeader {
+ //: Message info header
+ //% "Message info"
+ title: qsTrId("jolla-email-he-message_info")
+ }
+
+ MessageInfoLabel {
+ text: message ? message.subject : ""
+ font.pixelSize: Theme.fontSizeMedium
+ maximumLineCount: 10
+ }
+
+ Column {
+ width: parent.width
+
+ LinkedText {
+ x: Theme.horizontalPageMargin
+ width: parent.width - 2*x
+ plainText: message ? (message.fromAddress != "" ? message.fromDisplayName + " <" + message.fromAddress + ">"
+ : message.fromDisplayName) : ""
+ font.pixelSize: Theme.fontSizeSmall
+ elide: Text.ElideRight
+ wrapMode: Text.Wrap
+ }
+
+ MessageInfoLabel {
+ text: message ? Format.formatDate(message.date, Formatter.Timepoint) : ""
+ }
+ }
+
+ MessageInfoSection {
+ visible: calendarEvent !== null
+ //: Start and end time of a meeting
+ //% "When:"
+ headerText: qsTrId("jolla-email-la-cal-when")
+ bodyText: calendarEvent ? (Format.formatDate(
+ calendarEvent.startTime, Formatter.Timepoint) +
+ " - " +
+ Format.formatDate(
+ calendarEvent.endTime, Formatter.Timepoint)) : ""
+ }
+
+ MessageInfoLinkedText {
+ visible: calendarEvent && calendarEvent.organizer != ""
+ //: Meeting invitation organizer address
+ //% "Organizer:"
+ headerText: qsTrId("jolla-email-la-cal-organizer")
+ plainText: calendarEvent ? calendarEvent.organizer : ""
+ }
+
+ MessageInfoLinkedText {
+ visible: message && message.replyTo != ""
+ //: Reply to address
+ //% "Reply to:"
+ headerText: qsTrId("jolla-email-la-replyTo")
+ plainText: message ? message.replyTo : ""
+ }
+
+ MessageInfoRepeater {
+ visible: messageToAddresses != ""
+ headerText: {
+ if (calendarEvent) {
+ //: 'Mandatory: ' recipients label for calendar invitation
+ //% "Mandatory:"
+ return qsTrId("jolla-email-la-cal-mandatory_info")
+ } else {
+ //: 'To: ' recipients label
+ //% "To:"
+ return qsTrId("jolla-email-la-to_info")
+ }
+ }
+ model: messageToAddresses
+ }
+
+ MessageInfoRepeater {
+ visible: messageCcAddresses != ""
+ headerText: {
+ if (calendarEvent) {
+ //: 'Optional: ' recipients label for calendar invitation
+ //% "Optional:"
+ return qsTrId("jolla-email-la-cal-optional_info")
+ } else {
+ //: 'Cc: ' recipients label
+ //% "Cc:"
+ return qsTrId("jolla-email-la-cc_info")
+ }
+ }
+ model: messageCcAddresses
+ }
+
+ MessageInfoSection {
+ //: 'Importance: ' label
+ //% "Importance:"
+ headerText: qsTrId("jolla-email-la-importance")
+ bodyText: message ? priorityText(message.priority) : ""
+ function priorityText(priority) {
+ if (priority === EmailMessageListModel.HighPriority) {
+ //: Message priority high
+ //% "High"
+ return qsTrId("jolla-email-la-priority_high")
+ } else if (priority === EmailMessageListModel.LowPriority) {
+ //: Message priority low
+ //% "Low"
+ return qsTrId("jolla-email-la-priority_low")
+ } else {
+ //: Message priority normal
+ //% "Normal"
+ return qsTrId("jolla-email-la-priority_Normal")
+ }
+ }
+ }
+
+ MessageInfoSection {
+ visible: calendarEvent
+ //: 'Secrecy: ' label for calendar invitation
+ //% "Secrecy:"
+ headerText: qsTrId("jolla-email-la-cal-secrecy")
+ bodyText: secrecyText(calendarEvent ? calendarEvent.secrecy : CalendarEvent.SecrecyPublic)
+ function secrecyText(secrecy) {
+ switch (secrecy) {
+ case CalendarEvent.SecrecyPrivate:
+ //: Invitation secrecy private
+ //% "Private"
+ return qsTrId("jolla-email-la-cal-secrecy_private")
+ case CalendarEvent.SecrecyConfidential:
+ //: Invitation secrecy confidential
+ //% "Confidential"
+ return qsTrId("jolla-email-la-cal-secrecy_confidential")
+ default:
+ //: Invitation secrecy public
+ //% "Public"
+ return qsTrId("jolla-email-la-cal-secrecy_public")
+ }
+ }
+ }
+
+ MessageInfoSection {
+ visible: calendarEvent
+ //: 'Repeat: ' label for calendar
+ //% "Repeat:"
+ headerText: qsTrId("jolla-email-la-cal-repeat")
+ bodyText: recurText(calendarEvent ? calendarEvent.recur : CalendarEvent.RecurOnce)
+
+ function recurText(recur) {
+ if (calendarEvent) {
+ switch (calendarEvent.recur) {
+ case CalendarEvent.RecurDaily:
+ //% "Every Day"
+ return qsTrId("jolla-email-la-cal-recurrence-every_day")
+ case CalendarEvent.RecurWeekly:
+ //% "Every Week"
+ return qsTrId("jolla-email-la-cal-recurrence-every_week")
+ case CalendarEvent.RecurBiweekly:
+ //% "Every 2 Weeks"
+ return qsTrId("jolla-email-la-cal-recurrence-every_2_weeks")
+ case CalendarEvent.RecurMonthly:
+ //% "Every Month"
+ return qsTrId("jolla-email-la-cal-recurrence-every_month")
+ case CalendarEvent.RecurYearly:
+ //% "Every Year"
+ return qsTrId("jolla-email-la-cal-recurrence-every_year")
+ case CalendarEvent.RecurCustom:
+ //% "Custom"
+ return qsTrId("jolla-email-la-cal-recurrence-custom")
+ }
+ }
+ //: Recurrence - not set (once) text
+ //% "Once"
+ return qsTrId("jolla-email-la-cal-recurrence-once")
+ }
+ }
+
+ MessageInfoSection {
+ //: 'Account: ' label
+ //% "Account:"
+ headerText: qsTrId("jolla-email-la-account")
+ bodyText: message ? mailAccountListModel.displayNameFromAccountId(message.accountId) : ""
+ visible: message && mailAccountListModel.indexFromAccountId(message.accountId) >= 0
+ }
+
+ MessageInfoSection {
+ //: Message 'Size: ' label
+ //% "Size:"
+ headerText: qsTrId("jolla-email-la-message_size")
+ bodyText: Format.formatFileSize(message ? message.size : 0)
+ visible: !isLocalFile
+ }
+ }
+
+ VerticalScrollDecorator {}
+ }
+}
diff --git a/usr/share/jolla-email/pages/MessageInfoLabel.qml b/usr/share/jolla-email/pages/MessageInfoLabel.qml
new file mode 100644
index 00000000..cec53bb4
--- /dev/null
+++ b/usr/share/jolla-email/pages/MessageInfoLabel.qml
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2013 – 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+
+Label {
+ property bool header
+
+ x: Theme.horizontalPageMargin
+ width: parent.width - 2*x
+ font.pixelSize: Theme.fontSizeSmall
+ elide: Text.ElideRight
+ maximumLineCount: 2
+ wrapMode: Text.Wrap
+ color: header ? Theme.secondaryHighlightColor : Theme.highlightColor
+}
diff --git a/usr/share/jolla-email/pages/MessageInfoLinkedText.qml b/usr/share/jolla-email/pages/MessageInfoLinkedText.qml
new file mode 100644
index 00000000..ad7041c4
--- /dev/null
+++ b/usr/share/jolla-email/pages/MessageInfoLinkedText.qml
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2018 – 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Sailfish.TextLinking 1.0
+
+Column {
+ property alias headerText: header.text
+ property alias plainText: body.plainText
+
+ width: parent.width
+
+ MessageInfoLabel {
+ id: header
+ font.pixelSize: Theme.fontSizeMedium
+ header: true
+ }
+
+ LinkedText {
+ id: body
+ x: Theme.horizontalPageMargin
+ width: parent.width - 2*x
+ font.pixelSize: Theme.fontSizeSmall
+ wrapMode: Text.Wrap
+ }
+}
diff --git a/usr/share/jolla-email/pages/MessageInfoRepeater.qml b/usr/share/jolla-email/pages/MessageInfoRepeater.qml
new file mode 100644
index 00000000..916a19ba
--- /dev/null
+++ b/usr/share/jolla-email/pages/MessageInfoRepeater.qml
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2018 – 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Sailfish.TextLinking 1.0
+
+Column {
+ property alias headerText: header.text
+ property alias model: repeater.model
+
+ width: parent.width
+
+ MessageInfoLabel {
+ id: header
+ font.pixelSize: Theme.fontSizeMedium
+ header: true
+ }
+
+ Repeater {
+ id: repeater
+ LinkedText {
+ x: Theme.horizontalPageMargin
+ width: parent.width - 2*x
+ plainText: model.modelData
+ font.pixelSize: Theme.fontSizeSmall
+ elide: Text.ElideRight
+ wrapMode: Text.Wrap
+ }
+ }
+}
diff --git a/usr/share/jolla-email/pages/MessageInfoSection.qml b/usr/share/jolla-email/pages/MessageInfoSection.qml
new file mode 100644
index 00000000..db5dfc6e
--- /dev/null
+++ b/usr/share/jolla-email/pages/MessageInfoSection.qml
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2018 – 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+
+Column {
+ property alias headerText: header.text
+ property alias bodyText: body.text
+
+ width: parent.width
+ MessageInfoLabel {
+ id: header
+ font.pixelSize: Theme.fontSizeMedium
+ header: true
+ }
+
+ MessageInfoLabel {
+ id: body
+ }
+}
diff --git a/usr/share/jolla-email/pages/MessageItem.qml b/usr/share/jolla-email/pages/MessageItem.qml
new file mode 100644
index 00000000..8db19979
--- /dev/null
+++ b/usr/share/jolla-email/pages/MessageItem.qml
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2013 - 2019 Jolla Ltd.
+ * Copyright (c) 2019 - 2021 Open Mobile Platform LLC.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+import com.jolla.email 1.1
+import Jolla.Email 1.0
+import "utils.js" as Utils
+
+ListItem {
+ id: messageItem
+
+ property bool selectMode
+ property bool showRecipientsName
+ property alias primaryLine: senderName.text
+ property alias secondaryLine: subjectText.text
+ property alias date: msgDateTime.text
+ property bool isDraftsFolder
+ property string searchString
+ property bool highlightSender
+ property bool highlightRecipients
+ property bool highlightSubject
+ property bool highlightBody
+
+ signal emailViewerRequested(int messageId)
+
+ function remove() {
+ BatchedMessageDeletion.addMessage(model.messageId)
+
+ var remorseItem = remorseDelete(function() {
+ animateRemoval()
+ BatchedMessageDeletion.messageReadyForDeletion(model.messageId)
+ BatchedMessageDeletion.run(emailAgent)
+ })
+ remorseItem.canceled.connect(function() {
+ BatchedMessageDeletion.removeMessage(model.messageId)
+ })
+ }
+
+ onClicked: {
+ if (!selectMode) {
+ if (isDraftsFolder) {
+ pageStack.animatorPush(Qt.resolvedUrl("ComposerPage.qml"),
+ { messageId: model.messageId,
+ originalMessageId: model.messageId,
+ draft: true,
+ draftRemoveCallback: remove })
+ } else {
+ emailViewerRequested(model.messageId)
+ }
+ }
+ }
+
+ contentHeight: content.height + content.y + Theme.paddingMedium
+ menu: contextMenuComponent
+ highlighted: menuOpen || down || (model.selected && selectMode)
+
+ GlassItem {
+ visible: !model.readStatus
+ width: Theme.itemSizeSmall
+ height: Theme.itemSizeSmall
+ anchors.horizontalCenter: parent.left
+ y: content.y + senderName.height/2 - height/2
+ radius: 0.14
+ falloffRadius: 0.13
+ color: Theme.highlightColor
+ }
+
+ Column {
+ id: content
+ y: Theme.paddingMedium
+ spacing: -Math.round(Theme.paddingSmall/2)
+ anchors {
+ left: parent.left
+ leftMargin: Theme.horizontalPageMargin
+ right: parent.right
+ rightMargin: Theme.horizontalPageMargin
+ }
+ Item {
+ height: senderName.height
+ width: parent.width
+ Label {
+ id: senderName
+
+ text: showRecipientsName
+ ? (model.recipientsDisplayName.toString() != ""
+ ? Theme.highlightText(model.recipientsDisplayName.toString(),
+ (highlightRecipients ? searchString : ""),
+ Theme.highlightColor)
+ : //% "No recipients"
+ qsTrId("jolla-email-la-no_recipient"))
+ : Theme.highlightText(model.senderDisplayName, (highlightSender ? searchString : ""), Theme.highlightColor)
+ textFormat: Text.StyledText
+ anchors {
+ left: parent.left
+ right: msgDateTime.left
+ rightMargin: Theme.paddingLarge
+ }
+ truncationMode: TruncationMode.Fade
+ }
+
+ Label {
+ id: msgDateTime
+ text: Format.formatDate(model.qDateTime, Formatter.TimeValue)
+ font.pixelSize: Theme.fontSizeExtraSmall
+ anchors {
+ right: parent.right
+ baseline: senderName.baseline
+ }
+ }
+ Row {
+ id: icons
+ spacing: Theme.paddingSmall
+ anchors {
+ top: senderName.baseline
+ topMargin: Theme.paddingSmall
+ right: parent.right
+ }
+ HighlightImage {
+ visible: model.replied || model.repliedAll || model.forwarded
+ source: model.forwarded && (model.replied || model.repliedAll)
+ ? "image://theme/icon-s-message-reply-forward"
+ : model.forwarded ? "image://theme/icon-s-message-forward"
+ : "image://theme/icon-s-message-reply"
+ }
+
+ HighlightImage {
+ visible: model.priority != EmailMessageListModel.NormalPriority
+ source: Utils.priorityIcon(model.priority)
+ }
+
+ HighlightImage {
+ visible: model.hasAttachments
+ source: "image://theme/icon-s-attach?"
+ }
+ HighlightImage {
+ visible: model.hasCalendarInvitation
+ source: "image://theme/icon-s-date?"
+ }
+ HighlightImage {
+ visible: model.hasCalendarCancellation
+ source: "image://theme/icon-s-calendar-cancelled?"
+ }
+ HighlightImage {
+ visible: model.hasSignature && EmailUtils.emailAppCryptoEnabled
+ source: "image://theme/icon-s-certificates"
+ }
+ HighlightImage {
+ visible: model.isEncrypted
+ source: "image://theme/icon-s-secure"
+ }
+ }
+ }
+ Label {
+ id: subjectText
+
+ text: model.parsedSubject != ""
+ ? Theme.highlightText(model.parsedSubject, (highlightSubject ? searchString : ""), Theme.highlightColor)
+ : //: Empty subject
+ //% "(Empty subject)"
+ qsTrId("jolla-email-la-no_subject")
+ textFormat: Text.StyledText
+ font.pixelSize: Theme.fontSizeSmall
+ opacity: model.readStatus ? Theme.opacityHigh : 1.0
+ width: parent.width - icons.width
+ anchors {
+ left: parent.left
+ right: parent.right
+ rightMargin: Screen.sizeCategory >= Screen.Large
+ ? Theme.paddingLarge + icons.width
+ : Theme.paddingMedium + icons.width
+ }
+ truncationMode: TruncationMode.Fade
+ }
+
+ Label {
+ text: model.preview != ""
+ ? Theme.highlightText(model.preview, (highlightBody ? searchString : ""), Theme.primaryColor)
+ : // it should not show empty preview when preview is not retrived yet, first sync for e.g
+ model.isEncrypted
+ ? //% "(Encrypted content)"
+ qsTrId("jolla-email-la-encrypted_preview")
+ : //: Empty preview
+ //% "(Empty preview)"
+ qsTrId("jolla-email-la-no_preview")
+ textFormat: Text.StyledText
+ font.pixelSize: Theme.fontSizeSmall
+ color: Theme.highlightColor
+ opacity: model.readStatus ? Theme.opacityHigh : 1.0
+
+ maximumLineCount: Screen.sizeCategory >= Screen.Large ? 1 : ( model.readStatus ? 2 : 3)
+ lineHeight: subjectText.height - Math.round(Theme.paddingSmall/2)
+ lineHeightMode: Text.FixedHeight
+ width: parent.width
+ wrapMode: Text.Wrap
+ elide: Text.ElideRight
+ }
+ }
+
+ Component {
+ id: contextMenuComponent
+ ContextMenu {
+ MenuItem {
+ //% "Move to"
+ text: qsTrId("jolla-email-me-move_to")
+ onClicked: {
+ pageStack.animatorPush(Qt.resolvedUrl("MoveToPage.qml"),
+ { msgId: model.messageId,
+ accountKey: emailAgent.accountIdForMessage(model.messageId)})
+ }
+ }
+ MenuItem {
+ visible: model.readStatus
+ //% "Mark as unread"
+ text: qsTrId("jolla-email-me-mark-unread")
+ onDelayedClick: emailAgent.markMessageAsUnread(model.messageId)
+ }
+ MenuItem {
+ visible: !model.readStatus
+ //% "Mark as read"
+ text: qsTrId("jolla-email-me-mark-read")
+ onDelayedClick: emailAgent.markMessageAsRead(model.messageId)
+ }
+ MenuItem {
+ //% "Delete"
+ text: qsTrId("jolla-email-me-delete")
+ onClicked: messageItem.remove()
+ }
+ }
+ }
+}
diff --git a/usr/share/jolla-email/pages/MessageListHeader.qml b/usr/share/jolla-email/pages/MessageListHeader.qml
new file mode 100644
index 00000000..dea1b9b4
--- /dev/null
+++ b/usr/share/jolla-email/pages/MessageListHeader.qml
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2013 – 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.6
+import Sailfish.Silica 1.0
+
+PageHeader {
+ id: root
+
+ property alias folderName: folderText.text
+ property int count
+ property string errorText
+
+ title: count > 0 ? count.toLocaleString() : ""
+ titleColor: palette.highlightColor
+ interactive: true // don't wait until folder list is pushed to indicate the header is interactive
+ highlighted: defaultHighlighted || folderMouseArea.containsMouse
+
+ height: Math.max(_preferredHeight, _titleItem.y + _titleItem.height + ((errorText.length > 0) ? errorLabel.height : 0) + Theme.paddingMedium)
+
+ Behavior on height { NumberAnimation { duration: 250; easing.type: Easing.InOutQuad } }
+
+ Label {
+ id: folderText
+
+ parent: root.extraContent
+
+ x: parent.width - width
+ y: Math.floor((root._preferredHeight - height) / 2)
+
+ width: Math.min(implicitWidth, parent.width)
+
+ rightPadding: root.title !== "" ? Theme.paddingMedium : 0
+
+ truncationMode: TruncationMode.Fade
+
+ font: root._titleItem.font
+ color: highlighted ? palette.highlightColor : palette.primaryColor
+
+ MouseArea {
+ id: folderMouseArea
+
+ anchors {
+ verticalCenter: parent.verticalCenter
+ right: parent.right
+ }
+ width: parent.implicitWidth + Theme.paddingLarge
+ height: root.height
+
+ onClicked: pageStack.navigateForward()
+ }
+ }
+
+ // The styling matches the description field taken from
+ // sailfish-silica/components/private/PageHeaderDescription.qml
+ // It's reimplemented here so that the opacity can be animated
+ Item {
+ id: errorItem
+
+ x: root.leftMargin
+ y: root._titleItem.y + root._titleItem.height
+ width: root.width - root.leftMargin - root.rightMargin
+
+ opacity: ((root.errorText.length > 0) ? 1 : 0)
+ Behavior on opacity { FadeAnimation {} }
+
+ Icon {
+ id: errorIcon
+
+ x: errorLabel.x - width - Theme.paddingSmall
+ y: (errorLabel.height - height) / 2
+
+ source: "image://theme/icon-s-warning"
+ color: palette.secondaryHighlightColor
+ }
+
+ Label {
+ id: errorLabel
+
+ x: errorItem.width - width
+
+ width: Math.min(implicitWidth, errorItem.width - errorIcon.width - Theme.paddingSmall)
+
+ font.pixelSize: Theme.fontSizeSmall
+ color: palette.secondaryHighlightColor
+ horizontalAlignment: Text.AlignRight
+ truncationMode: TruncationMode.Fade
+ }
+ }
+
+ onErrorTextChanged: {
+ if (errorText.length > 0) {
+ errorLabel.text = errorText
+ }
+ }
+}
diff --git a/usr/share/jolla-email/pages/MessageListPage.qml b/usr/share/jolla-email/pages/MessageListPage.qml
new file mode 100644
index 00000000..883f98a6
--- /dev/null
+++ b/usr/share/jolla-email/pages/MessageListPage.qml
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2012 – 2019 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+
+Page {
+ id: messageListPage
+
+ property alias folderAccessor: messageListView.folderAccessor
+ property Page folderListPage
+
+ function removeMessage(id) {
+ messageListView.removeMessage(id)
+ }
+
+ onStatusChanged: {
+ if (status === PageStatus.Active) {
+ app.coverMode = "mainView"
+ if (!app.syncInProgress
+ && Qt.application.state === Qt.ApplicationActive
+ && messageListView.folderType !== EmailFolder.InvalidFolder) {
+ messageListView.synchronize(false)
+ }
+
+ if (folderListPage && !pageStack.nextPage(messageListPage)) {
+ pageStack.pushAttached(folderListPage)
+ }
+ }
+ }
+
+ onFolderListPageChanged: {
+ if (status === PageStatus.Active && folderListPage &&
+ !pageStack.nextPage(messageListPage)) {
+ pageStack.pushAttached(folderListPage)
+ }
+ }
+
+ MessageListView {
+ id: messageListView
+ }
+
+ Loader {
+ anchors.fill: parent
+ asynchronous: true
+ // Note: doesn't update if content changes to different account later
+ Component.onCompleted: {
+ setSource(Qt.resolvedUrl("FolderListPage.qml"), {accountKey: messageListView.accountId})
+ }
+
+ onLoaded: folderListPage = item
+ onStatusChanged: {
+ if (status == Loader.Error && sourceComponent) {
+ console.log(sourceComponent.errorString())
+ }
+ }
+ onItemChanged: {
+ if (item) {
+ item.folderClicked.connect(function(accessor) {
+ messageListView.folderAccessor = accessor
+
+ // if the message list is sorted by sender and we are navigating to a outgoing folder,
+ // default to sort by recipients since sort by sender is not available for outgoing folders
+ if (messageListView.isOutgoingFolder && messageListView.sortBy == EmailMessageListModel.Sender) {
+ messageListView.sortBy = EmailMessageListModel.Recipients
+ } else if (!messageListView.isOutgoingFolder && messageListView.sortBy == EmailMessageListModel.Recipients) {
+ messageListView.sortBy = EmailMessageListModel.Sender
+ }
+
+ pageStack.navigateBack()
+ })
+
+ item.deletingFolder.connect(function(id) {
+ if (id === messageListView.folderId) {
+ var inbox = emailAgent.inboxFolderId(messageListView.accountId)
+ if (inbox > 0) {
+ var accessor = emailAgent.accessorFromFolderId(inbox)
+ messageListView.folderAccessor = accessor
+ } else {
+ console.log("Delete current folder: unable to set current folder to Inbox")
+ }
+ }
+ })
+ }
+ }
+ }
+
+ FolderAccessHint {
+ pageActive: messageListPage.status == PageStatus.Active && Qt.application.active && folderListPage
+ }
+}
diff --git a/usr/share/jolla-email/pages/MessageListView.qml b/usr/share/jolla-email/pages/MessageListView.qml
new file mode 100644
index 00000000..cb43b823
--- /dev/null
+++ b/usr/share/jolla-email/pages/MessageListView.qml
@@ -0,0 +1,396 @@
+/*
+ * Copyright (c) 2013 – 2019 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+import "utils.js" as Utils
+
+SilicaListView {
+ id: messageListView
+
+ property alias folderAccessor: messageModel.folderAccessor
+ property alias sortBy: messageModel.sortBy
+ property alias accountId: folder.parentAccountId
+ property alias messageCount: messageModel.count
+ readonly property alias folderId: folder.folderId
+ readonly property alias folderType: folder.folderType
+ readonly property bool isDraftsFolder: folderType === EmailFolder.DraftsFolder
+ readonly property bool isOutboxFolder: folderType === EmailFolder.OutboxFolder
+ readonly property alias isOutgoingFolder: folder.isOutgoingFolder
+ readonly property bool showGetMoreMails: !(mailAccountListModel.customFieldFromAccountId("showMoreMails", accountId) == "false")
+ readonly property int fetchMore: 50
+ readonly property int getMore: 20
+ property bool waitToFetchMore
+ property bool errorOccurred
+ property string lastErrorText
+ readonly property bool updating: emailAgent.currentSynchronizingAccountId === accountId
+
+ function sendAll() {
+ if (isOutboxFolder) {
+ emailAgent.processSendingQueue(accountId)
+ } else {
+ console.log("Trying to process sending queue for something else than outbox.")
+ }
+ }
+
+ function synchronize(force) {
+ if (isOutboxFolder)
+ return
+
+ var key = "sync_" + accountId.toString() + "_" + folder.folderId.toString()
+ var now = Date.now()
+
+ if (typeof force == "boolean" && !force && (!Utils.canSyncFolder(key, now) || !emailAgent.isOnline())) {
+ return
+ }
+
+ // Store both manual sync and navigation between folders
+ // time stamps.
+ Utils.updateRecentSync(key, now)
+
+ emailAgent.exportUpdates(accountId)
+ emailAgent.retrieveMessageList(accountId, folder.folderId)
+ }
+
+ function removeMessage(id) {
+ var index = messageModel.indexFromMessageId(id)
+ currentIndex = index
+ positionViewAtIndex(index, ListView.Contain)
+ currentItem.remove()
+ }
+
+ anchors.fill: parent
+
+ header: MessageListHeader {
+ folderName: messageListView.updating
+ //: Updating header
+ //% "Updating..."
+ ? qsTrId("jolla-email-he-updating")
+ : Utils.standardFolderName(folder.folderType, folder.displayName)
+ count: messageListView.updating ? 0 : folder.folderUnreadCount
+ errorText: messageListView.errorOccurred ? messageListView.lastErrorText : ""
+
+ onHeightChanged: {
+ // If an error message causes the header height to change, compensate by moving the scroll position
+ if ((messageListView.contentY >= messageListView.originY)
+ && (messageListView.contentY < messageListView.originY + Theme.itemSizeSmall)
+ && (!messageListView.dragging)) {
+ messageListView.contentY = messageListView.originY
+ }
+ }
+ }
+
+ footer: Item {
+ width: messageListView.width
+ height: Theme.paddingLarge
+ }
+
+ section {
+ property: _sectionProperty()
+ criteria: _sectionCriteria()
+
+ delegate: SectionHeader {
+ text: _sectionDelegateText(section)
+ height: text === "" ? 0 : Theme.itemSizeSmall
+ horizontalAlignment: Text.AlignHCenter
+ font.capitalization: (messageModel.sortBy == EmailMessageListModel.Sender
+ || messageModel.sortBy == EmailMessageListModel.Subject)
+ ? Font.AllUppercase : Font.MixedCase
+
+ function _sectionDelegateText(section) {
+ var sortBy = messageModel.sortBy
+ if (sortBy === EmailMessageListModel.Time) {
+ return Format.formatDate(section, Formatter.TimepointSectionRelative)
+ } else if (sortBy === EmailMessageListModel.Size) {
+ if (section == "0") {
+ //: Section header for small size emails
+ //% "Small (<100 KB)"
+ return qsTrId("jolla-email-la-small_size")
+ } else if (section == "1") {
+ //: Section header for medium size emails
+ //% "Medium (100-500 KB)"
+ return qsTrId("jolla-email-la-medium_size")
+ } else {
+ //: Section header for large size emails
+ //% "Large (>500 KB)"
+ return qsTrId("jolla-email-la-large_size")
+ }
+ } else if (sortBy === EmailMessageListModel.ReadStatus) {
+ if (section == "true") {
+ //: Read emails section header
+ //% "Read emails"
+ return qsTrId("jolla-email-la-read_email")
+ } else {
+ //: Unread emails section header
+ //% "Unread emails"
+ return qsTrId("jolla-email-la-unread_email")
+ }
+ } else if (sortBy === EmailMessageListModel.Priority) {
+ // assuming javascript handling string and enum comparison
+ if (section == EmailMessageListModel.HighPriority) {
+ //: High priority section header
+ //% "High"
+ return qsTrId("jolla-email-la-high_priority")
+ } else if (section == EmailMessageListModel.LowPriority) {
+ //: Low priority section header
+ //% "Low"
+ return qsTrId("jolla-email-la-low_priority")
+ } else {
+ //: Normal priority section header
+ //% "Normal"
+ return qsTrId("jolla-email-la-normal_priority")
+ }
+ } else if (sortBy === EmailMessageListModel.Attachments) {
+ if (section == "true") {
+ //: Contains attachments section header
+ //% "Contains attachments"
+ return qsTrId("jolla-email-la-contains_attachments")
+ } else {
+ //: No attachments section header
+ //% "No attachments"
+ return qsTrId("jolla-email-la-no_attachments")
+ }
+ } else {
+ return section
+ }
+ }
+ }
+ }
+
+ onAtYEndChanged: {
+ if (atYEnd && messageModel.canFetchMore) {
+ if (quickScrollAnimating) {
+ waitToFetchMore = true
+ } else {
+ messageModel.limit = messageModel.limit + fetchMore
+ }
+ }
+ }
+
+ onQuickScrollAnimatingChanged: {
+ if (!quickScrollAnimating && waitToFetchMore) {
+ waitToFetchMore = false
+ messageModel.limit = messageModel.limit + fetchMore
+ }
+ }
+
+ Binding {
+ target: app
+ property: "inboxUnreadCount"
+ when: folder.folderType == EmailFolder.InboxFolder
+ value: folder.folderUnreadCount
+ }
+
+ EmailFolder {
+ id: folder
+ folderAccessor: messageModel.folderAccessor
+ }
+
+ PullDownMenu {
+ busy: app.syncInProgress
+
+ MenuItem {
+ //: Selects message list sort method
+ //% "Sort by: %1"
+ text: qsTrId("jolla-email-me-sort_by").arg(Utils.sortTypeText(messageModel.sortBy))
+ visible: messageListView.count > 0
+ onClicked: {
+ // Don't show sort by sender for outgoing folders
+ var obj = pageStack.animatorPush(Qt.resolvedUrl("SortPage.qml"),
+ { isOutgoingFolder: folder.isOutgoingFolder })
+ obj.pageCompleted.connect(function(page) {
+ page.sortSelected.connect(function(sortType) {
+ messageModel.sortBy = sortType
+ pageStack.pop()
+ })
+ })
+ }
+ }
+
+ MenuItem {
+ //% "Select messages"
+ text: qsTrId("jolla-email-me-select_messages")
+ visible: messageListView.count > 0
+ onClicked: {
+ pageStack.animatorPush(Qt.resolvedUrl("MultiSelectionPage.qml"), {
+ removeRemorse: removeRemorse,
+ selectionModel: messageModel,
+ accountId: accountId,
+ folderId: folder.folderId,
+ deletionModel: deletionModel
+ })
+ }
+ }
+
+ MenuItem {
+ //: Search from messages
+ //% "Search"
+ text: qsTrId("jolla-email-me-search")
+ onClicked: {
+ pageStack.animatorPush(Qt.resolvedUrl("SearchPage.qml"), { accountId: accountId })
+ }
+ }
+
+ MenuItem {
+ //: Send all messages currently in the outbox
+ //% "Send all"
+ text: isOutboxFolder ? qsTrId("jolla-email-me-send-all")
+ //: Synchronise account menu item
+ //% "Sync"
+ : qsTrId("jolla-email-me-sync")
+ enabled: !isOutboxFolder || (isOutboxFolder && messageListView.count > 0)
+ onClicked: {
+ if (isOutboxFolder) {
+ sendAll()
+ } else {
+ synchronize()
+ }
+ }
+ }
+
+ MenuItem {
+ enabled: mailAccountListModel.numberOfTransmitAccounts > 0
+ //: New message menu item
+ //% "New Message"
+ text: qsTrId("jolla-email-me-new_message")
+ onClicked: {
+ pageStack.animatorPush(Qt.resolvedUrl("ComposerPage.qml"), { accountId: accountId })
+ }
+ }
+ }
+
+ PushUpMenu {
+ visible: !messageModel.canFetchMore && showGetMoreMails
+ busy: app.syncInProgress
+
+ MenuItem {
+ //% "Get more mails"
+ text: qsTrId("jolla-email-me-get_more_mails")
+ onClicked: {
+ if (messageModel.limit) {
+ messageModel.limit = messageModel.limit + getMore
+ }
+ emailAgent.getMoreMessages(folder.folderId, getMore)
+ }
+ }
+ }
+
+ MessageRemorsePopup {
+ id: removeRemorse
+ }
+
+ ViewPlaceholder {
+ opacity: messageListView.count === 0 ? 1.0 : 0.0
+
+ text: {
+ if (!app.syncInProgress) {
+ //: Empty message list placeholder label
+ //% "No emails"
+ return qsTrId("jolla-email-la-empty_list")
+ }
+ return ""
+ }
+ }
+
+ model: DeletionDelegateModel {
+ id: deletionModel
+
+ model: EmailMessageListModel {
+ id: messageModel
+
+ limit: app.defaultMessageListLimit
+ // reset limit upon content change
+ onFolderAccessorChanged: {
+ limit = app.defaultMessageListLimit
+ messageListView.contentY = messageListView.originY
+ }
+ }
+
+ delegate: messageModel.sortBy == EmailMessageListModel.Subject
+ ? subjectSortedDelegate
+ : (messageModel.sortBy == EmailMessageListModel.Time
+ ? timeSortedDelegate
+ : defaultSortedDelegate)
+ }
+
+ Component {
+ id: subjectSortedDelegate
+ MessageListViewItem {
+ //% "(Empty subject)"
+ primaryLine: model.subject != "" ? model.subject : qsTrId("jolla-email-la-no_subject")
+ secondaryLine: model.senderDisplayName != "" ? model.senderDisplayName : model.senderEmailAddress
+ showRecipientsName: folder.isOutgoingFolder
+ isDraftsFolder: messageListView.isDraftsFolder
+ }
+ }
+ Component {
+ id: timeSortedDelegate
+ MessageListViewItem {
+ showRecipientsName: folder.isOutgoingFolder
+ isDraftsFolder: messageListView.isDraftsFolder
+ }
+ }
+ Component {
+ id: defaultSortedDelegate
+ MessageListViewItem {
+ date: Format.formatDate(model.qDateTime, Formatter.TimepointRelative)
+ showRecipientsName: folder.isOutgoingFolder
+ isDraftsFolder: messageListView.isDraftsFolder
+ }
+ }
+
+ VerticalScrollDecorator {}
+
+ function _sectionProperty() {
+ var sortBy = messageModel.sortBy
+ if (sortBy === EmailMessageListModel.Time) {
+ return "timeSection"
+ } else if (sortBy === EmailMessageListModel.Sender) {
+ return "senderDisplayName"
+ } else if (sortBy === EmailMessageListModel.Size) {
+ return "sizeSection"
+ } else if (sortBy === EmailMessageListModel.ReadStatus) {
+ return "readStatus"
+ } else if (sortBy === EmailMessageListModel.Priority) {
+ return "priority"
+ } else if (sortBy === EmailMessageListModel.Attachments) {
+ return "hasAttachments"
+ } else if (sortBy === EmailMessageListModel.Subject) {
+ return "subject"
+ } else if (sortBy === EmailMessageListModel.Recipients) {
+ return "recipients"
+ }
+ }
+
+ function _sectionCriteria() {
+ var sortBy = messageModel.sortBy
+ if (sortBy === EmailMessageListModel.Sender || sortBy === EmailMessageListModel.Subject
+ || sortBy === EmailMessageListModel.Recipients) {
+ return ViewSection.FirstCharacter
+ } else {
+ return ViewSection.FullString
+ }
+ }
+
+ Connections {
+ target: emailAgent
+
+ onCurrentSynchronizingAccountIdChanged: {
+ if (emailAgent.currentSynchronizingAccountId === folder.parentAccountId) {
+ messageListView.errorOccurred = false
+ }
+ }
+
+ onError: {
+ if (accountId === 0 || accountId === folder.parentAccountId) {
+ messageListView.lastErrorText = Utils.syncErrorText(syncError)
+ messageListView.errorOccurred = true
+ }
+ }
+ }
+}
diff --git a/usr/share/jolla-email/pages/MessageListViewItem.qml b/usr/share/jolla-email/pages/MessageListViewItem.qml
new file mode 100644
index 00000000..2d8e22c8
--- /dev/null
+++ b/usr/share/jolla-email/pages/MessageListViewItem.qml
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2014 – 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+
+MessageItem {
+ // About to be deleted
+ onEmailViewerRequested: {
+ pageStack.animatorPush(app.getMessageViewerComponent(), {
+ "messageId": messageId,
+ "isOutgoing": isOutgoingFolder,
+ "removeCallback": function(id) { remove() }
+ })
+ }
+}
diff --git a/usr/share/jolla-email/pages/MessageRemorsePopup.qml b/usr/share/jolla-email/pages/MessageRemorsePopup.qml
new file mode 100644
index 00000000..fac9e815
--- /dev/null
+++ b/usr/share/jolla-email/pages/MessageRemorsePopup.qml
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2013 – 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+
+RemorsePopup {
+ property EmailMessageListModel selectionModel
+ property DeletionDelegateModel deletionModel
+
+ function startDeleteSelectedMessages() {
+ //: Remorse popup for multiple emails deletion
+ //% "Deleted %n mail(s)"
+ execute(qsTrId("jolla-email-me-deleted-mails", selectionModel.selectedMessageCount),
+ function() { selectionModel.deleteSelectedMessages()})
+ }
+
+ onCanceled: {
+ selectionModel.deselectAllMessages()
+ deletionModel.clearHidden()
+ }
+}
diff --git a/usr/share/jolla-email/pages/MessageView.qml b/usr/share/jolla-email/pages/MessageView.qml
new file mode 100644
index 00000000..a50ac119
--- /dev/null
+++ b/usr/share/jolla-email/pages/MessageView.qml
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2012 – 2019 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+import Sailfish.WebView 1.0
+import Nemo.Configuration 1.0
+
+WebViewPage {
+ id: messageViewPage
+
+ property alias messageId: message.messageId
+ property Page messageInfoPage
+ property bool loaded
+ property bool isOutgoing
+ readonly property bool replyAll: message.multipleRecipients
+ property Page previousPage: pageStack.previousPage()
+ // either undefined or function taking message id as parameter
+ property var removeCallback
+ property string pathToLoad
+ property string messageAction
+ readonly property bool isLocalFile: pathToLoad !== ""
+
+ property bool _sendReadReceipt
+
+ function doRemove() {
+ if (removeCallback) {
+ removeCallback(messageId)
+ } else {
+ console.warn("MessageView requested removal, but there is no handler defined")
+ }
+ }
+
+ onStatusChanged: {
+ if (status == PageStatus.Activating && isLocalFile) {
+ message.loadFromFile(pathToLoad)
+ }
+ if (status == PageStatus.Active) {
+ if (!loaded) {
+ htmlLoader.load(message)
+ htmlLoader.markAsRead()
+ }
+ pageStack.pushAttached(messageInfoComponent, { message: message })
+ app.coverMode = "mailViewer"
+ }
+ }
+
+ Component.onDestruction: {
+ if (_sendReadReceipt) {
+ switch (sendReadReceiptsConfig.value) {
+ case 0:
+ pageStack.animatorPush(Qt.resolvedUrl("SendReadReceiptDialog.qml"), { originalEmailId: messageId })
+ break
+ case 1: // always send
+ if (!message.sendReadReceipt(
+ // Defined in SendReadReceiptDialog
+ qsTrId("jolla-email-la-read_receipt_email_subject_prefix"),
+ // Defined in SendReadReceiptDialog
+ qsTrId("jolla-email-la-read_receipt_email_body")
+ .arg(Qt.formatTime(originalEmail.date))
+ .arg(Qt.formatDate(originalEmail.date))
+ .arg(message.accountAddress))) {
+ // Defined in SendReadReceiptDialog
+ app.showSingleLineNotification(qsTrId("jolla-email-la-failed_send_read_receipt"))
+ }
+ break
+ default:
+ break
+ }
+ }
+ }
+
+ EmailMessage {
+ id: message
+ autoVerifySignature: autoVerifySignatureConfig.value
+
+ onHtmlBodyChanged: {
+ if (messageViewPage.status == PageStatus.Active) {
+ loaded = false
+ htmlLoader.load(message)
+ }
+ }
+
+ onBodyChanged: {
+ if (messageViewPage.status == PageStatus.Active) {
+ loaded = false
+ htmlLoader.load(message)
+ }
+ }
+ }
+
+ HtmlLoader {
+ id: htmlLoader
+
+ anchors.fill: parent
+ portrait: messageViewPage.isPortrait
+ attachmentsModel: attachModel
+ isOutgoing: messageViewPage.isOutgoing
+ isLocalFile: messageViewPage.isLocalFile
+ initialAction: messageViewPage.messageAction
+ onRemoveRequested: messageViewPage.doRemove()
+ onNeedToSendReadReceipt: {
+ _sendReadReceipt = true
+ }
+ }
+
+ Component {
+ id: messageInfoComponent
+ MessageInfo {
+ isLocalFile: messageViewPage.isLocalFile
+ }
+ }
+
+ AttachmentListModel {
+ id: attachModel
+ messageId: message.messageId
+ }
+
+ Binding {
+ target: app
+ property: "viewerSender"
+ value: message.fromDisplayName
+ }
+
+ Binding {
+ target: app
+ property: "viewerSubject"
+ value: message.subject
+ }
+
+ ConfigurationValue {
+ id: sendReadReceiptsConfig
+ key: "/apps/jolla-email/settings/sendReadReceipts"
+ defaultValue: 0
+ }
+
+ ConfigurationValue {
+ id: autoVerifySignatureConfig
+ key: "/apps/jolla-email/settings/autoVerifySignature"
+ defaultValue: false
+ }
+}
diff --git a/usr/share/jolla-email/pages/MessageViewFooter.qml b/usr/share/jolla-email/pages/MessageViewFooter.qml
new file mode 100644
index 00000000..225f18c9
--- /dev/null
+++ b/usr/share/jolla-email/pages/MessageViewFooter.qml
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2020 Open Mobile Platform LLC.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Sailfish.Silica.private 1.0 as SilicaPrivate
+import Sailfish.Calendar 1.0
+import Sailfish.WebView.Controls 1.0
+import Sailfish.WebView.Popups 1.0
+import Nemo.Email 0.1
+import org.nemomobile.calendar 1.0
+import "utils.js" as Utils
+
+SilicaControl {
+ id: footer
+
+ property bool open
+ property alias textSelectionController: textSelectionToolbar.controller
+ property bool showReplyAll
+ property alias portrait: textSelectionToolbar.portrait
+
+ signal reply
+ signal replyAll
+ signal forward
+ signal deleteEmail
+
+ height: portrait ? Theme.itemSizeMedium : Theme.itemSizeSmall
+
+ palette.colorScheme: Theme.DarkOnLight
+
+ Rectangle {
+ width: footer.width
+ height: footer.height
+
+ color: "#f3f0f0"
+ }
+
+ TextSelectionToolbar {
+ id: textSelectionToolbar
+
+ width: footer.width
+ height: footer.height
+
+ selectAllEnabled: true
+
+ buttons: {
+ if (controller && controller.selectionVisible) {
+ return defaultButtons
+ } else {
+ var buttons = [
+ {
+ "icon": "image://theme/icon-m-message-reply",
+ //% "Reply"
+ "label": qsTrId("jolla-email-la-reply"),
+ "action": footer.reply
+ }
+ ]
+
+ if (footer.showReplyAll) {
+ buttons.push(
+ {
+ "icon": "image://theme/icon-m-message-reply-all",
+ //% "Reply All"
+ "label": qsTrId("jolla-email-la-reply_all"),
+ "action": footer.replyAll
+ })
+ }
+ buttons.push(
+ {
+ "icon": "image://theme/icon-m-delete",
+ //% "Delete"
+ "label": qsTrId("jolla-email-la-delete"),
+ "action": footer.deleteEmail
+ }, {
+ "icon": "image://theme/icon-m-message-forward",
+ //% "Forward"
+ "label": qsTrId("jolla-email-la-forward"),
+ "action": footer.forward
+ })
+ return buttons
+ }
+ }
+
+ onCall: Qt.openUrlExternally("tel:" + controller.text)
+ onShare: webShareAction.shareText(controller.text)
+ }
+
+ WebShareAction {
+ id: webShareAction
+ }
+}
diff --git a/usr/share/jolla-email/pages/MessageViewHeader.qml b/usr/share/jolla-email/pages/MessageViewHeader.qml
new file mode 100644
index 00000000..c3d0d442
--- /dev/null
+++ b/usr/share/jolla-email/pages/MessageViewHeader.qml
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2013 - 2022 Jolla Ltd.
+ * Copyright (c) 2020 - 2021 Open Mobile Platform LLC.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Sailfish.Calendar 1.0
+import Nemo.Email 0.1
+import org.nemomobile.calendar 1.0
+import Jolla.Email 1.0
+import "utils.js" as Utils
+
+Column {
+ id: root
+
+ property EmailMessage email
+ property AttachmentListModel attachmentsModel
+ property bool portrait
+ property bool showLoadImages
+ property bool isOutgoing
+
+ property bool open: true
+
+ property alias contentX: content.x
+ readonly property alias contentY: header.height
+
+ property alias contentItem: buttonsColumn
+ property alias heightBehaviorEnabled: heightBehavior.enabled
+
+ property QtObject event
+ property QtObject occurrence
+
+ readonly property bool inlineInvitation: email && email.calendarInvitationSupportsEmailResponses
+
+ signal loadImagesClicked
+ signal loadImagesCloseClicked
+
+ signal clicked
+
+ function _emailRecipients() {
+ var recipientsDisplayName = email.recipientsDisplayName.toString()
+ return recipientsDisplayName != ""
+ ? //: 'To: ' message recipients (keep the colon separator here)
+ //% "To: %1"
+ qsTrId("jolla-email-la-recipients_header").arg(recipientsDisplayName)
+ : //% "No recipients"
+ qsTrId("jolla-email-la-no_recipient")
+ }
+
+ PageHeader {
+ id: header
+
+ width: parent.width
+ rightMargin: headerIcons.width > 0
+ ? (headerIcons.width + Theme.paddingMedium + headerIcons.anchors.rightMargin)
+ : Theme.horizontalPageMargin
+ descriptionRightMargin: Theme.horizontalPageMargin
+ interactive: true
+
+ title: email ? (isOutgoing ? _emailRecipients() : email.fromDisplayName) : ""
+ description: email ? email.subject : ""
+
+ Row {
+ id: headerIcons
+
+ anchors {
+ right: parent.right
+ rightMargin: Theme.horizontalPageMargin + Theme.paddingSmall
+ verticalCenter: parent.verticalCenter
+ verticalCenterOffset: -Theme.paddingLarge / 3
+ }
+ spacing: Theme.paddingSmall
+
+ HighlightImage {
+ anchors.verticalCenter: parent.verticalCenter
+ source: inlineInvitation && event
+ && (event.secrecy === CalendarEvent.SecrecyPrivate
+ || event.secrecy === CalendarEvent.SecrecyConfidential)
+ ? "image://theme/icon-s-secure"
+ : ""
+ color: header.titleColor
+ }
+
+ HighlightImage {
+ anchors.verticalCenter: parent.verticalCenter
+ source: email ? Utils.priorityIcon(email.priority) : ""
+ color: header.titleColor
+ }
+ }
+ }
+
+ ImportModel {
+ icsString: inlineInvitation ? email.calendarInvitationBody : ""
+ onCountChanged: {
+ if (count > 0) {
+ root.event = getEvent(0)
+ root.occurrence = root.event ? root.event.nextOccurrence() : null
+ } else {
+ root.event = null
+ root.occurrence = null
+ }
+ }
+ }
+
+ SilicaControl {
+ id: content
+
+ palette.colorScheme: Theme.DarkOnLight
+
+ width: root.width - x
+ height: root.open ? buttonsColumn.implicitHeight : 0
+
+ clip: heightAnimation.running
+ visible: root.open || heightAnimation.running
+
+ Behavior on height {
+ id: heightBehavior
+ SmoothedAnimation { id: heightAnimation; easing.type: Easing.InOutQuad; duration: 100 }
+ }
+
+ Rectangle {
+ width: root.width
+ height: buttonsColumn.implicitHeight
+
+ color: "#f3f0f0"
+ }
+
+ Column {
+ id: buttonsColumn
+ width: parent.width
+
+ LoadImagesItem {
+ width: root.width
+
+ visible: root.showLoadImages
+
+ onClicked: root.loadImagesClicked()
+ onCloseClicked: root.loadImagesCloseClicked()
+ }
+
+ DecryptItem {
+ width: root.width
+ email: root.email
+ }
+
+ AttachmentRow {
+ width: root.width
+
+ visible: email && email.numberOfAttachments > 0
+ attachmentsModel: root.attachmentsModel
+ emailMessage: email
+ }
+
+ Loader {
+ visible: email && email.signatureStatus != EmailMessage.NoDigitalSignature
+ // SignatureItem.qml is not installed by default.
+ active: root.email && EmailUtils.emailAppCryptoEnabled
+ source: "SignatureItem.qml"
+ onItemChanged: if (item) item.email = root.email
+ width: parent.width
+ }
+
+ CalendarDelegate {
+ width: root.width
+
+ visible: email && (email.hasCalendarInvitation || email.hasCalendarCancellation) && !inlineInvitation
+ email: root.email
+ }
+ }
+ }
+}
diff --git a/usr/share/jolla-email/pages/MessageViewPullDown.qml b/usr/share/jolla-email/pages/MessageViewPullDown.qml
new file mode 100644
index 00000000..f10addf5
--- /dev/null
+++ b/usr/share/jolla-email/pages/MessageViewPullDown.qml
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2013 – 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+
+PullDownMenu {
+ id: root
+
+ signal removeRequested
+
+ function _openComposer(action) {
+ pageStack.animatorPush(Qt.resolvedUrl("ComposerPage.qml"), { popDestination: previousPage, action: action, originalMessageId: message.messageId })
+ }
+
+ MenuItem {
+ //% "Delete"
+ text: qsTrId("jolla-email-me-delete")
+ onClicked: {
+ pageStack.pop()
+ root.removeRequested()
+ }
+ }
+ MenuItem {
+ //: Forward message menu item
+ //% "Forward"
+ text: qsTrId("jolla-email-me-forward")
+ onClicked: _openComposer('forward')
+ }
+ MenuItem {
+ visible: replyAll
+ //: Reply to all message recipients menu item
+ //% "Reply to All"
+ text: qsTrId("jolla-email-me-reply_all")
+ onClicked: _openComposer('replyAll')
+ }
+ MenuItem {
+ //: Reply to message sender menu item
+ //% "Reply"
+ text: qsTrId("jolla-email-me-reply")
+ onClicked: _openComposer('reply')
+ }
+}
diff --git a/usr/share/jolla-email/pages/MoveFolderPage.qml b/usr/share/jolla-email/pages/MoveFolderPage.qml
new file mode 100644
index 00000000..719aceef
--- /dev/null
+++ b/usr/share/jolla-email/pages/MoveFolderPage.qml
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2018 – 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+import "utils.js" as Utils
+
+Page {
+ id: root
+
+ property int selectedFolderId: -1
+ property int folderId
+ property int parentFolderId
+ property FolderListModel folderModel
+
+ onStatusChanged: {
+ if (status === PageStatus.Deactivating) {
+ if (selectedFolderId != -1) {
+ emailAgent.moveFolder(folderId, selectedFolderId)
+ }
+ }
+ }
+
+ FolderListProxyModel {
+ id: folderProxyModel
+ sourceModel: root.folderModel
+ includeRoot: true
+ }
+
+ SilicaListView {
+ model: folderProxyModel
+ header: PageHeader {
+ //: Move folder page header
+ //% "Select folder:"
+ title: qsTrId("email-ph-folder_move")
+ }
+
+ anchors.fill: parent
+
+ delegate: FolderItem {
+ enabled: canCreateChild &&
+ folderId != root.folderId &&
+ folderId != root.parentFolderId
+ // don't show local folders and descendant folders in the list
+ hidden: Utils.isLocalFolder(folderId) || root.folderModel.isFolderAncestorOf(folderId, root.folderId)
+ highlighted: folderId == root.selectedFolderId
+ isCurrentItem: folderId == root.folderId
+ onClicked: {
+ root.selectedFolderId = folderId
+ pageStack.pop()
+ }
+ }
+ VerticalScrollDecorator {}
+
+ Component.onCompleted: {
+ // Scroll list to current folder
+ // Take into account 'Root' folder on top of the list
+ currentIndex = root.folderModel.indexFromFolderId(folderId) + 1
+ }
+ }
+}
diff --git a/usr/share/jolla-email/pages/MoveToPage.qml b/usr/share/jolla-email/pages/MoveToPage.qml
new file mode 100644
index 00000000..a773dda7
--- /dev/null
+++ b/usr/share/jolla-email/pages/MoveToPage.qml
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2013 – 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+import "utils.js" as Utils
+
+Page {
+ property alias accountKey: folderModel.accountKey
+ // Need either messageId or messageModel
+ property int msgId
+ property EmailMessageListModel messageModel
+ property int currentFolder: emailAgent.folderIdForMessage(msgId)
+ property int selectedFolder
+
+ onStatusChanged: {
+ if (status === PageStatus.Deactivating) {
+ if (selectedFolder) {
+ if (messageModel) {
+ messageModel.moveSelectedMessages(selectedFolder)
+ messageModel.deselectAllMessages()
+ } else {
+ emailAgent.moveMessage(msgId, selectedFolder)
+ }
+ } else if (messageModel) {
+ messageModel.deselectAllMessages()
+ }
+ }
+ }
+
+ FolderListModel {
+ id: folderModel
+ }
+
+ SilicaListView {
+ anchors.fill: parent
+ model: folderModel
+ header: PageHeader {
+ //: Move to folder page header
+ //% "Select Folder:"
+ title: qsTrId("jolla-email-he-select_folder")
+ }
+
+ delegate: FolderItem {
+ // don't show local folders in the list
+ hidden: Utils.isLocalFolder(folderId)
+ enabled: folderId != currentFolder && canHaveMessages
+ onClicked: {
+ selectedFolder = folderId
+ pageStack.pop()
+ }
+ }
+
+ VerticalScrollDecorator {}
+
+ Component.onCompleted: {
+ // Scroll list to current folder
+ // Take into account 'Root' folder on top of the list
+ currentIndex = folderModel.indexFromFolderId(currentFolder) + 1
+ }
+ }
+}
diff --git a/usr/share/jolla-email/pages/MultiSelectionPage.qml b/usr/share/jolla-email/pages/MultiSelectionPage.qml
new file mode 100644
index 00000000..fa85d519
--- /dev/null
+++ b/usr/share/jolla-email/pages/MultiSelectionPage.qml
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2013 – 2019 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+
+Page {
+ id: page
+
+ readonly property int selectionCount: selectionModel ? selectionModel.selectedMessageCount : 0
+ // these two for move to page
+ property int accountId
+ property int folderId
+ property bool actionInProgress
+ property bool showMove: accountId != 0
+ property MessageRemorsePopup removeRemorse
+ property EmailMessageListModel selectionModel
+ property DeletionDelegateModel deletionModel
+
+ onStatusChanged: {
+ if (status === PageStatus.Deactivating) {
+ if (!actionInProgress) {
+ selectionModel.deselectAllMessages()
+ }
+ deletionModel.clearSelected()
+ } else if (status === PageStatus.Active) {
+ // we want to have all messages available here for the mass operations
+ selectionModel.limit = 0
+ }
+ }
+
+ function _deleteClicked() {
+ actionInProgress = true
+ deletionModel.hideSelected()
+ removeRemorse.selectionModel = selectionModel
+ removeRemorse.deletionModel = deletionModel
+ removeRemorse.startDeleteSelectedMessages()
+ pageStack.pop()
+ }
+
+ function _moveClicked() {
+ actionInProgress = true
+ pageStack.animatorReplace(Qt.resolvedUrl("MoveToPage.qml"), {
+ messageModel: selectionModel,
+ accountKey: accountId,
+ currentFolder: folderId
+ })
+ }
+
+ SilicaListView {
+ clip: dockedPanel.expanded
+
+ anchors {
+ top: parent.top
+ left: parent.left
+ right: parent.right
+ bottom: dockedPanel.top
+ }
+
+ header: PageHeader {
+ title: selectionCount ? //: Selected messages
+ //% "Selected %n"
+ qsTrId("jolla-email-he-select_messages", selectionCount)
+ : //: Message selection header, no currently selected messages
+ //% "Selected"
+ qsTrId("jolla-email-he-zero_selected_messages")
+ }
+
+ model: selectionModel
+
+ section {
+ property: 'timeSection'
+
+ delegate: SectionHeader {
+ text: Format.formatDate(section, Formatter.TimepointSectionRelative)
+ height: text === "" ? 0 : implicitHeight + Theme.itemSizeSmall / 2
+ horizontalAlignment: Text.AlignHCenter
+ }
+ }
+
+ delegate: MessageItem {
+ function _toggleSelection() {
+ if (model.selected) {
+ selectionModel.deselectMessage(model.index)
+ page.deletionModel.deselectItem(model.index)
+ } else {
+ selectionModel.selectMessage(model.index)
+ page.deletionModel.selectItem(model.index)
+ }
+ }
+
+ menu: undefined // actions in docked panel
+ selectMode: true
+
+ onClicked: _toggleSelection()
+ onPressAndHold: _toggleSelection()
+ }
+
+ PullDownMenu {
+ busy: app.syncInProgress
+
+ MenuItem {
+ //: Deselect all messages
+ //% "Deselect all"
+ text: qsTrId("jolla-email-me-deselect_all_messages")
+ visible: selectionCount
+ onClicked: {
+ selectionModel.deselectAllMessages()
+ page.deletionModel.clearSelected()
+ }
+ }
+
+ MenuItem {
+ //: Select all messages
+ //% "Select all"
+ text: qsTrId("jolla-email-me-select_all_messages")
+ visible: selectionModel.count > 0 && selectionCount < selectionModel.count
+ onClicked: {
+ selectionModel.selectAllMessages()
+ page.deletionModel.selectAll()
+ }
+ }
+ }
+
+ VerticalScrollDecorator {}
+ }
+
+ DockedPanel {
+ id: dockedPanel
+ width: parent.width
+ height: Theme.itemSizeLarge
+ dock: Dock.Bottom
+ open: selectionCount
+
+ Image {
+ anchors.fill: parent
+ fillMode: Image.PreserveAspectFit
+ source: "image://theme/graphic-gradient-edge"
+ }
+ Row {
+ Item {
+ width: moveIcon.visible ? dockedPanel.width/3 : dockedPanel.width/2
+ height: Theme.itemSizeLarge
+ IconButton {
+ anchors.centerIn: parent
+ icon.source: "image://theme/icon-m-delete"
+ onClicked: _deleteClicked()
+ }
+ }
+ Item {
+ width: moveIcon.visible ? dockedPanel.width/3 : dockedPanel.width/2
+ height: Theme.itemSizeLarge
+ IconButton {
+ anchors.centerIn: parent
+ icon.source: selectionModel.unreadMailsSelected ? "image://theme/icon-m-mail-open" : "image://theme/icon-m-mail"
+ onClicked: {
+ if (selectionModel.unreadMailsSelected) {
+ selectionModel.markAsReadSelectedMessages()
+ } else {
+ selectionModel.markAsUnReadSelectedMessages()
+ }
+ }
+ }
+ }
+ Item {
+ id: moveIcon
+ visible: showMove
+ width: dockedPanel.width/3
+ height: Theme.itemSizeLarge
+ IconButton {
+ anchors.centerIn: parent
+ icon.source: "image://theme/icon-m-message-forward"
+ onClicked: _moveClicked()
+ }
+ }
+ }
+ }
+}
diff --git a/usr/share/jolla-email/pages/NewFolderDialog.qml b/usr/share/jolla-email/pages/NewFolderDialog.qml
new file mode 100644
index 00000000..1ec89cee
--- /dev/null
+++ b/usr/share/jolla-email/pages/NewFolderDialog.qml
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2018 – 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+
+Dialog {
+ id: root
+
+ property int parentFolderId
+ property string parentFolderName
+ property FolderListModel folderModel
+
+ canAccept: folderNameField.acceptableInput
+
+ onAcceptBlocked: {
+ if (!folderNameField.acceptableInput) {
+ folderNameField.errorHighlight = true
+ }
+ }
+
+ onAccepted: {
+ emailAgent.createFolder(folderNameField.text, folderModel.accountKey, parentFolderId)
+ }
+
+ SilicaFlickable {
+ anchors.fill: parent
+ contentHeight: content.height + Theme.paddingLarge
+ Column {
+ width: parent.width
+ DialogHeader {
+ id: dialogHeader
+ //% "Create"
+ acceptText: qsTrId("email-ph-folder_create")
+ }
+ TextField {
+ id: folderNameField
+
+ //% "Folder name"
+ label: qsTrId("jolla-email-newfolder_folder_name_placeholder")
+ //% "Folder name required"
+ description: errorHighlight ? qsTrId("jolla-email-newfolder_folder_name_placeholder_error") : ""
+
+ acceptableInput: text.length > 0
+ onActiveFocusChanged: if (!activeFocus) errorHighlight = !acceptableInput
+ onAcceptableInputChanged: if (acceptableInput) errorHighlight = false
+
+ focus: true
+ EnterKey.enabled: root.canAccept
+ EnterKey.iconSource: "image://theme/icon-m-enter-accept"
+ EnterKey.onClicked: root.accept()
+ }
+
+ ValueButton {
+ id: valueButton
+ //% "Parent folder"
+ label: qsTrId("jolla-email-newfolder_parent_label")
+ value: parentFolderName
+ onClicked: {
+ var selector = pageStack.animatorPush(Qt.resolvedUrl("NewFolderParentSelectionPage.qml"), {
+ selectedFolderId: root.parentFolderId,
+ folderModel: root.folderModel
+ })
+ selector.pageCompleted.connect(function(page) {
+ page.folderSelected.connect(function(folderId, folderName) {
+ pageStack.pop()
+ root.parentFolderName = folderName
+ root.parentFolderId = folderId
+ })
+ })
+
+ }
+ }
+ }
+ VerticalScrollDecorator {}
+ }
+}
diff --git a/usr/share/jolla-email/pages/NewFolderParentSelectionPage.qml b/usr/share/jolla-email/pages/NewFolderParentSelectionPage.qml
new file mode 100644
index 00000000..9ff45eed
--- /dev/null
+++ b/usr/share/jolla-email/pages/NewFolderParentSelectionPage.qml
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2018 – 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+import "utils.js" as Utils
+
+Page {
+ id: root
+
+ property int selectedFolderId: -1
+ property FolderListModel folderModel
+
+ signal folderSelected(int folderId, string folderName)
+
+ FolderListProxyModel {
+ id: folderProxyModel
+ sourceModel: root.folderModel
+ includeRoot: true
+ }
+
+ SilicaListView {
+ anchors.fill: parent
+ model: folderProxyModel
+ header: PageHeader {
+ //% "Parent folder"
+ title: qsTrId("jolla-email-newfolder_select_parent_title")
+ }
+
+ delegate: FolderItem {
+ enabled: canCreateChild
+ isCurrentItem: folderId == root.selectedFolderId
+ // don't show local folders in the list
+ hidden: Utils.isLocalFolder(folderId)
+ onClicked: {
+ root.folderSelected(folderId, folderDisplayName)
+ }
+ }
+ VerticalScrollDecorator {}
+
+ Component.onCompleted: {
+ // Scroll list to current folder
+ // Take into account 'Root' folder on top of the list
+ currentIndex = root.folderModel.indexFromFolderId(selectedFolderId) + 1
+ }
+ }
+}
diff --git a/usr/share/jolla-email/pages/NoAccountsPage.qml b/usr/share/jolla-email/pages/NoAccountsPage.qml
new file mode 100644
index 00000000..e5ee5f71
--- /dev/null
+++ b/usr/share/jolla-email/pages/NoAccountsPage.qml
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import com.jolla.email 1.1
+import Sailfish.Policy 1.0
+
+Page {
+ SilicaFlickable {
+ anchors.fill: parent
+
+ PullDownMenu {
+ visible: AccessPolicy.accountCreationEnabled
+ MenuItem {
+ //: Add account menu item
+ //% "Add account"
+ text: qsTrId("jolla-email-me-add_account")
+ onClicked: {
+ app.showAccountsCreationDialog()
+ }
+ }
+ }
+
+ PageHeader {
+ //: Email page header
+ //% "Mail"
+ title: qsTrId("email-he-email")
+ }
+
+ NoAccountsPlaceholder {
+ enabled: true
+ }
+ }
+}
diff --git a/usr/share/jolla-email/pages/PendingInboxPage.qml b/usr/share/jolla-email/pages/PendingInboxPage.qml
new file mode 100644
index 00000000..e0b00d05
--- /dev/null
+++ b/usr/share/jolla-email/pages/PendingInboxPage.qml
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+import com.jolla.email 1.1
+
+Page {
+ id: root
+
+ property int accountId
+
+ onStatusChanged: {
+ if (status === PageStatus.Active) {
+ tryReplaceWithMessagePage()
+ }
+ }
+
+ function tryReplaceWithMessagePage() {
+ if (root.status != PageStatus.Active)
+ return
+
+ var inbox = emailAgent.inboxFolderId(accountId)
+ if (inbox > 0) {
+ var accessor = emailAgent.accessorFromFolderId(inbox)
+ pageStack.replace(Qt.resolvedUrl("MessageListPage.qml"), { folderAccessor: accessor },
+ PageStackAction.Immediate)
+ }
+ }
+
+ Connections {
+ target: emailAgent
+ onStandardFoldersCreated: tryReplaceWithMessagePage()
+ }
+
+ BusyLabel {
+ //% "Synchronizing account"
+ text: qsTrId("jolla-email-la-synchronizing_account")
+ running: true
+ }
+}
diff --git a/usr/share/jolla-email/pages/RenameFolderDialog.qml b/usr/share/jolla-email/pages/RenameFolderDialog.qml
new file mode 100644
index 00000000..b52f70e2
--- /dev/null
+++ b/usr/share/jolla-email/pages/RenameFolderDialog.qml
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2018 – 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+
+Dialog {
+ id: root
+
+ property int folderId
+ property string folderName
+ canAccept: nameEdit.acceptableInput
+
+ onAcceptBlocked: {
+ if (!nameEdit.acceptableInput) {
+ nameEdit.errorHighlight = true
+ }
+ }
+
+ onAccepted: {
+ emailAgent.renameFolder(folderId, nameEdit.text)
+ }
+
+ Column {
+ width: parent.width
+ DialogHeader {
+ //% "Rename"
+ acceptText: qsTrId("email-ph-folder_rename_title")
+ }
+
+ TextField {
+ id: nameEdit
+ text: folderName
+ focus: true
+
+ //% "Folder name"
+ label: qsTrId("email-la-folder_rename")
+ //% "New folder name required"
+ description: errorHighlight ? qsTrId("email-la-folder_rename_error") : ""
+
+ acceptableInput: text.length > 0 && text !== folderName
+ onActiveFocusChanged: if (!activeFocus) errorHighlight = !acceptableInput
+ onAcceptableInputChanged: if (acceptableInput) errorHighlight = false
+
+ EnterKey.enabled: root.canAccept
+ EnterKey.iconSource: "image://theme/icon-m-enter-accept"
+ EnterKey.onClicked: root.accept()
+ }
+ }
+}
diff --git a/usr/share/jolla-email/pages/SearchOptionsPage.qml b/usr/share/jolla-email/pages/SearchOptionsPage.qml
new file mode 100644
index 00000000..a7109543
--- /dev/null
+++ b/usr/share/jolla-email/pages/SearchOptionsPage.qml
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2015 – 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+
+Page {
+ property EmailMessageListModel searchModel
+
+ SilicaListView {
+ anchors.fill: parent
+ contentHeight: column.height
+
+ Column {
+ id: column
+ width: parent.width
+
+ PageHeader {
+ //% "Search options"
+ title: qsTrId("jolla-email-he-search_options")
+ }
+
+ ComboBox {
+ id: searchInCombo
+
+ currentIndex: searchModel.searchOn === EmailMessageListModel.LocalAndRemote ? 0 : searchModel.searchOn === EmailMessageListModel.Local ? 1 : 2
+ //% "Search on"
+ label: qsTrId("jolla-email-la-search_on")
+ menu: ContextMenu {
+ MenuItem {
+ //: Search on server and device
+ //% "Server and device"
+ text: qsTrId("jolla-email-me_search_server_and_device")
+ onClicked: searchModel.searchOn = EmailMessageListModel.LocalAndRemote
+ }
+ MenuItem {
+ //: Search on device
+ //% "Device"
+ text: qsTrId("jolla-email-me_search_device")
+ onClicked: searchModel.searchOn = EmailMessageListModel.Local
+ }
+ MenuItem {
+ //: Search on server
+ //% "Server"
+ text: qsTrId("jolla-email-me_search_server")
+ onClicked: searchModel.searchOn = EmailMessageListModel.Remote
+ }
+ }
+ }
+
+ SectionHeader {
+ visible: searchInCombo.currentIndex === 1
+ //% "Search in"
+ text: qsTrId("jolla-email-la-search_in")
+ }
+
+ TextSwitch {
+ visible: searchInCombo.currentIndex === 1
+ //: Search From address, the email sender
+ //% "From"
+ text: qsTrId("jolla-email-la-search_from")
+ checked: searchModel.searchFrom
+ onCheckedChanged: searchModel.searchFrom = checked
+ }
+
+ TextSwitch {
+ visible: searchInCombo.currentIndex === 1
+ //: Search recipients addresses, the recipients of the email
+ //% "Recipients"
+ text: qsTrId("jolla-email-la-search_recipients")
+ checked: searchModel.searchRecipients
+ onCheckedChanged: searchModel.searchRecipients = checked
+ }
+
+ TextSwitch {
+ visible: searchInCombo.currentIndex === 1
+ //: Search the email subject
+ //% "Subject"
+ text: qsTrId("jolla-email-la-search_subject")
+ checked: searchModel.searchSubject
+ onCheckedChanged: searchModel.searchSubject = checked
+ }
+
+ TextSwitch {
+ visible: searchInCombo.currentIndex === 1
+ //: Search email body, the email content
+ //% "Message body"
+ text: qsTrId("jolla-email-la-search_body")
+ checked: searchModel.searchBody
+ onCheckedChanged: searchModel.searchBody = checked
+ }
+ }
+ VerticalScrollDecorator {}
+ }
+}
diff --git a/usr/share/jolla-email/pages/SearchPage.qml b/usr/share/jolla-email/pages/SearchPage.qml
new file mode 100644
index 00000000..86c19079
--- /dev/null
+++ b/usr/share/jolla-email/pages/SearchPage.qml
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2015 – 2019 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+import "utils.js" as Utils
+
+Page {
+ id: searchPage
+
+ property int accountId
+ property string searchString: searchField.text.toLowerCase().trim()
+ property bool openingTopPage
+ property bool resetSearch
+
+ onSearchStringChanged: messageListModel.setSearch(searchString)
+
+ onStatusChanged: {
+ if (status === PageStatus.Deactivating) {
+ if (openingTopPage) {
+ messageListModel.cancelSearch()
+ }
+ } else if (status === PageStatus.Active) {
+ listView.currentIndex = -1 // To keep focus in a search field after coming back from message viewer
+ if (!openingTopPage) {
+ searchField.forceActiveFocus()
+ }
+ // Updating model search options doesn't automatically refresh
+ // the search results, so we force it manually here on returning
+ if (resetSearch) {
+ resetSearch = false
+ messageListModel.setSearch(searchString)
+ }
+ openingTopPage = false
+ }
+ }
+
+ EmailMessageListModel {
+ id: messageListModel
+
+ limit: app.defaultMessageListLimit
+ folderAccessor: emailAgent.accountWideSearchAccessor(accountId)
+ }
+
+ SilicaListView {
+ id: listView
+ anchors.fill: parent
+ currentIndex: -1 // to keep focus
+
+ header: Item {
+ width: headerContainer.width
+ height: headerContainer.height
+ }
+
+ PullDownMenu {
+ busy: app.syncInProgress
+
+ MenuItem {
+ //% "Search options"
+ text: qsTrId("jolla-email-me-search_options")
+ onClicked: {
+ openingTopPage = true
+ // TODO: Only reset the search if one of the search options changes
+ resetSearch = true
+ pageStack.animatorPush("SearchOptionsPage.qml", {searchModel: messageListModel})
+ }
+ }
+ }
+
+ model: messageListModel
+
+ section {
+ property: 'timeSection'
+
+ delegate: SectionHeader {
+ text: Format.formatDate(section, Formatter.TimepointSectionRelative)
+ height: text === "" ? 0 : implicitHeight + Theme.itemSizeSmall / 2
+ horizontalAlignment: Text.AlignHCenter
+ }
+ }
+
+ function removeMessage(id) {
+ if (currentItem) {
+ currentItem.doRemove(id)
+ } else {
+ console.warn("No current item when deleting searched email")
+ }
+ }
+
+ delegate: MessageItem {
+ searchString: searchPage.searchString
+ highlightSender: messageListModel.searchFrom
+ highlightRecipients: messageListModel.searchRecipients
+ highlightSubject: messageListModel.searchSubject
+ highlightBody: messageListModel.searchBody
+
+ // If the user selects the context menu option to move a message, this
+ // avoids forcing the active focus to the search field when we return
+ onMenuOpenChanged: openingTopPage = menuOpen
+
+ function doRemove(id) {
+ if (model.messageId != id) {
+ console.warn("Something went wrong removing an item in search page")
+ return
+ }
+ remove()
+ }
+
+ onEmailViewerRequested: {
+ // search model can delete delegates while viewing, workaround by going thru current item
+ listView.currentIndex = model.index
+ openingTopPage = true
+ // TODO: isOutgoing doesn't work for local folders this way, but hard to tell
+ // here the "virtual" folder
+ pageStack.animatorPush(app.getMessageViewerComponent(), {
+ "messageId": messageId,
+ "removeCallback": listView.removeMessage,
+ "isOutgoing": ((folderId == emailAgent.sentFolderId(accountId))
+ || (folderId == emailAgent.draftsFolderId(accountId))
+ || (folderId == emailAgent.outboxFolderId(accountId)))
+ })
+ }
+
+ // dismiss keyboard when scrolling
+ onPressed: searchField.focus = false
+ }
+
+ VerticalScrollDecorator {}
+
+ Column {
+ id: headerContainer
+
+ width: searchPage.width
+ parent: listView.contentItem
+ anchors.top: listView.headerItem ? listView.headerItem.top : listView.top
+
+ PageHeader {
+ //% "Search"
+ title: qsTrId("jolla-email-he-search")
+ }
+
+ SearchField {
+ id: searchField
+
+ width: parent.width
+ //% "Search emails"
+ placeholderText: qsTrId("jolla-components_email-la-search_emails")
+ autoScrollEnabled: false
+ // avoid removing focus whenever a message is added to the selection list
+ focusOutBehavior: FocusBehavior.KeepFocus
+ EnterKey.iconSource: "image://theme/icon-m-enter-close"
+ EnterKey.onClicked: focus = false
+ }
+ }
+ }
+}
diff --git a/usr/share/jolla-email/pages/SendReadReceiptDialog.qml b/usr/share/jolla-email/pages/SendReadReceiptDialog.qml
new file mode 100644
index 00000000..fc063547
--- /dev/null
+++ b/usr/share/jolla-email/pages/SendReadReceiptDialog.qml
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2018 – 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+import Nemo.Configuration 1.0
+
+Dialog {
+ id: root
+
+ property alias originalEmailId: originalEmail.messageId
+
+ canAccept: true
+
+ EmailMessage {
+ id: originalEmail
+ }
+
+ DialogHeader {
+ //% "Send receipt"
+ acceptText: qsTrId("email-dh-accept_send_read_receipt")
+ //% "Ignore"
+ cancelText: qsTrId("email-dh-do_not_send_read_receipt")
+ }
+
+ Column {
+ width: parent.width
+ spacing: Theme.paddingLarge
+ anchors {
+ top: parent.top
+ topMargin: Theme.itemSizeLarge // Page header size
+ }
+
+ Label {
+ x: Theme.horizontalPageMargin
+ width: parent.width - 2*x
+ wrapMode: Text.Wrap
+ font.pixelSize: Theme.fontSizeHuge
+ color: Theme.highlightColor
+ //% "Read receipt requested"
+ text: qsTrId("jolla-email-la-send_read_receipt")
+ }
+
+ Label {
+ x: Theme.horizontalPageMargin
+ width: parent.width - 2*x
+ wrapMode: Text.Wrap
+ font.pixelSize: Theme.fontSizeSmall
+ color: Theme.highlightColor
+ //% "Sender requested a read receipt. Do you want to send a receipt?"
+ text: qsTrId("jolla-email-la-send_read_receipt_description")
+ }
+ TextSwitch {
+ id: rememberChoiceSwitch
+ //% "Remember my choice"
+ text: qsTrId("jolla-email-ts-remember_choice")
+ checked: sendReadReceiptsConfig.value
+ }
+ }
+
+ onAccepted: {
+ if (originalEmail.messageId && !originalEmail.sendReadReceipt(
+ //% "Read: "
+ qsTrId("jolla-email-la-read_receipt_email_subject_prefix"),
+ //: %1:original email timestamp; %2:date of an email; %3:receiver email address
+ //% "Your email sent at %1 on %2 to %3 was read."
+ qsTrId("jolla-email-la-read_receipt_email_body")
+ .arg(Qt.formatTime(originalEmail.date))
+ .arg(Qt.formatDate(originalEmail.date))
+ .arg(originalEmail.accountAddress))) {
+ //% "Failed to send read receipt"
+ app.showSingleLineNotification(qsTrId("jolla-email-la-failed_send_read_receipt"))
+ }
+ if (rememberChoiceSwitch.checked) {
+ sendReadReceiptsConfig.value = 1 // means always send
+ }
+ }
+ onRejected: {
+ if (rememberChoiceSwitch.checked) {
+ sendReadReceiptsConfig.value = 2 // means always ignore
+ }
+ }
+
+ ConfigurationValue {
+ id: sendReadReceiptsConfig
+ key: "/apps/jolla-email/settings/sendReadReceipts"
+ defaultValue: 0
+ }
+}
diff --git a/usr/share/jolla-email/pages/ShareComposerPage.qml b/usr/share/jolla-email/pages/ShareComposerPage.qml
new file mode 100644
index 00000000..c492933f
--- /dev/null
+++ b/usr/share/jolla-email/pages/ShareComposerPage.qml
@@ -0,0 +1,113 @@
+/****************************************************************************************
+**
+** Copyright (c) 2013 - 2021 Jolla Ltd.
+** Copyright (c) 2021 Open Mobile Platform LLC
+** All rights reserved.
+**
+** License: Proprietary.
+**
+****************************************************************************************/
+import QtQuick 2.6
+import Sailfish.Silica 1.0
+import Sailfish.Share 1.0
+import Nemo.FileManager 1.0
+
+ComposerPage {
+ id: root
+
+ property var shareActionConfiguration
+
+ property var _fileResources: []
+ property var _contentResources: []
+ property var _tempFiles: []
+
+ function _addAttachment(fileInfo, title) {
+ var url = fileInfo.url + ""
+
+ if (!title) {
+ var fnIndex = url.lastIndexOf('/')
+ if (fnIndex >= 0) {
+ title = decodeURIComponent(url.slice(fnIndex+1))
+ }
+ }
+
+ attachmentsModel.append({
+ "url": url,
+ "title": title || fileInfo.fileName,
+ "mimeType": fileInfo.mimeType,
+ "fileSize": fileInfo.size
+ })
+ }
+
+ Component.onDestruction: {
+ shareAction.removeFilesAndRmdir(_tempFiles)
+ }
+
+ ShareAction {
+ id: shareAction
+
+ Component.onCompleted: {
+ shareAction.loadConfiguration(root.shareActionConfiguration)
+ root.accountId = shareAction.selectedTransferMethodInfo.accountId
+
+ var resources = shareAction.resources
+ for (var i = 0; i < resources.length; ++i) {
+ if (typeof resources[i] === "string") {
+ _fileResources.push(resources[i])
+ } else if ((resources[i].type === "text/plain" || resources[i].type === "text/x-url")
+ && (!resources[i].name)) {
+ // Show the contents inline within the email.
+ _contentResources.push(resources[i])
+ } else {
+ var tempFile = shareAction.writeContentToFile(resources[i], root.maximumAttachmentsSize)
+ if (tempFile.length > 0) {
+ _tempFiles.push(tempFile)
+ _fileResources.push(tempFile)
+ }
+ }
+ }
+ fileInstantiator.model = _fileResources
+ contentInstantiator.model = _contentResources
+ }
+ }
+
+ Instantiator {
+ id: fileInstantiator
+
+ model: undefined
+
+ delegate: FileInfo {
+ id: fileInfo
+
+ Component.onCompleted: {
+ fileInfo.url = modelData
+ _addAttachment(fileInfo)
+ }
+ }
+ }
+
+ Instantiator {
+ id: contentInstantiator
+
+ model: undefined
+
+ delegate: FileInfo {
+ id: contentFileInfo
+
+ Component.onCompleted: {
+ var content = modelData
+ if (content.type !== "text/plain" && content.type !== "text/x-url") {
+ // Other file types should have been converted into temporary files by ShareAction.
+ console.warn("Unexpected inline email content type:", content.type)
+ return
+ }
+ if (content.type === "text/x-url" && content.linkTitle) {
+ root.emailBody += (content.linkTitle + "\n\n")
+ }
+ if (!!content.status) {
+ root.emailBody += (content.status + "\n\n")
+ }
+ }
+ }
+ }
+}
diff --git a/usr/share/jolla-email/pages/SortPage.qml b/usr/share/jolla-email/pages/SortPage.qml
new file mode 100644
index 00000000..35c758bd
--- /dev/null
+++ b/usr/share/jolla-email/pages/SortPage.qml
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2013 – 2019 Jolla Ltd.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Email 0.1
+import "utils.js" as Utils
+
+Page {
+ id: root
+
+ property bool isOutgoingFolder
+
+ signal sortSelected(int sortType)
+
+ Component.onCompleted: {
+ if (isOutgoingFolder) {
+ sortModel.insert(1, {sortType: EmailMessageListModel.Recipients})
+ } else {
+ sortModel.insert(1, {sortType: EmailMessageListModel.Sender})
+ }
+ }
+
+ SilicaListView {
+ anchors.fill: parent
+ model: sortModel
+
+ header: PageHeader {
+ //% "Sort by"
+ title: qsTrId("jolla-email-he-sort_by")
+ }
+
+ delegate: BackgroundItem {
+ Label {
+ x: Theme.horizontalPageMargin
+ anchors.verticalCenter: parent.verticalCenter
+ text: Utils.sortTypeText(sortType)
+ color: highlighted ? Theme.highlightColor : Theme.primaryColor
+ }
+
+ onClicked: root.sortSelected(sortType)
+ }
+ VerticalScrollDecorator {}
+ }
+
+ ListModel {
+ id: sortModel
+
+ ListElement {
+ sortType: EmailMessageListModel.Time
+ }
+ ListElement {
+ sortType: EmailMessageListModel.Size
+ }
+ ListElement {
+ sortType: EmailMessageListModel.ReadStatus
+ }
+ ListElement {
+ sortType: EmailMessageListModel.Priority
+ }
+ ListElement {
+ sortType: EmailMessageListModel.Attachments
+ }
+ ListElement {
+ sortType: EmailMessageListModel.Subject
+ }
+ }
+}
diff --git a/usr/share/jolla-email/pages/utils.js b/usr/share/jolla-email/pages/utils.js
new file mode 100644
index 00000000..4880dd01
--- /dev/null
+++ b/usr/share/jolla-email/pages/utils.js
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2019 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
+ *
+ * License: Proprietary
+ */
+
+.pragma library
+.import Sailfish.Silica 1.0 as SS
+.import Nemo.Email 0.1 as Email
+
+var recentFolderSyncs = {}
+
+function canSyncFolder(key, time) {
+ // 30 second default folder sync interval.
+ // Try to avoid too frequent syncs when switching between folders.
+ var timeout = 30000
+
+ var lastSync = recentFolderSyncs[key] || 0
+ var elapsed = time - lastSync
+
+ if (elapsed < timeout) {
+ return false
+ }
+
+ return true
+}
+
+function updateRecentSync(key, value) {
+ recentFolderSyncs[key] = value
+}
+
+function lastSyncTime(lastSynchronized) {
+ if (lastSynchronized === 0) {
+ return ""
+ } else {
+ var elapsedTime = SS.Format.formatDate(lastSynchronized, SS.Formatter.TimeElapsed)
+
+ if (elapsedTime === "") {
+ //: 'Up to date label'
+ //% "Up to date"
+ return qsTrId("email-la_up_to_date")
+ } else {
+ return elapsedTime
+ }
+ }
+}
+
+function priorityIcon(priority) {
+ if (priority === Email.EmailMessageListModel.HighPriority) {
+ return "image://theme/icon-s-high-importance"
+ } else if (priority === Email.EmailMessageListModel.LowPriority) {
+ return "image://theme/icon-s-low-importance"
+ } else {
+ return ""
+ }
+}
+
+function standardFolderName(folderType, folderName) {
+ if (folderType === Email.EmailFolder.InboxFolder) {
+ //: Inbox folder
+ //% "Inbox"
+ return qsTrId("jolla-email-la-inbox_folder")
+ } else if (folderType === Email.EmailFolder.OutboxFolder) {
+ //: Outbox folder
+ //% "Outbox"
+ return qsTrId("jolla-email-la-outbox_folder")
+ } else if (folderType === Email.EmailFolder.SentFolder) {
+ //: Sent folder
+ //% "Sent"
+ return qsTrId("jolla-email-la-sent_folder")
+ } else if (folderType === Email.EmailFolder.DraftsFolder) {
+ //: Drafts folder
+ //% "Drafts"
+ return qsTrId("jolla-email-la-drafts_folder")
+ } else if (folderType === Email.EmailFolder.TrashFolder) {
+ //: Trash folder
+ //% "Trash"
+ return qsTrId("jolla-email-la-trash_folder")
+ } else {
+ return folderName
+ }
+}
+
+function isLocalFolder(folderId) {
+ return folderId === 1
+}
+
+function syncErrorText(syncError) {
+ if (syncError === Email.EmailAgent.SyncFailed) {
+ //: Synchronization failed error (Shown in app cover, small space)
+ //% "Sync error"
+ return qsTrId("jolla-email-la-sync_failed")
+ } else if (syncError === Email.EmailAgent.LoginFailed) {
+ //: Login failed error (Shown in app cover, small space)
+ //% "Login failed"
+ return qsTrId("jolla-email-la-login_failed")
+ } else if (syncError === Email.EmailAgent.DiskFull) {
+ //: Disk full error (Shown in app cover, small space)
+ //% "Disk Full"
+ return qsTrId("jolla-email-la-disk_full")
+ } else if (syncError === Email.EmailAgent.InvalidConfiguration) {
+ //: Invalid configuration (Shown in app cover, small space)
+ //% "Configuration error"
+ return qsTrId("jolla-email-la-invalid_configuration")
+ } else if (syncError === Email.EmailAgent.UntrustedCertificates) {
+ //: Invalid certificate (Shown in app cover, small space)
+ //% "Invalid certificate"
+ return qsTrId("jolla-email-la-invalid_certificate")
+ } else if (syncError === Email.EmailAgent.InternalError) {
+ //: Internal error (Shown in app cover, small space)
+ //% "Internal error"
+ return qsTrId("jolla-email-la-internal_error")
+ } else if (syncError === Email.EmailAgent.SendFailed) {
+ //: Send failed (Shown in app cover, small space)
+ //% "Send failed"
+ return qsTrId("jolla-email-la-send_failed")
+ } else if (syncError === Email.EmailAgent.Timeout) {
+ //: Connection timeout (Shown in app cover, small space)
+ //% "Connection timeout"
+ return qsTrId("jolla-email-la-connection_timeout")
+ } else if (syncError === Email.EmailAgent.ServerError) {
+ //: Server error (Shown in app cover, small space)
+ //% "Server error"
+ return qsTrId("jolla-email-la-server_error")
+ } else if (syncError === Email.EmailAgent.NotConnected) {
+ //: Not connected (Shown in app cover, small space)
+ //% "Not connected"
+ return qsTrId("jolla-email-la-not_connected")
+ }
+
+ console.warn("Unknown error message")
+ return ""
+}
+
+function sortTypeText(sortType) {
+ if (sortType === Email.EmailMessageListModel.Time) {
+ //: Sort by time
+ //% "Time"
+ return qsTrId("jolla-email-me-sort_time")
+ } else if (sortType === Email.EmailMessageListModel.Sender) {
+ //: sort by sender
+ //% "Sender"
+ return qsTrId("jolla-email-me-sort_sender")
+ } else if (sortType === Email.EmailMessageListModel.Recipients) {
+ //: sort by recipients
+ //% "Recipients"
+ return qsTrId("jolla-email-me-sort_recipients")
+ } else if (sortType === Email.EmailMessageListModel.Size) {
+ //: sort by size
+ //% "Size"
+ return qsTrId("jolla-email-me-sort_size")
+ } else if (sortType === Email.EmailMessageListModel.ReadStatus) {
+ //: sort by status
+ //% "Status"
+ return qsTrId("jolla-email-me-sort_status")
+ } else if (sortType === Email.EmailMessageListModel.Priority) {
+ //: sort by priority
+ //% "Importance"
+ return qsTrId("jolla-email-me-sort_importance")
+ } else if (sortType === Email.EmailMessageListModel.Attachments) {
+ //: sort by attachments
+ //% "Attachments"
+ return qsTrId("jolla-email-me-sort_attachments")
+ } else if (sortType === Email.EmailMessageListModel.Subject) {
+ //: sort by subject
+ //% "Subject"
+ return qsTrId("jolla-email-me-sort_subject")
+ }
+
+ console.warn("Unknown sort type")
+ return ""
+}
+
diff --git a/usr/share/jolla-email/pages/webviewframescript.js b/usr/share/jolla-email/pages/webviewframescript.js
new file mode 100644
index 00000000..cead0435
--- /dev/null
+++ b/usr/share/jolla-email/pages/webviewframescript.js
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2020 Open Mobile Platform LLC.
+ *
+ * License: Proprietary
+ */
+
+Services.scriptloader.loadSubScript("chrome://embedlite/content/ClickEventBlocker.js", this);
+
+addEventListener("DOMContentLoaded", function () {
+ // If the document doesn't have a viewport meta tag assume it is going to scale poorly and
+ // add one so it doesn't.
+ var viewport = content.document.querySelector("meta[name=viewport]");
+ if (!viewport) {
+ viewport = content.document.createElement("meta");
+ viewport.name = "viewport"
+ viewport.content = "width=device-width, initial-scale=1"
+ content.document.head.appendChild(viewport);
+ }
+
+ if (content.document.images.length > 0) {
+ sendAsyncMessage("JollaEmail:DocumentHasImages", {})
+ }
+})
+
+let global = this
+
+// This will send "embed:OpenLink" message when a link is clicked.
+ClickEventBlocker.init(global)
diff --git a/usr/share/jolla-gallery/mediasources/VKCacheMediaSource.qml b/usr/share/jolla-gallery/mediasources/FacebookCacheMediaSource.qml
similarity index 54%
rename from usr/share/jolla-gallery/mediasources/VKCacheMediaSource.qml
rename to usr/share/jolla-gallery/mediasources/FacebookCacheMediaSource.qml
index 48134f00..c8dd1b20 100644
--- a/usr/share/jolla-gallery/mediasources/VKCacheMediaSource.qml
+++ b/usr/share/jolla-gallery/mediasources/FacebookCacheMediaSource.qml
@@ -9,55 +9,55 @@ import QtQuick 2.6
import Sailfish.Accounts 1.0
import Sailfish.Silica 1.0
import com.jolla.gallery 1.0
-import com.jolla.gallery.vk 1.0
+import com.jolla.gallery.facebook 1.0
import org.nemomobile.socialcache 1.0
MediaSource {
id: root
- //: Label of the VK album in Jolla Gallery application
- //% "VK"
- title: qsTrId("jolla_gallery_vk-user_photos")
- icon: StandardPaths.resolveImport("com.jolla.gallery.vk.VKGalleryIcon")
+ //: Label of the Facebook album in Jolla Gallery application
+ //% "Facebook"
+ title: qsTrId("jolla_gallery_facebook-user_photos")
+ icon: StandardPaths.resolveImport("com.jolla.gallery.facebook.FacebookGalleryIcon")
model: allPhotos
- count: model.count
ready: syncHelper.syncProfiles.length > 0 && accountManager.cloudServiceReady
property bool applicationActive: Qt.application.active
- property VKImageCacheModel allPhotos: VKImageCacheModel {
- type: VKImageCacheModel.Images
- nodeIdentifier: constructNodeIdentifier("", "", "", "")
- downloader: VKImageDownloader
+ property FacebookImageCacheModel allPhotos: FacebookImageCacheModel {
+ type: FacebookImageCacheModel.Images
+ nodeIdentifier: ""
+ downloader: FacebookImageDownloader
}
- property VKImageCacheModel vkUsers: VKImageCacheModel {
- type: VKImageCacheModel.Users
+ property FacebookImageCacheModel fbUsers: FacebookImageCacheModel {
+ type: FacebookImageCacheModel.Users
onCountChanged: {
- root.page = count < 2 ? StandardPaths.resolveImport("com.jolla.gallery.vk.VKAlbumsPage")
- : StandardPaths.resolveImport("com.jolla.gallery.vk.VKUsersPage")
+ root.page = count < 2 ? StandardPaths.resolveImport("com.jolla.gallery.facebook.AlbumsPage")
+ : StandardPaths.resolveImport("com.jolla.gallery.facebook.UsersPage")
}
+ onModelUpdated: root.count = count > 0 ? getField(0, FacebookImageCacheModel.Count) : 0
}
property AccountManager accountManager: AccountManager {
property bool cloudServiceReady
Component.onCompleted: {
- cloudServiceReady = enabledAccounts("vk", "vk-images").length > 0
+ cloudServiceReady = enabledAccounts("facebook", "facebook-images").length > 0
}
}
property SyncHelper syncHelper: SyncHelper {
- socialNetwork: SocialSync.VK
+ socialNetwork: SocialSync.Facebook
dataType: SocialSync.Images
onLoadingChanged: {
if (!loading) {
- vkUsers.refresh()
+ fbUsers.refresh()
allPhotos.refresh()
}
}
onProfileDeleted: {
- vkUsers.refresh()
+ fbUsers.refresh()
allPhotos.refresh()
}
}
@@ -65,7 +65,7 @@ MediaSource {
// TODO: add a way to refresh the albums
Component.onCompleted: {
- vkUsers.refresh()
+ fbUsers.refresh()
allPhotos.refresh()
}
}
diff --git a/usr/share/jolla-gallery/pages/CoverPhoto.qml b/usr/share/jolla-gallery/pages/CoverPhoto.qml
index 4a90ae38..22f04a47 100644
--- a/usr/share/jolla-gallery/pages/CoverPhoto.qml
+++ b/usr/share/jolla-gallery/pages/CoverPhoto.qml
@@ -1,6 +1,6 @@
import QtQuick 2.2
import Sailfish.Silica 1.0
-import org.nemomobile.thumbnailer 1.0
+import Nemo.Thumbnailer 1.0
Item {
id: photo
diff --git a/usr/share/jolla-gallery/pages/FlickableImageView.qml b/usr/share/jolla-gallery/pages/FlickableImageView.qml
index 7833619f..38ebec5b 100644
--- a/usr/share/jolla-gallery/pages/FlickableImageView.qml
+++ b/usr/share/jolla-gallery/pages/FlickableImageView.qml
@@ -112,7 +112,7 @@ PagedView {
player: GalleryMediaPlayer {
autoPlay: root.autoPlay
active: currentItem && !currentItem.isImage && Qt.application.active
- source: active ? currentItem.source : ""
+ source: (currentItem && !currentItem.isImage) ? currentItem.source : ""
onPlayingChanged: {
if (playing && overlay.active) {
// go fullscreen for playback if triggered via Play icon.
diff --git a/usr/share/jolla-gallery/pages/GalleryCover.qml b/usr/share/jolla-gallery/pages/GalleryCover.qml
index d4d259f2..228ebdbe 100644
--- a/usr/share/jolla-gallery/pages/GalleryCover.qml
+++ b/usr/share/jolla-gallery/pages/GalleryCover.qml
@@ -2,7 +2,7 @@ import QtQuick 2.0
import QtDocGallery 5.0
import Sailfish.Silica 1.0
import com.jolla.gallery 1.0
-import org.nemomobile.thumbnailer 1.0
+import Nemo.Thumbnailer 1.0
CoverBackground {
id: cover
diff --git a/usr/share/jolla-gallery/pages/GalleryMediaIcon.qml b/usr/share/jolla-gallery/pages/GalleryMediaIcon.qml
index 0ede0c59..873d2621 100644
--- a/usr/share/jolla-gallery/pages/GalleryMediaIcon.qml
+++ b/usr/share/jolla-gallery/pages/GalleryMediaIcon.qml
@@ -1,6 +1,6 @@
import QtQuick 2.0
import Sailfish.Silica 1.0
-import org.nemomobile.thumbnailer 1.0
+import Nemo.Thumbnailer 1.0
import com.jolla.gallery 1.0
MediaSourceIcon {
diff --git a/usr/share/jolla-gallery/pages/GalleryStartPage.qml b/usr/share/jolla-gallery/pages/GalleryStartPage.qml
index 59fc4b42..bc49ff05 100644
--- a/usr/share/jolla-gallery/pages/GalleryStartPage.qml
+++ b/usr/share/jolla-gallery/pages/GalleryStartPage.qml
@@ -72,8 +72,7 @@ Page {
imageViewerPage = pageStack.push(
Qt.resolvedUrl("GalleryFullscreenPage.qml"),
{ model: viewerModel,
- currentIndex: viewerModel.count - urls.length,
- viewerOnlyMode: true
+ currentIndex: viewerModel.count - urls.length
},
PageStackAction.Immediate)
if (viewerAction) {
diff --git a/usr/share/jolla-mediaplayer/cover/IdleCover.qml b/usr/share/jolla-mediaplayer/cover/IdleCover.qml
new file mode 100644
index 00000000..9a488ba7
--- /dev/null
+++ b/usr/share/jolla-mediaplayer/cover/IdleCover.qml
@@ -0,0 +1,68 @@
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import com.jolla.mediaplayer 1.0
+
+Item {
+ property bool sourcesReady
+ property url largeAlbumArt
+ property url leftSmallAlbumArt
+ property url rightSmallAlbumArt
+
+ property bool _leftSmall: leftSmallAlbumArt != ""
+ property bool _rightSmall: rightSmallAlbumArt != ""
+
+ onSourcesReadyChanged: {
+ // sourcesReady changes after _leftSmall and _rightSmall have changed.
+ // Thus, image sizes have been figured out before loading images.
+ if (sourcesReady) {
+ largeThumbnail.source = largeAlbumArt
+
+ if (_leftSmall) {
+ leftThumbnail.source = leftSmallAlbumArt
+ }
+
+ if (_rightSmall) {
+ rightThumbnail.source = rightSmallAlbumArt
+ }
+ }
+ }
+
+ Image {
+ id: largeThumbnail
+
+ width: parent.width
+ height: _leftSmall || _rightSmall ? width : parent.height
+ sourceSize.width: width
+ sourceSize.height: height
+ fillMode: Image.PreserveAspectCrop
+ }
+
+ Image {
+ id: leftThumbnail
+
+ anchors.top: largeThumbnail.bottom
+ width: _rightSmall ? parent.width / 2 : parent.width
+ height: parent.height - largeThumbnail.height
+ sourceSize.width: width
+ sourceSize.height: height
+ fillMode: Image.PreserveAspectCrop
+ opacity: Theme.opacityLow
+ visible: _leftSmall
+ }
+
+ Image {
+ id: rightThumbnail
+
+ anchors {
+ top: leftThumbnail.top
+ left: leftThumbnail.right
+ }
+ width: parent.width / 2
+ height: parent.height - largeThumbnail.height
+ sourceSize.width: width
+ sourceSize.height: height
+ fillMode: Image.PreserveAspectCrop
+ opacity: Theme.opacityLow
+ visible: _rightSmall
+ }
+}
diff --git a/usr/share/jolla-mediaplayer/cover/MediaPlayerCover.qml b/usr/share/jolla-mediaplayer/cover/MediaPlayerCover.qml
new file mode 100644
index 00000000..af23cc8a
--- /dev/null
+++ b/usr/share/jolla-mediaplayer/cover/MediaPlayerCover.qml
@@ -0,0 +1,254 @@
+// -*- qml -*-
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import com.jolla.mediaplayer 1.0
+
+CoverBackground {
+ id: root
+
+ property alias idle: idleCover
+ property string idleArtist
+ property string idleSong
+ property var _reservedOrInvalid: ({})
+
+ function fetchAlbumArts(count) {
+ var artList = []
+ for (var i = 0; i < count; ++i) {
+ var albumArt = randomArt(allSongModel, albumArtProvider)
+ artList.push(albumArt)
+ }
+ return artList
+ }
+
+ function randomArt(model, albumArtProvider) {
+ var randomIndex = Math.floor(Math.random() * model.count)
+ var i = randomIndex
+ var count = model.count
+ var textualArt
+ // From index to end as index is a random model index
+ while (i < count) {
+ var song = model.get(i)
+ if (!_reservedOrInvalid[song.album + song.author]) {
+ var image = albumArtProvider.albumThumbnail(song.album, song.author)
+ _reservedOrInvalid[song.album + song.author] = true
+ if (image != "") {
+ return {
+ url: image,
+ author: song.author,
+ title: song.title
+ }
+ }
+ } else if (!textualArt) {
+ textualArt = {
+ url: image,
+ author: song.author,
+ title: song.title
+ }
+ }
+ ++i
+ }
+
+ // From beginning to index as index is a random model index
+ i = 0
+ count = randomIndex
+ while (i < count) {
+ song = model.get(i)
+ if (!_reservedOrInvalid[song.album + song.author]) {
+ image = albumArtProvider.albumThumbnail(song.album, song.author)
+ _reservedOrInvalid[song.album + song.author] = true
+ if (image != "") {
+ return {
+ url: image,
+ author: song.author,
+ title: song.title
+ }
+ }
+ } else if (!textualArt) {
+ textualArt = {
+ url: image,
+ author: song.author,
+ title: song.title
+ }
+ }
+ ++i
+ }
+
+ return textualArt ? textualArt : { url : "", album: "", author: ""}
+ }
+
+ width: Theme.coverSizeLarge.width
+ height: Theme.coverSizeLarge.height
+
+ VisualAudioModel {
+ id: visualAudioModel
+ modelActive: status != Cover.Inactive
+ }
+
+ CoverPlaceholder {
+ //: Coverpage text when there are no media
+ //% "Get music"
+ text: qsTrId("mediaplayer-la-get-music")
+ icon.source: "image://theme/icon-launcher-mediaplayer"
+ visible: allSongModel.count === 0 && !visualAudioModel.active
+ }
+
+ IdleCover {
+ id: idleCover
+ anchors.fill: parent
+ visible: !visualAudioModel.active
+ }
+
+ Image {
+ id: albumArtImage
+ visible: source != "" && visualAudioModel.active
+ anchors.fill: parent
+ sourceSize.width: width
+ sourceSize.height: height
+ source: visualAudioModel.metadata && 'url' in visualAudioModel.metadata
+ ? albumArtProvider.albumThumbnail(visualAudioModel.metadata.album, visualAudioModel.metadata.artist)
+ : ""
+ fillMode: Image.PreserveAspectCrop
+ }
+
+ Rectangle {
+ width: parent.width
+ height: column.y + column.height + 2*Theme.paddingLarge
+ visible: albumArtImage.visible
+ gradient: Gradient {
+ GradientStop { position: 0.0; color: Qt.rgba(0, 0, 0, Theme.opacityHigh) }
+ GradientStop { position: 0.6; color: Qt.rgba(0, 0, 0, Theme.opacityLow) }
+ GradientStop { position: 1.0; color: "transparent" }
+ }
+ }
+
+ Column {
+ id: column
+
+ x: Theme.paddingMedium
+ y: Theme.paddingMedium
+ spacing: Theme.paddingSmall
+ visible: allSongModel.count > 0
+ width: parent.width - 2*Theme.paddingMedium
+
+ Label {
+ id: durationLabel
+ anchors.horizontalCenter: parent.horizontalCenter
+ text: visualAudioModel.duration >= 3600000 ?
+ Format.formatDuration(visualAudioModel.position / 1000, Formatter.DurationLong) :
+ Format.formatDuration(visualAudioModel.position / 1000, Formatter.DurationShort)
+ color: (albumArtImage.visible && Theme.colorScheme == Theme.DarkOnLight)
+ ? Theme.highlightFromColor(Theme.highlightColor, Theme.LightOnDark)
+ : Theme.highlightColor
+ font.pixelSize: visualAudioModel.duration >= 3600000 ? Theme.fontSizeExtraLarge : Theme.fontSizeHuge
+ opacity: visualAudioModel.active ? (visualAudioModel.state === Audio.Paused ? Theme.opacityHigh : 1.0)
+ : 0.0
+ }
+
+ Label {
+ id: artistName
+ visible: (!albumArtImage.visible && visualAudioModel.active && text != "") || idleArtist != ""
+ text: visualAudioModel.metadata && 'url' in visualAudioModel.metadata
+ ? visualAudioModel.metadata.artist
+ : (idleArtist != "" ? idleArtist : "")
+ anchors.horizontalCenter: parent.horizontalCenter
+ width: Math.min(implicitWidth, parent.width)
+ color: durationLabel.color
+ truncationMode: TruncationMode.Fade
+ font.pixelSize: Theme.fontSizeLarge
+ lineHeightMode: Text.FixedHeight
+ lineHeight: Theme.itemSizeMedium/2 // to align with clock cover text
+ maximumLineCount: 1
+ }
+
+ Item {
+ width: parent.width
+ height: songTitle.height
+ visible: visualAudioModel.active || idleSong != ""
+
+ Label {
+ id: songTitle
+ text: visualAudioModel.metadata && 'url' in visualAudioModel.metadata
+ ? visualAudioModel.metadata.title
+ : (idleSong != "" ? idleSong : "")
+ anchors.horizontalCenter: parent.horizontalCenter
+ width: Math.min(implicitWidth, parent.width)
+ maximumLineCount: artistName.visible ? 2 : 3
+ color: (albumArtImage.visible && Theme.colorScheme == Theme.DarkOnLight)
+ ? Theme.lightPrimaryColor : Theme.primaryColor
+ wrapMode: Text.WordWrap
+ font.pixelSize: Theme.fontSizeLarge
+ lineHeightMode: Text.FixedHeight
+ lineHeight: Theme.itemSizeMedium/2 // to align with clock cover text
+ onLineLaidOut: {
+ // last line can show text as much as there fits
+ if (line.number == maximumLineCount - 1) {
+ line.width = parent.width + 1000
+ }
+ }
+ }
+
+ OpacityRampEffect {
+ offset: 0.5
+ // FIXME: OpacityRampEffect spits a warning when
+ // songTitle doesn't have an actual text
+ sourceItem: songTitle
+ enabled: songTitle.implicitWidth > Math.ceil(songTitle.width)
+ }
+ }
+
+ }
+
+ CoverActionList {
+ id: coverActions
+
+ iconBackground: albumArtImage.visible
+ enabled: visualAudioModel.active
+
+ CoverAction {
+ iconSource: visualAudioModel.state == Audio.Playing ? "image://theme/icon-cover-pause" : "image://theme/icon-cover-play"
+ onTriggered: AudioPlayer.playPause()
+ }
+
+ CoverAction {
+ iconSource: "image://theme/icon-cover-next-song"
+ onTriggered: AudioPlayer.playNext(true)
+ }
+ }
+
+ CoverActionList {
+ enabled: !coverActions.enabled && allSongModel.count > 0
+
+ CoverAction {
+ iconSource: "image://theme/icon-cover-shuffle"
+ onTriggered: AudioPlayer.shuffleAndPlay(allSongModel, allSongModel.count)
+ }
+ }
+
+ Connections {
+ target: allSongModel
+
+ //: placeholder string for albums without a known name
+ //% "Unknown album"
+ readonly property string unknownAlbum: qsTrId("mediaplayer-la-unknown-album")
+
+ //: placeholder string to be shown for media without a known artist
+ //% "Unknown artist"
+ readonly property string unknownArtist: qsTrId("mediaplayer-la-unknown-artist")
+
+ onFinished: {
+ var artList = fetchAlbumArts(3)
+ if (artList.length > 0) {
+ if (!artList[0].url || artList[0].url == "") {
+ root.idleArtist = artList[0].author ? artList[0].author : unknownArtist
+ root.idleSong = artList[0].title ? artList[0].title : unknownAlbum
+ } else {
+ root.idle.largeAlbumArt = artList[0].url
+ root.idle.leftSmallAlbumArt = artList[1] && artList[1].url ? artList[1].url : ""
+ root.idle.rightSmallAlbumArt = artList[2] && artList[2].url ? artList[2].url : ""
+ root.idle.sourcesReady = true
+ }
+ }
+ }
+ }
+}
diff --git a/usr/share/jolla-mediaplayer/mediaplayer.qml b/usr/share/jolla-mediaplayer/mediaplayer.qml
new file mode 100644
index 00000000..c4b32a2a
--- /dev/null
+++ b/usr/share/jolla-mediaplayer/mediaplayer.qml
@@ -0,0 +1,129 @@
+// -*- qml -*-
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Sailfish.Media 1.0
+import com.jolla.mediaplayer 1.0
+import Nemo.Thumbnailer 1.0 // register image provider
+import Nemo.DBus 2.0
+import "cover"
+import "pages"
+
+ApplicationWindow {
+ id: root
+
+ property Item _dockedPanel
+ property alias playlists: playlistManager
+ property alias visualAudioAppModel: audioAppModel
+ property Item activeMediaSource
+ property Component coverOverride: (activeMediaSource && activeMediaSource.hasOwnProperty("cover"))
+ ? activeMediaSource.cover
+ : null
+ onActiveMediaSourceChanged: AudioPlayer.mprisPlayerOverride =
+ (activeMediaSource && activeMediaSource.hasOwnProperty("mprisPlayer"))
+ ? activeMediaSource.mprisPlayer
+ : null
+
+ allowedOrientations: Screen.sizeCategory > Screen.Medium
+ ? defaultAllowedOrientations
+ : defaultAllowedOrientations & Orientation.PortraitMask
+ _defaultPageOrientations: Orientation.All
+ _defaultLabelFormat: Text.PlainText
+
+ cover: coverOverride != null ? coverOverride : Qt.resolvedUrl("cover/MediaPlayerCover.qml")
+
+ bottomMargin: _dockedPanel ? _dockedPanel.visibleSize : 0
+
+ initialPage: Component {
+ MainViewPage {
+ onMediaSourceActivated: {
+ root.activeMediaSource = source
+ }
+ }
+ }
+
+ function dockedPanel() {
+ if (!_dockedPanel) _dockedPanel = panelComponent.createObject(contentItem)
+ return _dockedPanel
+ }
+
+ VisualAudioAppModel {
+ id: audioAppModel
+ modelActive: root.applicationActive
+ onActiveChanged: dockedPanel()
+ onModelActiveChanged: {
+ if (active) {
+ dockedPanel().showControls()
+ }
+ }
+ }
+
+ Component {
+ id: panelComponent
+ MediaPlayerDockedPanel {
+ z: 1
+ author: audioAppModel.metadata && 'artist' in audioAppModel.metadata ? audioAppModel.metadata.artist : ""
+ title: audioAppModel.metadata && 'title' in audioAppModel.metadata ? audioAppModel.metadata.title : ""
+ duration: audioAppModel.duration / 1000
+ state: audioAppModel.state
+ active: audioAppModel.active
+ position: audioAppModel.position / 1000
+ }
+ }
+
+ AlbumArtProvider {
+ id: albumArtProvider
+ songsModel: allSongModel
+ }
+
+ GriloTrackerModel {
+ id: allSongModel
+
+ query: AudioTrackerHelpers.getSongsQuery("", {"unknownArtist": "", "unknownAlbum": "" })
+ }
+
+ PlaylistManager {
+ id: playlistManager
+ }
+
+ Component {
+ id: playQueuePage
+ PlayQueuePage {}
+ }
+
+ Connections {
+ target: AudioPlayer
+ onTryingToPlay: dockedPanel().showControls()
+ }
+
+ DBusAdaptor {
+ service: "com.jolla.mediaplayer"
+ path: "/com/jolla/mediaplayer/ui"
+ iface: "com.jolla.mediaplayer.ui"
+
+ function activateWindow(arg) {
+ root.activate()
+ }
+
+ function openUrl(arg) {
+ if (arg.length === 0) {
+ root.activate()
+
+ return true
+ }
+
+ AudioPlayer.playUrl(Qt.resolvedUrl(arg[0]))
+ if (!pageStack.currentPage || pageStack.currentPage.objectName !== "PlayQueuePage") {
+ pageStack.push(playQueuePage, {}, PageStackAction.Immediate)
+ }
+ dockedPanel().open = true
+ activate()
+
+ return true
+ }
+ }
+
+ // Ensure plugin overrides are disabled when the app shuts down
+ Component.onDestruction: activeMediaSource = null
+ Component.onCompleted: AudioPlayer.albumArtProvider = albumArtProvider
+}
diff --git a/usr/share/jolla-mediaplayer/pages/MainViewPage.qml b/usr/share/jolla-mediaplayer/pages/MainViewPage.qml
new file mode 100644
index 00000000..138281a0
--- /dev/null
+++ b/usr/share/jolla-mediaplayer/pages/MainViewPage.qml
@@ -0,0 +1,194 @@
+// -*- qml -*-
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Sailfish.Media 1.0
+import com.jolla.mediaplayer 1.0
+
+Page {
+ id: mainPage
+
+ signal mediaSourceActivated(Item source)
+
+ FilterModel {
+ id: filteredMediaSourceList
+
+ sourceModel: mediaSourceList
+
+ // Filter out if the value is not "1"
+ filterRegExp: mainPageHeader.searchText !== "" ? /^1$/ : RegExp("")
+ }
+
+ MediaPlayerListView {
+ id: mainListView
+ model: filteredMediaSourceList
+ anchors.fill: parent
+
+ PullDownMenu {
+ // FIXME: hiding search on this page now due to performing badly, should be reimplemented better
+ visible: visualAudioAppModel.active
+ NowPlayingMenuItem { id: nowPlaying }
+
+ MenuItem {
+ //: Search menu entry
+ //% "Search"
+ text: qsTrId("mediaplayer-me-search")
+ onClicked: mainPageHeader.enableSearch()
+ visible: false
+ }
+ }
+
+ header: SearchPageHeader {
+ id: mainPageHeader
+ width: parent.width
+ searchAsHeader: true
+
+ //: Title for the main page
+ //% "Media"
+ title: qsTrId("mediaplayer-he-media")
+
+ //: Main view search field placeholder text
+ //% "Search Media"
+ placeholderText: qsTrId("mediaplayer-tf-search-media")
+
+ Binding {
+ target: mediaSourceList
+ property: "searchText"
+ value: if (pageStack.currentPage === mainPage) mainPageHeader.searchText
+ }
+
+ Column {
+ id: playlistsItem
+
+ width: parent.width
+ height: {
+ var height = playlistsCategory.shouldBeVisible ? playlistsCategory.height : 0
+ if (playlists.populated && playlistRow.count === 0) {
+ return height
+ } else {
+ return height + playlistRow.height
+ }
+ }
+
+ clip: playlistRow.count > playlistRow.maxCount
+ Behavior on height { NumberAnimation { duration: 200; easing.type: Easing.InOutQuad } }
+
+ MediaContainerIconDelegate {
+ id: playlistsCategory
+
+ readonly property bool populated: playlists.populated
+ readonly property bool createNew: playlists.count == 0
+ readonly property bool shouldBeVisible: playlists.count !== 0 || mainPageHeader.searchText === ""
+
+ width: parent.width
+ opacity: shouldBeVisible ? 1.0 : 0.0
+ Behavior on opacity { FadeAnimation {} }
+ visible: opacity > 0.0
+ iconSource: "image://theme/icon-m-media-playlists"
+ title: !populated ? " "
+ : createNew
+ ? //: Playlists list item in the main view
+ //% "New playlist"
+ qsTrId("mediaplayer-me-new-playlist")
+ : //: Playlists list item in the main view
+ //% "Playlists"
+ qsTrId("mediaplayer-la-playlists")
+
+ //: Number of playlists
+ //% "%n playlists"
+ subtitle: populated ? (!createNew ? qsTrId("mediaplayer-la-number-of-playlists", playlists.count) : "")
+ : " "
+ onClicked: {
+ if (createNew) {
+ pageStack.animatorPush("com.jolla.mediaplayer.NewPlaylistDialog")
+ } else {
+ pageStack.animatorPush(Qt.resolvedUrl("PlaylistsPage.qml"), {searchText: mainPageHeader.searchText})
+ }
+ }
+ }
+
+ SilicaGridView {
+ id: playlistRow
+
+ readonly property int maxCount: Math.floor(parent.width / Theme.itemSizeExtraLarge)
+
+ width: parent.width
+ height: Theme.itemSizeExtraLarge + __silica_menu_height
+ cellHeight: Theme.itemSizeExtraLarge
+ cellWidth: width / Math.max(maxCount, 1)
+ flow: GridView.FlowTopToBottom
+
+ opacity: count > 0 ? 1.0 : 0.0
+ Behavior on opacity { FadeAnimator {} }
+ visible: !playlists.populated || count > 0
+
+ interactive: false
+ model: GriloTrackerModel {
+ id: playlistModel
+ query: PlaylistTrackerHelpers.getPlaylistsQuery(mainPageHeader.searchText, {"sortByUsage": true})
+ }
+
+ Connections {
+ target: playlists
+ onUpdated: playlistModel.refresh()
+ }
+
+ delegate: PlaylistItem {
+ width: playlistRow.cellWidth
+ contentHeight: playlistRow.cellHeight
+
+ highlighted: down || menuOpen
+ color: model.title != "" ? PlaylistColors.nameToColor(model.title)
+ : "transparent"
+ highlightColor: model.title != "" ? PlaylistColors.nameToHighlightColor(model.title)
+ : "transparent"
+
+ menu: Component {
+ ContextMenu {
+ MenuItem {
+ //% "Delete"
+ text: qsTrId("mediaplayer-me-delete")
+ onClicked: remove()
+ }
+ }
+ }
+
+ function remove() {
+ remorseDelete(function() {
+ playlists.removePlaylist(media)
+ })
+ }
+ }
+ }
+ }
+ }
+
+ delegate: MediaContainerIconDelegate {
+ id: delegate
+
+ width: ListView.view.width
+ title: mediaSource.title
+ subtitle: mediaSource.subtitle
+ iconSource: mediaSource.icon
+ iconSourceSize.width: Theme.iconSizeMedium
+ iconSourceSize.height: Theme.iconSizeMedium
+
+ onClicked: {
+ var obj = pageStack.animatorPush(Qt.resolvedUrl(mediaSource.mainView),
+ {model: mediaSource.model, searchText: mediaSource.searchText})
+ obj.pageCompleted.connect(function(view) {
+ mainPage.mediaSourceActivated(view)
+ })
+ }
+ ListView.onAdd: AddAnimation { target: delegate }
+ ListView.onRemove: animateRemoval()
+ }
+
+ ViewPlaceholder {
+ //: Placeholder text for an empty search view
+ //% "No items found"
+ text: qsTrId("mediaplayer-la-empty-search")
+ enabled: mainListView.count === 0 && !playlistRow.visible && !playlistsCategory.visible
+ }
+ }
+}
diff --git a/usr/share/jolla-mediaplayer/pages/PlaylistItem.qml b/usr/share/jolla-mediaplayer/pages/PlaylistItem.qml
new file mode 100644
index 00000000..5223dcc1
--- /dev/null
+++ b/usr/share/jolla-mediaplayer/pages/PlaylistItem.qml
@@ -0,0 +1,60 @@
+// -*- qml -*-
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+
+GridItem {
+ id: playlistItem
+
+ property color color: Theme.overlayBackgroundColor
+ property color highlightColor: Theme.highlightBackgroundColor
+
+ width: Theme.itemSizeExtraLarge
+ contentHeight: Theme.itemSizeExtraLarge
+ onClicked: pageStack.animatorPush(Qt.resolvedUrl("PlaylistPage.qml"), {media: media})
+
+ Rectangle {
+ id: background
+
+ anchors.fill: parent
+ color: playlistItem.highlighted ? playlistItem.highlightColor : playlistItem.color
+ }
+
+ Rectangle {
+ width: parent.width
+ height: parent.height / 2
+ gradient: Gradient {
+ GradientStop { position: 0.0; color: Qt.rgba(0, 0, 0, Theme.opacityLow) }
+ GradientStop { position: 1.0; color: Qt.rgba(0, 0, 0, 0) }
+ }
+ }
+
+ Image {
+ source: "image://theme/graphic-media-playlist-exlarge"
+ anchors.bottom: parent.bottom
+ anchors.right: parent.right
+ }
+
+ Label {
+ id: name
+
+ y: Theme.paddingMedium
+ x: Theme.paddingLarge
+ width: parent.width - x
+ truncationMode: TruncationMode.Fade
+ color: playlistItem.highlighted ? Theme.highlightColor: Theme.primaryColor
+ font.pixelSize: Theme.fontSizeExtraSmall
+ text: media.title
+ }
+
+ Label {
+ anchors.left: name.left
+ anchors.right: name.right
+ anchors.top: name.bottom
+ anchors.topMargin: Theme.paddingSmall
+ truncationMode: TruncationMode.Fade
+ color: playlistItem.highlighted ? Theme.highlightColor: Theme.primaryColor
+ font.pixelSize: Theme.fontSizeLarge
+ text: media.childCount
+ }
+}
diff --git a/usr/share/jolla-mediaplayer/pages/PlaylistPage.qml b/usr/share/jolla-mediaplayer/pages/PlaylistPage.qml
new file mode 100644
index 00000000..05180488
--- /dev/null
+++ b/usr/share/jolla-mediaplayer/pages/PlaylistPage.qml
@@ -0,0 +1,142 @@
+// -*- qml -*-
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Sailfish.Media 1.0
+import com.jolla.mediaplayer 1.0
+
+Page {
+ id: page
+
+ property var media
+ property bool isEditable: playlists.isEditable(media.url)
+
+ Connections {
+ target: playlists
+ onUpdated: {
+ if (playlistUrl == originalPlaylistModel.url) {
+ originalPlaylistModel.clear()
+ originalPlaylistModel.populate()
+ }
+ }
+ }
+
+ FilterModel {
+ id: playlistModel
+ sourceModel: originalPlaylistModel
+
+ filterRegExp: RegExpHelpers.regExpFromSearchString(playlistHeader.searchText, true)
+ }
+
+ PlaylistModel {
+ id: originalPlaylistModel
+ url: media.url
+ Component.onCompleted: populate()
+ }
+
+ MediaPlayerListView {
+ id: view
+ anchors.fill: parent
+ model: playlistModel
+
+ PullDownMenu {
+ enabled: playlistModel.count > 0
+ visible: playlistModel.count > 0
+
+ MenuItem {
+ //: Add to playing queue drop down menu item in playlist page
+ //% "Add to playing queue"
+ text: qsTrId("mediaplayer-me-playlist-add-to-playing-queue")
+ onClicked: AudioPlayer.addToQueue(playlistModel)
+ }
+
+ MenuItem {
+ //: Clear playlist drop down menu item in playlist page
+ //% "Clear playlist"
+ text: qsTrId("mediaplayer-me-playlist-clear-playlist")
+ visible: isEditable
+
+ onClicked: {
+ //: Clearing the playlist
+ //% "Clearing"
+ Remorse.popupAction(page, qsTrId("mediaplayer-la-clearing"), function() {
+ originalPlaylistModel.clear()
+ if (playlists.clearPlaylist(media, originalPlaylistModel)) {
+ pageStack.pop()
+ }
+ })
+ }
+ }
+
+ NowPlayingMenuItem { }
+
+ MenuItem {
+ //: Search menu entry
+ //% "Search"
+ text: qsTrId("mediaplayer-me-search")
+ onClicked: playlistHeader.enableSearch()
+ enabled: view.count > 0 || playlistHeader.searchText !== ''
+ }
+ }
+
+ ViewPlaceholder {
+ text: {
+ if (playlistHeader.searchText !== '') {
+ //: Placeholder text for an empty search view
+ //% "No items found"
+ return qsTrId("mediaplayer-la-empty-search")
+ } else {
+ //: "Placeholder text for an empty playlist; Add songs to playlist"
+ //% "Add some media"
+ return qsTrId("mediaplayer-la-add-some-media")
+ }
+ }
+ enabled: playlistModel.count === 0
+ }
+
+ header: SearchPageHeader {
+ id: playlistHeader
+ width: parent.width
+
+ title: media.title
+
+ //: Playlist search field placeholder text
+ //% "Search song"
+ placeholderText: qsTrId("mediaplayer-tf-playlist-search")
+ }
+
+ delegate: MediaListDelegate {
+ property int realIndex: playlistModel.mapRowToSource(index)
+
+ formatFilter: playlistHeader.searchText
+
+ function remove() {
+ remorseDelete(function() {
+ if (realIndex >= 0 ) {
+ originalPlaylistModel.remove(realIndex)
+ playlists.savePlaylist(page.media, originalPlaylistModel)
+ }
+ })
+ }
+
+ menu: menuComponent
+ onClicked: {
+ AudioPlayer.play(view.model, index)
+ playlists.updateAccessTime(page.media.url)
+ }
+ ListView.onRemove: animateRemoval()
+
+ Component {
+ id: menuComponent
+ ContextMenu {
+ MenuItem {
+ //: Remove from playlist context menu item in playlist page
+ //% "Remove from playlist"
+ text: qsTrId("mediaplayer-me-playlist-remove-from-playlist")
+ onClicked: remove()
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/usr/share/jolla-mediaplayer/pages/PlaylistsPage.qml b/usr/share/jolla-mediaplayer/pages/PlaylistsPage.qml
new file mode 100644
index 00000000..8fa6333f
--- /dev/null
+++ b/usr/share/jolla-mediaplayer/pages/PlaylistsPage.qml
@@ -0,0 +1,115 @@
+// -*- qml -*-
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Sailfish.Media 1.0
+import com.jolla.mediaplayer 1.0
+
+Page {
+ id: playlistsPage
+
+ property string searchText
+
+ MediaPlayerListView {
+ id: view
+
+ anchors.fill: parent
+ model: GriloTrackerModel {
+ id: playlistModel
+ query: PlaylistTrackerHelpers.getPlaylistsQuery(playlistsHeader.searchText, {})
+ }
+
+ Connections {
+ target: playlists
+ onUpdated: playlistModel.refresh()
+ }
+
+ PullDownMenu {
+
+ MenuItem {
+ //: Menu label for adding a new playlist
+ //% "New playlist"
+ text: qsTrId("mediaplayer-me-new-playlist")
+ onClicked: pageStack.animatorPush("com.jolla.mediaplayer.NewPlaylistDialog", {})
+ }
+
+ NowPlayingMenuItem { }
+
+ MenuItem {
+ //: Search menu entry
+ //% "Search"
+ text: qsTrId("mediaplayer-me-search")
+ onClicked: playlistsHeader.enableSearch()
+ enabled: view.count > 0 || playlistsHeader.searchText !== ''
+ }
+ }
+
+ header: SearchPageHeader {
+ id: playlistsHeader
+
+ width: parent.width
+
+ //: page header for the playlists page
+ //% "Playlists"
+ title: qsTrId("mediaplayer-he-playlists")
+
+ //: Playlists search field placeholder text
+ //% "Search playlist"
+ placeholderText: qsTrId("mediaplayer-tf-playlists-search")
+
+ searchText: playlistsPage.searchText
+ Component.onCompleted: if (searchText !== '') enableSearch()
+ }
+
+ delegate: MediaContainerPlaylistDelegate {
+ formatFilter: playlistsHeader.searchText
+ color: model.title != "" ? PlaylistColors.nameToColor(model.title)
+ : "transparent"
+ highlightColor: model.title != "" ? PlaylistColors.nameToHighlightColor(model.title)
+ : "transparent"
+ title: media.title
+ songCount: media.childCount
+ menu: menuComponent
+
+ // FIXME: makes the transparent color show up briefly
+ ListView.onRemove: animateRemoval()
+ onClicked: pageStack.animatorPush(Qt.resolvedUrl("PlaylistPage.qml"), {media: media})
+
+ function remove() {
+ remorseDelete(function() { playlists.removePlaylist(media) })
+ }
+
+ Component {
+ id: menuComponent
+ ContextMenu {
+ MenuItem {
+ //% "Delete"
+ text: qsTrId("mediaplayer-me-delete")
+ onClicked: remove()
+ }
+ }
+ }
+ }
+
+ ViewPlaceholder {
+ text: {
+ if (playlistsHeader.searchText !== '') {
+ //: Placeholder text for an empty search view
+ //% "No items found"
+ return qsTrId("mediaplayer-la-empty-search")
+ } else {
+ //: Placeholder text for an empty playlists view
+ //% "Create a playlist"
+ return qsTrId("mediaplayer-la-create-a-playlist")
+ }
+ }
+ enabled: view.count === 0 && !busyIndicator.running
+ }
+
+ PageBusyIndicator {
+ id: busyIndicator
+
+ running: playlistModel.fetching
+ }
+ }
+}
diff --git a/usr/share/jolla-mediaplayer/plugins/fmradio/ChannelSearchPage.qml b/usr/share/jolla-mediaplayer/plugins/fmradio/ChannelSearchPage.qml
deleted file mode 100644
index 244351bb..00000000
--- a/usr/share/jolla-mediaplayer/plugins/fmradio/ChannelSearchPage.qml
+++ /dev/null
@@ -1,119 +0,0 @@
-import QtQuick 2.0
-import QtMultimedia 5.0
-import Sailfish.Silica 1.0
-import com.jolla.mediaplayer.radio 1.0
-
-Page {
- property Radio radio
- property var availableStations
- property var bookmarks
-
- onStatusChanged: {
- if (status == PageStatus.Inactive) {
- radio.cancelSearchAll()
- } else if (status == PageStatus.Activating && availableStations.length == 0) {
- radio.searchAll()
- }
- }
-
- FrequencyFormatter {
- id: formatter
- }
-
- SilicaListView {
- id: channelList
-
- header: PageHeader {
- // translation on push up menu
- title: qsTrId("jolla-mediaplayer-radio-available_channels")
- }
-
- anchors.fill: parent
- model: availableStations
- delegate: ListItem {
- id: channelItem
-
- menu: contextMenu
- onClicked: {
- radio.frequency = modelData
- radio.startPlay()
- }
-
- Label {
- id: frequencyText
-
- anchors.centerIn: parent
- font.pixelSize: Theme.fontSizeLarge
- color: channelItem.highlighted || radio.frequency == modelData ? Theme.highlightColor
- : Theme.primaryColor
- text: formatter.formatMegahertz(modelData / 1000000)
- }
- Label {
- anchors.left: frequencyText.right
- anchors.right: parent.right
- anchors.leftMargin: Theme.paddingMedium
- anchors.baseline: frequencyText.baseline
- font.pixelSize: Theme.fontSizeMedium
- truncationMode: TruncationMode.Fade
- color: channelItem.highlighted || radio.frequency == modelData ? Theme.highlightColor
- : Theme.secondaryColor
- text: {
- var index = bookmarks.findByFrequency(modelData)
- if (index >= 0) {
- return bookmarks.get(index, RadioBookmarks.NameRole)
- } else if (modelData == radio.frequency) {
- return radio.radioData.stationName.trim()
- } else {
- return ""
- }
- }
- }
- Component {
- id: contextMenu
-
- ContextMenu {
- MenuItem {
- //% "Add to favorites"
- text: qsTrId("jolla-mediaplayer-radio-add_to_favorites")
- onClicked: {
- bookmarks.addStation(radio.radioData.stationName.trim(),
- radio.radioData.stationId.trim(),
- radio.frequency)
- channelList.update()
- }
- }
- }
- }
- }
-
- PullDownMenu {
- visible: !radio.searching
-
- MenuItem {
- //: Initiate channel search from pulley menu
- //% "Search"
- text: qsTrId("jolla-mediaplayer-radio-search")
- onClicked: radio.searchAll()
- }
- }
-
- Label {
- anchors.bottom: searchIndicator.top
- anchors.bottomMargin: Theme.paddingMedium
- anchors.horizontalCenter: searchIndicator.horizontalCenter
- color: Theme.highlightColor
- //% "Searching..."
- text: qsTrId("jolla-mediaplayer-radio-searching_stations")
- opacity: searchIndicator.opacity
- visible: searchIndicator.visible
- }
-
- BusyIndicator {
- id: searchIndicator
-
- anchors.centerIn: parent
- size: BusyIndicatorSize.Large
- running: radio.searching
- }
- }
-}
diff --git a/usr/share/jolla-mediaplayer/plugins/fmradio/fmradio.qml b/usr/share/jolla-mediaplayer/plugins/fmradio/fmradio.qml
deleted file mode 100644
index 8a6d6fb5..00000000
--- a/usr/share/jolla-mediaplayer/plugins/fmradio/fmradio.qml
+++ /dev/null
@@ -1,565 +0,0 @@
-// -*- qml -*-
-
-import QtQuick 2.0
-import Sailfish.Silica 1.0
-import Sailfish.Media 1.0
-import com.jolla.mediaplayer 1.0
-import com.jolla.mediaplayer.radio 1.0
-import org.nemomobile.configuration 1.0
-import QtMultimedia 5.0
-import Amber.Mpris 1.0
-
-Page {
- id: root
-
- property var model // set by framework, should have a better interface
- property string searchText // unused, just expected by mediaplayer page push
-
- property var bookmarks: model
- property var availableStations: []
- property Component cover: Component {
- CoverBackground {
- Image {
- anchors.fill: parent
- source: "image://theme/graphic-cover-fmradio"
- }
-
- Column {
- anchors.bottom: parent.bottom
- anchors.bottomMargin: Theme.paddingLarge
- width: parent.width
-
- Label {
- text: formatter.formatMegahertz(radio.frequency / 1000000)
- anchors.horizontalCenter: parent.horizontalCenter
- font.pixelSize: Theme.fontSizeHuge
- }
-
- Item {
- width: 1
- height: Theme.paddingSmall
- }
-
- Label {
- width: Math.min(parent.width - Theme.paddingMedium, implicitWidth)
- x: Math.max((parent.width - width) / 2, Theme.paddingMedium)
- truncationMode: TruncationMode.Fade
- font.pixelSize: Theme.fontSizeSmall
- text: stationText.text
- }
-
- Label {
- width: Math.min(parent.width - Theme.paddingMedium, implicitWidth)
- x: Math.max((parent.width - width) / 2, Theme.paddingMedium)
- truncationMode: TruncationMode.Fade
- color: Theme.secondaryColor
- font.pixelSize: Theme.fontSizeExtraSmall
- text: radioText.text
- }
- }
- }
- }
- property ProxyMprisPlayer mprisPlayer: ProxyMprisPlayer {
- // Mpris2 Player Interface
- canControl: true
- canGoNext: radio.antennaConnected
- canGoPrevious: radio.antennaConnected
- canPause: radio.antennaConnected
- canPlay: radio.antennaConnected
- canSeek: false
- loopStatus: Mpris.LoopNone
-
- metaData.contributingArtist: formatter.formatMegahertz(radio.frequency / 1000000) + " MHz"
- metaData.title: radio.radioData.stationName.trim()
-
- playbackStatus: radio.active ? Mpris.Playing : Mpris.Stopped
- shuffle: false
- volume: 1
-
- onPauseRequested: radio.stop()
- onPlayRequested: radio.start()
- onPlayPauseRequested: radio.togglePlayPause()
- onStopRequested: radio.stop()
- onNextRequested: radio.scanUp()
- onPreviousRequested: radio.scanDown()
- }
-
- onStatusChanged: {
- // we don't want two panels
- if (status == PageStatus.Activating || status == PageStatus.Active) {
- dockedPanel().hide(true)
- }
- }
-
- ConfigurationValue {
- id: lastFrequency
-
- key: "/apps/jolla-mediaplayer/radio_last_frequency"
- defaultValue: 0
- }
-
- Radio {
- id: radio
-
- // TODO: overriding Radio property. Can be removed when plugin detects antenna state.
- // This will ask antenna during phone call, but assume no one is around to see it.
- property bool antennaConnected: audioRoute.allowed
- property var _stationsFound: []
- property bool _searchingAll
- property bool active: state === Radio.ActiveState
-
- band: Radio.FM
- onFrequencyChanged: channelList.update()
- onStationFound: {
- _stationsFound.push(frequency)
- }
-
- onSearchingChanged: {
- if (!_searchingAll) {
- return
- }
-
- if (searching) {
- _stationsFound = []
- availableStations = _stationsFound
- } else {
- // Iris backend returns everything when search is finished. not bother to do incremental additions
- _stationsFound.sort(function(first, second) { return first - second } )
- availableStations = _stationsFound
- _searchingAll = false
- }
- }
-
- onStateChanged: {
- if (state === Radio.ActiveState) {
- startPlay()
- }
- }
-
- Component.onCompleted: {
- if (lastFrequency.value > 0) {
- radio.frequency = lastFrequency.value
- }
- }
-
- function searchAll() {
- _searchingAll = true
- searchAllStations(Radio.SearchFast)
- }
-
- function cancelSearchAll() {
- _searchingAll = false
- cancelScan()
- }
-
- function startPlay() {
- if (audioRoute.allowed) {
- if (radio.state === Radio.StoppedState) {
- radio.start()
- }
-
- if (!audioResource.acquired) {
- audioResource.acquire()
- }
-
- if (audioResource.acquired && radio.state === Radio.ActiveState) {
- audioRoute.enable()
- }
- }
- }
-
- function stopPlay() {
- radio.stop()
- audioRoute.disable()
- if (audioResource.acquired)
- audioResource.release()
- }
-
- function togglePlayPause() {
- if (radio.active) {
- radio.stopPlay()
- } else {
- radio.startPlay()
- }
- }
- }
-
- FrequencyFormatter {
- id: formatter
- }
-
- AudioResource {
- id: audioResource
-
- onAcquiredChanged: {
- if (acquired && audioRoute.allowed) {
- radio.startPlay()
- } else {
- radio.stopPlay()
- }
- }
- }
-
- AudioRoute {
- id: audioRoute
-
- onAllowedChanged: {
- if (allowed) {
- radio.startPlay()
- } else {
- radio.stopPlay()
- }
- }
- }
-
- SilicaFlickable {
- anchors.fill: parent
- contentHeight: parent.height
-
- SilicaListView {
- id: channelList
-
- model: radio.antennaConnected ? bookmarks : 0
- width: parent.width
- height: parent.height - panelContent.height
- clip: true
- header: PageHeader {
- //% "FM Radio"
- title: qsTrId("mediaplayer-radio-he-fm_radio")
- }
-
- currentIndex: -1
- onModelChanged: update()
-
- function update() {
- if (radio.antennaConnected) {
- currentIndex = bookmarks.findByFrequency(radio.frequency)
- lastFrequency.value = radio.frequency
- }
- }
-
- delegate: ListItem {
- id: listItem
-
- menu: contextMenu
-
- onClicked: {
- radio.frequency = model.frequency
- radio.startPlay()
- }
-
- function edit() {
- var obj = pageStack.animatorPush(renamePage, { name: model.name })
- obj.pageCompleted.connect(function(dialog) {
- dialog.accepted.connect(function() {
- bookmarks.modifyName(model.index, dialog.name)
- })
- })
- }
-
- function remove() {
- bookmarks.remove(model.index)
- channelList.update()
- }
-
- Label {
- id: frequencyText
-
- width: Theme.itemSizeExtraLarge
- anchors.verticalCenter: parent.verticalCenter
- horizontalAlignment: Text.AlignRight
- font.pixelSize: Theme.fontSizeLarge
- color: (listItem.highlighted || listItem.ListView.isCurrentItem) ? Theme.highlightColor
- : Theme.secondaryColor
- text: formatter.formatMegahertz(model.frequency / 1000000)
- }
- Label {
- anchors.left: frequencyText.right
- anchors.right: parent.right
- anchors.leftMargin: Theme.paddingMedium
- anchors.baseline: frequencyText.baseline
- font.pixelSize: Theme.fontSizeMedium
- elide: Text.ElideRight
- color: (listItem.highlighted || listItem.ListView.isCurrentItem) ? Theme.highlightColor
- : Theme.primaryColor
- text: model.name
- }
-
- Component {
- id: contextMenu
-
- ContextMenu {
- MenuItem {
- //% "Rename"
- text: qsTrId("jolla-mediaplayer-radio-rename")
- onClicked: listItem.edit()
- }
- MenuItem {
- //% "Delete"
- text: qsTrId("jolla-mediaplayer-radio-delete")
- onClicked: listItem.remove()
- }
- }
- }
- }
-
- InfoLabel {
- visible: !radio.antennaConnected
- anchors.verticalCenter: parent.verticalCenter
- //: Placeholder text on radio main page
- //% "Plug in your earphones. They are used as radio antenna"
- text: qsTrId("jolla-mediaplayer-radio-attach_earphones_hint")
- }
- }
-
- MediaPlayerPanelBackground {
- width: parent.width
- height: panelContent.height
- anchors.top: channelList.bottom
-
- BusyIndicator {
- size: BusyIndicatorSize.Small
- anchors.horizontalCenter: parent.horizontalCenter
- y: stationText.y
- running: radio.searching
- }
-
- Column {
- id: panelContent
-
- width: parent.width
- opacity: enabled ? 1.0 : 0.6
- enabled: radio.antennaConnected
-
- Item {
- width: 1
- height: root.isLandscape ? Theme.paddingSmall : Theme.paddingMedium
- }
-
- Item {
- width: parent.width
- height: tuner.height
-
- IconButton {
- property bool bookmarked: channelList.currentIndex >= 0
-
- visible: !tuner.adjusting
- width: parent.width / 3
- anchors.verticalCenter: parent.verticalCenter
- icon.source: bookmarked ? "image://theme/icon-m-favorite-selected" : "image://theme/icon-m-favorite"
- onClicked: {
- if (bookmarked) {
- bookmarks.remove(channelList.currentIndex)
- } else {
- bookmarks.addStation(radio.radioData.stationName.trim(),
- radio.radioData.stationId.trim(),
- radio.frequency)
- }
- channelList.update()
- }
- }
-
- IconButton {
- visible: tuner.adjusting
- width: parent.width / 3
- anchors.verticalCenter: parent.verticalCenter
- icon.source: "image://theme/icon-m-left"
- onClicked: {
- radio.tuneDown()
- adjustAutoStop.restart()
- }
- }
-
- Text {
- id: tuner
-
- property bool adjusting
-
- text: formatter.formatMegahertz(radio.frequency / 1000000)
- font.pixelSize: Theme.fontSizeHuge
- color: tunerMouseArea.pressed ? Theme.highlightColor : Theme.primaryColor
- anchors.horizontalCenter: parent.horizontalCenter
-
- Timer {
- id: adjustAutoStop
- interval: 5000
- onTriggered: tuner.adjusting = false
- }
-
- MouseArea {
- id: tunerMouseArea
- anchors.fill: parent
- onClicked: {
- tuner.adjusting = !tuner.adjusting
- if (tuner.adjusting) {
- adjustAutoStop.restart()
- }
- }
- }
- }
-
- Text {
- visible: !tuner.adjusting
- anchors.left: tuner.right
- anchors.leftMargin: Theme.paddingSmall
- anchors.baseline: tuner.baseline
- color: Theme.primaryColor
- text: "MHz"
- }
-
- IconButton {
- visible: !tuner.adjusting
- width: parent.width / 3
- anchors.right: parent.right
- anchors.verticalCenter: parent.verticalCenter
- icon.source: audioRoute.routeToSpeaker ? "image://theme/icon-m-speaker-on"
- : "image://theme/icon-m-speaker"
- onClicked: audioRoute.routeToSpeaker = !audioRoute.routeToSpeaker
- }
-
- IconButton {
- visible: tuner.adjusting
- width: parent.width / 3
- anchors.right: parent.right
- anchors.verticalCenter: parent.verticalCenter
- icon.source: "image://theme/icon-m-right"
- onClicked: {
- radio.tuneUp()
- adjustAutoStop.restart()
- }
- }
- }
- Label {
- id: stationText
-
- property string trimmedText: radio.radioData.stationName.trim()
- text: trimmedText != "" ? trimmedText : " "
- width: Math.min(parent.width - Theme.paddingMedium, implicitWidth)
- x: Math.max((parent.width - width) / 2, Theme.paddingMedium)
- truncationMode: TruncationMode.Fade
- font.pixelSize: Theme.fontSizeSmall
- color: Theme.primaryColor
- }
- Label {
- id: radioText
-
- property string trimmedText: radio.radioData.radioText.trim()
- text: trimmedText != "" ? trimmedText : " "
- width: Math.min(parent.width - Theme.paddingMedium, implicitWidth)
- x: Math.max((parent.width - width) / 2, Theme.paddingMedium)
- truncationMode: TruncationMode.Fade
- font.pixelSize: Theme.fontSizeExtraSmall
- color: Theme.secondaryColor
- }
-
- Item {
- width: 1
- height: Theme.paddingLarge
- }
-
- Row {
- id: navigation
- width: parent.width
-
- IconButton {
- id: gotoPrevious
- width: parent.width / 3
- icon.source: "image://theme/icon-m-previous"
- anchors.verticalCenter: parent.verticalCenter
- onPressAndHold: radio.scanDown()
- onClicked: {
- radio.scanDown()
- }
- }
-
- IconButton {
- id: playPause
-
- width: parent.width / 3
- icon.source: radio.active ? "image://theme/icon-m-pause"
- : "image://theme/icon-m-play"
- onClicked: radio.togglePlayPause()
- }
-
- IconButton {
- id: gotoNext
- width: parent.width / 3
- icon.source: "image://theme/icon-m-next"
- anchors.verticalCenter: parent.verticalCenter
- onPressAndHold: radio.scanUp()
- onClicked: {
- radio.scanUp()
- }
- }
- }
- Item {
- width: 1
- height: (root.isLandscape ? 1 : 2) * Theme.paddingLarge
- }
- }
- }
-
- PushUpMenu {
- visible: radio.antennaConnected
-
- BackgroundItem {
- id: channelButton
-
- anchors.horizontalCenter: parent.horizontalCenter
- height: icon.height + iconText.height + 2*Theme.paddingSmall
- width: Math.max(Theme.itemSizeHuge, iconText.width + 2*Theme.paddingSmall)
- onClicked: pageStack.animatorPush(Qt.resolvedUrl("ChannelSearchPage.qml"),
- { radio: radio,
- availableStations: Qt.binding(function() { return availableStations } ),
- bookmarks: bookmarks
- })
-
- Image {
- id: icon
-
- y: Theme.paddingSmall
- anchors.horizontalCenter: parent.horizontalCenter
- source: "image://theme/icon-m-media-radio" + (channelButton.highlighted ? ("?" + Theme.highlightColor)
- : "")
- }
- Text {
- id: iconText
-
- anchors.top: icon.bottom
- anchors.horizontalCenter: parent.horizontalCenter
- color: channelButton.highlighted ? Theme.highlightColor : Theme.primaryColor
- //% "Available channels"
- text: qsTrId("jolla-mediaplayer-radio-available_channels")
- }
- }
- }
- }
-
- Component {
- id: renamePage
-
- Dialog {
- id: dialog
- property alias name: nameEditor.text
-
- Column {
- width: parent.width
-
- DialogHeader {
- }
- TextField {
- id: nameEditor
-
- width: parent.width
- focus: true
- //: Channel name editor placeholder text
- //% "Channel name"
- placeholderText: qsTrId("jolla-mediaplayer-radio-channel_name")
- label: placeholderText
- EnterKey.iconSource: "image://theme/icon-m-enter-accept"
- EnterKey.onClicked: dialog.accept()
- }
- }
- }
- }
-}
diff --git a/usr/share/jolla-messages/common/CommHistoryService.qml b/usr/share/jolla-messages/common/CommHistoryService.qml
index 5e0226ad..c12b218c 100644
--- a/usr/share/jolla-messages/common/CommHistoryService.qml
+++ b/usr/share/jolla-messages/common/CommHistoryService.qml
@@ -1,5 +1,5 @@
import QtQuick 2.0
-import org.nemomobile.dbus 2.0
+import Nemo.DBus 2.0
DBusInterface {
id: service
diff --git a/usr/share/jolla-messages/messages.qml b/usr/share/jolla-messages/messages.qml
index 809dfef4..c0d9c710 100644
--- a/usr/share/jolla-messages/messages.qml
+++ b/usr/share/jolla-messages/messages.qml
@@ -219,6 +219,13 @@ ApplicationWindow {
}
}
+ function sendMessage(localUid, remoteUid, message) {
+ groupManager.createOutgoingMessageEvent(-1 /*groupId*/, localUid, remoteUid, message, function(eventId) {
+ var channel = channelManager.getConversation(localUid, remoteUid)
+ channel.sendMessage(message, eventId)
+ })
+ }
+
function loadAndShowSMSConversation(remoteUids, body) {
loadAndShowConversation(MessageUtils.telepathyAccounts.ringAccountPath, remoteUids, body, true)
}
diff --git a/usr/share/jolla-messages/pages/ImageView.qml b/usr/share/jolla-messages/pages/ImageView.qml
index 82dd571f..79de52c0 100644
--- a/usr/share/jolla-messages/pages/ImageView.qml
+++ b/usr/share/jolla-messages/pages/ImageView.qml
@@ -43,7 +43,7 @@ FullscreenContentPage {
anchors.fill: parent
additionalActions: Component {
IconButton {
- icon.source: "image://theme/icon-m-download"
+ icon.source: "image://theme/icon-m-cloud-download"
onClicked: {
root.copy()
pageStack.pop()
diff --git a/usr/share/jolla-messages/pages/MainPage.qml b/usr/share/jolla-messages/pages/MainPage.qml
index 2459f288..a5852902 100644
--- a/usr/share/jolla-messages/pages/MainPage.qml
+++ b/usr/share/jolla-messages/pages/MainPage.qml
@@ -8,8 +8,8 @@
import QtQuick 2.0
import Sailfish.Silica 1.0
import Sailfish.Messages 1.0
-import org.nemomobile.notifications 1.0
-import org.nemomobile.time 1.0
+import Nemo.Notifications 1.0
+import Nemo.Time 1.0
import "groups"
diff --git a/usr/share/jolla-messages/pages/MmsShare.qml b/usr/share/jolla-messages/pages/MmsShare.qml
index b3eea489..b4fd39a8 100644
--- a/usr/share/jolla-messages/pages/MmsShare.qml
+++ b/usr/share/jolla-messages/pages/MmsShare.qml
@@ -12,10 +12,10 @@ import Sailfish.Messages 1.0
import Sailfish.Telephony 1.0
import Sailfish.Share 1.0
import org.nemomobile.contacts 1.0
-import org.nemomobile.thumbnailer 1.0
+import Nemo.Thumbnailer 1.0
import org.nemomobile.ofono 1.0
import org.nemomobile.commhistory 1.0
-import MeeGo.QOfono 0.2
+import QOfono 0.2
MessageComposerPage {
id: newMessagePage
diff --git a/usr/share/jolla-messages/pages/common/CommHistoryService.qml b/usr/share/jolla-messages/pages/common/CommHistoryService.qml
index 5e0226ad..c12b218c 100644
--- a/usr/share/jolla-messages/pages/common/CommHistoryService.qml
+++ b/usr/share/jolla-messages/pages/common/CommHistoryService.qml
@@ -1,5 +1,5 @@
import QtQuick 2.0
-import org.nemomobile.dbus 2.0
+import Nemo.DBus 2.0
DBusInterface {
id: service
diff --git a/usr/share/jolla-messages/pages/conversation/AttachmentDelegate.qml b/usr/share/jolla-messages/pages/conversation/AttachmentDelegate.qml
index dc882dc4..ec92b8a2 100644
--- a/usr/share/jolla-messages/pages/conversation/AttachmentDelegate.qml
+++ b/usr/share/jolla-messages/pages/conversation/AttachmentDelegate.qml
@@ -1,6 +1,6 @@
import QtQuick 2.0
import Sailfish.Silica 1.0
-import org.nemomobile.thumbnailer 1.0
+import Nemo.Thumbnailer 1.0
Thumbnail {
id: attachment
diff --git a/usr/share/jolla-messages/pages/conversation/MessagesView.qml b/usr/share/jolla-messages/pages/conversation/MessagesView.qml
index fda01bc2..1f73bbc1 100644
--- a/usr/share/jolla-messages/pages/conversation/MessagesView.qml
+++ b/usr/share/jolla-messages/pages/conversation/MessagesView.qml
@@ -4,7 +4,7 @@ import Sailfish.Silica.private 1.0
import Sailfish.Contacts 1.0
import Sailfish.Messages 1.0
import org.nemomobile.commhistory 1.0
-import org.nemomobile.time 1.0
+import Nemo.Time 1.0
SilicaListView {
id: messagesView
@@ -14,6 +14,18 @@ SilicaListView {
currentIndex: -1
_quickScrollItem.directionsEnabled: QuickScrollDirection.Down
+ function formatDate(date) {
+ var today = new Date
+ if (date.getDate() == today.getDate()
+ && date.getMonth() == today.getMonth()
+ && date.getFullYear() == today.getFullYear()) {
+ //% "Today"
+ return qsTrId("messages-la-today")
+ } else {
+ return Format.formatDate(date, Formatter.TimepointSectionRelative)
+ }
+ }
+
BackgroundRectangle {
width: parent.width
height: stickyHeader.height
@@ -22,7 +34,7 @@ SilicaListView {
SectionHeader {
id: stickyHeader
property var date: undefined
- text: date !== undefined && Qt.application.active ? Format.formatDate(date, Formatter.TimepointSectionRelative) : ""
+ text: date !== undefined && Qt.application.active ? messagesView.formatDate(date) : ""
horizontalAlignment: Text.AlignHCenter
color: Theme.secondaryColor
}
@@ -135,13 +147,7 @@ SilicaListView {
id: dateSection
horizontalAlignment: Text.AlignHCenter
color: Theme.secondaryColor
- text: {
- if (modelData && Qt.application.active) { // force refresh
- return Format.formatDate(modelData.startTime, Formatter.TimepointSectionRelative)
- } else {
- return ""
- }
- }
+ text: (modelData && Qt.application.active) ? messagesView.formatDate(modelData.startTime) : ""
}
}
}
diff --git a/usr/share/jolla-messages/pages/conversation/SMSMessageDelegate.qml b/usr/share/jolla-messages/pages/conversation/SMSMessageDelegate.qml
index 755f934a..49702bf4 100644
--- a/usr/share/jolla-messages/pages/conversation/SMSMessageDelegate.qml
+++ b/usr/share/jolla-messages/pages/conversation/SMSMessageDelegate.qml
@@ -87,9 +87,9 @@ ListItem {
dateString = Format.formatDate(modelData.startTime, Formatter.WeekdayNameStandalone)
timeString = Format.formatDate(date, Formatter.TimeValue)
} else if (shorten) {
- timeString = Format.formatDate(date, Formatter.DurationElapsedShort)
+ timeString = Format.formatDate(date, Formatter.TimeElapsedShort)
} else {
- timeString = Format.formatDate(date, Formatter.DurationElapsed)
+ timeString = Format.formatDate(date, Formatter.TimeElapsed)
}
if (dateString) {
@@ -143,7 +143,7 @@ ListItem {
bottomMargin: (groupFirst ? Theme.paddingSmall : 0)
}
- radius: Theme.paddingLarge
+ radius: Math.min(Theme.paddingLarge, height / 2)
roundedCorners: {
// Note: MessagesView has a BottomToTop layout direction, so groupFirst is the bottom-most
var result = Corners.None
diff --git a/usr/share/jolla-messages/pages/groups/GroupDelegate.qml b/usr/share/jolla-messages/pages/groups/GroupDelegate.qml
index e7d084d6..01184aae 100644
--- a/usr/share/jolla-messages/pages/groups/GroupDelegate.qml
+++ b/usr/share/jolla-messages/pages/groups/GroupDelegate.qml
@@ -113,7 +113,7 @@ ListItem {
var daysDiff = (today - messageDate) / (24 * 60 * 60 * 1000)
if (daysDiff === 0) {
- label = Format.formatDate(model.startTime, Formatter.DurationElapsed)
+ label = Format.formatDate(model.startTime, Formatter.TimeElapsed)
} else {
label = Format.formatDate(model.startTime, Formatter.TimeValue)
}
diff --git a/usr/share/jolla-notes/cover/NotesCover.qml b/usr/share/jolla-notes/cover/NotesCover.qml
new file mode 100644
index 00000000..36ac78aa
--- /dev/null
+++ b/usr/share/jolla-notes/cover/NotesCover.qml
@@ -0,0 +1,58 @@
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+
+CoverBackground {
+ property string testName: "coverpage"
+ property int topMargin: Theme.itemSizeSmall
+ property int itemCount: Math.round((parent.height-Theme.itemSizeSmall)/label.lineHeight)
+
+ Repeater {
+ model: itemCount
+ delegate: Rectangle {
+ y: topMargin + index * label.lineHeight
+ width: parent.width
+ // gives 1.5 on phone, which looks OK on the phone small cover.
+ height: Theme.paddingSmall/4
+ color: Theme.primaryColor
+ opacity: Theme.opacityLow
+ }
+ }
+
+ Label {
+ id: label
+ property var noteText: {
+ if (pageStack.depth > 1 && currentNotePage) {
+ return currentNotePage.text.trim()
+ } else if (notesModel.count > 0 && notesModel.moveCount) {
+ return notesModel.get(0).text.trim()
+ }
+
+ return undefined
+ }
+ text: noteText !== undefined
+ ? noteText.replace(/\n/g, " ")
+ // From notes.cpp
+ : qsTrId("notes-de-name")
+ x: Theme.paddingSmall/2
+ y: topMargin - baselineOffset - Theme.paddingSmall + (noteText !== undefined ? 0 : lineHeight)
+ opacity: Theme.opacityHigh
+ font.pixelSize: Theme.fontSizeExtraLarge
+ font.italic: true
+ width: noteText !== undefined ? parent.width + Theme.itemSizeLarge : parent.width - Theme.paddingSmall
+ horizontalAlignment: noteText !== undefined || implicitWidth > width - Theme.paddingSmall ? Text.AlignLeft : Text.AlignHCenter
+ lineHeightMode: Text.FixedHeight
+ lineHeight: Math.floor(Theme.fontSizeExtraLarge * 1.35)
+ wrapMode: noteText !== undefined ? Text.Wrap : Text.NoWrap
+ maximumLineCount: itemCount
+ }
+
+ CoverActionList {
+ CoverAction {
+ iconSource: "image://theme/icon-cover-new"
+ onTriggered: {
+ openNewNote(PageStackAction.Immediate)
+ activate()
+ }
+ }
+ }
+}
diff --git a/usr/share/jolla-notes/notes.qml b/usr/share/jolla-notes/notes.qml
new file mode 100644
index 00000000..6acb5cb7
--- /dev/null
+++ b/usr/share/jolla-notes/notes.qml
@@ -0,0 +1,116 @@
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.DBus 2.0
+import "pages"
+
+ApplicationWindow
+{
+ id: app
+
+ property Item currentNotePage
+
+ initialPage: Component {
+ OverviewPage {
+ id: overviewpage
+ property Item currentPage: pageStack.currentPage
+ onCurrentPageChanged: {
+ if (currentPage == overviewpage) {
+ currentNotePage = null
+ } else if (currentPage.hasOwnProperty("__jollanotes_notepage")) {
+ currentNotePage = currentPage
+ }
+ }
+ }
+ }
+ cover: Qt.resolvedUrl("cover/NotesCover.qml")
+ allowedOrientations: defaultAllowedOrientations
+ _defaultPageOrientations: Orientation.All
+ _defaultLabelFormat: Text.PlainText
+
+ // exposed as a property so that the tests can access it
+ property NotesModel notesModel: NotesModel { id: notesModel }
+
+ function openNewNote(operationType) {
+ pageStack.pop(null, PageStackAction.Immediate)
+ pageStack.animatorPush(notePage, {potentialPage: 1, editMode: true}, operationType)
+ }
+
+ Component {
+ id: notePage
+ NotePage { }
+ }
+
+ DBusAdaptor {
+ service: "com.jolla.notes"
+ path: "/"
+ iface: "com.jolla.notes"
+
+ function newNote() {
+ if (pageStack.currentPage.__jollanotes_notepage === undefined || pageStack.currentPage.currentIndex >= 0) {
+ // don't open a new note if already showing a new unedited note
+ openNewNote(PageStackAction.Immediate)
+ }
+ app.activate()
+ }
+
+ function openUrl(urls) {
+ if (urls.length === 0) {
+ app.activate()
+ } else {
+ importNoteFile(urls)
+ }
+ }
+
+ function importNoteFile(pathList) {
+ // If the user has an empty note open (or we automatically pushed newNote
+ // page due to having no notes) then we need to pop that page.
+ if (pageStack.currentPage.__jollanotes_notepage !== undefined) {
+ pageStack.pop(null, PageStackAction.Immediate)
+ }
+
+ // For compatibility reasons this signal sometimes receives an array of strings
+ var filePath
+ if (typeof pathList === 'string') {
+ filePath = pathList
+ } else if (typeof pathList === 'object' && pathList.length !== undefined && pathList.length > 0) {
+ filePath = pathList[0]
+ if (pathList.length > 1) {
+ console.warn('jolla-notes: Importing only first path from:', pathList)
+ }
+ }
+ if (filePath && (String(filePath) != '')) {
+ console.log('jolla-notes: Importing note file:', filePath)
+ var plaintextNotes = vnoteConverter.importFromFile(filePath)
+ if (plaintextNotes.length === 0) {
+ var filename = filePath.substring(filePath.lastIndexOf("/") + 1)
+ //% "Unable to import: %1"
+ Notices.show(qsTrId("notes-la-unable_to_open").arg(filename))
+ }
+
+ for (var index = 0; index < plaintextNotes.length; ++index) {
+ // insert the note into the database
+ notesModel.newNote(index + 1, plaintextNotes[index], notesModel.nextColor())
+ }
+ if (plaintextNotes.length === 1 && pageStack.depth === 1) {
+ pageStack.push(notePage, {currentIndex: -1}, PageStackAction.Immediate)
+ } else for (index = 0; index < plaintextNotes.length; ++index) {
+ if (pageStack.depth === 1) {
+ // the current page is the overview page. indicate to the user which notes were imported,
+ // by flashing the delegates of the imported notes in the gridview.
+ pageStack.currentPage.flashGridDelegate(index)
+ } else {
+ // a note is currently open. Queue up the indication to the user
+ // so that it gets displayed when they next return to the gridview.
+ var overviewPage = pageStack.previousPage(app.currentNotePage)
+ overviewPage._flashDelegateIndexes[overviewPage._flashDelegateIndexes.length] = index
+ }
+ }
+ app.activate()
+ }
+ }
+
+ function activateWindow(arg) {
+ app.activate()
+ }
+ }
+}
diff --git a/usr/share/jolla-notes/pages/ColorItem.qml b/usr/share/jolla-notes/pages/ColorItem.qml
new file mode 100644
index 00000000..13654950
--- /dev/null
+++ b/usr/share/jolla-notes/pages/ColorItem.qml
@@ -0,0 +1,28 @@
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+
+Rectangle {
+ id: coloritem
+
+ signal clicked
+ property alias pageNumber: label.text
+
+ height: Theme.itemSizeExtraSmall
+ width: Math.max(Theme.itemSizeExtraSmall, label.width + 2*Theme.paddingMedium)
+ radius: Theme.paddingSmall/2
+ anchors {
+ right: parent.right
+ rightMargin: Theme.horizontalPageMargin
+ verticalCenter: parent.verticalCenter
+ topMargin: Theme.paddingLarge
+ }
+ Label {
+ id: label
+ font.pixelSize: Theme.fontSizeLarge
+ anchors.centerIn: parent
+ }
+ MouseArea {
+ anchors { fill: parent; margins: -Theme.paddingMedium }
+ onClicked: parent.clicked()
+ }
+}
diff --git a/usr/share/jolla-notes/pages/NoteItem.qml b/usr/share/jolla-notes/pages/NoteItem.qml
new file mode 100644
index 00000000..f3f23a1f
--- /dev/null
+++ b/usr/share/jolla-notes/pages/NoteItem.qml
@@ -0,0 +1,91 @@
+import QtQuick 2.5
+import Sailfish.Silica 1.0
+
+GridItem {
+ id: noteitem
+
+ property int pageNumber
+ property color color
+ property alias text: summary.text
+
+ // Create a tint with 10% of the primaryColor in the lower left,
+ // down to 0% in the upper right.
+ // Is there any way to use OpacityRampEffect instead of Gradient here?
+ Item {
+ // The rectangle inside is rotated to rotate the gradient,
+ // but then it needs to be clipped back to an upright square.
+ // This container item does the clipping so that the NoteItem itself
+ // doesn't have to clip (which would interfere with context menus)
+ anchors.fill: parent
+ clip: true
+ Rectangle {
+ rotation: 45 // diagonal gradient
+ // Use square root of 2, rounded up a little bit, to make the
+ // rotated square cover all of the parent square
+ width: parent.width * 1.412136
+ height: parent.height * 1.412136
+ x: parent.width - width
+ gradient: Gradient {
+ GradientStop { position: 0.0; color: Theme.rgba(Theme.primaryColor, 0) }
+ GradientStop { position: 1.0; color: Theme.rgba(Theme.primaryColor, Theme.opacityFaint) }
+ }
+ }
+ }
+
+ Item {
+ anchors { fill: parent; margins: Theme.paddingLarge }
+ Text {
+ id: summary
+ anchors {
+ top: parent.top
+ topMargin: - (font.pixelSize / 4)
+ left: parent.left
+ right: parent.right
+ }
+ height: parent.height
+ textFormat: Text.StyledText
+ font { family: Theme.fontFamily; pixelSize: Theme.fontSizeSmall }
+ color: highlighted ? Theme.highlightColor : Theme.primaryColor
+ wrapMode: Text.Wrap
+ maximumLineCount: Math.floor((height - Theme.paddingLarge) / fontMetrics.height)
+ elide: Text.ElideRight
+ }
+ FontMetrics {
+ id: fontMetrics
+ font: summary.font
+ }
+
+ OpacityRampEffect {
+ sourceItem: summary
+ slope: 0.6
+ offset: 0
+ direction: OpacityRamp.TopToBottom
+ }
+
+ Rectangle {
+ id: colortag
+ property string testName: "colortag"
+
+ anchors.bottom: parent.bottom
+ anchors.left: parent.left
+ width: Theme.itemSizeExtraSmall
+ height: width/8
+ radius: Math.round(Theme.paddingSmall/3)
+ color: noteitem.color
+ }
+ }
+
+ Text {
+ id: pagenumber
+
+ anchors.baseline: parent.bottom
+ anchors.baselineOffset: -Theme.paddingMedium
+ anchors.right: parent.right
+ anchors.rightMargin: Theme.paddingMedium
+ opacity: Theme.opacityLow
+ color: highlighted ? Theme.highlightColor : Theme.primaryColor
+ font { family: Theme.fontFamily; pixelSize: Theme.fontSizeLarge }
+ horizontalAlignment: Text.AlignRight
+ text: noteitem.pageNumber
+ }
+}
diff --git a/usr/share/jolla-notes/pages/NotePage.qml b/usr/share/jolla-notes/pages/NotePage.qml
new file mode 100644
index 00000000..46339307
--- /dev/null
+++ b/usr/share/jolla-notes/pages/NotePage.qml
@@ -0,0 +1,337 @@
+/*
+ * Copyright (C) 2015 - 2021 Jolla Ltd.
+ * Copyright (C) 2021 Open Mobile Platform LLC.
+ *
+ * License: Proprietary
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Sailfish.Share 1.0
+import Nemo.Configuration 1.0
+
+Page {
+ id: page
+
+ // currentIndex is for allocated notes.
+ // potentialPage is for empty notes that haven't been added to the db yet.
+ property int currentIndex: -1
+ property int potentialPage
+ property alias editMode: textArea.focus
+ property alias text: textArea.text
+ property alias color: noteview.color
+ property alias pageNumber: noteview.pageNumber
+ property bool loaded // only load from notesModel[currentIndex] once
+
+ property bool __jollanotes_notepage
+
+ highContrast: true
+
+ // TODO: should some kind of IndexConnection go into the silica components?
+ Connections {
+ target: notesModel
+
+ onRowsRemoved: {
+ console.log("Notes removed: " + first + ".." + last)
+ if (currentIndex >= first) {
+ if (currentIndex > last) {
+ currentIndex -= (last - first + 1)
+ } else {
+ // current note was deleted; turn it into a potential note
+ potentialPage = pageNumber
+ }
+ }
+ }
+
+ onRowsInserted: {
+ console.log("Notes inserted: " + first + ".." + last)
+ if (currentIndex >= first)
+ currentIndex += (last - first + 1)
+ }
+
+ onRowsMoved: {
+ console.log("Notes moved: " + start + ".." + end + " -> " + row)
+ // start and end are indexes from before the move,
+ // "row" is start's new index after the move
+ var numMoved = end - start + 1
+ if (currentIndex >= start && currentIndex <= end) {
+ // current note was among those moved
+ currentIndex += start - row
+ } else if (currentIndex > end && currentIndex < row + numMoved) {
+ // moved notes jumped over current note
+ currentIndex -= numMoved
+ } else if (currentIndex < start && currentIndex >= row) {
+ // moved notes jumped before current note
+ currentIndex += numMoved
+ }
+ }
+ onNewNoteInserted: currentIndex = 0
+ }
+
+ onCurrentIndexChanged: {
+ if (!loaded && currentIndex >= 0 && currentIndex < notesModel.count) {
+ potentialPage = 0
+ var item = notesModel.get(currentIndex)
+ noteview.savedText = item.text
+ noteview.text = item.text
+ noteview.color = item.color
+ noteview.pageNumber = item.pagenr
+ loaded = true
+ }
+ }
+
+ onStatusChanged: {
+ if (status == PageStatus.Deactivating) {
+ if (currentIndex >= 0 && noteview.text.trim() == '') {
+ notesModel.deleteNote(currentIndex)
+ currentIndex = -1
+ } else {
+ saveNote()
+ }
+ }
+ }
+
+ function saveNote() {
+ var text = textArea.text
+ if (text != noteview.savedText) {
+ noteview.savedText = text
+ if (potentialPage) {
+ if (text.trim() != '') {
+ notesModel.newNote(potentialPage, text, noteview.color)
+ return true
+ }
+ } else {
+ notesModel.updateNote(currentIndex, text)
+ return true
+ }
+ }
+ return false
+ }
+
+ onPotentialPageChanged: {
+ if (potentialPage) {
+ currentIndex = -1
+ noteview.savedText = ''
+ noteview.text = ''
+ noteview.color = notesModel.nextColor()
+ noteview.pageNumber = potentialPage
+ }
+ }
+
+ function openColorPicker() {
+ var obj = pageStack.animatorPush("Sailfish.Silica.ColorPickerPage",
+ {"colors": notesModel.availableColors})
+ obj.pageCompleted.connect(function(page) {
+ page.colorClicked.connect(function(color) {
+ noteview.color = color
+ if (currentIndex >= 0) {
+ notesModel.updateColor(currentIndex, color)
+ }
+ pageStack.pop()
+ })
+ })
+ }
+
+ function noteFileName(noteText) {
+ // Return a name for this vnote that can be used as a filename
+
+ // Remove any whitespace
+ var noWhitespace = noteText.replace(/\s/g, '')
+
+ // shorten
+ var shortened = noWhitespace.slice(0, Math.min(8, noWhitespace.length))
+
+ // Convert to 7-bit ASCII
+ var sevenBit = Format.formatText(shortened, Formatter.Ascii7Bit)
+ if (sevenBit.length < shortened.length) {
+ // This note's name is not representable in ASCII
+ //: Placeholder name for note filename
+ //% "note"
+ sevenBit = qsTrId("notes-ph-default-note-name")
+ }
+
+ // Remove any characters that are not part of the portable filename character set
+ return Format.formatText(sevenBit, Formatter.PortableFilename)
+ }
+
+ SilicaFlickable {
+ id: noteview
+
+ property color color: "white"
+ property alias text: textArea.text
+ property int pageNumber
+ property string savedText
+
+ anchors.fill: parent
+
+ // The PullDownMenu doesn't work if contentHeight is left implicit.
+ // It also doesn't work if contentHeight ends up equal to the
+ // page height, so add some padding.
+ contentHeight: column.y + column.height
+
+ PullDownMenu {
+ id: pulley
+
+ MenuItem {
+ //% "Change color"
+ text: qsTrId("notes-me-note-color")
+ onClicked: openColorPicker()
+ }
+ MenuItem {
+ //: Delete this note from note page
+ //% "Delete"
+ text: qsTrId("notes-me-delete-note")
+ onClicked: deleteNoteAnimation.restart()
+ SequentialAnimation {
+ id: deleteNoteAnimation
+ NumberAnimation {
+ target: noteview
+ property: "opacity"
+ duration: 200
+ easing.type: Easing.InOutQuad
+ to: 0.0
+ }
+ ScriptAction {
+ script: {
+ // If the note text is empty then the note
+ // will be deleted by onStatusChanged, and
+ // there should not be a remorse timer etc.
+ if (page.currentIndex >= 0
+ && noteview.text.trim() != '') {
+ var overview = pageStack.previousPage()
+ overview.showDeleteNote(page.currentIndex)
+ }
+ pageStack.pop(null, PageStackAction.Immediate)
+ noteview.opacity = 1.0
+ }
+ }
+ }
+ }
+ MenuItem {
+ //: This menu option can be used to share the note via Bluetooth
+ //% "Share"
+ text: qsTrId("notes-me-share-note")
+ enabled: noteview.text.trim() != ''
+ onClicked: {
+ var fileName = page.noteFileName(noteview.text) + (transferAsVNoteConfig.value == true ? ".vnt" : ".txt")
+ var mimeType = transferAsVNoteConfig.value == true ? "text/x-vnote" : "text/plain"
+ // vnoteConverter is a global installed by notes.cpp
+ var noteText = transferAsVNoteConfig.value == true ? vnoteConverter.vNote(textArea.text) : textArea.text
+ var content = {
+ "name": fileName,
+ "data": noteText,
+ "type": mimeType
+ }
+
+ if (mimeType == "text/plain") {
+ // also some non-standard fields for Twitter/Facebook status sharing:
+ content["status"] = noteText
+ content["linkTitle"] = fileName
+ }
+ shareAction.resources = [content]
+ shareAction.mimeType = mimeType
+ shareAction.trigger()
+ }
+ ShareAction {
+ id: shareAction
+
+ //: Page header for share method selection
+ //% "Share note"
+ title: qsTrId("notes-he-share-note")
+ }
+ }
+ MenuItem {
+ id: saveItem
+ enabled: !saving
+
+ property bool saving
+
+ function replace(force) {
+ if (!newNoteAnimation.running || force) {
+ app.pageStack.replace(notePage, {
+ potentialPage: 1,
+ editMode: true
+ }, PageStackAction.Immediate)
+ notesModel.newNoteInserted.disconnect(replace)
+ saving = false
+ }
+ }
+
+ //: Create a new note ready for editing
+ //% "New note"
+ text: qsTrId("notes-me-new-note")
+
+ onDelayedClick: {
+ if (saveNote()) {
+ saving = true
+ notesModel.newNoteInserted.connect(replace)
+ }
+ newNoteAnimation.restart()
+ }
+
+
+ SequentialAnimation {
+ id: newNoteAnimation
+ NumberAnimation {
+ target: noteview
+ property: "opacity"
+ duration: 200
+ easing.type: Easing.InOutQuad
+ to: 0.0
+ }
+ ScriptAction {
+ script: saveItem.replace(true)
+ }
+ }
+ }
+ }
+
+ Column {
+ id: column
+ width: page.width
+
+ Item {
+ id: headerItem
+ width: parent.width
+ height: Theme.itemSizeLarge
+
+ ColorItem {
+ id: colorItem
+ color: noteview.color
+ pageNumber: noteview.pageNumber
+ onClicked: openColorPicker()
+ }
+ }
+ TextArea {
+ id: textArea
+ font { family: Theme.fontFamily; pixelSize: Theme.fontSizeMedium }
+ width: parent.width
+ height: Math.max(noteview.height - headerItem.height, implicitHeight)
+ //: Placeholder text for new notes. At this point there's
+ //: nothing else on the screen.
+ //% "Write a note..."
+ placeholderText: qsTrId("notes-ph-empty-note")
+ color: Theme.primaryColor
+ backgroundStyle: TextEditor.NoBackground
+
+ onTextChanged: saveTimer.restart()
+ Timer {
+ id: saveTimer
+ interval: 5000
+ onTriggered: page.saveNote()
+ }
+ Connections {
+ target: Qt.application
+ onActiveChanged: if (!Qt.application.active) page.saveNote()
+ }
+ }
+ }
+ VerticalScrollDecorator {}
+ }
+
+ ConfigurationValue {
+ id: transferAsVNoteConfig
+ key: "/apps/jolla-notes/settings/transferAsVNote"
+ defaultValue: false
+ }
+}
diff --git a/usr/share/jolla-notes/pages/NotesModel.qml b/usr/share/jolla-notes/pages/NotesModel.qml
new file mode 100644
index 00000000..35a42e34
--- /dev/null
+++ b/usr/share/jolla-notes/pages/NotesModel.qml
@@ -0,0 +1,88 @@
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Nemo.Configuration 1.0
+import "notesdatabase.js" as Database
+
+ListModel {
+ id: model
+
+ property string filter
+ property bool populated
+ property int moveCount: 1
+ readonly property var availableColors: [
+ "#cc0000", "#cc7700", "#ccbb00",
+ "#88cc00", "#00b315", "#00bf9f",
+ "#005fcc", "#0016de", "#bb00cc"]
+ property var colorIndexConf: ConfigurationValue {
+ key: "/apps/jolla-notes/next_color_index"
+ defaultValue: 0
+ }
+ property var worker: WorkerScript {
+ source: "notesmodel.js"
+ onMessage: {
+ if (messageObject.reply === "insert") {
+ model.newNoteInserted()
+ } else if (messageObject.reply == "update") {
+ populated = true
+ }
+ }
+ }
+ signal newNoteInserted
+
+ Component.onCompleted: {
+ refresh()
+
+ if (Database.migrated_color_index !== -1) {
+ colorIndexConf.value = Database.migrated_color_index
+ }
+ }
+ onFilterChanged: refresh()
+
+ function refresh() {
+ Database.updateNotes(filter, function (results) {
+ var msg = {'action': 'update', 'model': model, 'results': results}
+ worker.sendMessage(msg)
+ })
+ }
+
+ function nextColor() {
+ var index = colorIndexConf.value
+ if (index >= availableColors.length)
+ index = 0
+ colorIndexConf.value = index + 1
+ return availableColors[index]
+ }
+
+ function newNote(pagenr, initialtext, color) {
+ var _color = color + "" // convert to string
+ Database.newNote(pagenr, _color, initialtext)
+ var msg = {'action': 'insert', 'model': model, "pagenr": pagenr, "text": initialtext, "color": _color }
+ worker.sendMessage(msg)
+ }
+
+ function updateNote(idx, text) {
+ Database.updateNote(get(idx).pagenr, text)
+ var msg = {'action': 'textupdate', 'model': model, 'idx': idx, 'text': text}
+ worker.sendMessage(msg)
+ }
+
+ function updateColor(idx, color) {
+ var _color = color + "" // convert to string
+ Database.updateColor(get(idx).pagenr, _color)
+ var msg = {'action': 'colorupdate', 'model': model, 'idx': idx, 'color': _color}
+ worker.sendMessage(msg)
+ }
+
+ function moveToTop(idx) {
+ Database.moveToTop(get(idx).pagenr)
+ var msg = {'action': 'movetotop', 'model': model, 'idx': idx}
+ worker.sendMessage(msg)
+ moveCount++
+ }
+
+ function deleteNote(idx) {
+ Database.deleteNote(get(idx).pagenr)
+ var msg = {'action': 'remove', 'model': model, "idx": idx}
+ worker.sendMessage(msg)
+ }
+}
diff --git a/usr/share/jolla-notes/pages/OverviewPage.qml b/usr/share/jolla-notes/pages/OverviewPage.qml
new file mode 100644
index 00000000..b5f3f711
--- /dev/null
+++ b/usr/share/jolla-notes/pages/OverviewPage.qml
@@ -0,0 +1,189 @@
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+
+Page {
+ id: overviewpage
+
+ function showDeleteNote(index) {
+ // This is needed both for UI (the user should see the remorse item)
+ // and to make sure the delegate exists.
+ view.positionViewAtIndex(index, GridView.Contain)
+ // Set currentIndex in order to find the corresponding currentItem.
+ // Is this really the only way to look up a delegate by index?
+ view.currentIndex = index
+ view.currentItem.deleteNote()
+ }
+ function flashGridDelegate(index) {
+ // This is needed both for UI (the user should see the remorse item)
+ // and to make sure the delegate exists.
+ view.positionViewAtIndex(index, GridView.Contain)
+ // Set currentIndex in order to find the corresponding currentItem.
+ // Is this really the only way to look up a delegate by index?
+ view.currentIndex = index
+ view.currentItem.flash()
+ }
+ property var _flashDelegateIndexes: []
+
+ readonly property bool populated: notesModel.populated
+ onPopulatedChanged: {
+ if (notesModel.count === 0) {
+ openNewNote(PageStackAction.Immediate)
+ }
+ }
+
+ onStatusChanged: {
+ if (status === PageStatus.Active) {
+ if (populated && _flashDelegateIndexes.length) {
+ // Flash grid delegates of imported notes
+ for (var i in _flashDelegateIndexes) {
+ flashGridDelegate(_flashDelegateIndexes[i])
+ }
+ _flashDelegateIndexes = []
+ }
+ if (notesModel.filter.length > 0) {
+ notesModel.refresh() // refresh search
+ }
+ } else if (status === PageStatus.Inactive) {
+ if (notesModel.filter.length == 0) view.headerItem.active = false
+ }
+ }
+
+ SilicaGridView {
+ id: view
+
+ currentIndex: -1
+ anchors.fill: overviewpage
+ model: notesModel
+ cellHeight: overviewpage.width / columnCount
+ cellWidth: cellHeight
+ // reference column width: 960 / 4
+ property int columnCount: Math.floor((isLandscape ? Screen.height : Screen.width) / (Theme.pixelRatio * 240))
+
+ onMovementStarted: {
+ focus = false // close the vkb
+ }
+
+ ViewPlaceholder {
+ id: placeholder
+
+ // Avoid flickering empty state placeholder when updating search results
+ function placeholderText() {
+ //% "Sorry, we couldn't find anything"
+ return notesModel.filter.length > 0 ? qsTrId("notes-la-could_not_find_anything")
+ //: Comforting text when overview is empty
+ //% "Write a note"
+ : qsTrId("notes-la-overview-placeholder")
+ }
+ Component.onCompleted: text = placeholderText()
+ Binding {
+ when: placeholder.opacity == 0.0
+ target: placeholder
+ property: "text"
+ value: placeholder.placeholderText()
+ }
+
+ enabled: notesModel.populated && notesModel.count === 0
+ }
+ header: SearchField {
+ width: parent.width
+ canHide: text.length === 0
+ active: false
+ inputMethodHints: Qt.ImhNone // Enable predictive text
+
+ onHideClicked: {
+ active = false
+ }
+
+ onTextChanged: notesModel.filter = text
+
+ EnterKey.iconSource: "image://theme/icon-m-enter-close"
+ EnterKey.onClicked: focus = false
+ }
+
+ delegate: NoteItem {
+ id: noteItem
+
+ // make model.index accessible to other delegates
+ property int index: model.index
+
+ function deleteNote() {
+ remorseDelete(function() {
+ notesModel.deleteNote(index)
+ })
+ }
+
+ function flash() {
+ flashAnim.running = true
+ }
+
+
+ text: model.text ? Theme.highlightText(model.text.substr(0, Math.min(model.text.length, 300)), notesModel.filter, Theme.highlightColor) : ""
+ color: model.color
+ pageNumber: model.pagenr
+ menu: contextMenuComponent
+
+ onClicked: pageStack.push(notePage, { currentIndex: model.index } )
+
+ Rectangle {
+ id: flashRect
+ anchors.fill: parent
+ color: noteItem.color
+ opacity: 0.0
+ SequentialAnimation {
+ id: flashAnim
+ running: false
+ PropertyAnimation { target: flashRect; property: "opacity"; to: Theme.opacityLow; duration: 600; easing.type: Easing.InOutQuad }
+ PropertyAnimation { target: flashRect; property: "opacity"; to: 0.01; duration: 600; easing.type: Easing.InOutQuad }
+ PropertyAnimation { target: flashRect; property: "opacity"; to: Theme.opacityLow; duration: 600; easing.type: Easing.InOutQuad }
+ PropertyAnimation { target: flashRect; property: "opacity"; to: 0.00; duration: 600; easing.type: Easing.InOutQuad }
+ }
+ }
+ }
+
+ PullDownMenu {
+ id: pullDownMenu
+
+ MenuItem {
+ visible: notesModel.filter.length > 0 || notesModel.count > 0
+ //% "Search"
+ text: qsTrId("notes-me-search")
+ onClicked: {
+ view.headerItem.active = true
+ view.headerItem.forceActiveFocus()
+ }
+ }
+
+ MenuItem {
+ //: Create a new note ready for editing
+ //% "New note"
+ text: qsTrId("notes-me-new-note")
+ onClicked: app.openNewNote(PageStackAction.Animated)
+ }
+ }
+ VerticalScrollDecorator {}
+ }
+
+ Component {
+ id: contextMenuComponent
+ ContextMenu {
+ id: contextMenu
+
+ MenuItem {
+ //: Delete this note from overview
+ //% "Delete"
+ text: qsTrId("notes-la-delete")
+ onClicked: contextMenu.parent.deleteNote()
+ }
+
+ MenuItem {
+ //: Move this note to be first in the list
+ //% "Move to top"
+ text: qsTrId("notes-la-move-to-top")
+ visible: contextMenu.parent && contextMenu.parent.index > 0
+ property int index
+ onClicked: index = contextMenu.parent.index // parent is null by the time delayedClick() is called
+ onDelayedClick: notesModel.moveToTop(index)
+ }
+ }
+ }
+}
diff --git a/usr/share/jolla-notes/pages/notesdatabase.js b/usr/share/jolla-notes/pages/notesdatabase.js
new file mode 100644
index 00000000..e498028f
--- /dev/null
+++ b/usr/share/jolla-notes/pages/notesdatabase.js
@@ -0,0 +1,143 @@
+// Copyright (C) 2012-2013 Jolla Ltd.
+// Contact: Richard Braakman ATTN: Source Code Requests
Polttimonkatu 3
33210 Tampere
FINLAND" + text: "Jollyboys Ltd.
ATTN: Source Code Requests
Polttimonkatu 3
33210 Tampere
FINLAND" } AboutText { diff --git a/usr/share/jolla-settings/pages/about/snippets/101-trademark-sailfish-jolla.qml b/usr/share/jolla-settings/pages/about/snippets/101-trademark-sailfish-jolla.qml index 2c9dd1d3..8c65bcf7 100644 --- a/usr/share/jolla-settings/pages/about/snippets/101-trademark-sailfish-jolla.qml +++ b/usr/share/jolla-settings/pages/about/snippets/101-trademark-sailfish-jolla.qml @@ -6,7 +6,7 @@ Column { spacing: Theme.paddingLarge AboutText { - //% "Jolla and Sailfish are trademarks or registered trademarks of Jolla Ltd. Jolla's product names are either trademarks or registered trademarks of Jolla. Jolla’s software is protected by copyright, trademark, trade secrets and other intellectual property rights of Jolla and its licensors." - text: qsTrId("settings_about-la-jolla_trademark_notification") + //% "Jolla and Sailfish are trademarks or registered trademarks of Jollyboys Ltd. ('Our'). Our product names are either our trademarks or registered trademarks. Our Software is protected by copyright, trademark, trade secrets and other intellectual property rights." + text: qsTrId("settings_about-la-jolla_trademarks") } } diff --git a/usr/share/jolla-settings/pages/about/snippets/250-avc.qml b/usr/share/jolla-settings/pages/about/snippets/250-avc.qml new file mode 100644 index 00000000..4adf975a --- /dev/null +++ b/usr/share/jolla-settings/pages/about/snippets/250-avc.qml @@ -0,0 +1,11 @@ +import QtQuick 2.1 +import com.jolla.settings.system 1.0 + +Item { + height: textItem.height + + AboutText { + id: textItem + text: "AVC Video. THIS PRODUCT IS LICENSED UNDER THE AVC PATENT PORTFOLIO LICENSE FOR THE PERSONAL USE OF A CONSUMER OR OTHER USES IN WHICH IT DOES NOT RECEIVE REMUNERATION TO (i) ENCODE VIDEO IN COMPLIANCE WITH THE AVC STANDARD (“AVC VIDEO”) AND/OR (ii) DECODE AVC VIDEO THAT WAS ENCODED BY A CONSUMER ENGAGED IN A PERSONAL ACTIVITY AND/OR WAS OBTAINED FROM A VIDEO PROVIDER LICENSED TO PROVIDE AVC VIDEO. NO LICENSE IS GRANTED OR SHALL BE IMPLIED FOR ANY OTHER USE. ADDITIONAL INFORMATION MAY BE OBTAINED FROM MPEG LA, L.L.C. SEE HTTP://WWW.MPEGLA.COM." + } +} diff --git a/usr/share/jolla-settings/pages/about/snippets/260-mp4.qml b/usr/share/jolla-settings/pages/about/snippets/260-mp4.qml new file mode 100644 index 00000000..2911bf20 --- /dev/null +++ b/usr/share/jolla-settings/pages/about/snippets/260-mp4.qml @@ -0,0 +1,11 @@ +import QtQuick 2.1 +import com.jolla.settings.system 1.0 + +Item { + height: textItem.height + + AboutText { + id: textItem + text: "MP4 Video. THIS PRODUCT IS LICENSED UNDER THE MPEG-4 VISUAL PATENT PORTFOLIO LICENSE FOR THE PERSONAL AND NON-COMMERCIAL USE OF A CONSUMER FOR (i) ENCODING VIDEO IN COMPLIANCE WITH THE MPEG-4 VISUAL STANDARD (\"MPEG-4 VIDEO\") AND/OR (ii) DECODING MPEG-4 VIDEO THAT WAS ENCODED BY A CONSUMER ENGAGED IN A PERSONAL AND NON- COMMERCIAL ACTIVITY AND/OR WAS OBTAINED FROM A VIDEO PROVIDER LICENSED BY MPEG LA TO PROVIDE MPEG-4 VIDEO. NO LICENSE IS GRANTED OR SHALL BE IMPLIED FOR ANY OTHER USE. ADDITIONAL INFORMATION INCLUDING THAT RELATING TO PROMOTIONAL, INTERNAL AND COMMERCIAL USES AND LICENSING MAY BE OBTAINED FROM MPEG LA, LLC. SEE HTTP://WWW.MPEGLA.COM." + } +} diff --git a/usr/share/jolla-settings/pages/about/snippets/270-mp3.qml b/usr/share/jolla-settings/pages/about/snippets/270-mp3.qml new file mode 100644 index 00000000..afa57049 --- /dev/null +++ b/usr/share/jolla-settings/pages/about/snippets/270-mp3.qml @@ -0,0 +1,11 @@ +import QtQuick 2.1 +import com.jolla.settings.system 1.0 + +Item { + height: textItem.height + + AboutText { + id: textItem + text: "MPEG Layer-3. MPEG Layer-3 audio coding technology licensed from Fraunhofer IIS and Thomson Licensing. Supply of this product does not convey a license nor imply any right to distribute MPEG Layer-3 compliant content created with this product in revenue-generating broadcast systems (terrestrial, satellite, cable and/or other distribution channels), streaming applications (via Internet, intranets and/or other networks), other content distribution systems (pay-audio or audio-on-demand applications and the like) or on physical media (compact discs, digital versatile discs, semiconductor chips, hard drives, memory cards and the like). An independent license for such use is required. For details, please visit http://mp3licensing.com." + } +} diff --git a/usr/share/jolla-settings/pages/about/snippets/400-package-licenses.qml b/usr/share/jolla-settings/pages/about/snippets/400-package-licenses.qml deleted file mode 100644 index 1283d5e1..00000000 --- a/usr/share/jolla-settings/pages/about/snippets/400-package-licenses.qml +++ /dev/null @@ -1,19 +0,0 @@ -import QtQuick 2.1 -import Sailfish.Silica 1.0 -import com.jolla.settings.system 1.0 - -Column { - AboutText { - //: Text surrounded by %1 and %2 is underlined and colored differently - //% "You can %1see information about packages%2 installed on this system." - text: qsTrId("settings_package_licenses-la-packages_info") - .arg("") - .arg("") - - MouseArea { - id: mouseArea - anchors.fill: parent - onClicked: pageStack.animatorPush("com.jolla.settings.system.PackagesPage") - } - } -} diff --git a/usr/share/jolla-settings/pages/advanced-networking/mainpage.qml b/usr/share/jolla-settings/pages/advanced-networking/mainpage.qml index e5a8d12f..2f8f6691 100644 --- a/usr/share/jolla-settings/pages/advanced-networking/mainpage.qml +++ b/usr/share/jolla-settings/pages/advanced-networking/mainpage.qml @@ -110,7 +110,10 @@ Page { ProxyForm { id: proxyForm network: netProxy - enabled: !disabledByMdmBanner.active + enabled: netProxySwitch.checked && !disabledByMdmBanner.active + //: Referring to the network proxy method to use for all connections + //% "Global proxy configuration" + comboLabel: qsTrId("settings_network-la-global_proxy_configuration") } } } diff --git a/usr/share/jolla-settings/pages/battery/mainpage.qml b/usr/share/jolla-settings/pages/battery/mainpage.qml index c8e37b52..4a492046 100644 --- a/usr/share/jolla-settings/pages/battery/mainpage.qml +++ b/usr/share/jolla-settings/pages/battery/mainpage.qml @@ -14,6 +14,23 @@ Page { readonly property int effectivePowerSaveModeThreshold: displaySettings.powerSaveModeEnabled ? displaySettings.powerSaveModeThreshold : -1 + readonly property var chargingModeOptions: [BatteryStatus.EnableCharging, + //BatteryStatus.DisableCharging, + BatteryStatus.ApplyChargingThresholds, + //BatteryStatus.ApplyChargingThresholdsAfterFull, + ] + property alias chargingThresholdsSupported: batteryStatus.chargingSuspendendable + readonly property var chargingThresholdOptions: [80, 90] + readonly property int chargingThresholdDelta: 3 + readonly property bool chargingThresholdsAreValid: batteryStatus.chargeEnableLimit < batteryStatus.chargeDisableLimit + readonly property bool chargingThresholdsAreSimple: batteryStatus.chargeEnableLimit + chargingThresholdDelta == batteryStatus.chargeDisableLimit + readonly property bool chargingThresholdsAreRelevant: (batteryStatus.chargingMode == BatteryStatus.ApplyChargingThresholds + || batteryStatus.chargingMode== BatteryStatus.ApplyChargingThresholdsAfterFull) + readonly property bool forcedChargingIsRelevant: (batteryStatus.chargerStatus == BatteryStatus.Connected + && batteryStatus.status != BatteryStatus.Full + && batteryStatus.chargingMode != BatteryStatus.EnableCharging) + property alias forcedChargingIsActive: batteryStatus.chargingForced + function thresholdText(threshold) { if (threshold < 0 ) { //% "Not in use" @@ -31,6 +48,47 @@ Page { } } + function chargingModeText(mode) { + if (mode == BatteryStatus.EnableCharging) { + //% "Normal" + return qsTrId("settings_battery-la-charging_always_enabled") + } + if (mode == BatteryStatus.DisableCharging) { + //% "Disabled" + return qsTrId("settings_battery-la-charging_always_disabled") + } + if (mode == BatteryStatus.ApplyChargingThresholds) { + //% "Apply thresholds" + return qsTrId("settings_battery-la-charging_apply_thresholds") + } + if (mode == BatteryStatus.ApplyChargingThresholdsAfterFull) { + //% "Charge to full, then apply thresholds" + return qsTrId("settings_battery-la-charging_apply_thresholds_after_full") + } + //% "Unknown" + return qsTrId("settings_battery-la-charging_unknown_mode") + } + function chargingModeDescription(mode) { + if (mode == BatteryStatus.EnableCharging) { + //% "Charge whenever a charger is connected" + return qsTrId("settings_battery-la-charging_always_enabled_description") + } + if (mode == BatteryStatus.DisableCharging) { + //% "Charge only when battery is close to empty" + return qsTrId("settings_battery-la-charging_always_disabled_description") + } + if (mode == BatteryStatus.ApplyChargingThresholds + || mode == BatteryStatus.ApplyChargingThresholdsAfterFull) { + if (chargingThresholdsAreSimple) { + //% "Stop charging at specified value" + return qsTrId("settings_battery-la-charging_apply_thresholds_description_value") + } + //% "Keep battery level within specified range" + return qsTrId("settings_battery-la-charging_apply_thresholds_description_range") + } + return "" + } + SilicaFlickable { anchors.fill: parent contentHeight: content.height + Theme.paddingMedium @@ -45,21 +103,9 @@ Page { title: qsTrId("settings_system-he-battery") } - IconTextSwitch { - icon.source: "image://theme/icon-m-battery-saver" - automaticCheck: false - checked: displaySettings.powerSaveModeForced - //% "Enable battery saving mode until charger is connected the next time" - text: qsTrId("settings_battery-la-battery-saving-mode-enabled") - //% "Battery saving mode will adjust the device behaviour to help improve battery life. " - //% "It may disable email and calendar sync, lower display brightness etc." - description: qsTrId("settings_battery-la-battery-saving-mode-enabled_description") - onClicked: displaySettings.powerSaveModeForced = !displaySettings.powerSaveModeForced - } - SectionHeader { - //% "Automatic battery saving" - text: qsTrId("settings_battery-la-automatic_battery_saving") + //% "Battery saving mode" + text: qsTrId("settings_battery-la-battery_saving_mode") } ComboBox { @@ -68,8 +114,9 @@ Page { value: thresholdText(effectivePowerSaveModeThreshold) //% "Activation threshold" label: qsTrId("settings_battery-la-battery_saving_threshold") - //% "Set threshold for automatically enabling battery saving mode." - description: qsTrId("settings_battery-la-power_saving_mode_threshold_description") + //% "Battery saving mode will adjust the device behaviour to help improve battery life. " + //% "It may disable email and calendar sync, lower display brightness etc." + description: qsTrId("settings_battery-la-battery_saving_threshold_description") Binding { target: thresholdComboBox @@ -87,10 +134,103 @@ Page { } } } + + IconTextSwitch { + icon.source: "image://theme/icon-m-battery-saver" + automaticCheck: false + checked: displaySettings.powerSaveModeForced + //% "Enable battery saving mode until charger is connected the next time" + text: qsTrId("settings_battery-la-battery-saving-mode-forced") + //% "Temporarily enable battery saving mode regardless of the activation threshold" + description: qsTrId("settings_battery-la-battery-saving-mode-forced_description") + onClicked: displaySettings.powerSaveModeForced = !displaySettings.powerSaveModeForced + } + + SectionHeader { + visible: chargingThresholdsSupported + //% "Battery ageing protection" + text: qsTrId("settings_battery-la-battery_ageing_protection") + } + + ComboBox { + id: chargingModeComboBox + visible: chargingThresholdsSupported + //% "Charging mode" + label: qsTrId("settings_battery-la-charging_mode") + value: chargingModeText(batteryStatus.chargingMode) + description: chargingModeDescription(batteryStatus.chargingMode) + Binding { + target: chargingModeComboBox + property: "currentIndex" + value: root.chargingModeOptions.indexOf(batteryStatus.chargingMode) + } + menu: ContextMenu { + Repeater { + model: root.chargingModeOptions + MenuItem { + text: chargingModeText(modelData) + onClicked: batteryStatus.chargingMode = modelData + } + } + } + } + + ComboBox { + id: chargingThresholdsComboBox + value: { + if (chargingThresholdsAreSimple) { + return "%1%".arg(batteryStatus.chargeDisableLimit) + } + return "%1% - %2%".arg(batteryStatus.chargeEnableLimit).arg(batteryStatus.chargeDisableLimit) + } + label: { + if (chargingThresholdsAreSimple) { + //% "Stop charging at" + return qsTrId("settings_battery-la-charging_disable_limit") + } + //% "Keep in range" + return qsTrId("settings_battery-la-charging_keep_in_range") + } + visible: chargingThresholdsSupported && chargingThresholdsAreRelevant + valueColor: chargingThresholdsAreValid ? Theme.highlightColor : "red" + Binding { + target: chargingThresholdsComboBox + property: "currentIndex" + value: root.chargingThresholdOptions.indexOf(batteryStatus.chargeDisableLimit) + } + menu: ContextMenu { + Repeater { + model: root.chargingThresholdOptions + MenuItem { + text: "%1%".arg(modelData) + onClicked: { + batteryStatus.chargeDisableLimit = modelData + batteryStatus.chargeEnableLimit = modelData - chargingThresholdDelta + } + } + } + } + } + + IconTextSwitch { + icon.source: "image://theme/icon-m-battery" + automaticCheck: false + visible: chargingThresholdsSupported && forcedChargingIsRelevant + checked: forcedChargingIsActive + //% "Fully charge this time" + text: qsTrId("settings_battery-la-apply-charging-thresholds-after-full") + //% "Temporarily suppress battery ageing protection to fully charge the battery once" + description: qsTrId("settings_battery-la-apply-charging-thresholds-after-full_description") + onClicked: forcedChargingIsActive = !forcedChargingIsActive + } } } DisplaySettings { id: displaySettings } + + BatteryStatus { + id: batteryStatus + } } diff --git a/usr/share/jolla-settings/pages/bluetooth/BluetoothVisibilityComboBox.qml b/usr/share/jolla-settings/pages/bluetooth/BluetoothVisibilityComboBox.qml index 806902e2..cb01dd02 100644 --- a/usr/share/jolla-settings/pages/bluetooth/BluetoothVisibilityComboBox.qml +++ b/usr/share/jolla-settings/pages/bluetooth/BluetoothVisibilityComboBox.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 ComboBox { id: root diff --git a/usr/share/jolla-settings/pages/bluetooth/EnableSwitch.qml b/usr/share/jolla-settings/pages/bluetooth/EnableSwitch.qml index f637df9f..8a428150 100644 --- a/usr/share/jolla-settings/pages/bluetooth/EnableSwitch.qml +++ b/usr/share/jolla-settings/pages/bluetooth/EnableSwitch.qml @@ -1,7 +1,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 -import MeeGo.Connman 0.2 +import Connman 0.2 import Nemo.DBus 2.0 import com.jolla.settings 1.0 import Sailfish.Policy 1.0 diff --git a/usr/share/jolla-settings/pages/bluetooth/bluetoothSettings.qml b/usr/share/jolla-settings/pages/bluetooth/bluetoothSettings.qml index 6f1e05c4..d0ff7f3a 100644 --- a/usr/share/jolla-settings/pages/bluetooth/bluetoothSettings.qml +++ b/usr/share/jolla-settings/pages/bluetooth/bluetoothSettings.qml @@ -1,13 +1,13 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import MeeGo.Connman 0.2 +import Connman 0.2 import Sailfish.Bluetooth 1.0 import com.jolla.settings.bluetooth.translations 1.0 import org.kde.bluezqt 1.0 as BluezQt -import Nemo.Ssu 1.1 as Ssu import Nemo.DBus 2.0 import Sailfish.Policy 1.0 import com.jolla.settings.system 1.0 +import org.nemomobile.systemsettings 1.0 Page { id: root @@ -164,6 +164,7 @@ Page { TextField { id: deviceNameField + width: parent.width //: Name of bluetooth device @@ -172,14 +173,16 @@ Page { // Show default name as hint when no text is entered. Don't do this when adapter is // unavailable to avoid confusion if the name normally has a non-default value. - placeholderText: adapter ? Ssu.DeviceInfo.displayName(Ssu.DeviceInfo.DeviceModel) : "" + placeholderText: adapter ? deviceInfo.prettyName : "" - //Make sure there's adapter. If adapter use adapter name. If no adapter name use ssu name. - text: adapter ? (adapter.name ? adapter.name : adapter.name = Ssu.DeviceInfo.displayName(Ssu.DeviceInfo.DeviceModel)) : "" + //Make sure there's adapter. If adapter use adapter name. If no adapter name use device info name. + text: adapter ? (adapter.name ? adapter.name + : adapter.name = deviceInfo.prettyName) + : "" onActiveFocusChanged: { if (!activeFocus && adapter) { - var newName = text.length ? text : Ssu.DeviceInfo.displayName(Ssu.DeviceInfo.DeviceModel) + var newName = text.length ? text : deviceInfo.prettyName if (adapter.name != newName) { adapter.name = newName } else { @@ -247,6 +250,10 @@ Page { } } + DeviceInfo { + id: deviceInfo + } + Connections { id: adapterConn target: root.adapter diff --git a/usr/share/jolla-settings/pages/browser/browser.qml b/usr/share/jolla-settings/pages/browser/browser.qml index 48ed0cd0..5401e7f7 100644 --- a/usr/share/jolla-settings/pages/browser/browser.qml +++ b/usr/share/jolla-settings/pages/browser/browser.qml @@ -12,7 +12,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import org.sailfishos.browser.settings 1.0 -import org.nemomobile.dbus 2.0 +import Nemo.DBus 2.0 import com.jolla.settings 1.0 ApplicationSettings { diff --git a/usr/share/jolla-settings/pages/crash-reporter/PendingUploads.qml b/usr/share/jolla-settings/pages/crash-reporter/PendingUploads.qml new file mode 100644 index 00000000..f0d3d3cb --- /dev/null +++ b/usr/share/jolla-settings/pages/crash-reporter/PendingUploads.qml @@ -0,0 +1,169 @@ +/* + * This file is part of crash-reporter + * + * Copyright (C) 2013 Jolla Ltd. + * Contact: Jakub Adam
" + //% "This is an irreversible change and you will need to enter a security code on all future boots in order to access your data.
" + //% "If you accept the device will reboot automatically and you will be prompted for the security code before encrypting user data." + text: qsTrId("settings_encryption-la-encrypt_user_data_warning").arg(createBackupLink()) + wrapMode: Text.Wrap + + onLinkActivated: pageStack.animatorPush("Sailfish.Vault.MainPage") + } + + Label { + //% "How do I make a backup and restore it?" + readonly property string title: qsTrId("settings_encryption-la-make_backup_and_restore_it") + readonly property string url: "https://sailfishos.org/article/backup-and-restore" + + x: Theme.horizontalPageMargin + width: parent.width - 2*Theme.horizontalPageMargin + height: implicitHeight + Theme.paddingLarge + font.pixelSize: Theme.fontSizeExtraSmall + color: Theme.highlightColor + linkColor: Theme.primaryColor + textFormat: Text.AutoText + text: "" + title +"" + wrapMode: Text.Wrap + onLinkActivated: Qt.openUrlExternally(link) + } + + Label { + x: Theme.horizontalPageMargin + width: parent.width - 2*Theme.horizontalPageMargin + height: implicitHeight + Theme.paddingLarge + font.pixelSize: Theme.fontSizeExtraSmall + color: Theme.highlightColor + text: securityCode.set + //% "You will need to enter your security code before user data can be encrypted." + ? qsTrId("settings_encryption-la-encrypt_user_data_security_code_notice") + //% "You will need to set a security code before user data can be encrypted." + : qsTrId("settings_encryption-la-encrypt_user_data_create_security_code_notice") + wrapMode: Text.Wrap + } + } + } +} + diff --git a/usr/share/jolla-settings/pages/encryption/LayoutTranslations.qml b/usr/share/jolla-settings/pages/encryption/LayoutTranslations.qml new file mode 100644 index 00000000..5de893ce --- /dev/null +++ b/usr/share/jolla-settings/pages/encryption/LayoutTranslations.qml @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2019 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.0 + +Item { + // providing dummy translations that can be used on settings layout files + function qsTrIdString() { + //% "Do you want to encrypt user data?" + QT_TRID_NOOP("settings_encryption-la-encrypt_user_data_confirmation") + + // Restoration UI translations + //% "OK" + QT_TRID_NOOP("settings_encryption-la-ok") + //% "Restoring user data" + QT_TRID_NOOP("settings_encryption-la-restoring-data") + //% "Restoring user data failed" + QT_TRID_NOOP("settings_encryption-la-restore-fail-summary") + //% "Data is kept on memory card" + QT_TRID_NOOP("settings_encryption-la-restore-fail-body") + } +} diff --git a/usr/share/jolla-settings/pages/encryption/SDCopyFailed.qml b/usr/share/jolla-settings/pages/encryption/SDCopyFailed.qml new file mode 100644 index 00000000..47473c1b --- /dev/null +++ b/usr/share/jolla-settings/pages/encryption/SDCopyFailed.qml @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2021 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 + +Page { + Label { + x: Theme.horizontalPageMargin + width: parent.width - 2*x + wrapMode: Text.Wrap + + //% "Copying data failed. Aborting encryption" + text: qsTrId("settings_encryption-la-copy-failed") + color: Theme.errorColor + + } +} diff --git a/usr/share/jolla-settings/pages/encryption/SDCopyPage.qml b/usr/share/jolla-settings/pages/encryption/SDCopyPage.qml new file mode 100644 index 00000000..c039a658 --- /dev/null +++ b/usr/share/jolla-settings/pages/encryption/SDCopyPage.qml @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2021 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Lipstick 1.0 +import Sailfish.Silica.private 1.0 + +Page { + id: sdCopyPage + backNavigation: false + + WindowGestureOverride { + id: gestureOverride + active: true + } + + BusyLabel { + running: true + //% "Saving data to SD card" + text: qsTrId("settings_encryption-la-saving-data") + } +} diff --git a/usr/share/jolla-settings/pages/encryption/encryption.qml b/usr/share/jolla-settings/pages/encryption/encryption.qml new file mode 100644 index 00000000..983c3873 --- /dev/null +++ b/usr/share/jolla-settings/pages/encryption/encryption.qml @@ -0,0 +1,406 @@ +/* + * Copyright (c) 2019 Jolla Ltd. + * Copyright (c) 2019 Open Mobile Platform LLC. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Nemo.DBus 2.0 +import Sailfish.Encryption 1.0 +import org.nemomobile.devicelock 1.0 +import org.nemomobile.systemsettings 1.0 + +Page { + id: page + + // Device lock autentication + + // threshold above which we may reset without charger + readonly property int batteryThreshold: 15 + readonly property bool batteryChargeOk: battery.chargePercentage > batteryThreshold + // To be checked + readonly property bool applicationActive: Qt.application.active + // external storage data + property string selectedDevPath: "tmp" + property bool selectedDevSuitable: false + property bool hasHomeCopy: copyHelper.hasHomeCopyService() + + property EncryptionService encryptionService + property CopyService copyService + + function createBackupLink() { + //: A link to Settings | System | Backup + //: Action or verb that can be used for %1 in settings_encryption-la-encrypt_user_data_warning and + //: settings_encryption-la-encrypt_user_data_description + //: Strongly proposing user to do a backup. + //% "Back up" + var backup = qsTrId("settings_encryption-la-back_up") + return "" + backup + "" + } + + function devPath() { + return sdSwitch.checked ? selectedDevPath : "tmp" + } + + BatteryStatus { + id: battery + } + + USBSettings { + id: usbSettings + } + + CopyHelper { + id: copyHelper + } + + EncryptionSettings { + id: encryptionSettings + onEncryptingHome: lipstick.startEncryptionPreparation() + onEncryptHomeError: console.warn("Home encryption failed. Maybe token expired.") + } + + Component { + id: encryptionServiceComponent + EncryptionService {} + } + + Component { + id: copyServiceComponent + CopyService {} + } + + DBusInterface { + id: dsmeDbus + bus: DBus.SystemBus + service: "com.nokia.dsme" + path: "/com/nokia/dsme/request" + iface: "com.nokia.dsme.request" + } + + DBusInterface { + id: lipstick + bus: DBus.SystemBus + service: "org.nemomobile.lipstick" + path: "/shutdown" + iface: "org.nemomobile.lipstick" + + function startEncryptionPreparation() { + lipstick.call("setShutdownMode", ["reboot"], + function(success) { + prepareEncryption.running = true + }, + function(error, message) { + console.info("Error occured when entering to reboot mode:", error, "message:", message) + } + ) + } + } + + Timer { + id: prepareEncryption + + property string securityCode + + interval: 3000 + onTriggered: { + page.encryptionService = encryptionServiceComponent.createObject(root) + page.encryptionService.prepare(securityCode, "zero") + } + } + + SilicaFlickable { + anchors.fill: parent + contentHeight: content.height + + VerticalScrollDecorator {} + + Column { + id: content + width: parent.width + spacing: Theme.paddingLarge + + PageHeader { + title: encryptionSettings.homeEncrypted + ? //% "Encryption information" + qsTrId("settings_encryption-he-encryption_information") + : //% "Encryption" + qsTrId("settings_encryption-he-encryption") + } + + Item { + id: batteryWarning + + width: parent.width - 2*Theme.horizontalPageMargin + height: Math.max(batteryIcon.height, batteryText.height) + x: Theme.horizontalPageMargin + visible: !page.batteryChargeOk && !encryptionSettings.homeEncrypted + + Image { + id: batteryIcon + anchors.verticalCenter: parent.verticalCenter + source: "image://theme/icon-l-battery" + } + + Label { + id: batteryText + + anchors { + left: batteryIcon.right + leftMargin: Theme.paddingMedium + right: parent.right + verticalCenter: parent.verticalCenter + } + font.pixelSize: Theme.fontSizeMedium + color: Theme.highlightColor + wrapMode: Text.Wrap + text: battery.chargerStatus === BatteryStatus.Connected + ? //: Battery low warning for device reset when charger is attached. Same as settings_reset-la-battery_charging + //% "Battery level low. Do not remove the charger." + qsTrId("settings_encryption-la-battery_charging") + : //: Battery low warning for device reset when charger is not attached. Same as settings_reset-la-battery_level_low + //% "Battery level too low." + qsTrId("settings_encryption-la-battery_level_low") + } + } + + Item { + id: mtpWarning + + width: parent.width - 2*Theme.horizontalPageMargin + height: Math.max(mtpIcon.height, mtpText.height) + x: Theme.horizontalPageMargin + visible: usbSettings.currentMode == usbSettings.MODE_MTP && !encryptionSettings.homeEncrypted + + Image { + id: mtpIcon + anchors.verticalCenter: parent.verticalCenter + source: "image://theme/icon-m-usb" + } + + Label { + id: mtpText + + anchors { + left: mtpIcon.right + leftMargin: Theme.paddingMedium + right: parent.right + verticalCenter: parent.verticalCenter + } + font.pixelSize: Theme.fontSizeMedium + color: Theme.highlightColor + wrapMode: Text.Wrap + text: //: USB MTP mode disconnect warning + //% "Media transfer (MTP) will be disconnected." + qsTrId("settings_encryption-la-mtp_disconnect") + } + } + + Label { + x: Theme.horizontalPageMargin + width: parent.width - 2*Theme.horizontalPageMargin + wrapMode: Text.Wrap + font.pixelSize: Theme.fontSizeSmall + color: Theme.highlightColor + linkColor: Theme.primaryColor + textFormat: Text.AutoText + visible: !encryptionSettings.homeEncrypted + + //: Takes "Back up" (settings_encryption-la-back_up) formatted hyperlink as parameter. + //: This is done because we're creating programmatically a hyperlink for it. + //% "This will erase all user data from the device. " + //% "This means losing user data that you have added to the device, reverts apps to clean state, accounts, contacts, photos and other media.
" + //% "%1 user data to memory card before encrypting the device." + text: qsTrId("settings_encryption-la-encrypt_user_data_description").arg(createBackupLink()) + + onLinkActivated: pageStack.animatorPush("Sailfish.Vault.MainPage") + } + + Button { + anchors.horizontalCenter: parent.horizontalCenter + preferredWidth: Theme.buttonWidthMedium + visible: !encryptionSettings.homeEncrypted + + //% "Encrypt" + text: qsTrId("settings_encryption-bt-encrypt") + onClicked: { + var obj = pageStack.animatorPush(Qt.resolvedUrl("HomeEncryptionDisclaimer.qml"), { + "encryptionSettings": encryptionSettings + }) + var mandatoryDeviceLock + obj.pageCompleted.connect(function(p) { + p.accepted.connect(function() { + mandatoryDeviceLock = p.acceptDestinationInstance + p.acceptDestinationInstance.authenticated.connect(function(authenticationToken) { + prepareEncryption.securityCode = mandatoryDeviceLock.securityCode + if (hasHomeCopy) + page.copyService = copyServiceComponent.createObject(root) + if (sdSwitch.checked) { + var copyPage = pageStack.animatorPush(Qt.resolvedUrl("SDCopyPage.qml")) + page.copyService.copyHome(selectedDevPath) + page.copyService.copied.connect(function(success) { + if (success) { + encryptionSettings.encryptHome(authenticationToken) + } else { + pageStack.pop(page) + completeAnimation() + pageStack.animatorPush(Qt.resolvedUrl("SDCopyFailed.qml")) + page.copyService.setCopyDev("") + } + }) + } else { + if (hasHomeCopy) + page.copyService.setCopyDev("") + encryptionSettings.encryptHome(authenticationToken) + } + }) + p.acceptDestinationInstance.canceled.connect(function() { + pageStack.pop(page) + }) + }) + p.canceled.connect(function() { + pageStack.pop(page) + }) + }) + } + enabled: (page.batteryChargeOk || battery.chargerStatus === BatteryStatus.Connected) + && !encryptionSettings.homeEncrypted + && (!sdSwitch.checked || selectedDevSuitable) + } + TextSwitch { + id: sdSwitch + //% "Copy user data to memory card" + text: qsTrId("settings_encryption-la-use_card") + //% "An encrypted memory card can be used to keep user data." + description: qsTrId("settings_encryption-la-use_card_description") + visible: !encryptionSettings.homeEncrypted && hasHomeCopy && copyHelper.memorycard + } + + ComboBox { + id: sdComboBox + enabled: sdSwitch.checked + visible: !encryptionSettings.homeEncrypted && hasHomeCopy && copyHelper.memorycard + //% "Encrypt using:" + label: qsTrId("settings_encryption-la-encrypt_using") + + menu: ContextMenu { + id: sdMenu + property bool firstUpdate: true + + Repeater { + id: sdRepeater + model: PartitionModel { + id: partitionModel + storageTypes: PartitionModel.External | PartitionModel.ExcludeParents + } + + MenuItem { + //% "Memory card: (%1)" + text: qsTrId("settings_encryption-memory_card").arg(Format.formatFileSize(bytesTotal)) + onClicked: { + update() + } + + Component.onCompleted: { + if (sdMenu.firstUpdate) { + sdMenu.firstUpdate = false + update() + } + } + function update() { + page.selectedDevSuitable = ((copyHelper.homeBytes() < bytesFree) && (mountPath !== "") + && copyHelper.checkWritable(mountPath)) + + sdComboBox.description = descriptionString((copyHelper.homeBytes() < bytesFree), (mountPath !== ""), + copyHelper.checkWritable(mountPath), isCryptoDevice) + page.selectedDevPath = devicePath + } + + function descriptionString(homeFits, mounted, writable, encrypted) { + if (!mounted) { //% "Card must be mounted" + return qsTrId("settings_encryption-la-card_not_mounted") + } else if (!homeFits) { //% "User data doesn't fit SD card" + return qsTrId("settings_encryption-la-data_doesnt_fit_to_card") + } else if (!writable) { //% "Selected card unwritable" + return qsTrId("settings_encryption-la-card_unwritable") + } else if (!encrypted) { //% "Card must be encrypted" + return qsTrId("settings_encryption-la-card_not_encrypted") + } else { + return "" + } + } + } + } + } + descriptionColor: Theme.errorColor + description: "" + } + + Column { + id: homeInfoColumn + width: parent.width + visible: encryptionSettings.homeEncrypted + + Label { + x: Theme.horizontalPageMargin + width: parent.width - 2*x + wrapMode: Text.Wrap + font.pixelSize: Theme.fontSizeSmall + color: Theme.highlightColor + + //: Shown in the Settings -> Encryption page when user data is already encrypted. + //% "Your user data is encrypted which means that only authorized users can access it. Users are authenticated with security code." + text: qsTrId("settings_encryption-la-encryption_user_data_description") + } + + SectionHeader { + //% "User data" + text: qsTrId("settings_encryption-la-encryption_user_data") + } + + DetailItem { + //% "Encryption" + label: qsTrId("settings_encryption-la-encryption") + //% "Enabled" + value: qsTrId("settings_encryption-la-enabled") + } + + DetailItem { + visible: homeInfo.type + //% "Device type" + label: qsTrId("settings_encryption-la-device_type") + value: homeInfo.type + } + + DetailItem { + visible: homeInfo.version + //% "Version" + label: qsTrId("settings_encryption-la-version") + value: homeInfo.version + } + + DetailItem { + visible: homeInfo.size > 0 + //% "Size" + label: qsTrId("settings_encryption-la-size") + value: Format.formatFileSize(homeInfo.size) + } + } + + Loader { + id: homeInfo + + readonly property string type: item && item.type || "" + readonly property string version: item && item.version || "" + readonly property double size: item && item.size || 0 + + active: encryptionSettings.homeEncrypted + sourceComponent: Component { + HomeInfo {} + } + } + } + } +} diff --git a/usr/share/jolla-settings/pages/ethernet/AddNetworkDialog.qml b/usr/share/jolla-settings/pages/ethernet/AddNetworkDialog.qml new file mode 100644 index 00000000..e544c40c --- /dev/null +++ b/usr/share/jolla-settings/pages/ethernet/AddNetworkDialog.qml @@ -0,0 +1,43 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Pickers 1.0 +import Sailfish.Settings.Networking 1.0 +import Connman 0.2 + +Dialog { + id: root + + property NetworkManager networkManager + canAccept: true + + property string path + onAccepted: { + root.forceActiveFocus() // proxy and ipv4 fields update on focus lost + path = networkManager.createServiceSync(network.json()) + } + + + SilicaFlickable { + anchors.fill: parent + contentHeight: column.height + Theme.paddingLarge + Column { + id: column + + width: parent.width + DialogHeader { + dialog: root + //% "Add network" + title: qsTrId("settings_network-he-ethernet-add_network") + //% "Save" + acceptText: qsTrId("settings_network-he-ethernet-save") + } + + AdvancedSettingsColumn { + id: advancedSettingsColumn + network: root.network + } + } + + VerticalScrollDecorator {} + } +} diff --git a/usr/share/jolla-settings/pages/ethernet/AdvancedSettingsPage.qml b/usr/share/jolla-settings/pages/ethernet/AdvancedSettingsPage.qml new file mode 100644 index 00000000..7e0242e1 --- /dev/null +++ b/usr/share/jolla-settings/pages/ethernet/AdvancedSettingsPage.qml @@ -0,0 +1,76 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Connman 0.2 +import Sailfish.Pickers 1.0 +import Sailfish.Settings.Networking 1.0 +import "../netproxy" + +Dialog { + id: root + + forwardNavigation: false + canNavigateForward: false + + property QtObject network + + SilicaFlickable { + anchors.fill: parent + contentHeight: content.height + Theme.paddingLarge + + PullDownMenu { + MenuItem { + //% "Forget network" + text: qsTrId("settings_network-me-ethernet-forget_network") + enabled: root.network + onClicked: { + var network = root.network + pageStack.pop() + network.autoConnect = false; + network.requestDisconnect() + network.remove() + root.network = null + } + } + } + + Column { + id: content + + width: parent.width + + DialogHeader { + id: dialogHeader + acceptText: "" + + //% "Save" + cancelText: qsTrId("settings_network-he-ethernet-save") + + Label { + parent: dialogHeader.extraContent + text: root.network ? root.network.name : "Testing testing" + color: Theme.highlightColor + width: parent.width + truncationMode: TruncationMode.Fade + font { + pixelSize: Theme.fontSizeLarge + family: Theme.fontFamilyHeading + } + anchors { + right: parent.right + rightMargin: -Theme.horizontalPageMargin + verticalCenter: parent.verticalCenter + } + + horizontalAlignment: Qt.AlignRight + } + } + + AdvancedSettingsColumn { + id: advancedSettingsColumn + network: root.network + globalProxyConfigPage: Qt.resolvedUrl("../advanced-networking/mainpage.qml") + } + } + VerticalScrollDecorator {} + } +} diff --git a/usr/share/jolla-settings/pages/ethernet/EthernetItem.qml b/usr/share/jolla-settings/pages/ethernet/EthernetItem.qml new file mode 100644 index 00000000..00840c6a --- /dev/null +++ b/usr/share/jolla-settings/pages/ethernet/EthernetItem.qml @@ -0,0 +1,117 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Settings.Networking 1.0 + +ListItem { + id: root + + property bool connected: networkService.state === "online" || (ready && connectCompletionTimer.running) + property bool ready: networkService.state === "ready" + property string previousState + property string currentState: networkService.state + + function getText(state) { + if (!root.enabled) { + return "" + } else if (connected) { + //% "Connected" + return qsTrId("settings_network-la-ethernet-connected_state") + } else if (state === "ready") { + //% "Limited connectivity" + return qsTrId("settings_network-la-ethernet-limited_state") + } else if (previousState === "online" && state === "association") { + // need previous state as well + // as connman signals 'association' on disconnect as well + //% "Disconnecting..." + return qsTrId("settings_network-la-ethernet-disconnecting_state") + } else if (state === "association" || state === "configuration") { + //% "Connecting..." + return qsTrId("settings_network-la-ethernet-connecting_state") + } else { + //% "Idle state" + return qsTrId("settings_network-la-ethernet-idle_state") + } + } + + enabled: !managed + contentHeight: textSwitch.height + highlighted: textSwitch.down || menuOpen || connected || ready + visible: networkService.type === "ethernet" + _backgroundColor: "transparent" + openMenuOnPressAndHold: false + menu: Component { + ContextMenu { + MenuItem { + //% "Connect" + text: qsTrId("settings_network-me-ethernet-connect") + visible: !networkService.connected && networkService.available + onClicked: networkService.requestConnect() + } + MenuItem { + //% "Disconnect" + text: qsTrId("settings_network-me-ethernet-disconnect") + visible: networkService.connected && !networkService.autoConnect + onClicked: networkService.requestDisconnect() + } + // The entry will be re-created by ConnMan as non-saved when cleared + // TODO: We may need to devise means to remove the others that are + // not tied to the particular adapter. + MenuItem { + //% "Clear settings" + text: qsTrId("settings_network-me-ethernet-clear-settings") + + onClicked: { + var network = networkService + //% "Cleared settings" + remorseAction(qsTrId("settings_network-la-ethernet-cleared-settings"), + function () { + network.autoConnect = false; + network.requestDisconnect() + network.remove() + }) + } + } + MenuItem { + //% "Details" + text: qsTrId("settings_network-me-ethernet-details") + onClicked: pageStack.animatorPush("NetworkDetailsPage.qml", {"network": networkService}) + } + + onActiveChanged: mainPage.suppressScan = active + } + } + + onCurrentStateChanged: { + if (previousState === "configuration" && currentState === "ready") + connectCompletionTimer.start() + else + connectCompletionTimer.stop() + + textSwitch.description = getText(currentState) + previousState = currentState + } + + ListView.onRemove: animateRemoval() + Component.onCompleted: textSwitch.description = getText(currentState) + + IconTextSwitch { + id: textSwitch + + enabled: root.enabled + icon.source: "image://theme/icon-m-lan" + automaticCheck: false + checked: networkService.autoConnect + highlighted: root.highlighted + text: networkService.name + onClicked: networkService.autoConnect = !networkService.autoConnect + onPressAndHold: root.openMenu() + } + + Timer { + id: connectCompletionTimer + + interval: 12000 + repeat: false + onTriggered: textSwitch.description = getText(currentState) + } +} diff --git a/usr/share/jolla-settings/pages/ethernet/EthernetSwitch.qml b/usr/share/jolla-settings/pages/ethernet/EthernetSwitch.qml new file mode 100644 index 00000000..712672fc --- /dev/null +++ b/usr/share/jolla-settings/pages/ethernet/EthernetSwitch.qml @@ -0,0 +1,96 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Policy 1.0 +import Sailfish.Settings.Networking 1.0 as Networking +import Connman 0.2 +import Nemo.Configuration 1.0 +import Nemo.DBus 2.0 +import com.jolla.connection 1.0 +import com.jolla.settings 1.0 + +SettingsToggle { + id: ethernetSwitch + + //% "Ethernet" + name: qsTrId("settings_network-la-ethernet") + activeText: networkManager.connectedEthernet ? networkManager.connectedEthernet.name : "" + icon.source: active && networkManager.connectedEthernet + ? "image://theme/icon-m-lan" : "image://theme/icon-m-lan" + + available: AccessPolicy.ethernetToggleEnabled + active: ethernetTechnology && ethernetTechnology.connected + checked: ethernetTechnology.powered + busy: busyTimer.running + + menu: ContextMenu { + SettingsMenuItem { + onClicked: ethernetSwitch.goToSettings() + } + + MenuItem { + //% "Connect to internet" + text: qsTrId("settings_network-me-ethernet-connect_to_internet") + onClicked: connectionSelector.openConnection() + } + } + + onToggled: { + // No accesspolicy for ethernet yet + //if (!AccessPolicy.ethernetToggleEnabled) { + // errorNotification.notify(SettingsControlError.BlockedByAccessPolicy) + if (networkManager.technologiesList().indexOf("ethernet") < 0) { + errorNotification.notify(SettingsControlError.NoEthernetDevice) + } else { + ethernetTechnology.powered = !ethernetTechnology.powered + if (ethernetTechnology.powered) { + busyTimer.stop() + } else if (connDialogConfig.rise) { + busyTimer.restart() + } + } + } + + Timer { + id: busyTimer + interval: connDialogConfig.scanningWait + onTriggered: connectionSelector.openConnection() + onRunningChanged: { + if (running) { + ethernetTechnology.connectedChanged.connect(stop) + } else { + ethernetTechnology.connectedChanged.disconnect(stop) + } + } + } + + ConfigurationGroup { + id: connDialogConfig + + // TODO: separate for ethernet? + path: "/apps/jolla-settings/wlan_fav_switch_connection_dialog" + + property bool rise: true + property int scanningWait: 5000 + } + + NetworkTechnology { + id: ethernetTechnology + path: networkManager.EthernetTechnology + } + + NetworkManager { id: networkManager } + + ConnectionAgent { id: connectionAgent } + + DBusInterface { + id: connectionSelector + + service: "com.jolla.lipstick.ConnectionSelector" + path: "/" + iface: "com.jolla.lipstick.ConnectionSelectorIf" + + function openConnection() { + call('openConnectionNow', 'ethernet') + } + } +} diff --git a/usr/share/jolla-settings/pages/ethernet/NetworkDetailsPage.qml b/usr/share/jolla-settings/pages/ethernet/NetworkDetailsPage.qml new file mode 100644 index 00000000..daf04499 --- /dev/null +++ b/usr/share/jolla-settings/pages/ethernet/NetworkDetailsPage.qml @@ -0,0 +1,112 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Connman 0.2 +import Sailfish.Settings.Networking 1.0 + +Page { + id: detailsPage + property QtObject network + allowedOrientations: Orientation.All + + SilicaFlickable { + anchors.fill: parent + contentHeight: column.height + Theme.paddingLarge + + PullDownMenu { + MenuItem { + //% "Edit" + text: qsTrId("settings_network-me-ethernet-edit") + onClicked: pageStack.animatorPush("AdvancedSettingsPage.qml", {"network": network}) + } + } + + Column { + id: column + width: parent.width + + PageHeader { + title: network.name + } + SectionHeader { + text: { + switch (network.state) { + case "online": + //% "Connected" + return qsTrId("settings_network-la-ethernet-connected_state") + case "ready": + //% "Limited connectivity" + return qsTrId("settings_network-la-ethernet-limited_state") + default: + //% "Not connected" + return qsTrId("settings_network-la-ethernet-not_connected") + } + } + } + + DetailItem { + //% "Hardware Address" + label: qsTrId("settings_network-la-ethernet-hardware_address") + value: network.ethernet["Address"] || "-" + } + + // Ethernet does not yet have setting for this but could be added later on + DetailItem { + property real speed: network.maxRate/1000000.0 + property string speedString: (speed).toLocaleString(Qt.locale(), 'f', 1) + + //% "Maximum speed" + label: qsTrId("settings_network-la-ethernet-maximum_speed") + + //: Megabits per second + //% "%1 Mb/s" + value: qsTrId("settings_network-la-ethernet-megabits_per_second").arg(speedString) + visible: speed != 0.0 + } + + Column { + width: parent.width + visible: network.ipv4["Address"] !== undefined || network.ipv6["Address"] !== undefined + + SectionHeader { + //% "Addresses" + text: qsTrId("settings_network-la-ethernet-addresses") + } + + DetailItem { + //% "IPv4 address" + label: qsTrId("settings_network-la-ethernet-ipv4_address") + value: network.ipv4["Address"] + visible: network.ipv4["Address"] !== undefined + } + + DetailItem { + //% "IPv4 Netmask" + label: qsTrId("settings_network-la-ethernet-ipv4_netmask") + value: network.ipv4["Netmask"] || "-" + visible: network.ipv4["Address"] !== undefined + } + + DetailItem { + //% "IPv4 Gateway" + label: qsTrId("settings_network-la-ethernet-ipv4_gateway") + value: network.ipv4["Gateway"] || "-" + visible: network.ipv4["Address"] !== undefined + } + + DetailItem { + //% "IPv6 address" + label: qsTrId("settings_network-la-ethernet-ipv6_address") + value: network.ipv6["Address"] + "/" + network.ipv6["PrefixLength"] + visible: network.ipv6["Address"] !== undefined + } + + DetailItem { + //% "DNS servers" + label: qsTrId("settings_network-la-ethernet-dns_servers") + value: network.nameservers ? network.nameservers.join("\n") : "-" + } + } + } + VerticalScrollDecorator { } + } +} diff --git a/usr/share/jolla-settings/pages/ethernet/mainpage.qml b/usr/share/jolla-settings/pages/ethernet/mainpage.qml new file mode 100644 index 00000000..d6dd1a02 --- /dev/null +++ b/usr/share/jolla-settings/pages/ethernet/mainpage.qml @@ -0,0 +1,255 @@ +import QtQuick 2.0 +import Connman 0.2 +import Sailfish.Silica 1.0 +import Sailfish.Policy 1.0 +import com.jolla.settings 1.0 +import Sailfish.Settings.Networking 1.0 +import com.jolla.connection 1.0 +import Nemo.DBus 2.0 +import org.nemomobile.systemsettings 1.0 + +Page { + id: mainPage + + property bool suppressScan + property var _errorPlaceholder + property bool showAddNetworkDialog + property bool pageReady + property bool techExists: false + + onStatusChanged: { + if (status == PageStatus.Active) { + pageReady = true + if (showAddNetworkDialog) { + showAddNetworkDialog = false + + var addNetworkProperties = networkHelper.readSettings() + var dialog = pageStack.push(Qt.resolvedUrl("AddNetworkDialog.qml"), { networkManager: networkManager }, PageStackAction.Immediate) + + dialog.accepted.connect(function() { + networkSetupLoader.active = true + networkSetupLoader.item.setup(dialog.path) + }) + } + } + } + + AboutSettings { + id: aboutSettings + } + + AddNetworkHelper { + id: networkHelper + } + + SilicaListView { + id: listView + + anchors.fill: parent + + PullDownMenu { + MenuItem { + // Menu item for opening the advanced network configuration page + //% "Advanced" + text: qsTrId("settings_network-me-ethernet_advanced") + onClicked: pageStack.animatorPush(Qt.resolvedUrl("../advanced-networking/mainpage.qml")) + } + MenuItem { + id: connectMenuItem + //% "Connect to internet" + text: qsTrId("settings_network-me-ethernet-connect_to_internet") + enabled: ethernetListModel.powered + onClicked: connectionSelector.openConnection() + } + } + + header: Column { + width: parent.width + enabled: true //AccessPolicy.ethernetToggleEnabled + + PageHeader { + //% "Ethernet" + title: qsTrId("settings_network-ph-ethernet") + } + + ListItem { + id: enableItem + + visible: techExists && ethernetListModel.available + contentHeight: ethernetSwitch.height + openMenuOnPressAndHold: false + + IconTextSwitch { + id: ethernetSwitch + + property string entryPath: "system_settings/connectivity/ethernet/enable_switch" + + // label + padding + ethernet icon + screen edge padding + automaticCheck: false + icon.source: "image://theme/icon-m-lan" + checked: ethernetListModel.available && ethernetListModel.powered + //% "Ethernet" + text: qsTrId("settings_network-la-ethernet") + enabled: true //AccessPolicy.ethernetToggleEnabled + //% "Fixed ethernet connection" + description: qsTrId("settings_network-la-ethernet_description") //{ +// if (!AccessPolicy.ethernetToggleEnabled) { +// if (checked) { + //: %1 is an operating system name without the OS suffix + //% "Enabled by %1 Device Manager" +// return qsTrId("settings_network-la-ethernet-enabled_by_mdm") +// .arg(aboutSettings.baseOperatingSystemName) + // } else { + //: %1 is an operating system name without the OS suffix + //% "Disabled by %1 Device Manager" +// return qsTrId("settings_network-la-ethernet-disabled_by_mdm") +// .arg(aboutSettings.baseOperatingSystemName) +// } +// } else { +// return "" +// } +// } + + onClicked: { + ethernetListModel.powered = !ethernetListModel.powered + } + } + } + } + + section.property: "managed" + section.delegate: Column { + property bool managed: section === "true" + + width: parent.width + visible: techExists && ethernetListModel.available + enabled: true //AccessPolicy.ethernetToggleEnabled + + SectionHeader { + text: { + if (managed) { + //% "Managed networks" + return qsTrId("settings_network-he-ethernet-managed_networks") + } else { + //% "Saved networks" + return qsTrId("settings_network-he-ethernet-saved_networks") + } + } + } + Label { + visible: techExists && managed + wrapMode: Text.Wrap + color: Theme.secondaryHighlightColor + font.pixelSize: Theme.fontSizeSmall + //: %1 is an operating system name without the OS suffix + //% "Networks added by %1 Device Manager" + text: qsTrId("settings_network-la-ethernet-networks_added_by_mdm") + .arg(aboutSettings.baseOperatingSystemName) + x: Theme.horizontalPageMargin + width: parent.width - 2*x + } + } + + model: (techExists && ethernetListModel.available) ? savedServices : null + + delegate: EthernetItem { width: parent.width } + + // This is shown when there is no ethernet adapter. + // ConnMan requires the adapter device to be present in order to allow + // changes to tech and/or service(s). + Component { + id: errorPlaceholderComponent + ViewPlaceholder { + opacity: (techExists && ethernetListModel.available) || !pageReady ? 0 : 1 + visible: opacity > 0.0 + //% "Ethernet can be managed only when adapter is connected. Please connect adapter." + text: qsTrId("settings_network-la-ethernet_unavailable") + Behavior on opacity { FadeAnimation {} } + } + } + + ViewPlaceholder { + //% "Pull down to connect to internet" + text: qsTrId("settings_network-ph-ethernet-connect") + enabled: ethernetListModel.available && listView.count == 0 && connectMenuItem.enabled && !startupTimer.running + } + + VerticalScrollDecorator {} + } + + Timer { + id: startupTimer + interval: 1000 + running: true + } + + TechnologyModel { + id: ethernetListModel + + name: "ethernet" + + onAvailableChanged: maybeCreateErrorPlaceHolder() + Component.onCompleted: maybeCreateErrorPlaceHolder() + + function maybeCreateErrorPlaceHolder() { + if ((!techExists || !ethernetListModel.available) && !_errorPlaceholder) { + _errorPlaceholder = errorPlaceholderComponent.createObject(listView) + } + } + } + + SavedServiceModel { + id: savedServices + name: "ethernet" + sort: true + groupByCategory: true + } + + NetworkTechnology { + id: ethernetTechnology + path: networkManager.EthernetTechnology + } + + NetworkManager { + id: networkManager + + onTechnologiesChanged: checkEthernet() + + function checkEthernet() { + // NOTE: something caches the values here as staying in the same view + // there always exists a tech with "ethernet" name once it has been + // connected. But when returning to main settings it is detected + // correctly as NULL after removal is done. libconnman-qt does send + // the signal correclty after removing the technology. Problem is + // thus, somewhere in QML caching. + techExists = networkManager.technologiesList().indexOf("ethernet") >= 0 + + if (!techExists && !_errorPlaceholder) { + _errorPlaceholder = errorPlaceholderComponent.createObject(listView) + } + } + } + + ConnectionAgent { id: connectionAgent } + + Loader { + id: networkSetupLoader + sourceComponent: AddNetworkNotifications { + onAvailableChanged: if (available) requestConnect() // a bit broken responsibility... + timeout: true + } + active: false + } + + DBusInterface { + id: connectionSelector + + service: "com.jolla.lipstick.ConnectionSelector" + path: "/" + iface: "com.jolla.lipstick.ConnectionSelectorIf" + + function openConnection() { + call('openConnectionNow', 'ethernet') + } + } +} diff --git a/usr/share/jolla-settings/pages/events/events.qml b/usr/share/jolla-settings/pages/events/events.qml index 71ea44b8..d85164e1 100644 --- a/usr/share/jolla-settings/pages/events/events.qml +++ b/usr/share/jolla-settings/pages/events/events.qml @@ -43,7 +43,8 @@ Page { Label { x: Theme.horizontalPageMargin width: parent.width - 2*x - //: List of Events widgets that can be installed from store. %1 is replaced with a localised concatenation of widget names e.g: "Weather and Calendar". + //: List of Events widgets that can be installed from store. %1 is replaced with + //: a localised concatenation of widget names e.g: "Weather and Calendar". //% "Install %1 from Store." text: qsTrId("settings_events-la-install_from_store").arg(unavailableWidgets.value) visible: unavailableWidgets.value.length > 0 @@ -83,7 +84,8 @@ Page { text: qsTrId("settings_events-la-access_events_when_device_locked") onClicked: lipstickSettings.lock_screen_events = !lipstickSettings.lock_screen_events - //% "When enabled you can check weather, upcoming events and notifications from Lock Screen without unlocking the device" + //% "When enabled you can check upcoming events and notifications " + //% "from Lock Screen without unlocking the device" description: qsTrId("settings_events-la-access_events_when_device_locked_description") ConfigurationGroup { diff --git a/usr/share/jolla-settings/pages/flight/FlightMode.qml b/usr/share/jolla-settings/pages/flight/FlightMode.qml index 70c760cc..7327f516 100644 --- a/usr/share/jolla-settings/pages/flight/FlightMode.qml +++ b/usr/share/jolla-settings/pages/flight/FlightMode.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import MeeGo.Connman 0.2 +import Connman 0.2 import Sailfish.Settings.Networking 1.0 import Nemo.KeepAlive 1.2 diff --git a/usr/share/jolla-settings/pages/gestures/gestures.qml b/usr/share/jolla-settings/pages/gestures/gestures.qml index a497246b..3a2cdd58 100644 --- a/usr/share/jolla-settings/pages/gestures/gestures.qml +++ b/usr/share/jolla-settings/pages/gestures/gestures.qml @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 – 2019 Jolla Ltd. + * Copyright (c) 2013 - 2022 Jolla Ltd. * Copyright (c) 2019 Open Mobile Platform LLC. * * License: Proprietary @@ -10,12 +10,15 @@ import Sailfish.Silica 1.0 import com.jolla.settings 1.0 import com.jolla.settings.system 1.0 import org.nemomobile.systemsettings 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import org.nemomobile.lipstick 0.1 Page { id: page + readonly property bool hasOrientationSensor: (deviceInfo.hasFeature(DeviceInfo.FeatureAccelerationSensor) + || deviceInfo.hasFeature(DeviceInfo.FeatureGyroSensor)) + readonly property bool flipoverGestureSupported: hasOrientationSensor SilicaFlickable { anchors.fill: parent @@ -58,11 +61,13 @@ Page { } SectionHeader { + visible: flipoverGestureSupported //% "Sensor gestures" text: qsTrId("settings_shortcuts-la-sensor_gestures") } TextSwitch { + visible: flipoverGestureSupported automaticCheck: false checked: displaySettings.flipoverGestureEnabled //% "Flip to silence calls and alarms" @@ -161,4 +166,6 @@ Page { } DisplaySettings { id: displaySettings } + + DeviceInfo { id: deviceInfo } } diff --git a/usr/share/jolla-settings/pages/jolla-camera/SettingsPage.qml b/usr/share/jolla-settings/pages/jolla-camera/SettingsPage.qml index 4ca399bf..80730f16 100644 --- a/usr/share/jolla-settings/pages/jolla-camera/SettingsPage.qml +++ b/usr/share/jolla-settings/pages/jolla-camera/SettingsPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import QtMultimedia 5.0 import Sailfish.Silica 1.0 import com.jolla.camera 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import org.nemomobile.systemsettings 1.0 import com.jolla.settings 1.0 import com.jolla.settings.system 1.0 diff --git a/usr/share/jolla-settings/pages/jolla-contacts/contactssettings.qml b/usr/share/jolla-settings/pages/jolla-contacts/contactssettings.qml index ab012a22..50615aaa 100644 --- a/usr/share/jolla-settings/pages/jolla-contacts/contactssettings.qml +++ b/usr/share/jolla-settings/pages/jolla-contacts/contactssettings.qml @@ -1,10 +1,10 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.Telephony 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import Nemo.DBus 2.0 import org.nemomobile.ofono 1.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 import com.jolla.contacts.settings 1.0 import com.jolla.settings 1.0 diff --git a/usr/share/jolla-settings/pages/jolla-email/email.qml b/usr/share/jolla-settings/pages/jolla-email/email.qml new file mode 100644 index 00000000..55039f6a --- /dev/null +++ b/usr/share/jolla-settings/pages/jolla-email/email.qml @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2013 – 2019 Jolla Ltd. + * Copyright (c) 2019 – 2020 Open Mobile Platform LLC. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Nemo.Configuration 1.0 +import Nemo.Email 0.1 +import com.jolla.email.settings.translations 1.0 +import com.jolla.settings 1.0 + +ApplicationSettings { + //: Email settings page header + //% "Mail" + applicationName: qsTrId("settings_email-he-email") + + EmailAccountListModel { + id: mailAccountListModel + onlyTransmitAccounts: true + } + + TextSwitch { + //% "Download images automatically" + text: qsTrId("settings_email-la-default_download_images") + //: Description informing the user that downloading images automatically might subject his mailbox to spam + //% "Automatically downloading images might subject your mailbox to spam." + description: qsTrId("settings_email-la-default_download_images_description") + checked: downloadImagesConfig.value + + onCheckedChanged: downloadImagesConfig.value = checked + } + + Loader { + // crypto.qml is installed by the crypto-gnupg subpackage. + active: emailAppCryptoEnabled + source: "crypto.qml" + width: parent.width + } + + ComboBox { + id: readReceiptsPolicy + //% "Send read receipts policy" + label: qsTrId("settings_email-la-default_send_read_receipts") + //: Description informing the user that email client will send read receipts automatically without any additional indications if it was requested by a sender + //% "What should be done when read receipt requested?" + description: qsTrId("settings_email-la-default_send_read_receipts_description") + currentIndex: sendReadReceiptsConfig.value + menu: ContextMenu { + MenuItem { + //% "Always ask" + text: qsTrId("settings_email-la-always_ask_read_receipt") + } + MenuItem { + //% "Always send" + text: qsTrId("settings_email-la-always_send_read_receipt") + } + MenuItem { + //% "Always ignore" + text: qsTrId("settings_email-la-always_ignore_read_receipt") + } + } + + onCurrentIndexChanged: sendReadReceiptsConfig.value = currentIndex + } + + ComboBox { + visible: mailAccountListModel.numberOfAccounts > 1 + currentIndex: Math.max(0, mailAccountListModel.indexFromAccountId(defaultAccountConfig.value)) + //% "Default sending account" + label: qsTrId("settings_email-la-default_sending_account") + menu: ContextMenu { + Repeater { + model: mailAccountListModel + MenuItem { + text: displayName != "" ? displayName : emailAddress + onClicked: defaultAccountConfig.value = mailAccountId + } + } + } + } + + ConfigurationValue { + id: defaultAccountConfig + key: "/apps/jolla-email/settings/default_account" + defaultValue: mailAccountListModel.numberOfAccounts > 1 ? mailAccountListModel.accountId(0) : 0 + } + + ConfigurationValue { + id: downloadImagesConfig + key: "/apps/jolla-email/settings/downloadImages" + defaultValue: false + } + ConfigurationValue { + id: sendReadReceiptsConfig + key: "/apps/jolla-email/settings/sendReadReceipts" + defaultValue: 0 + onValueChanged: { + readReceiptsPolicy.currentIndex = value + } + } +} diff --git a/usr/share/jolla-settings/pages/jolla-messages/SimCardMessagingSettings.qml b/usr/share/jolla-settings/pages/jolla-messages/SimCardMessagingSettings.qml index 4b2d0fcc..e97a2b04 100644 --- a/usr/share/jolla-settings/pages/jolla-messages/SimCardMessagingSettings.qml +++ b/usr/share/jolla-settings/pages/jolla-messages/SimCardMessagingSettings.qml @@ -9,11 +9,11 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.AccessControl 1.0 import com.jolla.messages.settings.translations 1.0 -import org.nemomobile.configuration 1.0 -import org.nemomobile.notifications 1.0 +import Nemo.Configuration 1.0 +import Nemo.Notifications 1.0 import org.nemomobile.ofono 1.0 -import MeeGo.QOfono 0.2 -import MeeGo.Connman 0.2 +import QOfono 0.2 +import Connman 0.2 Column { id: simCardMessagingSettings diff --git a/usr/share/jolla-settings/pages/jolla-messages/messages.qml b/usr/share/jolla-settings/pages/jolla-messages/messages.qml index c653f467..f19cf580 100644 --- a/usr/share/jolla-settings/pages/jolla-messages/messages.qml +++ b/usr/share/jolla-settings/pages/jolla-messages/messages.qml @@ -1,7 +1,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.Telephony 1.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 import com.jolla.messages.settings.translations 1.0 import org.nemomobile.ofono 1.0 import com.jolla.settings 1.0 diff --git a/usr/share/jolla-settings/pages/jolla-notes/notes.qml b/usr/share/jolla-settings/pages/jolla-notes/notes.qml new file mode 100644 index 00000000..fc1f6be5 --- /dev/null +++ b/usr/share/jolla-settings/pages/jolla-notes/notes.qml @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2015 - 2016 Jolla Ltd. + * Copyright (C) 2020 Open Mobile Platform LLC. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Nemo.Configuration 1.0 +import com.jolla.settings 1.0 +import com.jolla.notes.settings.translations 1.0 + +ApplicationSettings { + ComboBox { + id: transferFormatCombo + //% "Sharing format" + label: qsTrId("settings_notes-he-sharing_format") + currentIndex: transferAsVNoteConfig.value == false ? 0 : 1 + onCurrentIndexChanged: transferAsVNoteConfig.value = currentIndex == 0 ? false : true + menu: ContextMenu { + id: transferFormatComboMenu + MenuItem { + id: transferAsPTextMenu + //: Whether to transfer notes as plain text files + //% "Plain-text" + text: qsTrId("settings_notes-la-plain-text") + } + MenuItem { + id: transferAsVNoteMenu + //: Whether to transfer notes as vNote files + //% "vNote" + text: qsTrId("settings_notes-la-vnote") + } + } + } + + Label { + id: vnoteWarningLabel + anchors.left: transferFormatCombo.left + anchors.leftMargin: transferFormatCombo.labelMargin + anchors.right: parent.right + anchors.rightMargin: Theme.horizontalPageMargin + visible: !transferFormatComboMenu._open && transferFormatCombo.currentIndex == 1 + color: Theme.secondaryHighlightColor + font.pixelSize: Theme.fontSizeExtraSmall + wrapMode: Text.Wrap + opacity: (!transferFormatComboMenu._open && transferFormatCombo.currentIndex == 1) ? 1.0 : 0.0 + Behavior on opacity { FadeAnimation {} } + height: visible ? implicitHeight : 0 + Behavior on height { NumberAnimation {} } + //: Description informing the user of the disadvantes of using vNote format for sharing + //% "Notes sent in vNote format may not be readable by the recipient" + text: qsTrId("settings_notes-la-vnote_description") + } + + ConfigurationValue { + id: transferAsVNoteConfig + key: "/apps/jolla-notes/settings/transferAsVNote" + defaultValue: false + } +} diff --git a/usr/share/jolla-settings/pages/jolla-voicecall/CallBarring.qml b/usr/share/jolla-settings/pages/jolla-voicecall/CallBarring.qml index 9e1cf405..1164df5f 100644 --- a/usr/share/jolla-settings/pages/jolla-voicecall/CallBarring.qml +++ b/usr/share/jolla-settings/pages/jolla-voicecall/CallBarring.qml @@ -3,7 +3,7 @@ import Sailfish.Silica 1.0 import com.jolla.settings 1.0 import com.jolla.settings.system 1.0 import com.jolla.voicecall.settings.translations 1.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 Page { id: root diff --git a/usr/share/jolla-settings/pages/jolla-voicecall/CallCounters.qml b/usr/share/jolla-settings/pages/jolla-voicecall/CallCounters.qml index 3d329159..bd95000e 100644 --- a/usr/share/jolla-settings/pages/jolla-voicecall/CallCounters.qml +++ b/usr/share/jolla-settings/pages/jolla-voicecall/CallCounters.qml @@ -1,7 +1,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import org.nemomobile.dbus 2.0 -import org.nemomobile.time 1.0 +import Nemo.DBus 2.0 +import Nemo.Time 1.0 import com.jolla.voicecall.settings.translations 1.0 Column { diff --git a/usr/share/jolla-settings/pages/jolla-voicecall/CallForwarding.qml b/usr/share/jolla-settings/pages/jolla-voicecall/CallForwarding.qml index 963c8750..a31c2b61 100644 --- a/usr/share/jolla-settings/pages/jolla-voicecall/CallForwarding.qml +++ b/usr/share/jolla-settings/pages/jolla-voicecall/CallForwarding.qml @@ -3,7 +3,7 @@ import Sailfish.Silica 1.0 import com.jolla.settings 1.0 import com.jolla.settings.system 1.0 import com.jolla.voicecall.settings.translations 1.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 Page { id: root diff --git a/usr/share/jolla-settings/pages/jolla-voicecall/CallSettings.qml b/usr/share/jolla-settings/pages/jolla-voicecall/CallSettings.qml index 4b867e02..c5135955 100644 --- a/usr/share/jolla-settings/pages/jolla-voicecall/CallSettings.qml +++ b/usr/share/jolla-settings/pages/jolla-voicecall/CallSettings.qml @@ -1,7 +1,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import com.jolla.voicecall.settings.translations 1.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 Item { id: callSettings diff --git a/usr/share/jolla-settings/pages/jolla-voicecall/RecordedCallsPage.qml b/usr/share/jolla-settings/pages/jolla-voicecall/RecordedCallsPage.qml index 967a50ce..19ec78cc 100644 --- a/usr/share/jolla-settings/pages/jolla-voicecall/RecordedCallsPage.qml +++ b/usr/share/jolla-settings/pages/jolla-voicecall/RecordedCallsPage.qml @@ -4,7 +4,7 @@ import Sailfish.Contacts 1.0 import Sailfish.Share 1.0 import org.nemomobile.voicecall 1.0 import org.nemomobile.contacts 1.0 -import org.nemomobile.dbus 2.0 +import Nemo.DBus 2.0 Page { id: root @@ -224,7 +224,7 @@ Page { Label { id: timeStampLabel - text: Format.formatDate(model.modified, Formatter.TimepointRelativeCurrentDay) + text: Format.formatDate(model.modified, Formatter.TimepointRelative) font.pixelSize: Theme.fontSizeExtraSmall anchors.right: parent.right anchors.baseline: parent.baseline diff --git a/usr/share/jolla-settings/pages/jolla-voicecall/SimCardCallSettings.qml b/usr/share/jolla-settings/pages/jolla-voicecall/SimCardCallSettings.qml index 55a238c0..fa84b8e3 100644 --- a/usr/share/jolla-settings/pages/jolla-voicecall/SimCardCallSettings.qml +++ b/usr/share/jolla-settings/pages/jolla-voicecall/SimCardCallSettings.qml @@ -4,8 +4,8 @@ import com.jolla.voicecall.settings.translations 1.0 import Nemo.Configuration 1.0 import org.nemomobile.ofono 1.0 import com.jolla.settings.system 1.0 -import MeeGo.QOfono 0.2 -import MeeGo.Connman 0.2 +import QOfono 0.2 +import Connman 0.2 Column { id: simCallSettings diff --git a/usr/share/jolla-settings/pages/jolla-voicecall/VoiceMail.qml b/usr/share/jolla-settings/pages/jolla-voicecall/VoiceMail.qml index 3c95eb30..75dbd7fa 100644 --- a/usr/share/jolla-settings/pages/jolla-voicecall/VoiceMail.qml +++ b/usr/share/jolla-settings/pages/jolla-voicecall/VoiceMail.qml @@ -1,9 +1,9 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import com.jolla.voicecall.settings.translations 1.0 -import org.nemomobile.notifications 1.0 +import Nemo.Notifications 1.0 import Nemo.Configuration 1.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 Column { id: root diff --git a/usr/share/jolla-settings/pages/jolla-voicecall/voicecall.qml b/usr/share/jolla-settings/pages/jolla-voicecall/voicecall.qml index db821b59..7f446d82 100644 --- a/usr/share/jolla-settings/pages/jolla-voicecall/voicecall.qml +++ b/usr/share/jolla-settings/pages/jolla-voicecall/voicecall.qml @@ -14,8 +14,8 @@ import com.jolla.voicecall.settings.translations 1.0 import Nemo.Configuration 1.0 import org.nemomobile.ofono 1.0 import org.nemomobile.systemsettings 1.0 -import MeeGo.QOfono 0.2 -import MeeGo.Connman 0.2 +import QOfono 0.2 +import Connman 0.2 import com.jolla.settings 1.0 ApplicationSettings { diff --git a/usr/share/jolla-settings/pages/keys/DataCorruptionView.qml b/usr/share/jolla-settings/pages/keys/DataCorruptionView.qml new file mode 100644 index 00000000..41276cfd --- /dev/null +++ b/usr/share/jolla-settings/pages/keys/DataCorruptionView.qml @@ -0,0 +1,13 @@ +import QtQuick 2.6 +import Sailfish.Silica 1.0 +import "." + +SecretsResetView { + //: Appears when data corruption has been detected by the secrets daemon. + //% "Data corruption detected. Please reset your secrets data. Affects your keys, collections, etc." + text: qsTrId("secrets_ui-la-data_corruption_detected") + header: PageHeader { + //% "Keys" + title: qsTrId("secrets_ui-he-keys") + } +} diff --git a/usr/share/jolla-settings/pages/keys/SecretsResetView.qml b/usr/share/jolla-settings/pages/keys/SecretsResetView.qml new file mode 100644 index 00000000..32197045 --- /dev/null +++ b/usr/share/jolla-settings/pages/keys/SecretsResetView.qml @@ -0,0 +1,67 @@ +import QtQuick 2.6 +import Sailfish.Silica 1.0 +import Sailfish.Secrets 1.0 +import Sailfish.Secrets.Ui 1.0 +import org.nemomobile.systemsettings 1.0 + +SilicaFlickable { + id: secretsResetView + + property alias text: infoLabel.text + property alias header: colHeader.children + signal success + signal error + signal started + + contentHeight: secretsResetColumn.height + width: parent.width + + SecretsResetter { + id: secretsResetter + + onSuccess: secretsResetView.success() + onError: secretsResetView.error() + } + + Column { + id: secretsResetColumn + width: parent.width + padding: Theme.horizontalPageMargin + topPadding: Theme.paddingLarge + spacing: Theme.paddingLarge + + Item { + id: colHeader + width: parent.width - parent.padding + // Assuming only a single child for this item + height: children.length === 0 ? 0 : children[0].height + } + + Label { + id: infoLabel + wrapMode: Text.Wrap + width: parent.width - parent.padding + color: Theme.highlightColor + font.pixelSize: Theme.fontSizeMedium + + //: Generic information presented to the user about resetting secrets data. + //% "Affects all secrets data, including your keys, collectons, etc." + text: qsTrId("secrets_ui-la-reset_secrets_data") + } + + Button { + //: Button that can clear all the secrets data. + //% "Clear secrets data" + text: qsTrId("secrets_ui-bt-reset_secrets_data") + anchors.horizontalCenter: parent.horizontalCenter + enabled: secretsResetView.enabled + + onClicked: { + secretsResetView.started() + secretsResetter.resetSecretsData() + } + } + } + + VerticalScrollDecorator {} +} diff --git a/usr/share/jolla-settings/pages/keys/SigningSharePage.qml b/usr/share/jolla-settings/pages/keys/SigningSharePage.qml new file mode 100644 index 00000000..a05f243d --- /dev/null +++ b/usr/share/jolla-settings/pages/keys/SigningSharePage.qml @@ -0,0 +1,169 @@ +/**************************************************************************************** +** +** Copyright (c) 2018 - 2021 Jolla Ltd. +** Copyright (c) 2021 Open Mobile Platform LLC. +** All rights reserved. +** +** License: Proprietary. +** +****************************************************************************************/ +import QtQuick 2.6 +import Sailfish.Silica 1.0 +import Sailfish.Secrets 1.0 +import Sailfish.Secrets.Ui 1.0 +import Sailfish.Crypto 1.0 +import Sailfish.FileManager 1.0 as SailfishFileManager +import Sailfish.Gallery 1.0 +import Sailfish.TransferEngine 1.0 +import Sailfish.Share 1.0 +import Sailfish.Lipstick 1.0 +import Nemo.Notifications 1.0 +import Nemo.FileManager 1.0 +import Nemo.DBus 2.0 + +Page { + id: root + + property var shareActionConfiguration + property var _fileToSign + + signal signed + + onSigned: { + signer.shareToEmail(root._fileToSign, signer.getSignaturePath(root._fileToSign)) + } + + Component.onCompleted: { + shareAction.loadConfiguration(shareActionConfiguration) + _fileToSign = shareAction.resources[0] || "" + } + + ShareAction { + id: shareAction + } + + BusyPlaceholder { + id: busyPlaceholder + anchors.centerIn: parent + indicatorSize: BusyIndicatorSize.Large + active: signer.busy + spacing: Theme.paddingMedium + + text: { + if (signer.busy) { + //% "Signing, this might take a while" + return qsTrId("secrets_ui-la_signing_busy_state") + } + return "" + } + } + + ProgressBar { + anchors { + top: busyPlaceholder.bottom + topMargin: Theme.paddingMedium + } + minimumValue: 0 + maximumValue: signer.totalBytesToProcess + value: signer.processedBytes + width: parent.width + visible: opacity > 0 + opacity: signer.busy ? 1.0 : 0.0 + Behavior on opacity { FadeAnimation {}} + } + + CryptoManager { + id: cryptoMgr + } + + SecretManager { + id: secretMgr + } + + Signer { + id: signer + cryptoManager: cryptoMgr + onSigningDone: page.signed() + } + + SecretPluginsModel { + id: secretPlugins + secretManager: secretMgr + filters: SecretPluginsModel.EncryptedStorage + + onError: secretsErrorNotification.show(error) + } + + StorageNotification { + id: storageErrorNotification + } + + SecretsErrorNotification { + id: secretsErrorNotification + } + + SilicaListView { + anchors.fill: parent + enabled: !busyPlaceholder.active && secretPlugins.count > 0 + opacity: enabled ? 1.0 : 0.0 + Behavior on opacity { FadeAnimator { duration: 400 }} + model: !secretPlugins.masterLocked ? secretPlugins : null + + header: Column { + width: parent.width + + PageHeader { + //% "Sign" + title: qsTrId("secrets_ui-he-sign") + } + + SailfishFileManager.FileInfoItem { + fileInfo: FileInfo { url: root._fileToSign } + } + + Label { + //% "Select existing or add new key to use to digitally sign the document" + text: qsTrId("secrets_ui-la_select_or_import_key_to_sign") + font.pixelSize: Theme.fontSizeSmall + x: Theme.horizontalPageMargin + width: parent.width - 2 * x + wrapMode: Text.Wrap + color: Theme.secondaryHighlightColor + //storedKeysModel.count > 0 + visible: false + } + + SectionHeader { + //% "Keys" + text: qsTrId("secrets_ui-he-keys") + } + + MasterLockHeader { + secrets: secretPlugins + } + + Item { + width: 1 + height: Theme.paddingMedium + } + } + + ViewPlaceholder { + //% "Import or generate key to use to sign the document" + text: qsTrId("secrets_ui-la-import_or_generate_key_to_sign") + visible: false + } + + delegate: PluginKeysItem { + populated: secretPlugins.populated + cryptoManager: cryptoMgr + secretManager: secretMgr + onPluginLockCodeRequest: secretPlugins.pluginLockCodeRequest(pluginName, requestType) + onStorageError: storageErrorNotification.show(error) + onError: secretsErrorNotification.show(error) + onClicked: signer.sign(root._fileToSign, key, digest) + } + + VerticalScrollDecorator {} + } +} diff --git a/usr/share/jolla-settings/pages/keys/keys.qml b/usr/share/jolla-settings/pages/keys/keys.qml new file mode 100644 index 00000000..03f3e642 --- /dev/null +++ b/usr/share/jolla-settings/pages/keys/keys.qml @@ -0,0 +1,193 @@ +import QtQuick 2.6 +import org.nemomobile.systemsettings 1.0 +import Sailfish.Silica 1.0 +import Sailfish.Secrets 1.0 as Secrets +import Sailfish.Crypto 1.0 as Crypto +import Sailfish.Secrets.Ui 1.0 + +Page { + id: page + + readonly property bool healthCheckDone: (healthCheckReq.status === Secrets.Request.Finished) && (healthCheckReq.result.code === Secrets.Result.Succeeded) + readonly property alias healthCheckOk: healthCheckReq.isHealthy + + Component.onCompleted: { + healthCheckReq.startRequest() + } + + Crypto.CryptoManager { + id: cryptoMgr + } + + Secrets.SecretManager { + id: secretMgr + } + + StorageNotification { + id: storageErrorNotification + } + + SecretsErrorNotification { + id: secretsErrorNotification + } + + Secrets.HealthCheckRequest { + id: healthCheckReq + manager: secretMgr + + onStatusChanged: { + if (status === Secrets.Request.Finished) { + console.log("salt data health:", saltDataHealth) + console.log("masterlock health:", masterlockHealth) + } + } + onResultChanged: { + if (status === Secrets.Request.Finished) { + if (result.code !== Secrets.Result.Succeeded) { + console.warn("error during health check, resultcode:", result.code, "errorcode:", result.errorCode) + } + + // If this was after a reset, re-enable the reset item + if (dataCorruptionViewLoader.item !== null) { + dataCorruptionViewLoader.item.enabled = true; + } + } + } + } + + Connections { + target: Qt.application + onStateChanged: { + if (Qt.application.state === Qt.ApplicationActive) { + console.log("app activated, starting health check") + healthCheckReq.startRequest() + } + } + } + + SecretPluginsModel { + id: secretPlugins + secretManager: secretMgr + filters: SecretPluginsModel.EncryptedStorage + + onError: secretsErrorNotification.show(error) + } + + InfoLabel { + anchors.centerIn: parent + enabled: !healthCheckDone && (healthCheckReq.status === Secrets.Request.Finished) && (healthCheckReq.result.code !== Secrets.Result.Succeeded) + opacity: enabled ? 1.0 : 0.0 + Behavior on opacity { FadeAnimator { duration: 400 }} + text: { + //: Shown when the initial health check fails when the user opens the Keys page in Settings. + //% "Error during secrets health check." + return qsTrId("secrets_ui-la-healthcheck_error") + } + } + + InfoLabel { + anchors.centerIn: parent + enabled: healthCheckDone && healthCheckOk && (secretPlugins.count === 0) + opacity: enabled ? 1.0 : 0.0 + Behavior on opacity { FadeAnimator { duration: 400 }} + // A bit misleading text is no plugins but IMO close enough for now. + text: { + //% "No keys" + return qsTrId("secrets_ui-la-no_keys") + } + } + + SilicaListView { + anchors.fill: parent + enabled: healthCheckDone && healthCheckOk && (secretPlugins.count > 0) + opacity: enabled ? 1.0 : 0.0 + Behavior on opacity { FadeAnimator { duration: 400 }} + + model: !secretPlugins.masterLocked ? secretPlugins : null + footer: Item { + width: 1 + height: Theme.paddingLarge + } + + InfoLabel { + anchors.verticalCenter: parent.verticalCenter + //% "Oops, something went wrong. No secret storages installed on the device" + text: qsTrId("secrets_ui-la-secrets_ui-la-no_secret_storages") + opacity: secretPlugins.ready && secretPlugins.count === 0 ? 1.0 : 0.0 + Behavior on opacity { FadeAnimator { duration: 400 }} + } + + header: Column { + id: column + + width: parent.width + + PageHeader { + //% "Keys" + title: qsTrId("secrets_ui-he-keys") + } + + MasterLockHeader { + secrets: secretPlugins + } + + Item { + width: 1 + height: Theme.paddingMedium + } + } + + delegate: PluginKeysItem { + populated: secretPlugins.populated + openMenuOnClick: true + editMode: true + cryptoManager: cryptoMgr + secretManager: secretMgr + onPluginLockCodeRequest: secretPlugins.pluginLockCodeRequest(pluginName, requestType) + onStorageError: storageErrorNotification.show(error) + onError: secretsErrorNotification.show(error) + } + + VerticalScrollDecorator {} + } + + Timer { + id: healthCheckTimer + interval: 2000 + onTriggered: { + // This will check if everything is OK and trigger the necessary properties to change, + // so the proper UI will appear after this. + healthCheckReq.startRequest() + } + } + + Loader { + id: dataCorruptionViewLoader + asynchronous: true + enabled: healthCheckDone && !healthCheckOk + active: enabled + opacity: enabled ? 1.0 : 0.0 + Behavior on opacity { FadeAnimator { duration: 400 }} + width: parent.width + source: "DataCorruptionView.qml" + onActiveChanged: { + if (active) { + // Should never destroy the created item once it becomes active + active = true + } + } + onItemChanged: { + if (item !== null) { + item.success.connect(function() { + // Give some time for the secrets service to restart properly before we perform the health check + console.log("secrets data reset successfully, starting health check in", healthCheckTimer.interval, "ms") + healthCheckTimer.start() + }); + item.started.connect(function() { + console.log("secrets data reset started") + item.enabled = false + }); + } + } + } +} diff --git a/usr/share/jolla-settings/pages/lockscreen/lockscreen.qml b/usr/share/jolla-settings/pages/lockscreen/lockscreen.qml index 6d757611..f2f9595c 100644 --- a/usr/share/jolla-settings/pages/lockscreen/lockscreen.qml +++ b/usr/share/jolla-settings/pages/lockscreen/lockscreen.qml @@ -3,7 +3,7 @@ import Sailfish.Silica 1.0 import com.jolla.settings 1.0 import com.jolla.settings.system 1.0 import org.nemomobile.systemsettings 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import org.nemomobile.lipstick 0.1 Page { diff --git a/usr/share/jolla-settings/pages/mobile/EditMobileNetworkPage.qml b/usr/share/jolla-settings/pages/mobile/EditMobileNetworkPage.qml index eb463f73..6ba2a8d8 100644 --- a/usr/share/jolla-settings/pages/mobile/EditMobileNetworkPage.qml +++ b/usr/share/jolla-settings/pages/mobile/EditMobileNetworkPage.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 import Sailfish.Silica 1.0 import Sailfish.Policy 1.0 import Sailfish.Settings.Networking 1.0 diff --git a/usr/share/jolla-settings/pages/mobile/ImsStatus.qml b/usr/share/jolla-settings/pages/mobile/ImsStatus.qml index f902010e..4edf5242 100644 --- a/usr/share/jolla-settings/pages/mobile/ImsStatus.qml +++ b/usr/share/jolla-settings/pages/mobile/ImsStatus.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 import Sailfish.Settings.Networking 1.0 Column { @@ -11,7 +11,7 @@ Column { checked: ims.registration > OfonoIpMultimediaSystem.RegistrationDisabled //: Text switch that controls whether the 4G voice calls are possible - //% "4G calling (beta)" + //% "4G calling (VoLTE)" text: qsTrId("settings_network-bt-4g_voicecall") //% "Registered" diff --git a/usr/share/jolla-settings/pages/mobile/NetworkItemDelegate.qml b/usr/share/jolla-settings/pages/mobile/NetworkItemDelegate.qml index f5102a81..7571a288 100644 --- a/usr/share/jolla-settings/pages/mobile/NetworkItemDelegate.qml +++ b/usr/share/jolla-settings/pages/mobile/NetworkItemDelegate.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 ListItem { id: root diff --git a/usr/share/jolla-settings/pages/mobile/SelectNetworkPage.qml b/usr/share/jolla-settings/pages/mobile/SelectNetworkPage.qml index a3c860d2..1ea51da3 100644 --- a/usr/share/jolla-settings/pages/mobile/SelectNetworkPage.qml +++ b/usr/share/jolla-settings/pages/mobile/SelectNetworkPage.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 import Sailfish.Silica 1.0 import Sailfish.Settings.Networking 1.0 import com.jolla.settings 1.0 diff --git a/usr/share/jolla-settings/pages/mobile/SimMobileNetworkSettings.qml b/usr/share/jolla-settings/pages/mobile/SimMobileNetworkSettings.qml index f74a95a4..d940ee46 100644 --- a/usr/share/jolla-settings/pages/mobile/SimMobileNetworkSettings.qml +++ b/usr/share/jolla-settings/pages/mobile/SimMobileNetworkSettings.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 -import MeeGo.QOfono 0.2 -import MeeGo.Connman 0.2 +import QOfono 0.2 +import Connman 0.2 import Sailfish.Silica 1.0 import Sailfish.Policy 1.0 import Sailfish.Settings.Networking 1.0 @@ -240,6 +240,13 @@ Column { menu: ContextMenu { id: networkModeMenu + MenuItem { + readonly property string tech: "nr" + //: Network mode settings ComboBox item for preferring 5G + //% "Prefer 5G" + text: qsTrId("settings_network-me-network_mode_prefer_5G") + visible: radioSettings.availableTechnologies.indexOf(tech) >= 0 + } MenuItem { readonly property string tech: "lte" //: Network mode settings ComboBox item for preferring 4G/LTE diff --git a/usr/share/jolla-settings/pages/mobile/mainpage.qml b/usr/share/jolla-settings/pages/mobile/mainpage.qml index f4308e22..5c558288 100644 --- a/usr/share/jolla-settings/pages/mobile/mainpage.qml +++ b/usr/share/jolla-settings/pages/mobile/mainpage.qml @@ -1,12 +1,12 @@ import QtQuick 2.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 import Sailfish.Silica 1.0 import Sailfish.Policy 1.0 import Sailfish.Telephony 1.0 import com.jolla.settings.system 1.0 import org.nemomobile.ofono 1.0 import Sailfish.Settings.Networking 1.0 -import MeeGo.Connman 0.2 +import Connman 0.2 Page { id: root @@ -45,7 +45,7 @@ Page { SimActivationPullDownMenu { id: pullDownMenu - multiSimManager: sailfishSimManager + enabled: !disabledByMdmBanner.active visible: true diff --git a/usr/share/jolla-settings/pages/nfc/NfcConfig.qml b/usr/share/jolla-settings/pages/nfc/NfcConfig.qml new file mode 100644 index 00000000..42f3e2e5 --- /dev/null +++ b/usr/share/jolla-settings/pages/nfc/NfcConfig.qml @@ -0,0 +1,109 @@ +import QtQml 2.0 +import Nemo.DBus 2.0 + +QtObject { + id: nfc + + property bool nfcEnabled + property bool nfcBluetoothStaticHandoverEnabled + property bool nfcBluetoothStaticHandoverSupported + property bool busy: changeTimer.running + property bool neardBusy: neardChangeTimer.running + + function refreshSettings() { + nfcSettingsDbus.getEnabled() + neardSettingsDbus.getBluetoothStaticHandover() + } + + function toggleNfcEnabled() { + nfcSettingsDbus.setEnabled(!nfcEnabled) + } + + function toggleNfcBluetoothStaticHandoverEnabled() { + neardSettingsDbus.setBluetoothStaticHandover(!nfcBluetoothStaticHandoverEnabled) + } + + property Timer changeTimer: Timer { + interval: 2000 + } + + property Timer neardChangeTimer: Timer { + interval: 2000 + } + + property QtObject nfcSettingsDbus: DBusInterface { + bus: DBus.SystemBus + service: 'org.sailfishos.nfc.settings' + path: '/' + iface: 'org.sailfishos.nfc.Settings' + signalsEnabled: true + + function enabledChanged(enabled) { + changeTimer.stop() + nfc.nfcEnabled = enabled + } + + function getEnabled() { + changeTimer.restart() + call("GetEnabled", undefined, function (enabled) { + // Success state + changeTimer.stop() + nfc.nfcEnabled = enabled + }, function() { + // Failure state + nfcEnabled = false + changeTimer.stop() + }) + } + + function setEnabled(enabled) { + changeTimer.restart() + call("SetEnabled", enabled, undefined, function () { + // Failure state + nfcEnabled = false + changeTimer.stop() + }) + } + } + + property QtObject neardSettingsDbus: DBusInterface { + bus: DBus.SystemBus + service: 'org.neard' + path: '/' + iface: 'org.sailfishos.neard.Settings' + signalsEnabled: true + + function bluetoothStaticHandoverChanged(enabled) { + neardChangeTimer.stop() + nfc.nfcBluetoothStaticHandoverEnabled = enabled + } + + function getBluetoothStaticHandover() { + neardChangeTimer.restart() + call("GetBluetoothStaticHandover", undefined, function (enabled) { + // Success state + neardChangeTimer.stop() + nfc.nfcBluetoothStaticHandoverEnabled = enabled + nfcBluetoothStaticHandoverSupported = true + }, function() { + // Failure state + nfcBluetoothStaticHandoverEnabled = false + nfcBluetoothStaticHandoverSupported = false + neardChangeTimer.stop() + }) + } + + function setBluetoothStaticHandover(enabled) { + neardChangeTimer.restart() + call("SetBluetoothStaticHandover", enabled, undefined, function () { + // Failure state + nfcBluetoothStaticHandoverEnabled = false + neardChangeTimer.stop() + }) + } + } + + Component.onCompleted: { + refreshSettings() + } +} diff --git a/usr/share/jolla-settings/pages/nfc/NfcSwitch.qml b/usr/share/jolla-settings/pages/nfc/NfcSwitch.qml new file mode 100644 index 00000000..643777bb --- /dev/null +++ b/usr/share/jolla-settings/pages/nfc/NfcSwitch.qml @@ -0,0 +1,18 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Nemo.DBus 2.0 +import com.jolla.settings.system 1.0 +import com.jolla.settings 1.0 + +SettingsToggle { + //% "NFC" + name: qsTrId("settings_nfc_switch-la-nfc") + icon.source: "image://theme/icon-m-nfc" + onToggled: nfcConfig.toggleNfcEnabled() + checked: nfcConfig.nfcEnabled + busy: nfcConfig.busy + + NfcConfig { + id: nfcConfig + } +} diff --git a/usr/share/jolla-settings/pages/nfc/nfc.qml b/usr/share/jolla-settings/pages/nfc/nfc.qml new file mode 100644 index 00000000..020f9e84 --- /dev/null +++ b/usr/share/jolla-settings/pages/nfc/nfc.qml @@ -0,0 +1,52 @@ +import QtQuick 2.6 +import Sailfish.Silica 1.0 +import Nemo.DBus 2.0 +import com.jolla.settings.system 1.0 +import com.jolla.settings 1.0 + +Page { + id: root + + SilicaFlickable { + anchors.fill: parent + contentHeight: content.height + + Column { + id: content + width: parent.width + + PageHeader { + //% "NFC" + title: qsTrId("settings_nfc-he-nfc") + } + + IconTextSwitch { + //% "Near Field Communication (NFC)" + text: qsTrId("settings_nfc-la-nfc") + //% "Allow device to detect NFC tags and other devices when touched. This feature consumes some battery power." + description: qsTrId("settings_nfc-la-nfc_switch_description") + icon.source: "image://theme/icon-m-nfc" + onClicked: nfcConfig.toggleNfcEnabled() + checked: nfcConfig.nfcEnabled + automaticCheck: false + busy: nfcConfig.busy + } + + TextSwitch { + //% "Bluetooth Secure Simple Pairing" + text: qsTrId("settings_nfc-la-bluetooth_simple_pairing") + //% "Allow automatic Bluetooth pairing via NFC." + description: qsTrId("settings_nfc-la-bluetooth_simple_pairing_switch_description") + onClicked: nfcConfig.toggleNfcBluetoothStaticHandoverEnabled() + checked: nfcConfig.nfcBluetoothStaticHandoverEnabled + automaticCheck: false + busy: nfcConfig.neardBusy + visible: nfcConfig.nfcBluetoothStaticHandoverSupported && nfcConfig.nfcEnabled + } + } + } + + NfcConfig { + id: nfcConfig + } +} diff --git a/usr/share/jolla-settings/pages/packages/packages.qml b/usr/share/jolla-settings/pages/packages/packages.qml new file mode 100644 index 00000000..97a53ba2 --- /dev/null +++ b/usr/share/jolla-settings/pages/packages/packages.qml @@ -0,0 +1,61 @@ +import QtQuick 2.0 +import QtDocGallery 5.0 +import Sailfish.Silica 1.0 +import Sailfish.FileManager 1.0 +import Nemo.FileManager 1.0 + +Page { + DocumentGalleryModel { + id: fileModel + + properties: ["url", "fileName"] + sortProperties: ["+fileName"] + rootType: DocumentGallery.File + autoUpdate: true + filter: GalleryFilterUnion { + GalleryEqualsFilter { property: "fileExtension"; value: "rpm" } + GalleryEqualsFilter { property: "fileExtension"; value: "apk" } + } + + } + + SilicaListView { + model: fileModel + anchors.fill: parent + header: PageHeader { + //% "Install package" + title: qsTrId("settings_packages-he-install_package") + } + + delegate: BackgroundItem { + height: fileItem.height + + onClicked: Qt.openUrlExternally(url) + + FileItem { + id: fileItem + fileName: model.fileName + mimeType: fileInfo.mimeType + size: fileInfo.size + modified: fileInfo.lastModified + + FileInfo { + id: fileInfo + url: model.url + } + } + } + + ViewPlaceholder { + enabled: fileModel.count == 0 && (fileModel.status === DocumentGalleryModel.Finished || fileModel.status === DocumentGalleryModel.Idle) + + //% "No installable packages found" + text: qsTrId("settings_packages-la-no_installable_packages_found") + + //% "Copy RPM or APK files to the internal memory or connected storage device" + hintText: qsTrId("settings_packages-la-copy_package_files_to_device") + } + + VerticalScrollDecorator {} + } +} diff --git a/usr/share/jolla-settings/pages/pin/ModemPin.qml b/usr/share/jolla-settings/pages/pin/ModemPin.qml index 5825f80a..1c02190a 100644 --- a/usr/share/jolla-settings/pages/pin/ModemPin.qml +++ b/usr/share/jolla-settings/pages/pin/ModemPin.qml @@ -7,8 +7,9 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import org.nemomobile.notifications 1.0 -import MeeGo.QOfono 0.2 +import Sailfish.Settings.Networking 1.0 +import Nemo.Notifications 1.0 +import QOfono 0.2 Column { id: root diff --git a/usr/share/jolla-settings/pages/pin/PinInputPage.qml b/usr/share/jolla-settings/pages/pin/PinInputPage.qml index e9fd8507..15992275 100644 --- a/usr/share/jolla-settings/pages/pin/PinInputPage.qml +++ b/usr/share/jolla-settings/pages/pin/PinInputPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.Telephony 1.0 import com.jolla.settings.system 1.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 Page { id: pinInputPage diff --git a/usr/share/jolla-settings/pages/pin/pin.qml b/usr/share/jolla-settings/pages/pin/pin.qml index 32b81b9a..e4faea25 100644 --- a/usr/share/jolla-settings/pages/pin/pin.qml +++ b/usr/share/jolla-settings/pages/pin/pin.qml @@ -1,10 +1,11 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.Telephony 1.0 +import Sailfish.Settings.Networking 1.0 import com.jolla.settings.system 1.0 import org.nemomobile.systemsettings 1.0 import org.nemomobile.ofono 1.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 Page { id: root diff --git a/usr/share/jolla-settings/pages/reset/reset.qml b/usr/share/jolla-settings/pages/reset/reset.qml index 717f414d..a9117919 100644 --- a/usr/share/jolla-settings/pages/reset/reset.qml +++ b/usr/share/jolla-settings/pages/reset/reset.qml @@ -2,9 +2,9 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.Policy 1.0 import com.jolla.settings.system 1.0 -import org.nemomobile.dbus 2.0 +import Nemo.DBus 2.0 import org.nemomobile.devicelock 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import org.nemomobile.systemsettings 1.0 Page { diff --git a/usr/share/jolla-settings/pages/sailfish-weather/SettingsPage.qml b/usr/share/jolla-settings/pages/sailfish-weather/SettingsPage.qml new file mode 100644 index 00000000..27a2fb58 --- /dev/null +++ b/usr/share/jolla-settings/pages/sailfish-weather/SettingsPage.qml @@ -0,0 +1,45 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import org.sailfishos.weather.settings 1.0 +import Nemo.Configuration 1.0 +import com.jolla.settings 1.0 + +ApplicationSettings { + id: root + ConfigurationValue { + id: temperatureUnitValue + key: "/sailfish/weather/temperature_unit" + defaultValue: "celsius" + } + + ComboBox { + //% "Temperature units" + label: qsTrId("weather_settings-la-temperature_units") + Component.onCompleted: { + switch (temperatureUnitValue.value) { + case "celsius": + currentIndex = 0 + break + case "fahrenheit": + currentIndex = 1 + break + default: + console.log("WeatherSettings: Invalid temperature unit value", temperatureUnitValue.value) + break + } + } + + menu: ContextMenu { + MenuItem { + //% "Celsius" + text: qsTrId("weather_settings-me-celsius") + onClicked: temperatureUnitValue.value = "celsius" + } + MenuItem { + //% "Fahrenheit" + text: qsTrId("weather_settings-me-fahrenheit") + onClicked: temperatureUnitValue.value = "fahrenheit" + } + } + } +} diff --git a/usr/share/jolla-settings/pages/sailfishos/UpgradeDetails.qml b/usr/share/jolla-settings/pages/sailfishos/UpgradeDetails.qml index dd0652d6..a70b7d70 100644 --- a/usr/share/jolla-settings/pages/sailfishos/UpgradeDetails.qml +++ b/usr/share/jolla-settings/pages/sailfishos/UpgradeDetails.qml @@ -98,7 +98,7 @@ Column { //: beginning of a sentence, thus a colon is needed after "Last checked". //% "Last checked: %1" text: qsTrId("settings_sailfishos-la-last_checked").arg( - Format.formatDate(storeIf.lastChecked, Formatter.DurationElapsed)) + Format.formatDate(storeIf.lastChecked, Formatter.TimeElapsed)) color: Theme.secondaryHighlightColor font.pixelSize: Theme.fontSizeExtraSmall visible: (storeIf.updateStatus === StoreInterface.UpToDate || diff --git a/usr/share/jolla-settings/pages/sailfishos/UpgradeSettings.qml b/usr/share/jolla-settings/pages/sailfishos/UpgradeSettings.qml index 276fa4cf..b65f2a3f 100644 --- a/usr/share/jolla-settings/pages/sailfishos/UpgradeSettings.qml +++ b/usr/share/jolla-settings/pages/sailfishos/UpgradeSettings.qml @@ -8,7 +8,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.Policy 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import com.jolla.settings.sailfishos 1.0 import org.nemomobile.ofono 1.0 diff --git a/usr/share/jolla-settings/pages/sailfishos/mainpage.qml b/usr/share/jolla-settings/pages/sailfishos/mainpage.qml index c99b6f96..de1c86b9 100644 --- a/usr/share/jolla-settings/pages/sailfishos/mainpage.qml +++ b/usr/share/jolla-settings/pages/sailfishos/mainpage.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.Vault 1.0 import Sailfish.Policy 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import org.nemomobile.systemsettings 1.0 import com.jolla.settings.sailfishos 1.0 import com.jolla.settings.system 1.0 as MdmBanner @@ -49,7 +49,6 @@ Page { && updateProgress === 0 readonly property bool haveDetails: updateStatus === StoreInterface.UpdateAvailable || updateStatus === StoreInterface.PreparingForUpdate - readonly property bool downloading: updateProgress > 0 && updateProgress < 100 readonly property bool downloaded: updateProgress === 100 readonly property bool ssuRndModeRequiresRegistration: ssu.deviceMode & Ssu.RndMode && !ssu.registered readonly property bool ssuCbetaRequiresRegistration: ssu.domain === "cbeta" && !ssu.registered diff --git a/usr/share/jolla-settings/pages/sounds/DoNotDisturbSwitch.qml b/usr/share/jolla-settings/pages/sounds/DoNotDisturbSwitch.qml index 27543064..8f3d154e 100644 --- a/usr/share/jolla-settings/pages/sounds/DoNotDisturbSwitch.qml +++ b/usr/share/jolla-settings/pages/sounds/DoNotDisturbSwitch.qml @@ -1,7 +1,7 @@ import QtQuick 2.6 import Sailfish.Silica 1.0 import com.jolla.settings 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 SettingsToggle { //% "Do not disturb" diff --git a/usr/share/jolla-settings/pages/sounds/RingtoneVolumeSettingsSlider.qml b/usr/share/jolla-settings/pages/sounds/RingtoneVolumeSettingsSlider.qml new file mode 100644 index 00000000..2fa74bc6 --- /dev/null +++ b/usr/share/jolla-settings/pages/sounds/RingtoneVolumeSettingsSlider.qml @@ -0,0 +1,24 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import com.jolla.settings 1.0 + +SettingsControl { + id: root + + contentHeight: slider.height + + VolumeSliderController { + slider: slider + } + + SettingsSlider { + id: slider + + width: root.width + + onPressAndHold: { + slider.cancel() + root.openMenu() + } + } +} diff --git a/usr/share/jolla-settings/pages/sounds/RingtoneVolumeSlider.qml b/usr/share/jolla-settings/pages/sounds/RingtoneVolumeSlider.qml new file mode 100644 index 00000000..4362b0d8 --- /dev/null +++ b/usr/share/jolla-settings/pages/sounds/RingtoneVolumeSlider.qml @@ -0,0 +1,10 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 + +Slider { + id: slider + + VolumeSliderController { + slider: slider + } +} diff --git a/usr/share/jolla-settings/pages/sounds/SoundsPage.qml b/usr/share/jolla-settings/pages/sounds/SoundsPage.qml index 30180186..653dd378 100644 --- a/usr/share/jolla-settings/pages/sounds/SoundsPage.qml +++ b/usr/share/jolla-settings/pages/sounds/SoundsPage.qml @@ -3,7 +3,7 @@ import Sailfish.Silica 1.0 import com.jolla.settings 1.0 import com.jolla.settings.system 1.0 import org.nemomobile.systemsettings 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import QtFeedback 5.0 Page { @@ -90,6 +90,10 @@ Page { } } + RingtoneVolumeSlider { + width: parent.width + } + VolumeSlider { width: parent.width } @@ -146,7 +150,7 @@ Page { } SectionHeader { - //% "Do not disturb" + //% "Do not disturb mode" text: qsTrId("settings_sounds-la-do_not_disturb") } TextSwitch { @@ -159,11 +163,81 @@ Page { onClicked: doNotDisturb.value = !doNotDisturb.value } + ComboBox { + id: dndRingtoneCombobox + + //% "Ringtone for incoming calls" + label: qsTrId("settings_sounds-la-do_not_disturb_ringtone") + menu: ContextMenu { + MenuItem { + property string value: "off" + //: No ringtone on incoming calls on do no disturb mode + //% "Off" + text: qsTrId("settings_sounds-la-do_not_disturb_ringtone_off") + } + MenuItem { + property string value: "favorites" + //: Favorite contacts have ringtone on incoming calls on do no disturb mode + //% "Only favorite contacts" + text: qsTrId("settings_sounds-la-do_not_disturb_ringtone_favorites") + } + MenuItem { + property string value: "contacts" + //: Known contacts have ringtone on incoming calls on do no disturb mode + //% "Only contacts" + text: qsTrId("settings_sounds-la-do_not_disturb_ringtone_contacts") + } + MenuItem { + property string value: "on" + //: Ringtone plays on incoming calls on do no disturb mode + //% "On" + text: qsTrId("settings_sounds-la-do_not_disturb_ringtone_on") + } + } + + //% "Allow some incoming calls to play ringtones as exceptions to ‘Do not disturb’ mode" + description: qsTrId("settings_sounds-la-do_not_disturb_ringtone_exceptions") + + onCurrentItemChanged: { + if (currentItem) { + doNotDisturbRingtone.value = currentItem.value + } + } + Component.onCompleted: updateIndex() + + + function updateIndex() { + currentIndex = valueToIndex(doNotDisturbRingtone.value) + } + + function valueToIndex(config) { + switch(config) { + case "off": + return 0 + case "favorites": + return 1 + case "contacts": + return 2 + case "on": + case "default": + return 3 + } + } + } + ConfigurationValue { id: doNotDisturb defaultValue: false key: "/lipstick/do_not_disturb" } + + ConfigurationValue { + id: doNotDisturbRingtone + + defaultValue: "on" + key: "/lipstick/do_not_disturb_ringtone" + onValueChanged: dndRingtoneCombobox.updateIndex() + } } VerticalScrollDecorator {} } diff --git a/usr/share/jolla-settings/pages/sounds/VolumeSettingsSlider.qml b/usr/share/jolla-settings/pages/sounds/VolumeSettingsSlider.qml index 2fa74bc6..c316c391 100644 --- a/usr/share/jolla-settings/pages/sounds/VolumeSettingsSlider.qml +++ b/usr/share/jolla-settings/pages/sounds/VolumeSettingsSlider.qml @@ -9,6 +9,9 @@ SettingsControl { VolumeSliderController { slider: slider + volumeControlActive: true + stepSize: 10 + maximumValue: maximumVolume * stepSize } SettingsSlider { diff --git a/usr/share/jolla-settings/pages/sounds/VolumeSlider.qml b/usr/share/jolla-settings/pages/sounds/VolumeSlider.qml index 4362b0d8..07b2d656 100644 --- a/usr/share/jolla-settings/pages/sounds/VolumeSlider.qml +++ b/usr/share/jolla-settings/pages/sounds/VolumeSlider.qml @@ -6,5 +6,8 @@ Slider { VolumeSliderController { slider: slider + volumeControlActive: true + stepSize: 10 + maximumValue: maximumVolume * stepSize } } diff --git a/usr/share/jolla-settings/pages/sounds/VolumeSliderController.qml b/usr/share/jolla-settings/pages/sounds/VolumeSliderController.qml index 1e512058..9852b31c 100644 --- a/usr/share/jolla-settings/pages/sounds/VolumeSliderController.qml +++ b/usr/share/jolla-settings/pages/sounds/VolumeSliderController.qml @@ -5,6 +5,8 @@ import Nemo.Ngf 1.0 import com.jolla.settings 1.0 import com.jolla.settings.system 1.0 import org.nemomobile.systemsettings 1.0 +import Nemo.Configuration 1.0 +import org.nemomobile.lipstick 0.1 Item { id: root @@ -12,14 +14,19 @@ Item { property QtObject slider property bool externalChange property bool propertiesUpdating - readonly property bool play: slider.down && !playDelay.running + readonly property bool play: slider.down && !playDelay.running && !volumeControlActive + property bool volumeControlActive + property int stepSize: 20 + property int maximumValue: 100 + property alias maximumVolume: volumeControl.maximumVolume function updateSliderValue() { if (propertiesUpdating) { return } externalChange = true - slider.value = (profileControl.profile == "silent") ? 0 : profileControl.ringerVolume + slider.value = volumeControlActive ? volumeControl.volume * 10 : + (profileControl.profile == "silent") ? 0 : profileControl.ringerVolume externalChange = false } @@ -29,17 +36,32 @@ Item { name: "default" PropertyChanges { + id: sliderProperties + readonly property real maxDragX: slider.width - slider.rightMargin - slider._highlightItem.width/2 + readonly property real stepWidth: slider._grooveWidth / volumeControl.maximumVolume + property bool restrictedMaxDragXBinding: volumeControl.restrictedVolume !== volumeControl.maximumVolume + target: slider // assuming Slider's internal paddings allow label to be nicely shown if a bit extra is reserved height: slider.implicitHeight + valueLabel.height + Theme.paddingSmall - //% "Ringtone volume" - label: qsTrId("settings_sounds_la_volume") - maximumValue: 100 + label: volumeControlActive ? + //% "Volume" + qsTrId("settings_sounds_la_media_volume") : + //% "Ringtone volume" + qsTrId("settings_sounds_la_volume") + maximumValue: root.maximumValue minimumValue: 0 - stepSize: 20 + stepSize: root.stepSize onDownChanged: { + if (volumeControlActive && sliderProperties.restrictedMaxDragXBinding) { + slider.drag.maximumX = Qt.binding(function() { + return sliderProperties.maxDragX - sliderProperties.stepWidth * (volumeControl.maximumVolume - volumeControl.currentMax) + }) + sliderProperties.restrictedMaxDragXBinding = false + } + if (slider.down) { playDelay.restart() } @@ -48,8 +70,12 @@ Item { onValueChanged: { if (!root.externalChange) { root.propertiesUpdating = true // don't update slider until new values of ringVolume + profile are both known - profileControl.ringerVolume = slider.value - profileControl.profile = (slider.value > 0) ? "general" : "silent" + if (volumeControlActive) { + volumeControl.volume = slider.value / 10 + } else { + profileControl.ringerVolume = slider.value + profileControl.profile = (slider.value > 0) ? "general" : "silent" + } root.propertiesUpdating = false } } @@ -70,6 +96,11 @@ Item { slider.animateValue = true } + ConfigurationValue { + key: "/jolla/sound/sw_volume_slider/active" + value: slider.down + } + NonGraphicalFeedback { id: feedback event: "ringtone" @@ -83,11 +114,13 @@ Item { SliderValueLabel { id: valueLabel + property int scaledVolume: Math.round(slider.value * 10 / maximumVolume) + parent: root.slider slider: root.slider //% "%1%" - text: slider.value > 0 ? qsTrId("settings_sounds-la-percentage_format").arg(slider.value) + text: slider.value > 0 ? qsTrId("settings_sounds-la-percentage_format").arg(volumeControlActive ? scaledVolume : slider.value) : "" scale: slider.pressed ? Theme.fontSizeLarge / Theme.fontSizeMedium : 1.0 font.pixelSize: Theme.fontSizeMedium @@ -103,6 +136,16 @@ Item { Behavior on scale { NumberAnimation { duration: 80 } } } + VolumeControl { + id: volumeControl + + readonly property int currentMax: (restrictedVolume !== maximumVolume) ? restrictedVolume : maximumVolume + + onVolumeChanged: { + root.updateSliderValue() + } + } + ProfileControl { id: profileControl diff --git a/usr/share/jolla-settings/pages/storage/DiskUsageModel.qml b/usr/share/jolla-settings/pages/storage/DiskUsageModel.qml index d3bcc109..c64d6fe3 100644 --- a/usr/share/jolla-settings/pages/storage/DiskUsageModel.qml +++ b/usr/share/jolla-settings/pages/storage/DiskUsageModel.qml @@ -78,7 +78,7 @@ ListModel { { //% "Android™ apps" label: qsTrId("settings_about-li-disk_usage-android_apps"), - path: '/home/.android/data/app/', + path: ':apkd:app', storageType: 'user', position: 0, androidDataDirectory: true @@ -86,7 +86,7 @@ ListModel { { //% "Android™ app data files" label: qsTrId("settings_about-li-disk_usage-android_app_data_files"), - path: ':apkd:', + path: ':apkd:data', storageType: 'user', position: 0, androidDataDirectory: true @@ -97,7 +97,8 @@ ListModel { path: StandardPaths.home + '/android_storage/', storageType: 'user', position: 0, - androidDataDirectory: true + androidDataDirectory: true, + pathAllowed: true }, { //: %1 is operating system name @@ -111,10 +112,7 @@ ListModel { { //% "Android™ runtime" label: qsTrId("settings_about-li-disk_usage-android_runtime"), - // NOTE: We can not use /opt/alien/ as there is lots of bind mounts - // there that mess up the calculations, also the amount of data outside - // system dir is not making much difference. - path: '/opt/alien/system/', + path: ':apkd:runtime', storageType: 'system', position: 0, androidDataDirectory: true diff --git a/usr/share/jolla-settings/pages/storage/DiskUsagePage.qml b/usr/share/jolla-settings/pages/storage/DiskUsagePage.qml index 45627d5c..f30b5cdf 100644 --- a/usr/share/jolla-settings/pages/storage/DiskUsagePage.qml +++ b/usr/share/jolla-settings/pages/storage/DiskUsagePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import org.nemomobile.systemsettings 1.0 -import org.nemomobile.dbus 2.0 +import Nemo.DBus 2.0 Page { id: diskUsagePage diff --git a/usr/share/jolla-settings/pages/sync/sync.qml b/usr/share/jolla-settings/pages/sync/sync.qml new file mode 100644 index 00000000..f5ebde4d --- /dev/null +++ b/usr/share/jolla-settings/pages/sync/sync.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import com.jolla.settings.sync 1.0 + +SyncSettingsPage { +} diff --git a/usr/share/jolla-settings/pages/tethering/BluetoothTethering.qml b/usr/share/jolla-settings/pages/tethering/BluetoothTethering.qml new file mode 100644 index 00000000..ecc950d0 --- /dev/null +++ b/usr/share/jolla-settings/pages/tethering/BluetoothTethering.qml @@ -0,0 +1,41 @@ +import QtQuick 2.0 +import Sailfish.Settings.Networking 1.0 +import Nemo.Connectivity 1.0 +import Nemo.DBus 2.0 +import Connman 0.2 +import com.jolla.connection 1.0 + +Item { + readonly property alias busy: delayedTetheringSwitch.running + property alias active: btTechnology.tethering + property alias powered: btTechnology.powered + + function stopTethering() { + delayedTetheringSwitch.start() + connectionAgent.stopTethering("bluetooth", true) + } + + function startTethering() { + delayedTetheringSwitch.start() + connectionAgent.startTethering("bluetooth") + } + + Timer { + id: delayedTetheringSwitch + interval: 15000 + } + + ConnectionAgent { + id: connectionAgent + onBluetoothTetheringFinished: delayedTetheringSwitch.stop() + } + + NetworkManager { + id: networkManager + } + + NetworkTechnology { + id: btTechnology + path: networkManager.BluetoothTechnology + } +} diff --git a/usr/share/jolla-settings/pages/tethering/MobileDataWifiTethering.qml b/usr/share/jolla-settings/pages/tethering/MobileDataWifiTethering.qml index c7685c19..44a6b19e 100644 --- a/usr/share/jolla-settings/pages/tethering/MobileDataWifiTethering.qml +++ b/usr/share/jolla-settings/pages/tethering/MobileDataWifiTethering.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import Sailfish.Settings.Networking 1.0 import Nemo.Connectivity 1.0 import Nemo.DBus 2.0 -import MeeGo.Connman 0.2 +import Connman 0.2 import com.jolla.connection 1.0 Item { @@ -18,7 +18,7 @@ Item { function stopTethering() { delayedTetheringSwitch.start() - connectionAgent.stopTethering() + connectionAgent.stopTethering("wifi") } function startTethering() { @@ -61,7 +61,7 @@ Item { ConnectionAgent { id: connectionAgent - onTetheringFinished: delayedTetheringSwitch.stop() + onWifiTetheringFinished: delayedTetheringSwitch.stop() } NetworkManager { diff --git a/usr/share/jolla-settings/pages/tethering/mainpage.qml b/usr/share/jolla-settings/pages/tethering/mainpage.qml index 2c04c3eb..80883c4d 100644 --- a/usr/share/jolla-settings/pages/tethering/mainpage.qml +++ b/usr/share/jolla-settings/pages/tethering/mainpage.qml @@ -2,11 +2,11 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.Silica.private 1.0 import Sailfish.Policy 1.0 -import Nemo.Ssu 1.1 as Ssu import com.jolla.settings 1.0 import com.jolla.settings.system 1.0 import Sailfish.Settings.Networking 1.0 import com.jolla.settings.system 1.0 +import org.nemomobile.systemsettings 1.0 Page { id: page @@ -36,6 +36,10 @@ Page { return ok } + DeviceInfo { + id: deviceInfo + } + SilicaFlickable { id: content anchors.fill: parent @@ -49,6 +53,8 @@ Page { SimActivationPullDownMenu { id: pullDownMenu + + showSimActivation: false // only for flight mode checking } SimViewPlaceholder { @@ -73,9 +79,8 @@ Page { active: !AccessPolicy.internetSharingEnabled } - // WLAN hotspot #/# users ListItem { - id: hotspotItem + id: wlanHotspotItem contentHeight: wlanSwitch.height openMenuOnPressAndHold: false _backgroundColor: "transparent" @@ -83,18 +88,16 @@ Page { IconTextSwitch { id: wlanSwitch - property string entryPath: "system_settings/connectivity/tethering/wlan_hotspot_switch" - //% "WLAN hotspot" text: qsTrId("settings_network-la-wlan-hotspot") - //% "Share device's mobile connection through WLAN network others can join" - description: qsTrId("settings_network-me-share_mobile_connection") + //% "Share device's mobile connection via WLAN" + description: qsTrId("settings_network-me-share_mobile_connection_wlan") icon.source: "image://theme/icon-m-wlan-hotspot" busy: wifiTethering.busy automaticCheck: false checked: wifiTethering.active - highlighted: hotspotItem.highlighted + highlighted: wlanHotspotItem.highlighted enabled: content.enabled && !wifiTethering.offlineMode && passwordInput.text.length > 0 && networkNameInput.text.length > 0 && !wlanSwitch.busy @@ -153,7 +156,7 @@ Page { opacity: content.enabled ? 1.0 : Theme.opacityLow maximumLength: 32 - text: wifiTethering.identifier.length === 0 ? Ssu.DeviceInfo.displayName(Ssu.DeviceInfo.DeviceModel) : wifiTethering.identifier + text: wifiTethering.identifier.length === 0 ? deviceInfo.prettyName : wifiTethering.identifier //% "Network name (SSID)" label: qsTrId("settings_network-la-tethering_network_name") EnterKey.iconSource: "image://theme/icon-m-enter-next" @@ -184,10 +187,57 @@ Page { //% "Minimum length for passphrase is 8 characters" description: errorHighlight ? qsTrId("settings-la-passphrase-length") : "" } + + // BT hotspot + SectionHeader { + //% "Bluetooth" + text: qsTrId("settings_network-he-bluetooth") + visible: deviceInfo.hasFeature(DeviceInfo.FeatureBluetoothTethering) + } + + ListItem { + id: btHotspotItem + contentHeight: btSwitch.height + openMenuOnPressAndHold: false + _backgroundColor: "transparent" + visible: deviceInfo.hasFeature(DeviceInfo.FeatureBluetoothTethering) + + IconTextSwitch { + id: btSwitch + + //% "Bluetooth network sharing" + text: qsTrId("settings_network-la-bt-hotspot") + //% "Allow paired devices to use the internet connection when Bluetooth is on" + description: qsTrId("settings_network-me-share_network_connection_bt") + icon.source: "image://theme/icon-m-bluetooth" + + busy: btTethering.busy + automaticCheck: false + checked: btTethering.active + highlighted: btHotspotItem.highlighted + enabled: content.enabled + && !btSwitch.busy + onClicked: { + if (btTethering.busy) { + return + } + + if (btTethering.active) { + btTethering.stopTethering() + } else { + btTethering.startTethering() + } + } + } + } } } MobileDataWifiTethering { id: wifiTethering } + + BluetoothTethering { + id: btTethering + } } diff --git a/usr/share/jolla-settings/pages/text_input/textinput.qml b/usr/share/jolla-settings/pages/text_input/textinput.qml index afeb17e0..665b9803 100644 --- a/usr/share/jolla-settings/pages/text_input/textinput.qml +++ b/usr/share/jolla-settings/pages/text_input/textinput.qml @@ -26,7 +26,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import com.jolla.keyboard 1.0 import com.jolla.keyboard.translations 1.0 diff --git a/usr/share/jolla-settings/pages/text_input/xt9pinyin.qml b/usr/share/jolla-settings/pages/text_input/xt9pinyin.qml index fba9b928..8bd42b7a 100644 --- a/usr/share/jolla-settings/pages/text_input/xt9pinyin.qml +++ b/usr/share/jolla-settings/pages/text_input/xt9pinyin.qml @@ -1,6 +1,6 @@ import QtQuick 2.6 import Sailfish.Silica 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 Column { width: parent.width diff --git a/usr/share/jolla-settings/pages/topmenu/topmenu.qml b/usr/share/jolla-settings/pages/topmenu/topmenu.qml index 3b28583d..9e5aae17 100644 --- a/usr/share/jolla-settings/pages/topmenu/topmenu.qml +++ b/usr/share/jolla-settings/pages/topmenu/topmenu.qml @@ -3,7 +3,7 @@ import Sailfish.Silica 1.0 import com.jolla.settings 1.0 import com.jolla.settings.system 1.0 import org.nemomobile.systemsettings 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 Page { id: root diff --git a/usr/share/jolla-settings/pages/transferui/mainpage.qml b/usr/share/jolla-settings/pages/transferui/mainpage.qml index 579df3ef..b3f5d21f 100644 --- a/usr/share/jolla-settings/pages/transferui/mainpage.qml +++ b/usr/share/jolla-settings/pages/transferui/mainpage.qml @@ -1,3 +1,39 @@ +/**************************************************************************************** +** Copyright (c) 2013 - 2023 Jolla Ltd. +** +** All rights reserved. +** +** This file is part of Sailfish Transfer Engine component package. +** +** You may use this file under the terms of BSD license as follows: +** +** Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are met: +** +** 1. Redistributions of source code must retain the above copyright notice, this +** list of conditions and the following disclaimer. +** +** 2. Redistributions in binary form must reproduce the above copyright notice, +** this list of conditions and the following disclaimer in the documentation +** and/or other materials provided with the distribution. +** +** 3. Neither the name of the copyright holder nor the names of its +** contributors may be used to endorse or promote products derived from +** this software without specific prior written permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** +****************************************************************************************/ + import QtQuick 2.0 import Sailfish.TransferEngine 1.0 diff --git a/usr/share/jolla-settings/pages/vpn/EnableSwitch.qml b/usr/share/jolla-settings/pages/vpn/EnableSwitch.qml index ed91d2c7..bff80bbd 100644 --- a/usr/share/jolla-settings/pages/vpn/EnableSwitch.qml +++ b/usr/share/jolla-settings/pages/vpn/EnableSwitch.qml @@ -7,16 +7,18 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import MeeGo.Connman 0.2 +import Connman 0.2 import Nemo.DBus 2.0 import com.jolla.settings 1.0 -import org.nemomobile.systemsettings 1.0 +import Nemo.Connectivity 1.0 SettingsToggle { id: root property string _connectionName - readonly property bool waitForConnection: (!networkManager.connected || (SettingsVpnModel.bestState <= VpnConnection.Configuration)) && SettingsVpnModel.autoConnect + readonly property bool waitForConnection: (!networkManager.connected + || (SettingsVpnModel.bestState <= VpnConnection.Association)) + && SettingsVpnModel.autoConnect function _updateConnectionName() { var connectionName = "" @@ -37,9 +39,11 @@ SettingsToggle { active: SettingsVpnModel.bestState == VpnConnection.Ready checked: (SettingsVpnModel.bestState != VpnConnection.Idle - && SettingsVpnModel.bestState != VpnConnection.Failure) || waitForConnection + && SettingsVpnModel.bestState != VpnConnection.Failure) || waitForConnection - busy: (SettingsVpnModel.bestState == VpnConnection.Configuration || SettingsVpnModel.bestState == VpnConnection.Disconnect) + busy: (SettingsVpnModel.bestState == VpnConnection.Association || + SettingsVpnModel.bestState == VpnConnection.Configuration || + SettingsVpnModel.bestState == VpnConnection.Disconnect) && !waitForConnection menu: ContextMenu { diff --git a/usr/share/jolla-settings/pages/vpn/VpnItem.qml b/usr/share/jolla-settings/pages/vpn/VpnItem.qml index 5aad243d..1a5f1ca7 100644 --- a/usr/share/jolla-settings/pages/vpn/VpnItem.qml +++ b/usr/share/jolla-settings/pages/vpn/VpnItem.qml @@ -7,9 +7,9 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import MeeGo.Connman 0.2 +import Connman 0.2 import Sailfish.Policy 1.0 -import org.nemomobile.systemsettings 1.0 +import Nemo.Connectivity 1.0 import Sailfish.Settings.Networking.Vpn 1.0 ListItem { @@ -84,7 +84,7 @@ ListItem { automaticCheck: false checked: connection ? connection.autoConnect : false highlighted: root.highlighted - busy: connection ? (connection.state === VpnConnection.Configuration || connection.state === VpnConnection.Disconnect) : false + busy: connection ? (connection.state === VpnConnection.Configuration || connection.state === VpnConnection.Association || connection.state === VpnConnection.Disconnect) : false text: connection ? connection.name : '' description: { var state @@ -99,7 +99,7 @@ ListItem { } else if (connection.state == VpnConnection.Disconnect) { //% "Disconnecting..." state = qsTrId("settings_network-la-disconnecting_state") - } else if (connection.state == VpnConnection.Configuration) { + } else if (connection.state == VpnConnection.Configuration || connection.state == VpnConnection.Association) { //% "Connecting..." state = qsTrId("settings_network-la-connecting_state") } else if (checked && !root.networkOnline) { diff --git a/usr/share/jolla-settings/pages/vpn/mainpage.qml b/usr/share/jolla-settings/pages/vpn/mainpage.qml index d6cc7806..202ee593 100644 --- a/usr/share/jolla-settings/pages/vpn/mainpage.qml +++ b/usr/share/jolla-settings/pages/vpn/mainpage.qml @@ -8,10 +8,11 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.Policy 1.0 -import MeeGo.Connman 0.2 +import Connman 0.2 import com.jolla.settings.system 1.0 import Sailfish.Settings.Networking.Vpn 1.0 import org.nemomobile.systemsettings 1.0 +import Nemo.Connectivity 1.0 import Qt.labs.folderlistmodel 2.1 Page { diff --git a/usr/share/jolla-settings/pages/wlan/AddNetworkDialog.qml b/usr/share/jolla-settings/pages/wlan/AddNetworkDialog.qml index 73d06f06..4095621c 100644 --- a/usr/share/jolla-settings/pages/wlan/AddNetworkDialog.qml +++ b/usr/share/jolla-settings/pages/wlan/AddNetworkDialog.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.Pickers 1.0 import Sailfish.Settings.Networking 1.0 -import MeeGo.Connman 0.2 +import Connman 0.2 Dialog { id: root @@ -191,7 +191,6 @@ Dialog { AdvancedSettingsColumn { id: advancedSettingsColumn network: root.network - globalProxyButtonVisible: false } } diff --git a/usr/share/jolla-settings/pages/wlan/AdvancedSettingsPage.qml b/usr/share/jolla-settings/pages/wlan/AdvancedSettingsPage.qml index bc44e419..d47394d1 100644 --- a/usr/share/jolla-settings/pages/wlan/AdvancedSettingsPage.qml +++ b/usr/share/jolla-settings/pages/wlan/AdvancedSettingsPage.qml @@ -1,12 +1,16 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import MeeGo.Connman 0.2 +import Connman 0.2 import Sailfish.Pickers 1.0 import Sailfish.Settings.Networking 1.0 +import "../netproxy" -Page { +Dialog { id: root + forwardNavigation: false + canNavigateForward: false + property QtObject network onStatusChanged: { @@ -21,12 +25,6 @@ Page { contentHeight: content.height + Theme.paddingLarge PullDownMenu { - MenuItem { - //% "Details" - text: qsTrId("settings_network-me-details") - onClicked: pageStack.animatorPush("NetworkDetailsPage.qml", {network: network}) - - } MenuItem { //% "Forget network" text: qsTrId("settings_network-me-forget_network") @@ -45,7 +43,32 @@ Page { width: parent.width - PageHeader { title: root.network ? root.network.name : "" } + DialogHeader { + id: dialogHeader + acceptText: "" + + //% "Save" + cancelText: qsTrId("settings_network-he-save") + + Label { + parent: dialogHeader.extraContent + text: root.network ? root.network.name : "" + color: Theme.highlightColor + width: parent.width + truncationMode: TruncationMode.Fade + font { + pixelSize: Theme.fontSizeLarge + family: Theme.fontFamilyHeading + } + anchors { + right: parent.right + rightMargin: -Theme.horizontalPageMargin + verticalCenter: parent.verticalCenter + } + + horizontalAlignment: Qt.AlignRight + } + } EncryptionComboBox { network: root.network @@ -116,6 +139,7 @@ Page { AdvancedSettingsColumn { id: advancedSettingsColumn network: root.network + globalProxyConfigPage: Qt.resolvedUrl("../advanced-networking/mainpage.qml") } } VerticalScrollDecorator {} diff --git a/usr/share/jolla-settings/pages/wlan/AutoProxyForm.qml b/usr/share/jolla-settings/pages/wlan/AutoProxyForm.qml deleted file mode 100644 index 16e37137..00000000 --- a/usr/share/jolla-settings/pages/wlan/AutoProxyForm.qml +++ /dev/null @@ -1,77 +0,0 @@ -import QtQuick 2.0 -import Sailfish.Silica 1.0 -import Sailfish.Settings.Networking 1.0 - -Column { - id: form - - property QtObject network - - property bool updating - property bool _completed - property bool _updateRequired - - Connections { - target: network - onProxyConfigChanged: timer.restart() - } - - Timer { - id: timer - - interval: 1 - onTriggered: { - form.updating = false - if (form._updateRequired) - updateAutoProxy() - } - } - - function updateAutoProxyIfAcceptable() { - if (!_completed) - return - - if (urlField.acceptableInput) - _updateRequired = true - - if (!updating && _updateRequired) - updateAutoProxy() - } - - function updateAutoProxy() { - var proxyConfig = network.proxyConfig - - proxyConfig["Method"] = "auto" - proxyConfig["Servers"] = [] - - if (urlField.validProtocol) { - proxyConfig["URL"] = urlField.text - } else { - proxyConfig["URL"] = "https://" + urlField.text - } - - updating = true - _updateRequired = false - network.proxyConfig = proxyConfig - } - - Component.onCompleted: _completed = true - - NetworkAddressField { - id: urlField - - focus: true - text: network.proxyConfig["URL"] ? network.proxyConfig["URL"] : "" - onActiveFocusChanged: if (!activeFocus) updateAutoProxyIfAcceptable() - - //: Keep short, placeholder label that cannot wrap - //% "E.g. https://example.com/proxy.pac" - placeholderText: qsTrId("settings_network-la-automatic_proxy_address_example") - - //% "Proxy address" - label: qsTrId("settings_network-la-proxy_address") - - EnterKey.iconSource: "image://theme/icon-m-enter-close" - EnterKey.onClicked: parent.focus = true - } -} diff --git a/usr/share/jolla-settings/pages/wlan/ManualProxyForm.qml b/usr/share/jolla-settings/pages/wlan/ManualProxyForm.qml deleted file mode 100644 index a875cd13..00000000 --- a/usr/share/jolla-settings/pages/wlan/ManualProxyForm.qml +++ /dev/null @@ -1,313 +0,0 @@ -import QtQuick 2.0 -import Sailfish.Silica 1.0 -import Sailfish.Settings.Networking 1.0 - -Column { - id: form - - property QtObject network - - property bool updating - property bool _completed - property bool _updateRequired - - Connections { - target: network - onProxyConfigChanged: { - if (proxyServersChanged()) { - setServersModel() - } - if (proxyExcludesChanged()) { - setExcludes() - } - - timer.restart() - } - } - - Timer { - id: timer - - interval: 1 - onTriggered: { - form.updating = false - if (form._updateRequired) - updateManualProxy() - } - } - - function remove(index) { - var item = repeater.itemAt(index) - if (item) { - repeater.model.remove(index) - updateManualProxy() - } - } - - function updateManualProxyIfValid(addressField, portField) { - if (!_completed) - return - - if (addressField.acceptableInput && portField.acceptableInput) - _updateRequired = true - - if (!updating && _updateRequired) - updateManualProxy() - } - - function updateManualProxyExcludesIfValid(addressField) { - if (!_completed) - return - - if (addressField.acceptableInput) - _updateRequired = true - - if (!updating && _updateRequired) - updateManualProxy() - } - - function updateManualProxy() { - var proxyServer - var proxyExcludes - var proxyConfig = network.proxyConfig - - proxyConfig["Method"] = "manual" - proxyConfig["Servers"] = [] - - var addProxy = function(addressField, portField) { - if (addressField.acceptableInput && portField.acceptableInput) { - if (addressField.validProtocol) { - proxyServer = addressField.text - } else { - proxyServer = "http://" + addressField.text - } - - proxyServer = proxyServer + ":" + parseInt(portField.text, 10) - proxyConfig["Servers"].push(proxyServer) - } - } - - for (var i = 0; i < repeater.count; i++) { - var item = repeater.itemAt(i) - addProxy(item.addressField, item.portField) - } - - if (proxyExcludesField.acceptableInput) { - proxyConfig["Excludes"] = proxyExcludesField.text.replace(" ", "").split(",") - } else { - proxyConfig["Excludes"] = [] - } - - if (proxyConfig["Servers"].length > 0) { - updating = true - _updateRequired = false - network.proxyConfig = proxyConfig - } - } - - function proxyServersChanged() { - var changed = false; - var servers = network.proxyConfig["Servers"] - - if (!servers) { - if (repeater.model.count !== 0) { - changed = true - } - } else if (servers.length !== repeater.model.count) { - changed = true - } else { - for (var i = 0; i < servers.length; i++) { - var item = repeater.itemAt(i) - var serverConfig = servers[i].split(":") - var address = serverConfig[0] + ":" + serverConfig[1] - var port = serverConfig[2] - - if (item.addressField.text !== address) { - changed = true - } - - if (item.portField.text !== port) { - changed = true - } - } - } - return changed - } - - function setServersModel() { - var servers = network.proxyConfig["Servers"] - repeater.model.clear() - - if (!servers) { - repeater.model.append({}) - } else { - for (var i = 0; i < servers.length; i++) { - repeater.model.append({}) - var item = repeater.itemAt(i) - var serverConfig = servers[i].split(":") - - item.addressField.text = serverConfig[0] + ":" + serverConfig[1] - if (serverConfig.length > 2) { - item.portField.text = serverConfig[2] - } - } - } - } - - Component.onCompleted: _completed = true - - Repeater { - id: repeater - model: ListModel {} - - Component.onCompleted: { - setServersModel() - } - - ListItem { - id: proxyItem - - property bool initialized: model.index === 0 - property alias addressField: addressField - property alias portField: portField - - width: parent.width - openMenuOnPressAndHold: false - contentHeight: initialized ? column.height : 0 - opacity: initialized ? 1.0 : 0.0 - _backgroundColor: "transparent" - Behavior on opacity { FadeAnimation {}} - Behavior on contentHeight { NumberAnimation { duration: 200; easing.type: Easing.InOutQuad }} - - Component.onCompleted: initialized = true - ListView.onRemove: animateRemoval() - - menu: ContextMenu { - MenuItem { - onClicked: remove(index) - //% "Delete" - text: qsTrId("settings_network-me-delete") - } - } - - Column { - id: column - - width: parent.width - - SectionHeader { - visible: model.index > 0 - //% "Proxy %1" - text: qsTrId("settings_network-he-proxy_number").arg(model.index + 1) - } - - NetworkAddressField { - id: addressField - - _suppressPressAndHoldOnText: true - focusOutBehavior: FocusBehavior.KeepFocus - focusOnClick: false - onClicked: forceActiveFocus() - onPressAndHold: if (repeater.model.count > 1) openMenu() - focus: model.index === 0 - highlighted: activeFocus || menuOpen - onActiveFocusChanged: if (!activeFocus) updateManualProxyIfValid(addressField, portField) - - //: Keep short, placeholder label that cannot wrap - //% "E.g. http://proxy.example.com" - placeholderText: qsTrId("settings_network-la-manual_proxy_address_example") - - //% "Proxy address" - label: qsTrId("settings_network-la-proxy_address") - - EnterKey.iconSource: "image://theme/icon-m-enter-next" - EnterKey.onClicked: portField.focus = true - } - - IpPortField { - id: portField - - _suppressPressAndHoldOnText: true - focusOutBehavior: FocusBehavior.KeepFocus - focusOnClick: false - onClicked: forceActiveFocus() - onPressAndHold: if (repeater.model.count > 1) proxyItem.openMenu() - highlighted: activeFocus || menuOpen - onActiveFocusChanged: if (!activeFocus) updateManualProxyIfValid(addressField, portField) - - EnterKey.iconSource: "image://theme/icon-m-enter-next" - EnterKey.onClicked: { - if (model.index + 1 < repeater.count) { - repeater.itemAt(model.index + 1).addressField.focus = true - } else { - proxyExcludesField.focus = true - } - } - } - } - } - } - - function proxyExcludesChanged() { - var changed = false; - var excludes = WlanUtils.maybeJoin(network.proxyConfig["Excludes"]); - - if (excludes !== proxyExcludesField.text) { - changed = true - } - - return changed - } - - function setExcludes() { - proxyExcludesField.text = WlanUtils.maybeJoin(network.proxyConfig["Excludes"]) - } - - - NetworkField { - id: proxyExcludesField - - regExp: new RegExp( /^[\w- \.,]*$/ ) - Component.onCompleted: setExcludes() - onActiveFocusChanged: if (!activeFocus) updateManualProxyExcludesIfValid(proxyExcludesField) - - //: Keep short, placeholder label that cannot wrap - //% "E.g. example.com, domain.com" - placeholderText: qsTrId("settings_network-la-exclude_domains_example") - - //% "Exclude domains" - label: qsTrId("settings_network-la-exclude_domains") - - //% "List valid domain names separated by commas" - description: errorHighlight ? qsTrId("settings_network_la-exclude_domains_error") : "" - - EnterKey.iconSource: "image://theme/icon-m-enter-close" - EnterKey.onClicked: parent.focus = true - } - - BackgroundItem { - id: addProxyItem - - onClicked: repeater.model.append({}) - Image { - id: addIcon - x: Theme.paddingLarge - anchors.verticalCenter: parent.verticalCenter - source: "image://theme/icon-m-add" + (addProxyItem.highlighted ? "?" + Theme.highlightColor : "") - } - Label { - id: serviceName - - //% "Add another proxy" - text: qsTrId("settings_network-bt-add_another_proxy") - anchors { - left: addIcon.right - leftMargin: Theme.paddingSmall - verticalCenter: parent.verticalCenter - right: parent.right - rightMargin: Theme.paddingLarge - } - color: addProxyItem.highlighted ? Theme.highlightColor : Theme.primaryColor - } - } -} diff --git a/usr/share/jolla-settings/pages/wlan/NetworkDetailsPage.qml b/usr/share/jolla-settings/pages/wlan/NetworkDetailsPage.qml index 94695b58..1e32d0db 100644 --- a/usr/share/jolla-settings/pages/wlan/NetworkDetailsPage.qml +++ b/usr/share/jolla-settings/pages/wlan/NetworkDetailsPage.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import MeeGo.Connman 0.2 +import Connman 0.2 import Sailfish.Settings.Networking 1.0 Page { @@ -12,13 +12,24 @@ Page { anchors.fill: parent contentHeight: column.height + Theme.paddingLarge + PullDownMenu { + MenuItem { + //% "Edit" + text: qsTrId("settings_network-me-edit") + onClicked: pageStack.animatorPush("AdvancedSettingsPage.qml", {"network": network}) + } + } + Column { id: column width: parent.width PageHeader { title: network.name - description: { + } + + SectionHeader { + text: { switch (network.state) { case "online": //% "Connected" @@ -33,6 +44,12 @@ Page { } } + DetailItem { + //% "Hardware Address" + label: qsTrId("settings_network-la-hardware_address") + value: network.ethernet["Address"] || "-" + } + DetailItem { //% "Security" label: qsTrId("settings_network-la-security") @@ -125,7 +142,7 @@ Page { Column { width: parent.width - visible: ipv4Address.value.length > 0 || ipv6Address.value.length > 0 + visible: network.ipv4["Address"] !== undefined || network.ipv6["Address"] !== undefined SectionHeader { //% "Addresses" @@ -140,25 +157,37 @@ Page { } DetailItem { - id: ipv4Address //% "IPv4 address" label: qsTrId("settings_network-la-ipv4_address") value: network.ipv4["Address"] - visible: value.length > 0 + visible: network.ipv4["Address"] !== undefined + } + + DetailItem { + //% "IPv4 Netmask" + label: qsTrId("settings_network-la-ipv4_netmask") + value: network.ipv4["Netmask"] || "-" + visible: network.ipv4["Address"] !== undefined + } + + DetailItem { + //% "IPv4 Gateway" + label: qsTrId("settings_network-la-ipv4_gateway") + value: network.ipv4["Gateway"] || "-" + visible: network.ipv4["Address"] !== undefined } DetailItem { - id: ipv6Address //% "IPv6 address" label: qsTrId("settings_network-la-ipv6_address") - value: network.ipv6["Address"] - visible: value.length > 0 + value: network.ipv6["Address"] + "/" + network.ipv6["PrefixLength"] + visible: network.ipv6["Address"] !== undefined } + DetailItem { //% "DNS servers" label: qsTrId("settings_network-la-dns_servesr") - value: network.nameservers ? network.nameservers.join(" ") : "" - visible: value.length > 0 + value: network.nameservers ? network.nameservers.join("\n") : "-" } } } diff --git a/usr/share/jolla-settings/pages/wlan/PeapComboBox.qml b/usr/share/jolla-settings/pages/wlan/PeapComboBox.qml index dc9b483c..fa5229e5 100644 --- a/usr/share/jolla-settings/pages/wlan/PeapComboBox.qml +++ b/usr/share/jolla-settings/pages/wlan/PeapComboBox.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import MeeGo.Connman 0.2 +import Connman 0.2 ComboBox { //% "PEAP version" diff --git a/usr/share/jolla-settings/pages/wlan/ProxyForm.qml b/usr/share/jolla-settings/pages/wlan/ProxyForm.qml deleted file mode 100644 index fd15eae6..00000000 --- a/usr/share/jolla-settings/pages/wlan/ProxyForm.qml +++ /dev/null @@ -1,108 +0,0 @@ -import QtQuick 2.6 -import Sailfish.Silica 1.0 - -Column { - id: root - property QtObject network - property alias currentIndex: proxyCombo.currentIndex - property alias proxyLoader: proxyLoader - - width: parent.width - opacity: enabled ? 1.0 : Theme.opacityLow - - function methodStringToInteger(method) { - if (method === "manual") { - return 1 - } else if (method === "auto") { - return 2 - } else { - return 0 - } - } - - Connections { - target: network - onProxyConfigChanged: { - var configIndex = methodStringToInteger(network.proxyConfig["Method"]) - if (proxyCombo.currentIndex !== configIndex) { - proxyLoader.item.updating = true - proxyLoader.focus = false - proxyCombo.currentIndex = configIndex - } - } - } - - ComboBox { - id: proxyCombo - - onCurrentIndexChanged: { - var proxyConfig = network.proxyConfig - proxyLoader.item.updating = true - - if (currentIndex === 0) { - proxyConfig["Method"] = "direct" - network.proxyConfig = proxyConfig - } - } - - Component.onCompleted: { - var method = network.proxyConfig["Method"] - - currentIndex = methodStringToInteger(method) - } - - //: Referring to the network proxy method to use for this connection - //% "Proxy configuration" - label: qsTrId("settings_network-la-proxy_configuration") - menu: ContextMenu { - MenuItem { - //% "No proxies" - text: qsTrId("settings_network-me-no_proxies") - } - MenuItem { - //% "Manual" - text: qsTrId("settings_network-me-manual") - } - MenuItem { - //% "Automatic" - text: qsTrId("settings_network-me-automatic") - } - } - } - - Loader { - id: proxyLoader - width: parent.width - sourceComponent: { - var index = proxyCombo.currentIndex - if (index === 0) { - return fakeEmptyItem - } else if (index === 1) { - return manualProxy - } else if (index === 2) { - return autoProxy - } - } - } - - // this is a workaround for Loader not reseting its height when sourceComponent is undefined - Component { - id: fakeEmptyItem - - Item { - property bool updating: false - } - } - - Component { - id: manualProxy - - ManualProxyForm { network: root.network } - } - - Component { - id: autoProxy - - AutoProxyForm { network: root.network } - } -} diff --git a/usr/share/jolla-settings/pages/wlan/NetworkItemDelegate.qml b/usr/share/jolla-settings/pages/wlan/WlanItem.qml similarity index 96% rename from usr/share/jolla-settings/pages/wlan/NetworkItemDelegate.qml rename to usr/share/jolla-settings/pages/wlan/WlanItem.qml index 7db54b75..047dfb20 100644 --- a/usr/share/jolla-settings/pages/wlan/NetworkItemDelegate.qml +++ b/usr/share/jolla-settings/pages/wlan/WlanItem.qml @@ -87,10 +87,11 @@ ListItem { } } MenuItem { - //% "Edit" - text: qsTrId("settings_network-me-edit") - onClicked: pageStack.animatorPush("AdvancedSettingsPage.qml", {"network": networkService}) + //% "Details" + text: qsTrId("settings_network-me-details") + onClicked: pageStack.animatorPush("NetworkDetailsPage.qml", {"network": networkService}) } + onActiveChanged: mainPage.suppressScan = active } } diff --git a/usr/share/jolla-settings/pages/wlan/EnableSwitch.qml b/usr/share/jolla-settings/pages/wlan/WlanSwitch.qml similarity index 97% rename from usr/share/jolla-settings/pages/wlan/EnableSwitch.qml rename to usr/share/jolla-settings/pages/wlan/WlanSwitch.qml index 99838673..3bce9e23 100644 --- a/usr/share/jolla-settings/pages/wlan/EnableSwitch.qml +++ b/usr/share/jolla-settings/pages/wlan/WlanSwitch.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.Policy 1.0 import Sailfish.Settings.Networking 1.0 as Networking -import MeeGo.Connman 0.2 +import Connman 0.2 import Nemo.Configuration 1.0 import Nemo.DBus 2.0 import com.jolla.connection 1.0 @@ -39,7 +39,7 @@ SettingsToggle { if (!AccessPolicy.wlanToggleEnabled) { errorNotification.notify(SettingsControlError.BlockedByAccessPolicy) } else if (wifiTechnology.tethering) { - connectionAgent.stopTethering(true) + connectionAgent.stopTethering("wifi", true) } else { wifiTechnology.powered = !wifiTechnology.powered if (wifiTechnology.powered) { diff --git a/usr/share/jolla-settings/pages/wlan/mainpage.qml b/usr/share/jolla-settings/pages/wlan/mainpage.qml index 6ed65eec..4516366a 100644 --- a/usr/share/jolla-settings/pages/wlan/mainpage.qml +++ b/usr/share/jolla-settings/pages/wlan/mainpage.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import MeeGo.Connman 0.2 +import Connman 0.2 import Sailfish.Silica 1.0 import Sailfish.Policy 1.0 import com.jolla.settings 1.0 @@ -132,7 +132,7 @@ Page { onClicked: { if (wifiTechnology.tethering) - connectionAgent.stopTethering(true) + connectionAgent.stopTethering("wifi", true) else wifiListModel.powered = !wifiListModel.powered } @@ -183,7 +183,7 @@ Page { model: wifiListModel.available ? savedNetworks : null - delegate: NetworkItemDelegate { width: parent.width } + delegate: WlanItem { width: parent.width } // This is shown when connman is completely broken Component { diff --git a/usr/share/jolla-settings/settings.qml b/usr/share/jolla-settings/settings.qml index 528ef8cc..e9b63bd2 100644 --- a/usr/share/jolla-settings/settings.qml +++ b/usr/share/jolla-settings/settings.qml @@ -2,8 +2,8 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 // Load translations import com.jolla.settings 1.0 -import org.nemomobile.dbus 2.0 -import org.nemomobile.notifications 1.0 +import Nemo.DBus 2.0 +import Nemo.Notifications 1.0 import "./pages" ApplicationWindow { diff --git a/usr/share/jolla-startupwizard-pre-user-session/main.qml b/usr/share/jolla-startupwizard-pre-user-session/main.qml index 7ba6b604..e58690da 100644 --- a/usr/share/jolla-startupwizard-pre-user-session/main.qml +++ b/usr/share/jolla-startupwizard-pre-user-session/main.qml @@ -12,7 +12,8 @@ import Sailfish.Lipstick 1.0 import com.jolla.settings.system 1.0 import com.jolla.startupwizard 1.0 import org.nemomobile.systemsettings 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 +import QtQuick.Window 2.2 as QtQuick // Don't use ApplicationWindow as it involves covers and other features that can't be handled // before the user session begins. @@ -132,8 +133,8 @@ Window { pageStack.animatorPush(welcomeComponent) } - width: Screen.width - height: Screen.height + width: root.QtQuick.Screen.primaryOrientation === Qt.PortraitOrientation ? Screen.width : Screen.height + height: root.QtQuick.Screen.primaryOrientation === Qt.PortraitOrientation ? Screen.height : Screen.width StartupWizardManager { id: wizardManager diff --git a/usr/share/jolla-startupwizard/DeviceLockDialog.qml b/usr/share/jolla-startupwizard/DeviceLockDialog.qml index 35e90f75..c0ee6766 100644 --- a/usr/share/jolla-startupwizard/DeviceLockDialog.qml +++ b/usr/share/jolla-startupwizard/DeviceLockDialog.qml @@ -36,8 +36,6 @@ MandatoryDeviceLockInputPage { //% "User data encrypted" subTitleText: homeEncrypted && !lockCodeSet ? qsTrId("startupwizard-la-user_data_encrypted") : "" - //% "Skip" - cancelText: qsTrId("startupwizard-la-skip_security_code") showCancelButton: !homeEncrypted onStatusChanged: { diff --git a/usr/share/jolla-startupwizard/SUWAccountCreationManager.qml b/usr/share/jolla-startupwizard/SUWAccountCreationManager.qml new file mode 100644 index 00000000..37f44102 --- /dev/null +++ b/usr/share/jolla-startupwizard/SUWAccountCreationManager.qml @@ -0,0 +1,15 @@ +/* + * Copyright (c) 2022 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import com.jolla.settings.accounts 1.0 + +AccountCreationManager { + endDestination: _pageAfterAccountSetup + endDestinationAction: PageStackAction.Replace + endDestinationReplaceTarget: null +} diff --git a/usr/share/jolla-startupwizard/SUWAccountFactory.qml b/usr/share/jolla-startupwizard/SUWAccountFactory.qml new file mode 100644 index 00000000..94127b37 --- /dev/null +++ b/usr/share/jolla-startupwizard/SUWAccountFactory.qml @@ -0,0 +1,10 @@ +/* + * Copyright (c) 2022 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import com.jolla.settings.accounts 1.0 + +AccountFactory {} diff --git a/usr/share/jolla-startupwizard/SUWWizardPostAccountCreationDialog.qml b/usr/share/jolla-startupwizard/SUWWizardPostAccountCreationDialog.qml new file mode 100644 index 00000000..8ad0d553 --- /dev/null +++ b/usr/share/jolla-startupwizard/SUWWizardPostAccountCreationDialog.qml @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2022 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import com.jolla.startupwizard 1.0 + +WizardPostAccountCreationDialog { + endDestination: _pageAfterAccountSetup + endDestinationAction: PageStackAction.Replace + endDestinationReplaceTarget: null + backNavigation: false +} diff --git a/usr/share/jolla-startupwizard/main.qml b/usr/share/jolla-startupwizard/main.qml index 5aac3b22..d7d78ab7 100644 --- a/usr/share/jolla-startupwizard/main.qml +++ b/usr/share/jolla-startupwizard/main.qml @@ -8,13 +8,13 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 import Sailfish.Silica.private 1.0 +import Sailfish.Settings.Networking 1.0 import com.jolla.startupwizard 1.0 import com.jolla.settings.system 1.0 -import com.jolla.settings.accounts 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import org.nemomobile.devicelock 1.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 import Sailfish.AccessControl 1.0 import Sailfish.Policy 1.0 @@ -26,7 +26,8 @@ ApplicationWindow { property bool _internetConnectionSkipped property int _modemIndex property bool _pinRequested - property variant _fingerprintAuthenticationToken + property var _fingerprintAuthenticationToken + property bool _enteredTutorial property Component _firstPageAfterPinQuery: { if (reachedTutorialConf.value === true) { @@ -46,8 +47,10 @@ ApplicationWindow { readonly property Component tutorialMainComponent: { var tutorial = Qt.createComponent(pageStack.resolveImportPage("Sailfish.Tutorial.TutorialEntryPage")) if (tutorial.status != Component.Ready) { + console.log("No Tutorial installed, skipping.") tutorial = noTutorialComponent } + return tutorial } @@ -55,21 +58,19 @@ ApplicationWindow { ofonoInitTimeout.stop() var pageComponent = showSimPinQuery ? pinQueryComponent : _firstPageAfterPinQuery var page = pageStack.replace(pageComponent, {}, PageStackAction.Immediate) - if (pageComponent == tutorialMainComponent) { - if (page.status === PageStatus.Active) { - // don't allow back navigation from the tutorial - page.backNavigation = false - tutorialExitConf() - } - } } function _accountSetupPage() { if (root._internetConnectionSkipped) { return root._pageAfterAccountSetup - } else if (accountFactory.jollaAccountExists()) { // Store exists for account (TODO JB#47405 : should be fixed for jolla-settings-account) - console.log("User already has a", _accountName, "account, skipping", _accountName, "account creation. (Ignore the upcoming 'Great, your", _accountName, "account was added' message.)") - return storeAccountAlreadyExistsComponent + } else if (accountFactory.item && accountFactory.item.jollaAccountExists()) { + // Store exists for account (TODO JB#47405 : should be fixed for jolla-settings-account) + console.log("User already has a", _accountName, "account, skipping", _accountName, + "account creation. (Ignore the upcoming 'Great, your", _accountName, + "account was added' message.)") + // This is only used if a store account already exists when the SUW is run; otherwise, the + // Settings account creation flow takes care of triggering this flow. + return Qt.createComponent(Qt.resolvedUrl("SUWWizardPostAccountCreationDialog.qml")) } else { return _createStoreAccountPage() } @@ -80,7 +81,9 @@ ApplicationWindow { root._accountPage.destroy() } var props = { "wizardMode": true, "runningFromSettingsApp": false } - root._accountPage = accountCreator.accountCreationPageForProvider(_accountName.toLowerCase(), props) + root._accountPage = accountCreationManager.item + ? accountCreationManager.item.accountCreationPageForProvider(_accountName.toLowerCase(), props) + : null return root._accountPage || root._pageAfterAccountSetup } @@ -99,6 +102,19 @@ ApplicationWindow { initialPage: busyWaitComponent + Connections { + target: pageStack + onCurrentPageChanged: { + // detect if we entered the tutorial + if (!root._enteredTutorial && pageStack.currentPage.hasOwnProperty("allowSystemGesturesBetweenLessons")) { + root._enteredTutorial = true + // don't allow back navigation from the tutorial + pageStack.currentPage.backNavigation = false + tutorialExitConf() + } + } + } + Component { id: busyWaitComponent Page { @@ -116,8 +132,16 @@ ApplicationWindow { id: wizardManager } - AccountFactory { + Loader { + id: accountCreationManager + + source: Qt.resolvedUrl("SUWAccountCreationManager.qml") + } + + Loader { id: accountFactory + + source: Qt.resolvedUrl("SUWAccountFactory.qml") } ScreenBlank { @@ -128,13 +152,6 @@ ApplicationWindow { key: "/apps/jolla-startupwizard/reached_tutorial" } - AccountCreationManager { - id: accountCreator - endDestination: root._pageAfterAccountSetup - endDestinationAction: PageStackAction.Replace - endDestinationReplaceTarget: null - } - PersonalizedNamingSetup { id: personalizedNaming } @@ -216,6 +233,7 @@ ApplicationWindow { Component { id: networkCheckComponent + NetworkCheckDialog { readonly property bool dateTimeSettingsEnabled: AccessPolicy.dateTimeSettingsEnabled && AccessControl.hasGroup(AccessControl.RealUid, "sailfish-datetime") @@ -225,16 +243,19 @@ ApplicationWindow { //% "Setting up your internet connection at this point is highly recommended" headingText: qsTrId("startupwizard-he-internet_connection_heading") - //% "With an internet connection you can set up your Store account and download essential apps now. You'll also be able to access the Store and OS updates immediately after setting up your account." + //% "With an internet connection you can set up your Store account and download essential apps now. " + //% "You'll also be able to access the Store and OS updates immediately after setting up your account." bodyText: _accountPage ? qsTrId("startupwizard-la-internet_connection_body") : "" - skipText: (_accountPage ? - //: Skip text if user doesn't want to set up the internet connection at the moment. (Text surrounded by %1 and %2 is underlined and colored differently) - //% "%1Skip%2 internet connection setup and set up my Store account later" - qsTrId("startupwizard-la-skip_internet_connection_account_specific") : - //: Skip text if user doesn't want to set up the internet connection at the moment. (Text surrounded by %1 and %2 is underlined and colored differently) - //% "%1Skip%2 internet connection setup" - qsTrId("startupwizard-la-skip_internet_connection")) + skipText: (_accountPage + ? //: Skip text if user doesn't want to set up the internet connection at the moment. + //: (Text surrounded by %1 and %2 is underlined and colored differently) + //% "%1Skip%2 internet connection setup and set up my Store account later" + qsTrId("startupwizard-la-skip_internet_connection_account_specific") + : //: Skip text if user doesn't want to set up the internet connection at the moment. + //: (Text surrounded by %1 and %2 is underlined and colored differently) + //% "%1Skip%2 internet connection setup" + qsTrId("startupwizard-la-skip_internet_connection")) .arg("") .arg("") @@ -263,27 +284,6 @@ ApplicationWindow { acceptDestination = root._accountSetupPage() } } - - onAccepted: { - if (acceptDestination == tutorialMainComponent) { - // Entering tutorial so disable backNavigation - acceptDestinationInstance.backNavigation = false - tutorialExitConf() - } - } - } - } - - // This is only used if a store account already exists when the SUW is run; otherwise, the - // Settings account creation flow takes care of triggering this flow. - Component { - id: storeAccountAlreadyExistsComponent - - WizardPostAccountCreationDialog { - endDestination: root._pageAfterAccountSetup - endDestinationAction: PageStackAction.Replace - endDestinationReplaceTarget: null - backNavigation: false } } @@ -334,7 +334,7 @@ ApplicationWindow { Page { onStatusChanged: { - if (status = PageStatus.Active) { + if (status == PageStatus.Active) { tutorialExitConf() // Tutorial not installed so just quit Qt.quit() @@ -342,19 +342,4 @@ ApplicationWindow { } } } - - // ---- the strings below aren't used yet; they have been added to get the translations done in - // ----- in preparation for implementing JB#27908 - - //: Heading when user is asked to provide the current location - //% "Welcome! Where do you live?" - property string _countryPickerHeading: qsTrId("startupwizard-he-welcome_where_do_you_live") - - //: Explains why user's location is being requested. It is used to define the WLAN frequences that can be used by the device. - //% "This information is needed to define the allowed WLAN frequencies." - property string _countryPickerIntro: qsTrId("startupwizard-la-country_requested_for_wlan") - - //: Allows user to choose current location from a list of countries, regions etc. if the automatically-chosen location was incorrect. - //% "If we didn't guess correctly, please select your area below." - property string _countryPickerFallbackExplanation: qsTrId("startupwizard-la-didnt_guess_area_correctly") } diff --git a/usr/share/lipstick-appsupport-ui/PermissionQueryWindow.qml b/usr/share/lipstick-appsupport-ui/PermissionQueryWindow.qml new file mode 100644 index 00000000..aac654e0 --- /dev/null +++ b/usr/share/lipstick-appsupport-ui/PermissionQueryWindow.qml @@ -0,0 +1,248 @@ +/* + * Copyright (c) 2024 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.6 +import QtQuick.Window 2.0 as QtQuick +import Sailfish.Silica 1.0 +import Sailfish.Bluetooth 1.0 +import Sailfish.Lipstick 1.0 + +SystemDialog { + id: root + + readonly property int buttonAllow: 1 + readonly property int buttonAllowAlways: 2 + readonly property int buttonAllowForeground: 4 + readonly property int buttonDeny: 8 + readonly property int buttonDenyAndDontAsk: 16 + readonly property int buttonAllowOnce: 32 + readonly property int buttonNoUpgrade: 64 + readonly property int buttonNoUpgradeAndDontAsk: 128 + readonly property int buttonNoUpgradeOnce: 256 + readonly property int buttonNoUpgradeOnceAndDontAsk: 512 + readonly property int buttonLinkToSettings: 1024 + + readonly property int replyLinkedToSettings: -2 + readonly property int replyCanceled: -1 + readonly property int replyGrantedAlways: 0 + readonly property int replyGrantedForegroundOnly: 1 + readonly property int replyDenied: 2 + readonly property int replyDeniedDoNotAsk: 3 + readonly property int replyGrantedOnce: 4 + + property string uuid + property string message + property string detailedMessage + property int buttonVisibility + property string groupName + property var buttonTexts + + property bool windowVisible: visibility != QtQuick.Window.Hidden + && visibility != QtQuick.Window.Minimized + + signal done(string uuid, int result) + + function init(uuid, buttonVisibility, groupName, message, detailedMessage, buttonTexts) { + root.uuid = uuid + root.buttonVisibility = buttonVisibility + root.message = message + root.detailedMessage = detailedMessage + root.groupName = groupName + root.buttonTexts = buttonTexts + + raise() + show() + } + + autoDismiss: true + contentHeight: content.height + + onDismissed: { + root.done(uuid, replyCanceled) + } + + Column { + id: content + width: parent.width + topPadding: Math.max(Theme.paddingLarge * 3, + (root.orientation == Qt.PortraitOrientation && Screen.topCutout.height > 0) + ? Screen.topCutout.height + Theme.paddingSmall : 0) + bottomPadding: Theme.paddingLarge + + Image { + anchors.horizontalCenter: parent.horizontalCenter + horizontalAlignment: Image.AlignHCenter + verticalAlignment: Image.AlignVCenter + fillMode: Image.Pad + + source: { + if (root.groupName === "android.permission-group.STORAGE") + return "image://theme/icon-m-storage" + else if (root.groupName === "android.permission-group.CAMERA") + return "image://theme/icon-m-camera" + else if (root.groupName === "android.permission-group.MICROPHONE") + return "image://theme/icon-m-mic" + else if (root.groupName === "android.permission-group.CONTACTS") + return "image://theme/icon-m-contact" + else if (root.groupName === "android.permission-group.CALENDAR") + return "image://theme/icon-m-alarm" + else if (root.groupName === "android.permission-group.LOCATION") + return "image://theme/icon-m-location" + else if (root.groupName === "android.permission-group.PHONE_CALLS") + return "image://theme/icon-m-call" + else if (root.groupName === "android.permission-group.PHONE") + return "image://theme/icon-m-call" + else if (root.groupName === "android.permission-group.SMS") + return "image://theme/icon-m-sms" + else + return "image://theme/icon-m-question" + } + } + + SystemDialogHeader { + topPadding: 2 * Theme.paddingLarge + // These are received in translated state + title: root.message + description: root.detailedMessage + } + + Column { + width: parent.width + + SystemDialogTextButton { + width: parent.width + visible: root.buttonVisibility & buttonAllow + bottomPadding: topPadding + + text: root.buttonTexts[0] + + onClicked: { + root.done(root.uuid, replyGrantedAlways) + } + } + + SystemDialogTextButton { + width: parent.width + visible: root.buttonVisibility & buttonAllowAlways + bottomPadding: topPadding + + text: root.buttonTexts[1] + + onClicked: { + root.done(root.uuid, replyGrantedAlways) + } + } + + SystemDialogTextButton { + width: parent.width + visible: root.buttonVisibility & buttonAllowForeground + bottomPadding: topPadding + + text: root.buttonTexts[2] + + onClicked: { + root.done(root.uuid, replyGrantedForegroundOnly) + } + } + + SystemDialogTextButton { + width: parent.width + visible: root.buttonVisibility & buttonAllowOnce + bottomPadding: topPadding + + text: root.buttonTexts[5] + + onClicked: { + root.done(root.uuid, replyGrantedOnce) + } + } + + SystemDialogTextButton { + width: parent.width + visible: root.buttonVisibility & buttonDeny + bottomPadding: topPadding + + text: root.buttonTexts[3] + + onClicked: { + root.done(root.uuid, replyDenied) + } + } + + SystemDialogTextButton { + width: parent.width + visible: root.buttonVisibility & buttonDenyAndDontAsk + bottomPadding: topPadding + + text: root.buttonTexts[4] + + onClicked: { + root.done(root.uuid, replyDeniedDoNotAsk) + } + } + + SystemDialogTextButton { + width: parent.width + visible: root.buttonVisibility & buttonNoUpgrade + bottomPadding: topPadding + + text: root.buttonTexts[6] + + onClicked: { + root.done(root.uuid, replyDenied) + } + } + + SystemDialogTextButton { + width: parent.width + visible: root.buttonVisibility & buttonNoUpgradeAndDontAsk + bottomPadding: topPadding + + text: root.buttonTexts[7] + + onClicked: { + root.done(root.uuid, replyDeniedDoNotAsk) + } + } + + SystemDialogTextButton { + width: parent.width + visible: root.buttonVisibility & buttonNoUpgradeOnce + bottomPadding: topPadding + + text: root.buttonTexts[8] + + onClicked: { + root.done(root.uuid, replyDenied) + } + } + + SystemDialogTextButton { + width: parent.width + visible: root.buttonVisibility & buttonNoUpgradeOnceAndDontAsk + bottomPadding: topPadding + + text: root.buttonTexts[9] + + onClicked: { + root.done(root.uuid, replyDeniedDoNotAsk) + } + } + + SystemDialogTextButton { + width: parent.width + visible: root.buttonVisibility & buttonLinkToSettings + bottomPadding: topPadding + + text: root.buttonTexts[10] + + onClicked: { + root.done(root.uuid, replyLinkedToSettings) + } + } + } + } +} diff --git a/usr/share/lipstick-appsupport-ui/main.qml b/usr/share/lipstick-appsupport-ui/main.qml new file mode 100644 index 00000000..0605d900 --- /dev/null +++ b/usr/share/lipstick-appsupport-ui/main.qml @@ -0,0 +1,139 @@ +/* + * Copyright (c) 2024 Jolla Ltd. + * + * License: Proprietary + */ + +import QtQuick 2.6 +import QtQuick.Window 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Lipstick 1.0 +import Nemo.DBus 2.0 + +ApplicationWindow { + id: root + + property PermissionQueryWindow _permissionQueryWindow + property string uuid + property int queryCount + property int queryIndex + property bool replied + + Component.onCompleted: { + delayedQuit.restart() + } + + function _showConsentWindow(uuid, buttons, groupName, message, detailedMessage, buttonTexts) { + root.replied = false + if (!_permissionQueryWindow) { + var comp = Qt.createComponent(Qt.resolvedUrl("PermissionQueryWindow.qml")) + if (comp.status == Component.Error) { + console.log("PermissionQueryWindow.qml error:", comp.errorString()) + return + } + _permissionQueryWindow = comp.createObject(root) + _permissionQueryWindow.done.connect(function(uuid, result) { + if (!root.replied) { + dbusClient.reply(uuid, result) + root.replied = true + } + if (result == _permissionQueryWindow.replyCanceled || root.queryIndex >= root.queryCount - 1) { + root._closeWindow() + delayedQuit.restart() + } + }) + } + _permissionQueryWindow.init(uuid, buttons, groupName, message, detailedMessage, buttonTexts) + } + + function _closeWindow() { + if (_permissionQueryWindow + && _permissionQueryWindow.visibility != Window.Hidden) { + _permissionQueryWindow.lower() + } + } + + allowedOrientations: defaultAllowedOrientations + _defaultPageOrientations: Orientation.All + _defaultLabelFormat: Text.PlainText + cover: undefined + + Timer { + id: delayedQuit + interval: 10000 + onTriggered: { + console.log("lipstick-appsupport-ui: exiting...") + Qt.quit() + } + } + + DBusInterface { + id: dbusClient + bus: DBus.SessionBus + + service: 'com.jolla.appsupport.permissions' + path: '/com/jolla/appsupport/permissions' + iface: 'com.jolla.appsupport.permissions' + + function reply(key, result) { + call('consentReply', [ key, result ]) + } + } + + DBusAdaptor { + id: dbusService + + service: 'com.jolla.appsupport.consent' + iface: 'com.jolla.appsupport.consent' + path: '/com/jolla/appsupport/consent' + + xml: '
" + weekdayText[0].toUpperCase() + weekdayText.substring(1) + } else { + return text + } + } + + anchors.baseline: clockItem.baseline + truncationMode: TruncationMode.Fade + width: parent.width - parent.spacing - clockItem.width + anchors.baselineOffset: lineCount > 1 ? -height/2 : 0 + color: Theme.highlightColor + FontMetrics { + id: fontMetrics + font: dateLabel.font + } + } + } + + Separator { + id: dateTimeSeparator + + anchors { left: parent.left; right: parent.right } + color: Theme.highlightColor + } + } + } + } EditableGridManager { id: gridManager supportsFolders: rootFolder @@ -99,7 +203,7 @@ IconGridViewBase { source: "image://theme/" + iconId opacity: show ? 1.0 : 0.0 Behavior on opacity { FadeAnimation {} } - y: target ? target.offsetY + target.iconOffset : -20000 + y: target ? target.targetY + target.iconOffset : -20000 anchors.horizontalCenter: target ? target.horizontalCenter : gridview.contentItem.horizontalCenter scale: 1.3 parent: gridview.contentItem @@ -115,10 +219,6 @@ IconGridViewBase { target: Lipstick.compositor onDisplayOff: setEditMode(false) } - Connections { - target: Lipstick.compositor.launcherLayer - onActiveChanged: if (!Lipstick.compositor.launcherLayer.active) setEditMode(false) - } PolicyValue { id: policy @@ -137,15 +237,20 @@ IconGridViewBase { } width: cellWidth - height: cellHeight + height: gridview.realCellHeight manager: gridManager isFolder: model.object.type == LauncherModel.Folder folderItemCount: isFolder && model.object ? model.object.itemCount : 0 editMode: gridview.launcherEditMode - // This compresses the icons toward the center of the screen, leaving extra margin at the top and bottom - offsetY: y - (((y-gridview.originY+height/2)%launcherPager.height)/launcherPager.height - 0.5) * - (largeScreen && rootFolder ? Theme.paddingLarge*4 : Theme._homePageMargin - Theme.paddingLarge) + // the grid view lays out item for full screen, this overrides the layouting so that + // the page has top and bottom margins + targetY: { + var rowInPage = Math.floor(index % (gridview.columns * gridview.rows) / gridview.columns) + var pageNumber = Math.floor(model.index / (gridview.columns * gridview.rows)) + var pageStart = pageNumber * launcherPager.height + return gridview.originY + pageStart + gridview.topMargin + rowInPage * gridview.realCellHeight + } onEditModeChanged: { if (editMode && !uninstallButton && canUninstall && policy.value) { @@ -153,12 +258,6 @@ IconGridViewBase { } } - onIsUpdatingChanged: { - if (isUpdating && !updatingItem) { - updatingItem = updatingComponent.createObject(contentItem) - } - } - Timer { id: scaleUpTimer interval: 200 @@ -200,8 +299,10 @@ IconGridViewBase { } else if (isFolder) { setEditMode(false) showFolder(model.object) - // Ensure the launcher is visible - could be peeking from bottom due to hint. - Lipstick.compositor.setCurrentWindow(Lipstick.compositor.launcherLayer.window) + if (Lipstick.compositor.multitaskingHome) { + // Ensure the launcher is visible - could be peeking from bottom due to hint. + Lipstick.compositor.setCurrentWindow(Lipstick.compositor.launcherLayer.window) + } } else if (launcherEditMode) { setEditMode(false) } else { @@ -212,14 +313,18 @@ IconGridViewBase { } else { Desktop.instance.switcher.activateWindowFor(object) } - Lipstick.compositor.launcherLayer.hide() + + if (Lipstick.compositor.multitaskingHome) { + Lipstick.compositor.launcherLayer.hide() + } + gridview.itemLaunched() } Lipstick.compositor.launcherLayer.pinned = false } onPressAndHold: { - if (Lipstick.compositor.launcherLayer.active && !launcherEditMode) { + if (!launcherEditMode) { setEditMode(true) wrapper.startReordering(true) } @@ -302,19 +407,20 @@ IconGridViewBase { visible: !launcherEditMode || isFolder } - Component { - id: updatingComponent - BusyIndicator { - anchors.centerIn: launcherIcon - running: model.object.isUpdating - opacity: running - Behavior on opacity { FadeAnimation {} } - Label { - anchors.centerIn: parent - text: model.object.updatingProgress + '%' - visible: model.object.isUpdating && model.object.updatingProgress >= 0 && model.object.updatingProgress <= 100 - font.pixelSize: Theme.fontSizeSmall - } + BusyIndicator { + anchors.centerIn: launcherIcon + running: model.object.isUpdating + || (!Lipstick.compositor.multitaskingHome && model.object.isLaunching) + opacity: running + Behavior on opacity { FadeAnimation {} } + + // If the launcher icons use custom size scale the busy indicator accordingly to align dimensions + scale: (Theme.iconSizeLauncher / Theme.pixelRatio) / 86 + Label { + anchors.centerIn: parent + text: model.object.updatingProgress + '%' + visible: model.object.isUpdating && model.object.updatingProgress >= 0 && model.object.updatingProgress <= 100 + font.pixelSize: Theme.fontSizeSmall } } diff --git a/usr/share/lipstick-jolla-home-qt5/launcher/LauncherView.qml b/usr/share/lipstick-jolla-home-qt5/launcher/LauncherView.qml index ebe00fc3..975b3d79 100644 --- a/usr/share/lipstick-jolla-home-qt5/launcher/LauncherView.qml +++ b/usr/share/lipstick-jolla-home-qt5/launcher/LauncherView.qml @@ -5,13 +5,12 @@ * License: Proprietary */ -import QtQuick 2.0 +import QtQuick 2.6 import org.nemomobile.lipstick 0.1 import Sailfish.Silica 1.0 import Sailfish.Silica.private 1.0 import com.jolla.lipstick 0.1 import "../main" -import "../backgrounds" ApplicationWindow { id: launcherWindow @@ -22,12 +21,6 @@ ApplicationWindow { allowedOrientations: Lipstick.compositor.topmostWindowOrientation - children: MenuBackground { - z: -1 - - anchors.fill: parent - } - initialPage: Component { Page { id: page @@ -35,11 +28,27 @@ ApplicationWindow { layer.enabled: orientationTransitionRunning Launcher { + id: launcher + // We don't want the pager to resize due to keyboard being shown. height: Math.ceil(page.height + pageStack.panelSize) width: parent.width } + Binding { + when: !Lipstick.compositor.multitaskingHome + target: Lipstick.compositor.switcherLayer + property: "contentY" + value: { + if (launcher.openedChildFolder) { + var statusBar = Lipstick.compositor.homeLayer.statusBar + return statusBar.baseY + statusBar.height + } else { + return launcher.contentY + } + } + } + orientationTransitions: OrientationTransition { page: page applicationWindow: launcherWindow diff --git a/usr/share/lipstick-jolla-home-qt5/launcher/OpenFileDialog.qml b/usr/share/lipstick-jolla-home-qt5/launcher/OpenFileDialog.qml index 3101edc5..3e77e871 100644 --- a/usr/share/lipstick-jolla-home-qt5/launcher/OpenFileDialog.qml +++ b/usr/share/lipstick-jolla-home-qt5/launcher/OpenFileDialog.qml @@ -8,7 +8,7 @@ SystemWindow { id: root property string content - property bool isUri: true + property bool isGeoUri: openFileModel.url.toString().substring(0, 4) == "geo:" property real reservedHeight: ((Screen.sizeCategory < Screen.Large) ? 0.2 * Screen.height : 0.4 * Screen.height) - 1 property bool verticalOrientation: Lipstick.compositor.topmostWindowOrientation === Qt.PrimaryOrientation @@ -48,18 +48,22 @@ SystemWindow { bottomPadding: 0 title: openFileModel.isFile - //% "Open file" - ? qsTrId("lipstick-jolla-home-la-open_file") - //% "Open link" - : qsTrId("lipstick-jolla-home-la-open_link") + ? //% "Open file" + qsTrId("lipstick-jolla-home-la-open_file") + : root.isGeoUri + ? //% "Open location" + qsTrId("lipstick-jolla-home-la-open_location") + : //% "Open link" + qsTrId("lipstick-jolla-home-la-open_link") //% "Attempting to open" - description: qsTrId("lipstick-jolla-home-la-attempting_to_open_file") + description: root.isGeoUri ? "" : qsTrId("lipstick-jolla-home-la-attempting_to_open_file") } Label { x: (Screen.sizeCategory < Screen.Large) ? Theme.horizontalPageMargin : 0 // Match the padding inside SystemDialogHeader width: parent.width - (2 * x) + visible: !root.isGeoUri // not pretty enough to show color: Theme.highlightColor wrapMode: Text.Wrap maximumLineCount: 2 diff --git a/usr/share/lipstick-jolla-home-qt5/launcher/UninstallButton.qml b/usr/share/lipstick-jolla-home-qt5/launcher/UninstallButton.qml index cdaa07b3..7cf581c8 100644 --- a/usr/share/lipstick-jolla-home-qt5/launcher/UninstallButton.qml +++ b/usr/share/lipstick-jolla-home-qt5/launcher/UninstallButton.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.6 import Sailfish.Silica 1.0 Image { diff --git a/usr/share/lipstick-jolla-home-qt5/layers/AlarmLayer.qml b/usr/share/lipstick-jolla-home-qt5/layers/AlarmLayer.qml index a6237dee..f19d6114 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/AlarmLayer.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/AlarmLayer.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 import org.nemomobile.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/layers/AppLayer.qml b/usr/share/lipstick-jolla-home-qt5/layers/AppLayer.qml index 4d31d5a2..bbc98f7f 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/AppLayer.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/AppLayer.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 import Sailfish.Lipstick 1.0 @@ -22,7 +22,7 @@ StackLayer { onQueueWindow: { if (Desktop.startupWizardRunning) { if (JollaSystemInfo.matchingPidForCommand(window.window.processId, '/usr/bin/jolla-startupwizard', true) !== -1 - || JollaSystemInfo.matchingPidForCommand(window.window.processId, '/usr/bin/sailfish-browser', true) !== -1) { + || JollaSystemInfo.matchingPidForCommand(window.window.processId, '/usr/bin/sailfish-captiveportal', true) !== -1) { contentItem.appendItem(window) } } else if (!Desktop.instance.switcher.checkMinimized(window.window.windowId)) { diff --git a/usr/share/lipstick-jolla-home-qt5/layers/DialogLayer.qml b/usr/share/lipstick-jolla-home-qt5/layers/DialogLayer.qml index cc21a527..be78b3a5 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/DialogLayer.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/DialogLayer.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 import "../backgrounds" diff --git a/usr/share/lipstick-jolla-home-qt5/layers/EdgeLayer.qml b/usr/share/lipstick-jolla-home-qt5/layers/EdgeLayer.qml index bea6307e..36646713 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/EdgeLayer.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/EdgeLayer.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.6 import QtQuick.Window 2.1 as QtQuick import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 @@ -96,6 +96,7 @@ Layer { clip: edgeLayer._showActive || edgeLayer._hideActive || edgeLayer._smoothClip + || edgeLayer.pinned || (interactiveArea && interactiveArea.drag.active) || gestureTransition.running || visibleTransition.running diff --git a/usr/share/lipstick-jolla-home-qt5/layers/EventsLayer.qml b/usr/share/lipstick-jolla-home-qt5/layers/EventsLayer.qml index c9c2639b..dea928ea 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/EventsLayer.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/EventsLayer.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/layers/HomeLayer.qml b/usr/share/lipstick-jolla-home-qt5/layers/HomeLayer.qml index c1a64f26..77722439 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/HomeLayer.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/HomeLayer.qml @@ -5,11 +5,11 @@ * License: Proprietary */ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 import Nemo.DBus 2.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import com.jolla.lipstick 0.1 import Sailfish.Lipstick 1.0 import "../compositor" @@ -194,7 +194,8 @@ Pannable { SwitcherLayer { id: switcherLayer - readonly property real inactiveScale: Screen.sizeCategory >= Screen.Large ? 0.90 : 0.83 + readonly property real inactiveScale: Lipstick.compositor.multitaskingHome ? (Screen.sizeCategory >= Screen.Large ? 0.90 : 0.83) + : 1.0 readonly property bool moving: homescreen.moving || (Desktop.instance && Desktop.instance.switcher.moving) property bool inhibitScale diff --git a/usr/share/lipstick-jolla-home-qt5/layers/LauncherLayer.qml b/usr/share/lipstick-jolla-home-qt5/layers/LauncherLayer.qml index ec3926af..e0ec364c 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/LauncherLayer.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/LauncherLayer.qml @@ -1,7 +1,8 @@ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 import org.nemomobile.lipstick 0.1 +import "../backgrounds" EdgeLayer { id: launcherLayer @@ -110,6 +111,12 @@ EdgeLayer { hintDuration: 600 _finishDragWithAnimation: !pinned && !_wasPinning + MenuBackground { + z: -1 + anchors.fill: parent + parent: launcherLayer.contentItem + } + Timer { // long-press timer to detect pinning interval: 400 @@ -117,8 +124,10 @@ EdgeLayer { && (absoluteExposure > cellHeight/2 && (maximumExposure - absoluteExposure) > cellHeight/2) onRunningChanged: launcherLayer._startPinPosition = launcherLayer._transposed ? launcherLayer.x : launcherLayer.y onTriggered: { - launcherLayer.pinPosition = launcherLayer._transposed ? launcherLayer.x : launcherLayer.y - launcherLayer.pinned = true + if (Lipstick.compositor.multitaskingHome) { + launcherLayer.pinPosition = launcherLayer._transposed ? launcherLayer.x : launcherLayer.y + launcherLayer.pinned = true + } } } diff --git a/usr/share/lipstick-jolla-home-qt5/layers/Layer.qml b/usr/share/lipstick-jolla-home-qt5/layers/Layer.qml index 6a1da4b7..6dea9ef9 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/Layer.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/Layer.qml @@ -5,7 +5,7 @@ * License: Proprietary */ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 import com.jolla.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/layers/LayerEdgeIndicator.qml b/usr/share/lipstick-jolla-home-qt5/layers/LayerEdgeIndicator.qml index 55bc930b..5f7b2136 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/LayerEdgeIndicator.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/LayerEdgeIndicator.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.6 import Sailfish.Silica 1.0 Icon { diff --git a/usr/share/lipstick-jolla-home-qt5/layers/LayersParent.qml b/usr/share/lipstick-jolla-home-qt5/layers/LayersParent.qml index 396dc2e5..841458e8 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/LayersParent.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/LayersParent.qml @@ -1,4 +1,4 @@ -import QtQuick 2.2 +import QtQuick 2.6 import QtQuick.Window 2.2 as QtQuick Item { diff --git a/usr/share/lipstick-jolla-home-qt5/layers/LockScreenLayer.qml b/usr/share/lipstick-jolla-home-qt5/layers/LockScreenLayer.qml index ca4c6110..0211b34d 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/LockScreenLayer.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/LockScreenLayer.qml @@ -5,7 +5,7 @@ * License: Proprietary */ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 import com.jolla.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/layers/NotificationOverviewLayer.qml b/usr/share/lipstick-jolla-home-qt5/layers/NotificationOverviewLayer.qml index 028ea6ce..dabb9605 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/NotificationOverviewLayer.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/NotificationOverviewLayer.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 import com.jolla.lipstick 0.1 @@ -27,7 +27,7 @@ Layer { } exposed: { - if (!hasNotifications) { + if (!hasNotifications || !Lipstick.compositor.multitaskingHome) { return false } return (Lipstick.compositor.lockScreenLayer.exposed || Lipstick.compositor.homeVisible || lipstickSettings.lowPowerMode) @@ -176,6 +176,7 @@ Layer { anchors.verticalCenter: parent.verticalCenter showCount: Screen.sizeCategory >= Screen.Large || lockScreenLocked + maximumCount: Lipstick.compositor.experimentalFeatures.lockscreen_notification_count layer.enabled: lipstickSettings.lowPowerMode layer.effect: ShaderEffect { diff --git a/usr/share/lipstick-jolla-home-qt5/layers/OverlayLayer.qml b/usr/share/lipstick-jolla-home-qt5/layers/OverlayLayer.qml index 465afd61..4dafa81d 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/OverlayLayer.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/OverlayLayer.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 import com.jolla.lipstick 0.1 @@ -9,16 +9,9 @@ Item { property alias contentItem: overlayLayer onChildrenChanged: updateWindows() + z: 10000 // ensure on top of siblings after reparenting - readonly property Item activeFocusItem: root.activeFocusItem - // There's no notification for item flags, but the only known instances of - // ItemAcceptsInputMethod changing dynamically is the TextInput/Edit read only - // property. By including it in the binding we'll force a re-evaluation if - // the property both exists and changes. - && !root.activeFocusItem.readOnly - && JollaSystemInfo.itemAcceptsInputMethod(root.activeFocusItem) - ? root.activeFocusItem - : null + property Item activeFocusItem onActiveFocusItemChanged: { // Search for the layer of the focus item diff --git a/usr/share/lipstick-jolla-home-qt5/layers/PannableLayer.qml b/usr/share/lipstick-jolla-home-qt5/layers/PannableLayer.qml index 57cd306d..e3023bfb 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/PannableLayer.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/PannableLayer.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 import org.nemomobile.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/layers/PartnerLayer.qml b/usr/share/lipstick-jolla-home-qt5/layers/PartnerLayer.qml index cf9d4142..54c6ccf5 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/PartnerLayer.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/PartnerLayer.qml @@ -5,7 +5,7 @@ * License: Proprietary */ -import QtQuick 2.2 +import QtQuick 2.6 import QtQuick.Window 2.1 as QtQuick import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/layers/StackLayer.qml b/usr/share/lipstick-jolla-home-qt5/layers/StackLayer.qml index 046d84db..c56c25e3 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/StackLayer.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/StackLayer.qml @@ -5,7 +5,7 @@ * License: Proprietary */ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 import "../backgrounds" @@ -153,7 +153,8 @@ Layer { } function show(w, quick) { - if (quick === undefined) quick = false + if (quick === undefined) + quick = false if (Lipstick.compositor.debug) { console.log("StackLayer: Show window: \"", w, "\" current window: \"", window, "\"") console.log("StackLayer: Show active layer: \"", layer, "\" is active: ", active) diff --git a/usr/share/lipstick-jolla-home-qt5/layers/SwitcherLayer.qml b/usr/share/lipstick-jolla-home-qt5/layers/SwitcherLayer.qml index b6f1eadb..90058eaf 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/SwitcherLayer.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/SwitcherLayer.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 import com.jolla.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/layers/TopMenuLayer.qml b/usr/share/lipstick-jolla-home-qt5/layers/TopMenuLayer.qml index ebd46f09..56b08694 100644 --- a/usr/share/lipstick-jolla-home-qt5/layers/TopMenuLayer.qml +++ b/usr/share/lipstick-jolla-home-qt5/layers/TopMenuLayer.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 import org.nemomobile.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/lockscreen/Clock.qml b/usr/share/lipstick-jolla-home-qt5/lockscreen/Clock.qml index 5cf87b32..5da008e6 100644 --- a/usr/share/lipstick-jolla-home-qt5/lockscreen/Clock.qml +++ b/usr/share/lipstick-jolla-home-qt5/lockscreen/Clock.qml @@ -5,10 +5,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 -import org.nemomobile.time 1.0 +import Nemo.Time 1.0 import org.nemomobile.lipstick 0.1 import "../main" diff --git a/usr/share/lipstick-jolla-home-qt5/lockscreen/DeviceLockPrompt.qml b/usr/share/lipstick-jolla-home-qt5/lockscreen/DeviceLockPrompt.qml index fe63c910..7fdf74a7 100644 --- a/usr/share/lipstick-jolla-home-qt5/lockscreen/DeviceLockPrompt.qml +++ b/usr/share/lipstick-jolla-home-qt5/lockscreen/DeviceLockPrompt.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import com.jolla.settings.system 1.0 import com.jolla.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/lockscreen/DeviceLockView.qml b/usr/share/lipstick-jolla-home-qt5/lockscreen/DeviceLockView.qml index 9c4003ba..0ba634b0 100644 --- a/usr/share/lipstick-jolla-home-qt5/lockscreen/DeviceLockView.qml +++ b/usr/share/lipstick-jolla-home-qt5/lockscreen/DeviceLockView.qml @@ -7,13 +7,13 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import com.jolla.lipstick 0.1 import com.jolla.settings.system 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import org.nemomobile.devicelock 1.0 -import org.nemomobile.ngf 1.0 +import Nemo.Ngf 1.0 import org.nemomobile.lipstick 0.1 DeviceLockInput { @@ -29,15 +29,15 @@ DeviceLockInput { // Don't show emergency call button if device has no voice capability, in case something happen and // the value is undefined show it since this is critical functionality - showEmergencyButton: Desktop.simManager.enabledModems.length > 0 || !Desktop.simManager.ready + showEmergencyButton: Desktop.deviceInfo.hasCellularVoiceCallFeature && (Desktop.simManager.enabledModems.length > 0 || !Desktop.simManager.ready) focus: !Desktop.startupWizardRunning + pasteDisabled: true Timer { id: resetTimer interval: 300 onTriggered: { pininput.titleText = pininput.enterSecurityCode - pininput.lastChance = false pininput.emergency = false pininput._resetView() } diff --git a/usr/share/lipstick-jolla-home-qt5/lockscreen/EdgeIndicator.qml b/usr/share/lipstick-jolla-home-qt5/lockscreen/EdgeIndicator.qml index f0a46b7c..80e30864 100644 --- a/usr/share/lipstick-jolla-home-qt5/lockscreen/EdgeIndicator.qml +++ b/usr/share/lipstick-jolla-home-qt5/lockscreen/EdgeIndicator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/lockscreen/LockItem.qml b/usr/share/lipstick-jolla-home-qt5/lockscreen/LockItem.qml index f5e92756..71a4f3b0 100644 --- a/usr/share/lipstick-jolla-home-qt5/lockscreen/LockItem.qml +++ b/usr/share/lipstick-jolla-home-qt5/lockscreen/LockItem.qml @@ -7,13 +7,12 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Telephony 1.0 import Sailfish.Media 1.0 import Nemo.DBus 2.0 import com.jolla.lipstick 0.1 -import com.jolla.settings.system 1.0 import org.nemomobile.lipstick 0.1 import "../backgrounds" import "../main" @@ -27,7 +26,6 @@ SilicaFlickable { property alias mpris: mpris property alias leftIndicator: leftIndicator property alias rightIndicator: rightIndicator - property string iconSuffix property real contentTopMargin property int statusBarHeight @@ -306,7 +304,13 @@ SilicaFlickable { width: bottomBackground.width - OngoingCall { + Loader { + active: Desktop.deviceInfo.hasCellularVoiceCallFeature + width: parent.width + + sourceComponent: Component { + OngoingCall {} + } } Row { diff --git a/usr/share/lipstick-jolla-home-qt5/lockscreen/LockScreen.qml b/usr/share/lipstick-jolla-home-qt5/lockscreen/LockScreen.qml index def8c6ae..3927113c 100644 --- a/usr/share/lipstick-jolla-home-qt5/lockscreen/LockScreen.qml +++ b/usr/share/lipstick-jolla-home-qt5/lockscreen/LockScreen.qml @@ -5,16 +5,15 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import org.nemomobile.lipstick 0.1 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import org.nemomobile.devicelock 1.0 -import org.nemomobile.ngf 1.0 +import Nemo.Ngf 1.0 import Sailfish.Silica 1.0 -import Sailfish.Ambience 1.0 import com.jolla.lipstick 0.1 import Sailfish.Lipstick 1.0 -import org.nemomobile.notifications 1.0 +import Nemo.Notifications 1.0 import "../compositor" import "../main" import "../statusarea" @@ -40,6 +39,12 @@ ApplicationWindow { property bool vignetteActive + // This must be synchronized with tk_lock state. Hence, connect to + // device lock state reported by Desktop.qml that is from system bus. + readonly property bool systemStartedAndUnlocked: systemStarted.value && Desktop.deviceLockState === DeviceLock.Unlocked + readonly property bool deviceLockCodeInUse: DeviceLock.automaticLocking != -1 + readonly property bool dismissLockscreenOnBootup: Lipstick.compositor.experimentalFeatures.dismiss_lockscreen_on_bootup + palette.colorScheme: lockScreen.lowPowerMode ? Theme.LightOnDark : undefined onVignetteActiveChanged: { @@ -54,7 +59,7 @@ ApplicationWindow { id: systemStarted value: (!startupWizardExpiry.running || Lipstick.compositor.appLayer.opaque) - && (PinQueryAgent.simStatus != PinQueryAgent.SimUndefined || PinQueryAgent.simPinCompleted) + && (PinQueryAgent.simStatus != PinQueryAgent.SimUndefined || PinQueryAgent.simPinCompleted) } Timer { @@ -99,7 +104,8 @@ ApplicationWindow { lockScreen.nextPannableItem(false, false) } else { lockScreen.reset() - if (Lipstick.compositor.showDeviceLock && deviceLockItem.locked) { + if (Lipstick.compositor.pendingShowUnlockScreen && deviceLockItem.locked) { + Lipstick.compositor.pendingShowUnlockScreen = false lockScreen.nextPannableItem(false, true) } } @@ -152,7 +158,7 @@ ApplicationWindow { if (lipstickSettings.lockscreenVisible && !Lipstick.compositor.cameraLayer.active) { Lipstick.compositor.setCurrentWindow(Lipstick.compositor.lockScreenLayer.window) } else if (!lipstickSettings.lockscreenVisible && Desktop.deviceLockState == DeviceLock.Locked) { - Lipstick.compositor.showDeviceLock = true + Lipstick.compositor.pendingShowUnlockScreen = true } } } @@ -275,22 +281,24 @@ ApplicationWindow { } } - Connections { - target: Desktop - - // This must be synchronized with tk_lock state. Hence, connect to - // device lock state reported by Desktop.qml that is from system bus. - onDeviceLockStateChanged: { - if (systemStarted.value && Desktop.deviceLockState === DeviceLock.Unlocked) { - if (!DeviceLock.enabled) { + onSystemStartedAndUnlockedChanged: { + if (systemStartedAndUnlocked) { + if (!deviceLockCodeInUse) { + // We can end up here only due to the singular Undefined -> Unlocked device lock state + // transition that is seen during lipstick startup when device lock code is not in use + if (dismissLockscreenOnBootup) { + // Optional behvior selectable via dconf: land to home/launcher + lockScreen.unlock(false) + } else { + // Default behevior: land to lockscreen if (deviceLockContainer.isCurrentItem) { lockScreen.setCurrentItem(lockContainer, lockScreen.visible) } - } else if (!lockScreen.nextPannableItem(true, false)) { - lockScreen.unlock(true) - } else if (lockScreen.pinQueryPannable) { - lockScreen.pinQueryPannable.deviceWasLocked = true } + } else if (!lockScreen.nextPannableItem(true, false)) { + lockScreen.unlock(true) + } else if (lockScreen.pinQueryPannable) { + lockScreen.pinQueryPannable.deviceWasLocked = true } } } @@ -315,14 +323,13 @@ ApplicationWindow { lockScreen.nextPannableItem(false, false) lockScreen.open(false) - if (lockedOut ) { + if (lockedOut) { lipstickSettings.lockScreen(true) } } else { lockScreen.activate(lockScreenPage.vignetteActive) lipstickSettings.lockScreen(true) } - } onNotice: { @@ -397,9 +404,6 @@ ApplicationWindow { readonly property bool pendingPannableItem: deviceLockItem.locked || needPinQuery - // Suffix that should be added to all theme icons that are shown in low power mode - property string iconSuffix: lipstickSettings.lowPowerMode ? ('?' + Theme.highlightColor) : '' - property color textColor: Lipstick.compositor.lockScreenLayer.textColor readonly property bool locked: lipstickSettings.lockscreenVisible || Desktop.deviceLockState >= DeviceLock.Locked @@ -600,7 +604,6 @@ ApplicationWindow { visible: systemStarted.value allowAnimations: Lipstick.compositor.lockScreenLayer.vignette.opened - iconSuffix: lockScreen.iconSuffix clock.followPeekPosition: !parent.rightItem Binding { target: lockItem.mpris.item; property: "enabled"; value: !lockScreen.lowPowerMode } @@ -652,7 +655,7 @@ ApplicationWindow { && item.authenticationInput.status !== AuthenticationInput.Idle ? 1 : 0 - headingVerticalOffset: statusBar.y + statusBar.height + Theme.paddingLarge + headingVerticalOffset: statusBar.y + statusBar.height enabled: locked && !lockScreen.moving && deviceLockContainer.isCurrentItem focus: !Desktop.startupWizardRunning diff --git a/usr/share/lipstick-jolla-home-qt5/lockscreen/OngoingCall.qml b/usr/share/lipstick-jolla-home-qt5/lockscreen/OngoingCall.qml index f4155a26..090f1d81 100644 --- a/usr/share/lipstick-jolla-home-qt5/lockscreen/OngoingCall.qml +++ b/usr/share/lipstick-jolla-home-qt5/lockscreen/OngoingCall.qml @@ -12,10 +12,10 @@ import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 import Sailfish.Media 1.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 import Nemo.DBus 2.0 import org.nemomobile.lipstick 0.1 -import org.nemomobile.policy 1.0 +import Nemo.Policy 1.0 import com.jolla.lipstick 0.1 BackgroundItem diff --git a/usr/share/lipstick-jolla-home-qt5/lockscreen/SneakPeekHint.qml b/usr/share/lipstick-jolla-home-qt5/lockscreen/SneakPeekHint.qml index ff165c86..3059c0a1 100644 --- a/usr/share/lipstick-jolla-home-qt5/lockscreen/SneakPeekHint.qml +++ b/usr/share/lipstick-jolla-home-qt5/lockscreen/SneakPeekHint.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/lockscreen/Vignette.qml b/usr/share/lipstick-jolla-home-qt5/lockscreen/Vignette.qml index 159fabd4..b5760612 100644 --- a/usr/share/lipstick-jolla-home-qt5/lockscreen/Vignette.qml +++ b/usr/share/lipstick-jolla-home-qt5/lockscreen/Vignette.qml @@ -5,7 +5,7 @@ * License: Proprietary */ -import QtQuick 2.2 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/lockscreen/WeatherIndicator.qml b/usr/share/lipstick-jolla-home-qt5/lockscreen/WeatherIndicator.qml index c74913de..2ac48efc 100644 --- a/usr/share/lipstick-jolla-home-qt5/lockscreen/WeatherIndicator.qml +++ b/usr/share/lipstick-jolla-home-qt5/lockscreen/WeatherIndicator.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Weather 1.0 as Weather import org.nemomobile.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/lockscreen/WeatherIndicatorLoader.qml b/usr/share/lipstick-jolla-home-qt5/lockscreen/WeatherIndicatorLoader.qml index bbaf95e2..9fff500b 100644 --- a/usr/share/lipstick-jolla-home-qt5/lockscreen/WeatherIndicatorLoader.qml +++ b/usr/share/lipstick-jolla-home-qt5/lockscreen/WeatherIndicatorLoader.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 import com.jolla.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/main.qml b/usr/share/lipstick-jolla-home-qt5/main.qml index 72dd30b1..c7ae9777 100644 --- a/usr/share/lipstick-jolla-home-qt5/main.qml +++ b/usr/share/lipstick-jolla-home-qt5/main.qml @@ -5,14 +5,14 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.6 import QtFeedback 5.0 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 import org.nemomobile.lipstick 0.1 import Nemo.DBus 2.0 -import org.nemomobile.notifications 1.0 as Nemo -import org.nemomobile.configuration 1.0 +import Nemo.Notifications 1.0 as Nemo +import Nemo.Configuration 1.0 import com.jolla.lipstick 0.1 import "main" @@ -61,9 +61,8 @@ ApplicationWindow { allowedOrientations: Orientation.All property alias switcher: switcher - property bool coversVisible: Lipstick.compositor.switcherLayer.visible - readonly property bool active: Lipstick.compositor.switcherLayer.active && Lipstick.compositor.systemInitComplete + onActiveChanged: { if (!active) { hintTimer.stop() @@ -79,8 +78,8 @@ ApplicationWindow { } } - onCoversVisibleChanged: { - if (coversVisible) { + onVisibleChanged: { + if (visible) { CoverControl.status = Cover.Activating CoverControl.status = Cover.Active } else { @@ -105,7 +104,11 @@ ApplicationWindow { Timer { id: hintTimer interval: 1000 - onTriggered: if (!Lipstick.compositor.topMenuHinting) Lipstick.compositor.launcherLayer.showHint() + onTriggered: { + if (!Lipstick.compositor.topMenuHinting && Lipstick.compositor.multitaskingHome) { + Lipstick.compositor.launcherLayer.showHint() + } + } } Switcher { @@ -114,6 +117,7 @@ ApplicationWindow { } Binding { + when: Lipstick.compositor.multitaskingHome target: Lipstick.compositor.switcherLayer property: "contentY" value: switcher.contentY @@ -153,19 +157,23 @@ ApplicationWindow { onCancelTransfer: bluetoothObexSystemAgent.cancelTransfer(transferPath) } - VoicecallAgent { - onDialNumber: voicecall.dial(number) - } + Loader { + active: Desktop.deviceInfo.hasCellularVoiceCallFeature + sourceComponent: Component { + VoicecallAgent { + property QtObject voicecall: DBusInterface { + service: "com.jolla.voicecall.ui" + path: "/" + iface: "com.jolla.voicecall.ui" - DBusInterface { - id: voicecall - service: "com.jolla.voicecall.ui" - path: "/" - iface: "com.jolla.voicecall.ui" - - function dial(number) { - call('dial', number) - } + function dial(number) { + call('dial', number) + } + } + + onDialNumber: voicecall.dial(number) + } + } } ShutterKeyHandler { diff --git a/usr/share/lipstick-jolla-home-qt5/main/ConnectionManager.qml b/usr/share/lipstick-jolla-home-qt5/main/ConnectionManager.qml index 737c91b0..24b47a02 100644 --- a/usr/share/lipstick-jolla-home-qt5/main/ConnectionManager.qml +++ b/usr/share/lipstick-jolla-home-qt5/main/ConnectionManager.qml @@ -1,6 +1,6 @@ pragma Singleton -import QtQuick 2.2 -import MeeGo.Connman 0.2 +import QtQuick 2.6 +import Connman 0.2 QtObject { property alias cellularPath: networkManager.CellularTechnology diff --git a/usr/share/lipstick-jolla-home-qt5/main/Desktop.qml b/usr/share/lipstick-jolla-home-qt5/main/Desktop.qml index 7c130501..0051c025 100644 --- a/usr/share/lipstick-jolla-home-qt5/main/Desktop.qml +++ b/usr/share/lipstick-jolla-home-qt5/main/Desktop.qml @@ -14,8 +14,9 @@ import Sailfish.Silica.Background 1.0 import Sailfish.Telephony 1.0 import Nemo.DBus 2.0 import Nemo.FileManager 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import org.nemomobile.devicelock 1.0 +import org.nemomobile.systemsettings 1.0 import com.jolla.lipstick 0.1 QtObject { @@ -67,7 +68,7 @@ QtObject { property var startupWizardDoneWatcher: FileWatcher { Component.onCompleted: { - var markerFile = StandardPaths.home + "/.jolla-startupwizard-usersession-done" + var markerFile = StandardPaths.home + "/.config/jolla-startupwizard-usersession-done" if (!testFileExists(markerFile)) { fileName = markerFile } @@ -105,6 +106,10 @@ QtObject { Component.onCompleted: getDeviceLockState() } + property QtObject deviceInfo: DeviceInfo { + readonly property bool hasCellularVoiceCallFeature: hasFeature(DeviceInfo.FeatureCellularVoice) + } + property QtObject pendingWindowPrompt: ConfigurationValue { key: "/desktop/lipstick-jolla-home/windowprompt/pending" defaultValue: [] @@ -112,9 +117,19 @@ QtObject { property bool windowPromptPending: pendingWindowPrompt.value.length > 0 + // allow forcing the loading while we have it otherwise disabled + property QtObject forceWeather: ConfigurationValue { + key: "/desktop/lipstick-jolla-home/force_weather_loading" + defaultValue: false + } + property bool weatherAvailable + // some file of the app that ensures it's installed + readonly property string weatherAppFile: StandardPaths.qmlImportPath + "org/sailfishos/weather/settings/qmldir" function refreshWeatherAvailable() { - weatherAvailable = fileUtils.exists(StandardPaths.resolveImport("Sailfish.Weather.WeatherIndicator")) + // hide weather due to foreca not working + //weatherAvailable = fileUtils.exists(weatherAppFile) + weatherAvailable = forceWeather.value } property FileUtils fileUtils: FileUtils { } diff --git a/usr/share/lipstick-jolla-home-qt5/main/EditableGridDelegate.qml b/usr/share/lipstick-jolla-home-qt5/main/EditableGridDelegate.qml index fa2b223d..b9dceded 100644 --- a/usr/share/lipstick-jolla-home-qt5/main/EditableGridDelegate.qml +++ b/usr/share/lipstick-jolla-home-qt5/main/EditableGridDelegate.qml @@ -5,7 +5,7 @@ * License: Proprietary */ -import QtQuick 2.1 +import QtQuick 2.6 import org.nemomobile.lipstick 0.1 import Sailfish.Silica 1.0 import Sailfish.Silica.private 1.0 @@ -29,7 +29,7 @@ Item { property bool dragged property bool animateMovement: true - property real offsetY: y + property real targetY: y property alias contentItem: delegateContentItem default property alias _content: delegateContentItem.data @@ -95,7 +95,7 @@ Item { if (_viewWidth !== manager.view.width) { // Don't animate when created or view is resized delegateContentItem.x = wrapper.x - delegateContentItem.y = wrapper.offsetY + delegateContentItem.y = wrapper.targetY _viewWidth = manager.view.width _oldY = y } else if (!reordering) { @@ -169,7 +169,7 @@ Item { } if (item && item !== wrapper && item.y !== wrapper.y) { - var yDist = item.y - offsetY + var yDist = item.y - targetY if (Math.abs(yDist) <= item.height - height/2) { // Our items have differing heights and we don't have enough overlap yet return @@ -188,12 +188,12 @@ Item { var folderThreshold = manager.supportsFolders && !isFolder ? item.width / 4 : item.width / 2 if (offset < folderThreshold) { - if (Math.abs(index - item.modelIndex) > 1 || index > item.modelIndex || item.y !== wrapper.offsetY) { + if (Math.abs(index - item.modelIndex) > 1 || index > item.modelIndex || item.y !== wrapper.targetY) { idx = index < item.modelIndex ? item.modelIndex - 1 : item.modelIndex manager.folderItem = null } } else if (offset >= item.width - folderThreshold) { - if (Math.abs(index - item.modelIndex) > 1 || index < item.modelIndex || item.y !== wrapper.offsetY) { + if (Math.abs(index - item.modelIndex) > 1 || index < item.modelIndex || item.y !== wrapper.targetY) { idx = index > item.modelIndex ? item.modelIndex + 1 : item.modelIndex manager.folderItem = null } @@ -242,7 +242,7 @@ Item { objectName: "EditableGridDelegate_contentItem" x: wrapper.x - y: wrapper.offsetY + y: wrapper.targetY width: wrapper.width height: wrapper.height parent: manager.contentContainer @@ -306,7 +306,7 @@ Item { moveTimer.running = true manager.reorderTimer.stop() } - onOffsetYChanged: { + onTargetYChanged: { moveTimer.running = true } } @@ -319,25 +319,25 @@ Item { ParallelAnimation { id: slideMoveAnim NumberAnimation { target: delegateContentItem; property: "x"; to: wrapper.x; duration: 150; easing.type: Easing.InOutQuad } - NumberAnimation { target: delegateContentItem; property: "y"; to: wrapper.offsetY; duration: 150; easing.type: Easing.InOutQuad } + NumberAnimation { target: delegateContentItem; property: "y"; to: wrapper.targetY; duration: 150; easing.type: Easing.InOutQuad } onStopped: { // This is a safeguard. If the animation is canceled make sure the icon is left in // the correct state. delegateContentItem.x = wrapper.x - delegateContentItem.y = wrapper.offsetY + delegateContentItem.y = wrapper.targetY } } SequentialAnimation { id: fadeMoveAnim NumberAnimation { target: delegateContentItem; property: "opacity"; to: 0; duration: 75 } - ScriptAction { script: { delegateContentItem.x = wrapper.x; delegateContentItem.y = wrapper.offsetY } } + ScriptAction { script: { delegateContentItem.x = wrapper.x; delegateContentItem.y = wrapper.targetY } } NumberAnimation { target: delegateContentItem; property: "opacity"; to: 1.0; duration: 75 } onStopped: { // This is a safeguard. If the animation is canceled make sure the icon is left in // the correct state. delegateContentItem.x = wrapper.x - delegateContentItem.y = wrapper.offsetY + delegateContentItem.y = wrapper.targetY delegateContentItem.opacity = 1.0 } } diff --git a/usr/share/lipstick-jolla-home-qt5/main/EditableGridManager.qml b/usr/share/lipstick-jolla-home-qt5/main/EditableGridManager.qml index b929ad83..f2e35cba 100644 --- a/usr/share/lipstick-jolla-home-qt5/main/EditableGridManager.qml +++ b/usr/share/lipstick-jolla-home-qt5/main/EditableGridManager.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.6 QtObject { property Item view diff --git a/usr/share/lipstick-jolla-home-qt5/main/OrientationTransition.qml b/usr/share/lipstick-jolla-home-qt5/main/OrientationTransition.qml index 4c2620bc..4038e7b3 100644 --- a/usr/share/lipstick-jolla-home-qt5/main/OrientationTransition.qml +++ b/usr/share/lipstick-jolla-home-qt5/main/OrientationTransition.qml @@ -1,4 +1,4 @@ -import QtQuick 2.2 +import QtQuick 2.6 import Sailfish.Silica 1.0 Transition { diff --git a/usr/share/lipstick-jolla-home-qt5/main/PeekArea.qml b/usr/share/lipstick-jolla-home-qt5/main/PeekArea.qml index 3372b9c0..b7de792f 100644 --- a/usr/share/lipstick-jolla-home-qt5/main/PeekArea.qml +++ b/usr/share/lipstick-jolla-home-qt5/main/PeekArea.qml @@ -5,7 +5,7 @@ * License: Proprietary */ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 import org.nemomobile.lipstick 0.1 @@ -201,6 +201,7 @@ Item { ParallelAnimation { id: resetAnimation + running: false NumberAnimation { @@ -219,6 +220,7 @@ Item { FadeAnimation { id: fadeOut + target: peekArea duration: clipEndAnimation.duration to: peekArea.closing ? 0 : 1 diff --git a/usr/share/lipstick-jolla-home-qt5/main/PeekAreaFilter.qml b/usr/share/lipstick-jolla-home-qt5/main/PeekAreaFilter.qml index e9908bcc..dcd25983 100644 --- a/usr/share/lipstick-jolla-home-qt5/main/PeekAreaFilter.qml +++ b/usr/share/lipstick-jolla-home-qt5/main/PeekAreaFilter.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Lipstick 1.0 PeekFilter { diff --git a/usr/share/lipstick-jolla-home-qt5/main/WallpaperPath.qml b/usr/share/lipstick-jolla-home-qt5/main/WallpaperPath.qml index 25802d82..541eca74 100644 --- a/usr/share/lipstick-jolla-home-qt5/main/WallpaperPath.qml +++ b/usr/share/lipstick-jolla-home-qt5/main/WallpaperPath.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.6 QtObject { id: wallpaperPath diff --git a/usr/share/lipstick-jolla-home-qt5/nfc/NfcDialog.qml b/usr/share/lipstick-jolla-home-qt5/nfc/NfcDialog.qml index 3f5ec93d..edb60e77 100644 --- a/usr/share/lipstick-jolla-home-qt5/nfc/NfcDialog.qml +++ b/usr/share/lipstick-jolla-home-qt5/nfc/NfcDialog.qml @@ -65,7 +65,7 @@ SystemWindow { //% "NFC tag detected" title: qsTrId("lipstick-jolla-home-nfc_tag_detected") - topPadding: transpose ? Theme.paddingLarge : 2*Theme.paddingLarge + semiTight: true } Label { diff --git a/usr/share/lipstick-jolla-home-qt5/notifications/AmbiencePreview.qml b/usr/share/lipstick-jolla-home-qt5/notifications/AmbiencePreview.qml deleted file mode 100644 index fdbace83..00000000 --- a/usr/share/lipstick-jolla-home-qt5/notifications/AmbiencePreview.qml +++ /dev/null @@ -1,118 +0,0 @@ -import QtQuick 2.0 -import Sailfish.Silica 1.0 -import Sailfish.Ambience 1.0 -import org.nemomobile.lipstick 0.1 - -Item { - id: ambiencePreview - property alias displayName: displayNameLabel.text - property alias coverImage: image.source - - signal finished - - width: 4 * Theme.itemSizeExtraLarge - height: Screen.sizeCategory >= Screen.Large - ? Theme.itemSizeExtraLarge + (2 * Theme.paddingLarge) - : Screen.height / 5 - visible: peekAnimation.running - y: -height - - property bool _pending - property bool _topMenuExposed: Lipstick.compositor.topMenuLayer.exposed - - function show() { - _pending = false - if (image.status === Image.Ready) { - peekAnimation.restart() - } else if (image.status === Image.Loading) { - _pending = true - } else { - finished() - } - } - - on_TopMenuExposedChanged: { - if (peekAnimation.running && _topMenuExposed) { - peekAnimation.stop() - } - } - - SequentialAnimation { - id: peekAnimation - alwaysRunToEnd: true - - NumberAnimation { - target: ambiencePreview - property: "y" - from: -height - to: 0 - duration: 300 - easing.type: Easing.OutQuad - } - PauseAnimation { - duration: 2000 - } - NumberAnimation { - target: ambiencePreview - property: "y" - from: 0 - to: -height - duration: 300 - easing.type: Easing.InQuad - } - ScriptAction { - script: finished() - } - } - - Image { - id: image - anchors.fill: parent - clip: true - fillMode: Image.PreserveAspectCrop - sourceSize { width: width; height: height } - smooth: true - asynchronous: true - - onStatusChanged: { - if (_pending) { - if (status === Image.Ready) { - _pending = false - peekAnimation.restart() - } else if (status === Image.Error || status === Image.Null) { - _pending = false - finished() - } - } - } - - Rectangle { - anchors.fill: parent - color: Theme.rgba(Theme.highlightDimmerColor, Theme.opacityHigh) - } - - BusyIndicator { - anchors.centerIn: parent - size: BusyIndicatorSize.Medium - running: true - } - } - - Label { - id: displayNameLabel - anchors { - left: parent.left - leftMargin: Theme.paddingLarge - right: parent.right - rightMargin: Theme.paddingLarge - bottom: parent.bottom - bottomMargin: Theme.paddingMedium - } - font.pixelSize: Theme.fontSizeLarge - horizontalAlignment: Text.AlignLeft - wrapMode: Text.Wrap - maximumLineCount: 2 - truncationMode: TruncationMode.Elide - color: Theme.highlightColor - } -} diff --git a/usr/share/lipstick-jolla-home-qt5/notifications/NotificationActionRow.qml b/usr/share/lipstick-jolla-home-qt5/notifications/NotificationActionRow.qml index cd7d96fe..c30c2bb0 100644 --- a/usr/share/lipstick-jolla-home-qt5/notifications/NotificationActionRow.qml +++ b/usr/share/lipstick-jolla-home-qt5/notifications/NotificationActionRow.qml @@ -6,13 +6,16 @@ import QtQuick 2.6 import Sailfish.Silica 1.0 +import org.nemomobile.lipstick 0.1 -Grid { +Item { id: root + property QtObject notification property bool active: true property alias count: repeater.count property alias animating: heightAnimation.running + property int textAreaMaxHeight: Screen.height property int visibleCount: { var count = 0 if (notification) { @@ -27,33 +30,52 @@ Grid { return count } - signal actionInvoked(string actionName) + signal actionInvoked(string actionName, string actionText) - property bool _active: active && visibleCount > 0 - property int _totalWidth - property int _currentMaxButtonWidth: Theme.buttonWidthExtraSmall + property bool replyActivationPending + property bool replyTextActive + onReplyTextActiveChanged: { + if (replyTextActive) { + replyTextLoader.active = true + } + } - on_ActiveChanged: if (_active) repeater.model = notification.remoteActions - Component.onCompleted: if (_active) repeater.model = notification.remoteActions + property string currentTextActionName + property var currentTextAction: { + if (notification && currentTextActionName != "") { + var actions = notification.remoteActions + for (var i = 0; i < actions.length; i++) { + var action = actions[i] + if (action.name === currentTextActionName) { + return action + } + } + } + return null + } + + onActiveChanged: { + if (!active) { + replyTextActive = false + } + } + + onNotificationChanged: { + if (buttonGrid._active && notification) { + repeater.model = notification.remoteActions + } + } - function calculateTotalWidth() { - var maxButtonWidth = 0 - var width = 0 - for (var i = 0; i < count; i++) { - var button = repeater.itemAt(i) - if (button && button.text.length > 0) { - width = width + button.implicitWidth + spacing - maxButtonWidth = Math.max(maxButtonWidth, button.implicitWidth) + Connections { + target: notification + onRemoteActionsChanged: { + if (buttonGrid._active) { + repeater.model = notification.remoteActions } } - _currentMaxButtonWidth = maxButtonWidth - _totalWidth = width } - spacing: Theme.paddingMedium - horizontalItemAlignment: Grid.AlignRight - columns: _totalWidth > parent.width ? 1 : visibleCount - height: _active ? implicitHeight : 0 + height: replyTextActive ? replyTextLoader.height : buttonGrid.height Behavior on height { NumberAnimation { id: heightAnimation @@ -62,29 +84,149 @@ Grid { } } - opacity: _active ? 1.0 : 0.0 - Behavior on opacity { FadeAnimator {}} - enabled: _active + function reset() { + currentTextActionName = "" + replyTextActive = false + } - Repeater { - id: repeater + Grid { + id: buttonGrid - delegate: SecondaryButton { - preferredWidth: Theme.buttonWidthExtraSmall - text: modelData.name !== "default" && modelData.name !== "app" - ? (modelData.displayName || "") - : "" - visible: text.length > 0 - onImplicitWidthChanged: calculateTotalWidth() + property bool _active: notification && active && visibleCount > 0 && !root.replyTextActive + property int _totalWidth + property int _currentMaxButtonWidth: Theme.buttonWidthExtraSmall - width: columns === 1 ? _currentMaxButtonWidth : implicitWidth + on_ActiveChanged: if (_active) repeater.model = notification.remoteActions + Component.onCompleted: if (_active) repeater.model = notification.remoteActions - onClicked: root.actionInvoked(modelData.name) + function calculateTotalWidth() { + var maxButtonWidth = 0 + var width = 0 + for (var i = 0; i < count; i++) { + var button = repeater.itemAt(i) + if (button && button.text.length > 0) { + width = width + button.implicitWidth + spacing + maxButtonWidth = Math.max(maxButtonWidth, button.implicitWidth) + } + } + _currentMaxButtonWidth = maxButtonWidth + _totalWidth = width + } + + spacing: Theme.paddingMedium + anchors.right: parent.right + columns: _totalWidth > parent.width ? 1 : visibleCount + height: _active ? implicitHeight : 0 + + opacity: _active ? 1.0 : 0.0 + Behavior on opacity { FadeAnimator {}} + enabled: _active + Repeater { + id: repeater + + delegate: SecondaryButton { + // on phone sized displays, try to squeeze in multiple buttons to fit on one line + preferredWidth: (root.visibleCount > 2 && Screen.sizeCategory < Screen.Large) + ? Theme.buttonWidthTiny : Theme.buttonWidthExtraSmall + text: modelData.name !== "default" && modelData.name !== "app" + ? (modelData.displayName || "") + : "" + visible: text.length > 0 + onImplicitWidthChanged: buttonGrid.calculateTotalWidth() + + width: buttonGrid.columns === 1 ? buttonGrid._currentMaxButtonWidth : implicitWidth + + onClicked: { + if (modelData.type === "input") { + root.currentTextActionName = modelData.name + if (Lipstick.compositor.lockScreenLayer.lockScreenEventsEnabled) { + root.replyActivationPending = true + Lipstick.compositor.unlock() + } else { + root.replyTextActive = true + } + } else { + root.actionInvoked(modelData.name, "") + } + } + } } } Connections { - target: notification - onRemoteActionsChanged: if (_active) repeater.model = notification.remoteActions + target: Lipstick.compositor.lockScreenLayer + onDeviceIsLockedChanged: { + if (root.replyActivationPending && !Lipstick.compositor.lockScreenLayer.deviceIsLocked) { + root.replyTextActive = true + root.replyActivationPending = false + } + } + onShowingLockCodeEntryChanged: { + if (!Lipstick.compositor.lockScreenLayer.showingLockCodeEntry) { + root.replyActivationPending = false + } + } + } + + Loader { + id: replyTextLoader + + active: false + sourceComponent: replyTextComponent + } + + Component { + id: replyTextComponent + + Item { + opacity: root.replyTextActive ? 1.0 : 0.0 + Behavior on opacity { FadeAnimation {} } + visible: opacity > 0 + width: root.width + height: Math.max(actionTextArea.height, actionTextEnter.height + 2*Theme.paddingSmall) + + TextArea { + id: actionTextArea + + textLeftMargin: 0 + textRightMargin: Theme.paddingMedium + height: Math.min(implicitHeight, Theme.itemSizeLarge*2, root.textAreaMaxHeight) + anchors.left: parent.left + anchors.right: actionTextEnter.left + placeholderText: root.currentTextAction ? root.currentTextAction.displayName : "" + labelVisible: false // the placeholder is enough + // avoid implicit inverted color on the keyboard side just because a popup might have such + _keyboardPalette: "" + _appWindow: undefined // suppress warnings + + Component.onCompleted: forceActiveFocus() + } + + Button { + id: actionTextEnter + + height: implicitHeight + 2*Theme.paddingSmall + enabled: actionTextArea.text != "" + icon.source: "image://theme/icon-m-send" + anchors.right: parent.right + anchors.bottom: parent.bottom + anchors.bottomMargin: Theme.paddingSmall + + onClicked: { + root.actionInvoked(root.currentTextActionName, actionTextArea.text) + actionTextArea.text = "" + } + } + + Connections { + target: root + onCurrentTextActionNameChanged: actionTextArea.text = "" + onReplyTextActiveChanged: { + if (root.replyTextActive) { + actionTextArea.forceActiveFocus() + } + } + } + } } } diff --git a/usr/share/lipstick-jolla-home-qt5/notifications/NotificationColumn.qml b/usr/share/lipstick-jolla-home-qt5/notifications/NotificationColumn.qml index 331cf3df..eddc82c5 100644 --- a/usr/share/lipstick-jolla-home-qt5/notifications/NotificationColumn.qml +++ b/usr/share/lipstick-jolla-home-qt5/notifications/NotificationColumn.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 import com.jolla.lipstick 0.1 @@ -16,6 +16,7 @@ import "../main" Column { id: root property bool showCount + property alias maximumCount: boundedModel.maximumCount readonly property bool hasNotifications: repeater.count > 0 diff --git a/usr/share/lipstick-jolla-home-qt5/notifications/NotificationListView.qml b/usr/share/lipstick-jolla-home-qt5/notifications/NotificationListView.qml index e62b352e..20c05a48 100644 --- a/usr/share/lipstick-jolla-home-qt5/notifications/NotificationListView.qml +++ b/usr/share/lipstick-jolla-home-qt5/notifications/NotificationListView.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.6 import org.nemomobile.lipstick 0.1 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 diff --git a/usr/share/lipstick-jolla-home-qt5/notifications/NotificationPreview.qml b/usr/share/lipstick-jolla-home-qt5/notifications/NotificationPreview.qml index 3193cd2d..8b122752 100644 --- a/usr/share/lipstick-jolla-home-qt5/notifications/NotificationPreview.qml +++ b/usr/share/lipstick-jolla-home-qt5/notifications/NotificationPreview.qml @@ -18,10 +18,11 @@ import "../systemwindow" SystemWindow { id: notificationWindow + property bool active property QtObject notification: notificationPreviewPresenter.notification property bool showNotification: notification != null && (notification.previewBody || notification.previewSummary) - property string summaryText: showNotification ? notification.previewSummary : "" - property string bodyText: showNotification ? notification.previewBody : "" + property string summaryText: (showNotification && notification) ? notification.previewSummary : "" + property string bodyText: (showNotification && notification) ? notification.previewBody : "" // we didn't earlier use app name on the popup so there can be transient notification that have only inferred // name set. As that's not always correct, showing transient notification name only if it's explicitly set. property string appNameText: notification != null ? (notification.isTransient ? notification.explicitAppName @@ -35,7 +36,17 @@ SystemWindow { property bool _invoked property string pendingAction + property string pendingActionText property QtObject pendingNotification + property int _availableHeight: notificationWindow.height + - (notificationWindow.transpose + ? Qt.inputMethod.keyboardRectangle.width + : Qt.inputMethod.keyboardRectangle.height) + property int _biggestCorner: Math.max(Screen.topLeftCorner.radius, + Screen.topRightCorner.radius, + Screen.bottomLeftCorner.radius, + Screen.bottomRightCorner.radius) + Binding { // Invocation typically closes the notification, so bind the current values @@ -89,13 +100,14 @@ SystemWindow { return -1 } - function _triggerAction(actionName) { + function _triggerAction(actionName, actionText) { if (Desktop.deviceLockState !== DeviceLock.Unlocked) { pendingAction = actionName + pendingActionText = actionText ? actionText : "" pendingNotification = notification } else { notificationWindow._invoked = true - notification.actionInvoked(actionName) + notification.actionInvoked(actionName, actionText) } // Always hide the notification preview after it is tapped @@ -105,10 +117,10 @@ SystemWindow { Lipstick.compositor.unlock() } - onVisibleChanged: if (!visible) popupArea.expanded = false + onActiveChanged: if (!active) popupArea.expanded = false opacity: 0 - visible: false + visible: active && !actionRow.replyActivationPending InverseMouseArea { id: outsideArea @@ -116,7 +128,12 @@ SystemWindow { anchors.fill: popupArea enabled: false - onPressedOutside: if (popupArea.expanded) notificationWindow.notificationExpired() + onPressedOutside: { + if (popupArea.expanded) { + notificationFeedbackPlayer.removeNotification(notification.id) + notificationWindow.notificationExpired() + } + } } Binding { @@ -130,13 +147,15 @@ SystemWindow { onDeviceIsLockedChanged: { if (pendingAction.length > 0 && !Lipstick.compositor.lockScreenLayer.deviceIsLocked) { notificationWindow._invoked = true - pendingNotification.actionInvoked(pendingAction) + pendingNotification.actionInvoked(pendingAction, pendingActionText) pendingAction = "" + pendingActionText = "" } } onShowingLockCodeEntryChanged: { if (!Lipstick.compositor.lockScreenLayer.showingLockCodeEntry) { pendingAction = "" + pendingActionText = "" } } } @@ -149,7 +168,18 @@ SystemWindow { Private.SwipeItem { id: popupArea - readonly property int baseX: Theme.paddingSmall + readonly property int baseX: { + // handle top notch separately + if (Lipstick.compositor.topmostWindowOrientation === Qt.PortraitOrientation + && Screen.topCutout.height > Theme.paddingLarge) { + // assuming pushed down enough to avoid corners + return Theme.paddingSmall + } + + return Math.max(_biggestCorner, Theme.paddingSmall, + Lipstick.compositor.topmostWindowOrientation === Qt.LandscapeOrientation + ? Screen.topCutout.height : 0) + } property bool expanded property real textOpacity: 0 @@ -159,13 +189,23 @@ SystemWindow { onSwipedAway: { notificationWindow.state = "" + notificationFeedbackPlayer.removeNotification(notification.id) notificationWindow.notificationExpired() } objectName: "NotificationPreview_popupArea" _showPress: false - y: Theme.paddingMedium + y: { + if (Qt.inputMethod.visible && popupArea.height > notificationWindow._availableHeight) { + // simple way to make sure the text area visible above the keyboard + return -actionRow.y + (notificationWindow._availableHeight - actionRow.height) + } + + return Theme.paddingMedium + + (Screen.hasCutouts && Lipstick.compositor.topmostWindowOrientation === Qt.PortraitOrientation + ? Screen.topCutout.height : 0) + } width: displayWidth swipeDistance: notificationWindow.width height: expanded @@ -231,10 +271,12 @@ SystemWindow { right: parent.right verticalCenter: popupPreviewScrollContainer.verticalCenter } - visible: !popupArea.expanded + visible: !popupArea.expanded || actionRow.replyTextActive source: "image://theme/icon-m-change-type" highlighted: dropDownMouseArea.containsMouse color: palette.primaryColor + transformOrigin: Item.Center + rotation: actionRow.replyTextActive ? 180 : 0 } MouseArea { @@ -245,9 +287,13 @@ SystemWindow { enabled: dropDownArrow.visible onClicked: { - scrollAnimation.reset() - popupArea.expanded = true - outsideArea.enabled = true + if (actionRow.replyTextActive) { + actionRow.replyTextActive = false + } else { + scrollAnimation.reset() + popupArea.expanded = true + outsideArea.enabled = true + } } } @@ -386,15 +432,19 @@ SystemWindow { NotificationActionRow { id: actionRow - onActionInvoked: _triggerAction(actionName) + onActionInvoked: _triggerAction(actionName, actionText) + notification: notificationWindow.notification active: !notificationWindow._invoked + textAreaMaxHeight: notificationWindow._availableHeight / 2 anchors { top: notificationIcon.loaded && notificationIcon.height > popupExpandedText.height ? notificationIcon.bottom : popupExpandedText.bottom topMargin: Theme.paddingMedium right: parent.right rightMargin: Theme.paddingMedium + left: parent.left + leftMargin: Theme.paddingMedium } } } @@ -409,7 +459,10 @@ SystemWindow { height: Lipstick.compositor.homeLayer.statusBar.height y: -height - onClicked: notificationWindow.notificationExpired() + onClicked: { + notificationFeedbackPlayer.removeNotification(notification.id) + notificationWindow.notificationExpired() + } Rectangle { anchors.fill: parent @@ -422,17 +475,30 @@ SystemWindow { anchors { verticalCenter: bannerArea.verticalCenter + verticalCenterOffset: Screen.hasCutouts + && Lipstick.compositor.topmostWindowOrientation === Qt.PortraitOrientation + ? Screen.topCutout.height / 2 : 0 left: bannerArea.left - leftMargin: Theme.horizontalPageMargin + leftMargin: { + if (Lipstick.compositor.topmostWindowOrientation === Qt.PortraitOrientation + && Screen.topCutout.height > Theme.paddingLarge) { + return Theme.horizontalPageMargin + } + + return Math.max(_biggestCorner, Theme.horizontalPageMargin) + } } // only one image shown so using fallbacks. image-path should be better than no image at all. source: { // don't use guessed appIcon on transient notifications, similar to appNameText - if (notificationWindow.appIconUrl != "" && (!notification.isTransient - || notification.appIconOrigin != Notification.InferredValue)) { - return Notifications.iconSource(notificationWindow.appIconUrl) - } else if (notification && notification.hints["image-path"] != "") { - return Notifications.iconSource(notification.hints["image-path"]) + if (notification) { + if (notificationWindow.appIconUrl != "" + && (!notification.isTransient + || notification.appIconOrigin != Notification.InferredValue)) { + return Notifications.iconSource(notificationWindow.appIconUrl) + } else if (notification.hints["image-path"] != "") { + return Notifications.iconSource(notification.hints["image-path"]) + } } return "" } @@ -462,34 +528,24 @@ SystemWindow { } } - Loader { - id: ambiencePreviewLoader - } - - Component { - id: ambiencePreviewComponent - AmbiencePreview { - onFinished: notificationWindow.notificationComplete() - } - } + Timer { + id: displayTimer - Binding { - target: notificationFeedbackPlayer - property: "minimumPriority" - value: lipstickSettings.lockscreenVisible ? 100 : 0 + interval: 0 + onTriggered: displayNotification() } Timer { - id: displayTimer + id: delayedShowNext + interval: 0 - repeat: false - onTriggered: displayNotification() + onTriggered: notificationPreviewPresenter.showNextNotification() } Timer { id: forceHideTimer + interval: 7000 - repeat: false onTriggered: { notificationTimer.duration = 3000 notificationTimer.start() @@ -539,38 +595,11 @@ SystemWindow { onAppIconUrlChanged: refreshPeriod() function displayNotification() { - // We use two different presentation styles: one that can be clicked and one that cannot. - // Check for configurations that can't be correctly activated - if (notification.remoteActions.length == 0) { - if (notification.previewSummary && notification.previewBody) { - // Notifications with preview summary + preview body should have actions, as tapping on the preview pop-up should trigger some action - console.log('Warning: Notification has both preview summary and preview body but no actions. Remove the preview body or add an action:', notification.appName, notification.category, notification.previewSummary, notification.previewBody) - } - } else { - if (notification.previewSummary && !notification.previewBody) { - // Notifications with preview summary but no body should not have any actions, as the small preview banner is too small to receive presses - console.log('Warning: Notification has an action but only shows a preview summary. Add a preview body or remove the actions:', notification.appName, notification.category, notification.previewSummary, notification.previewBody) - } else if ((!notification.previewSummary && !notification.previewBody) && notification.hints['transient'] == true) { - console.log('Warning: Notification has actions but is transient and without a preview, its actions will not be triggerable from the UI:', notification.appName, notification.category, notification.previewSummary, notification.previewBody) - } - } - if (showNotification) { - if (notification.category === "x-jolla.ambience.preview") { - ambiencePreviewLoader.sourceComponent = ambiencePreviewComponent - var preview = ambiencePreviewLoader.item - if (preview) { - preview.displayName = notification.previewSummary - preview.coverImage = notification.previewBody - preview.show() - state = "showAmbience" - } - } else { - var actions = notification.remoteActions - // Show preview banner or pop-up - var hasMultipleLines = (notification.previewSummary.length > 0 && notification.previewBody.length > 0) - state = actions.length > 0 || hasMultipleLines ? "showPopup" : "showBanner" - } + var actions = notification.remoteActions + // Show preview banner or pop-up + var hasMultipleLines = (notification.previewSummary.length > 0 && notification.previewBody.length > 0) + state = actions.length > 0 || hasMultipleLines ? "showPopup" : "showBanner" } } @@ -614,7 +643,9 @@ SystemWindow { function notificationComplete() { state = "" _invoked = false - notificationPreviewPresenter.showNextNotification() + actionRow.reset() + // avoid binding loop in case notification is completed from notification change handler + delayedShowNext.start() } states: [ @@ -623,7 +654,7 @@ SystemWindow { PropertyChanges { target: notificationWindow opacity: 1 - visible: true + active: true } PropertyChanges { target: popupArea @@ -644,7 +675,7 @@ SystemWindow { PropertyChanges { target: notificationWindow opacity: 1 - visible: true + active: true } PropertyChanges { target: popupPreviewScroll @@ -657,7 +688,7 @@ SystemWindow { PropertyChanges { target: notificationWindow opacity: 1 - visible: true + active: true } PropertyChanges { target: bannerArea @@ -671,7 +702,7 @@ SystemWindow { PropertyChanges { target: notificationWindow opacity: 1 - visible: true + active: true } PropertyChanges { target: bannerArea @@ -679,14 +710,6 @@ SystemWindow { x: bannerArea.x contentOpacity: 1 } - }, - State { - name: "showAmbience" - PropertyChanges { - target: notificationWindow - opacity: 1 - visible: true - } } ] diff --git a/usr/share/lipstick-jolla-home-qt5/notifications/NotificationStandardGroupItem.qml b/usr/share/lipstick-jolla-home-qt5/notifications/NotificationStandardGroupItem.qml index a79e3b4a..61026452 100644 --- a/usr/share/lipstick-jolla-home-qt5/notifications/NotificationStandardGroupItem.qml +++ b/usr/share/lipstick-jolla-home-qt5/notifications/NotificationStandardGroupItem.qml @@ -134,7 +134,7 @@ NotificationGroupItem { contentLeftMargin: groupHeader.textLeftMargin summaryText: notification ? notification.summary : "" bodyText: notification ? notification.body : "" - timestampText: notification ? (root._timestampCounter, Format.formatDate(notification.timestamp, Formatter.DurationElapsedShort)) : "" + timestampText: notification ? (root._timestampCounter, Format.formatDate(notification.timestamp, Formatter.TimeElapsedShort)) : "" animateContentResizing: boundedNotificationModel.updating animateAddition: defaultAnimateAddition diff --git a/usr/share/lipstick-jolla-home-qt5/notifications/NotificationStandardGroupMember.qml b/usr/share/lipstick-jolla-home-qt5/notifications/NotificationStandardGroupMember.qml index 5d4dee3d..174c49e5 100644 --- a/usr/share/lipstick-jolla-home-qt5/notifications/NotificationStandardGroupMember.qml +++ b/usr/share/lipstick-jolla-home-qt5/notifications/NotificationStandardGroupMember.qml @@ -143,6 +143,7 @@ NotificationGroupMember { onClicked: { if (expanded) { expanded = false + actionRow.replyTextActive = false } else { expand() } @@ -222,9 +223,11 @@ NotificationGroupMember { NotificationActionRow { id: actionRow + + notification: root.notification active: expanded - onActionInvoked: notification.actionInvoked(actionName) - anchors.right: parent.right + onActionInvoked: notification.actionInvoked(actionName, actionText) + width: parent.width } } diff --git a/usr/share/lipstick-jolla-home-qt5/sim/PinQueryWindow.qml b/usr/share/lipstick-jolla-home-qt5/sim/PinQueryWindow.qml index 759d6492..fbbde00d 100644 --- a/usr/share/lipstick-jolla-home-qt5/sim/PinQueryWindow.qml +++ b/usr/share/lipstick-jolla-home-qt5/sim/PinQueryWindow.qml @@ -7,11 +7,11 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.6 import Sailfish.Silica 1.0 import com.jolla.lipstick 0.1 import com.jolla.settings.system 1.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 import "../sim" import "../main" diff --git a/usr/share/lipstick-jolla-home-qt5/sim/SimPinWrapper.qml b/usr/share/lipstick-jolla-home-qt5/sim/SimPinWrapper.qml index 93310916..d04b712a 100644 --- a/usr/share/lipstick-jolla-home-qt5/sim/SimPinWrapper.qml +++ b/usr/share/lipstick-jolla-home-qt5/sim/SimPinWrapper.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.6 import Sailfish.Silica 1.0 FocusScope { diff --git a/usr/share/lipstick-jolla-home-qt5/sim/SimReboot.qml b/usr/share/lipstick-jolla-home-qt5/sim/SimReboot.qml index b8fcace9..f02fd9de 100644 --- a/usr/share/lipstick-jolla-home-qt5/sim/SimReboot.qml +++ b/usr/share/lipstick-jolla-home-qt5/sim/SimReboot.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import org.nemomobile.lipstick 0.1 import Nemo.DBus 2.0 import Sailfish.Silica 1.0 @@ -53,14 +53,15 @@ SystemWindow { ? qsTrId("lipstick-jolla-home-la-sim_removal_restart") //% "Without restarting the device, SIM card might not work reliably." : qsTrId("lipstick-jolla-home-la-sim_reboot") - topPadding: transpose ? Theme.paddingLarge : 2*Theme.paddingLarge + semiTight: true } SystemDialogIconButton { anchors.horizontalCenter: parent.horizontalCenter width: Theme.itemSizeHuge*1.5 - iconSource: (Screen.sizeCategory >= Screen.Large) ? (isRemovalWarning ? "image://theme/icon-l-acknowledge" : "image://theme/icon-l-reboot") - : (isRemovalWarning ? "image://theme/icon-m-acknowledge" : "image://theme/icon-m-reboot") + iconSource: (Screen.sizeCategory >= Screen.Large) + ? (isRemovalWarning ? "image://theme/icon-l-acknowledge" : "image://theme/icon-l-reboot") + : (isRemovalWarning ? "image://theme/icon-m-acknowledge" : "image://theme/icon-m-reboot") text: isRemovalWarning //% "Got it" ? qsTrId("lipstick-jolla-home-bt-ok") diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/AlarmStatusIndicator.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/AlarmStatusIndicator.qml index 3ceacfd9..36766b39 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/AlarmStatusIndicator.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/AlarmStatusIndicator.qml @@ -12,7 +12,7 @@ import com.jolla.lipstick 0.1 import Sailfish.Silica 1.0 Icon { - source: "image://theme/icon-status-alarm" + iconSuffix + source: "image://theme/icon-status-alarm" visible: Desktop.timedStatus.alarmPresent height: visible ? implicitHeight : 0 } diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/BluetoothStatusIndicator.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/BluetoothStatusIndicator.qml index a61d1f80..4cb80ae1 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/BluetoothStatusIndicator.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/BluetoothStatusIndicator.qml @@ -5,12 +5,12 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 Icon { - source: 'image://theme/icon-status-bluetooth' + (bluetooth.connected ? '-connected' : '') + iconSuffix + source: 'image://theme/icon-status-bluetooth' + (bluetooth.connected ? '-connected' : '') opacity: bluetooth.connected || bluetooth.enabled ? 1.0 : 0.0 Behavior on opacity { FadeAnimation {} } diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/CellularNetworkNameStatusIndicator.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/CellularNetworkNameStatusIndicator.qml index 4dce46ca..5be384ba 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/CellularNetworkNameStatusIndicator.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/CellularNetworkNameStatusIndicator.qml @@ -7,9 +7,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 -import MeeGo.QOfono 0.2 +import QOfono 0.2 import com.jolla.lipstick 0.1 import org.nemomobile.ofono 1.0 diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/CellularNetworkTypeStatusIndicator.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/CellularNetworkTypeStatusIndicator.qml index 8efce3e4..d1db98e3 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/CellularNetworkTypeStatusIndicator.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/CellularNetworkTypeStatusIndicator.qml @@ -7,13 +7,14 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import MeeGo.QOfono 0.2 +import QtQuick 2.6 +import QOfono 0.2 import Sailfish.Silica 1.0 import com.jolla.lipstick 0.1 Row { id: cellularNetworkTypeStatusIndicator + property alias text: cellularNetworkTypeStatusIndicatorText.text property alias color: cellularNetworkTypeStatusIndicatorText.color @@ -25,10 +26,11 @@ Row { property string _cellularDataTechnology: ofonoNetworkRegistration.technologyValue visible: dataSimIndex >= 0 && width > 0 - spacing: Math.round(Theme.paddingSmall/6) + spacing: Math.round(Theme.paddingSmall / 6) OfonoNetworkRegistration { id: ofonoNetworkRegistration + modemPath: Desktop.simManager.defaultDataModem readonly property string statusValue: valid ? status : "invalid" readonly property string technologyValue: valid ? technology : "invalid" @@ -49,19 +51,18 @@ Row { horizontalAlignment: Text.AlignRight color: Theme.primaryColor text: { - var techToG = {gsm: "2", edge: "2.5", umts: "3", hspa: "3.5", lte: "4"} + var techToG = {gsm: "2", edge: "2.5", umts: "3", hspa: "3.5", lte: "4", nr: "5"} var onlineIds = {registered: true, roaming: true} return (fakeOperator === "" ? ((_cellularGPRSAttached && onlineIds[_cellularRegistrationStatus]) ? (techToG[_cellularDataTechnology] || "") : "") - : "3.5"); + : "3.5") } } Text { - id: cellularNetworkTypeStatusIndicatorGeneration anchors { baseline: cellularNetworkTypeStatusIndicatorText.baseline } diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/ConnectionStatusIndicator.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/ConnectionStatusIndicator.qml index 1f3dd122..053da526 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/ConnectionStatusIndicator.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/ConnectionStatusIndicator.qml @@ -7,9 +7,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 -import MeeGo.Connman 0.2 +import Connman 0.2 import org.nemomobile.lipstick 0.1 import com.jolla.lipstick 0.1 @@ -104,11 +104,11 @@ Item { opacity: blinkIconTimer.primaryIconVisible ? 1 : 0 source: { if (wlanStatus.connected && _wlanIconId !== "") - return "image://theme/" + _wlanIconId + iconSuffix + return "image://theme/" + _wlanIconId else if (_cellularIconId !== "") - return "image://theme/" + _cellularIconId + mobileDataIconSuffix + return "image://theme/" + _cellularIconId else if (_wlanIconId !== "") - return "image://theme/" + _wlanIconId + iconSuffix + return "image://theme/" + _wlanIconId else return "" } @@ -121,9 +121,9 @@ Item { id: secondaryIcon source: { if (wlanStatus.connected && _cellularIconId !== "") - return "image://theme/" + _cellularIconId + mobileDataIconSuffix + return "image://theme/" + _cellularIconId else if (mobileDataStatus.connected && _wlanIconId !== "") - return "image://theme/" + _wlanIconId + iconSuffix + return "image://theme/" + _wlanIconId else return "" } @@ -134,7 +134,7 @@ Item { Icon { id: tetheringOverlay - source: "image://theme/icon-status-data-share" + mobileDataIconSuffix + source: "image://theme/icon-status-data-share" visible: tethering.enabled anchors.bottom: parent.bottom } diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/DoNotDisturbIndicator.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/DoNotDisturbIndicator.qml index 7b576e0e..b997e71e 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/DoNotDisturbIndicator.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/DoNotDisturbIndicator.qml @@ -8,7 +8,7 @@ import QtQuick 2.6 import Sailfish.Silica 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 Icon { source: "image://theme/icon-status-do-not-disturb" diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/FlightModeStatus.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/FlightModeStatus.qml index b828efd7..df286052 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/FlightModeStatus.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/FlightModeStatus.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQml 2.2 -import MeeGo.Connman 0.2 +import Connman 0.2 NetworkManager { id: flightMode diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/FlightModeStatusIndicator.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/FlightModeStatusIndicator.qml index c13ffed3..59850460 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/FlightModeStatusIndicator.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/FlightModeStatusIndicator.qml @@ -7,12 +7,12 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 Icon { property alias offline: flightModeStatus.enabled - source: "image://theme/icon-status-airplane-mode" + iconSuffix + source: "image://theme/icon-status-airplane-mode" FlightModeStatus { id: flightModeStatus diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/LocationStatusIndicator.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/LocationStatusIndicator.qml index 2c181691..f3ad097a 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/LocationStatusIndicator.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/LocationStatusIndicator.qml @@ -5,14 +5,14 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import com.jolla.lipstick 0.1 Icon { property bool recentlyOnDisplay - source: "image://theme/icon-status-gps" + iconSuffix + source: "image://theme/icon-status-gps" LocationStatus { id: locationStatus diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/MobileDataStatus.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/MobileDataStatus.qml index 58b4eab3..6a83b6b0 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/MobileDataStatus.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/MobileDataStatus.qml @@ -1,6 +1,6 @@ import QtQml 2.2 import com.jolla.lipstick 0.1 -import MeeGo.Connman 0.2 +import Connman 0.2 QtObject { id: mobileData diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/ProfileStatusIndicator.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/ProfileStatusIndicator.qml index db8a628b..72f11498 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/ProfileStatusIndicator.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/ProfileStatusIndicator.qml @@ -5,14 +5,14 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.systemsettings 1.0 Icon { id: profileStatusIndicator - source: profileControl.isSilent ? ("image://theme/icon-status-silent" + iconSuffix) + source: profileControl.isSilent ? "image://theme/icon-status-silent" : "" width: source != "" ? implicitWidth : 0 height: source != "" ? implicitHeight : 0 diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/StatusArea.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/StatusArea.qml index 6580d714..f780bbb5 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/StatusArea.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/StatusArea.qml @@ -7,7 +7,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 import Sailfish.Telephony 1.0 @@ -15,23 +15,32 @@ import Sailfish.Settings.Networking 1.0 import com.jolla.lipstick 0.1 import org.nemomobile.devicelock 1.0 import org.nemomobile.lipstick 0.1 -import org.nemomobile.time 1.0 +import Nemo.Time 1.0 +import Nemo.Configuration 1.0 import "../lockscreen" import "../main" import "../backgrounds" ContrastBackground { id: statusArea + property bool updatesEnabled: true property bool recentlyOnDisplay: true property bool lockscreenMode - property string iconSuffix: lipstickSettings.lowPowerMode ? ('?' + Theme.highlightColor) : '' - property string mobileDataIconSuffix: '?' + (lipstickSettings.lowPowerMode ? Theme.highlightColor : mobileDataIconColor) - property alias mobileDataIconColor: cellularStatusLoader.mobileDataColor - property color color: lipstickSettings.lowPowerMode ? Theme.highlightColor : Theme.primaryColor + property color color: Theme.primaryColor + property int cornerPadding: { + // assuming the roundings are simple with x and y detached the radius amount from edges. + // for simplicity using just one padding (they are likely same anyway) + var biggestCorner = Math.max(Screen.topLeftCorner.radius, + Screen.topRightCorner.radius, + Screen.bottomLeftCorner.radius, + Screen.bottomRightCorner.radius) + // 0.7 assumed being enough of the rounding to avoid + return Math.max(biggestCorner * 0.7, Theme.paddingMedium) + } onUpdatesEnabledChanged: if (updatesEnabled) recentlyOnDisplay = updatesEnabled - height: batteryStatusIndicator.totalHeight + height: iconBar.height width: parent.width Timer { @@ -42,19 +51,25 @@ ContrastBackground { Item { id: iconBar + width: parent.width + // assuming the cutout case doesn't need padding due to clock item text not drawing full height height: batteryStatusIndicator.height + + (Screen.hasCutouts && Lipstick.compositor.topmostWindowOrientation === Qt.PortraitOrientation + ? Screen.topCutout.height : 0) - // Left side status indicators Row { id: leftIndicators + + x: statusArea.cornerPadding height: batteryStatusIndicator.height spacing: Theme.paddingSmall + BatteryStatusIndicator { id: batteryStatusIndicator + color: statusArea.color usbPreparingMode: usbModeSelector.preparingMode != "" - iconSuffix: statusArea.iconSuffix } ProfileStatusIndicator { @@ -71,35 +86,15 @@ ContrastBackground { //XXX Headset indicator //XXX Call forwarding indicator - - Loader { - active: Desktop.showDualSim - visible: active - sourceComponent: floatingIndicators - } - } - - // These indicators could be on either side, depending upon dual sim - Component { - id: floatingIndicators - Row { - spacing: Theme.paddingSmall - BluetoothStatusIndicator { - anchors.verticalCenter: parent.verticalCenter - visible: opacity > 0.0 - } - LocationStatusIndicator { - anchors.verticalCenter: parent.verticalCenter - visible: opacity > 0.0 - recentlyOnDisplay: statusArea.recentlyOnDisplay - } - } } Item { id: centralArea + anchors { top: iconBar.top + topMargin: Screen.hasCutouts && Lipstick.compositor.topmostWindowOrientation === Qt.PortraitOrientation + ? (Screen.topCutout.height) : 0 bottom: iconBar.bottom left: leftIndicators.right leftMargin: Theme.paddingMedium @@ -109,8 +104,18 @@ ContrastBackground { Loader { // If possible position this item centrally within the iconBar x: Math.max((iconBar.width - width)/2 - parent.x, 0) - y: (parent.height - height)/2 - sourceComponent: lockscreenMode ? lockIcon : timeText + y: (parent.height - height) / 2 + sourceComponent: lockscreenMode ? lockIcon + : displayClockOnLauncher.value ? undefined // clock already shown on the launcher header + : timeText + + + ConfigurationValue { + id: displayClockOnLauncher + + key: "/desktop/sailfish/experimental/display_clock_on_launcher" + defaultValue: false + } } } @@ -141,23 +146,30 @@ ContrastBackground { } } - // Right side status indicators Row { id: rightIndicators - height: parent.height + + height: leftIndicators.height spacing: Theme.paddingSmall anchors { right: parent.right - rightMargin: Theme.paddingMedium + rightMargin: statusArea.cornerPadding + } + + // Location status indicator positioned to leftmost on right side + // due to JB#58226 to avoid abrupt movement of the other indicators. + LocationStatusIndicator { + anchors.verticalCenter: parent.verticalCenter + visible: opacity > 0.0 + recentlyOnDisplay: statusArea.recentlyOnDisplay } VpnStatusIndicator { id: vpnStatusIndicator anchors.verticalCenter: parent.verticalCenter } - Loader { - active: !Desktop.showDualSim - visible: active - sourceComponent: floatingIndicators + BluetoothStatusIndicator { + anchors.verticalCenter: parent.verticalCenter + visible: opacity > 0.0 } ConnectionStatusIndicator { id: connStatusIndicator @@ -166,7 +178,7 @@ ContrastBackground { } Item { width: flightModeStatusIndicator.offline ? flightModeStatusIndicator.width : cellularStatusLoader.width - height: iconBar.height + height: parent.height visible: Desktop.simManager.enabledModems.length > 0 || flightModeStatusIndicator.offline FlightModeStatusIndicator { @@ -176,22 +188,21 @@ ContrastBackground { Loader { id: cellularStatusLoader + height: parent.height active: Desktop.simManager.availableModemCount > 0 - readonly property color mobileDataColor: item ? item.mobileDataColor : statusArea.color sourceComponent: Row { - property alias mobileDataColor: cellularNetworkTypeStatusIndicator.color height: parent.height opacity: 1.0 - flightModeStatusIndicator.opacity CellularNetworkTypeStatusIndicator { - id: cellularNetworkTypeStatusIndicator anchors.verticalCenter: parent.verticalCenter color: { - var repeaterItem = Desktop.simManager.indexOfModem(Desktop.simManager.defaultDataModem) === 1 && networkStatusRepeater.count > 1 + var repeaterItem = (Desktop.simManager.indexOfModem(Desktop.simManager.defaultDataModem) === 1 + && networkStatusRepeater.count > 1) ? networkStatusRepeater.itemAt(1) : networkStatusRepeater.itemAt(0) - return !!repeaterItem ? repeaterItem.iconColor : statusArea.color + return !!repeaterItem && repeaterItem.highlighted ? Theme.highlightColor : statusArea.color } } @@ -201,9 +212,8 @@ ContrastBackground { model: Desktop.simManager.enabledModems MobileNetworkStatusIndicator { - readonly property color iconColor: _highlight ? Theme.highlightColor : statusArea.color - readonly property bool _highlight: Telephony.promptForVoiceSim - || (Desktop.showDualSim && Desktop.simManager.activeModem !== modemPath) + highlighted: Telephony.promptForVoiceSim + || (Desktop.showDualSim && Desktop.simManager.activeModem !== modemPath) visible: Desktop.showDualSim || Desktop.simManager.activeModem === modemPath modemPath: modelData @@ -211,7 +221,6 @@ ContrastBackground { showMaximumStrength: fakeOperator !== "" showRoamingStatus: !Desktop.showDualSim - iconSuffix: _highlight ? ('?' + Theme.highlightColor) : statusArea.iconSuffix } } } diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/StatusBar.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/StatusBar.qml index 0d7e94d3..d0a10598 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/StatusBar.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/StatusBar.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Silica.private 1.0 as SilicaPrivate import Sailfish.Lipstick 1.0 @@ -13,7 +13,6 @@ SilicaControl { property alias updatesEnabled: statusArea.updatesEnabled property alias recentlyOnDisplay: statusArea.recentlyOnDisplay property alias lockscreenMode: statusArea.lockscreenMode - property alias iconSuffix: statusArea.iconSuffix property alias color: statusArea.color property alias backgroundVisible: background.visible property alias shadowVisible: statusArea.shadowVisible @@ -25,12 +24,13 @@ SilicaControl { SilicaPrivate.OverlayGradient { id: background + visible: false anchors { fill: parent bottomMargin: -2 * Theme.paddingLarge } - opacity: 1.0 - Math.abs(statusBar.y/Theme.paddingMedium) + opacity: 1.0 - Math.abs(statusBar.y / Theme.paddingMedium) } MouseArea { @@ -47,11 +47,14 @@ SilicaControl { Item { id: statusAreaContainer + height: parent.height width: parent.width clip: Lipstick.compositor.statusBarPushDownY > 0 + StatusArea { id: statusArea + y: baseY + Lipstick.compositor.statusBarPushDownY } } diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/TetheringStatus.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/TetheringStatus.qml index e9008509..4b769f36 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/TetheringStatus.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/TetheringStatus.qml @@ -8,7 +8,7 @@ ****************************************************************************/ import QtQml 2.2 -import MeeGo.Connman 0.2 +import Connman 0.2 QtObject { id: tethering diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/VpnStatus.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/VpnStatus.qml index 78ba7d71..75e42a23 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/VpnStatus.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/VpnStatus.qml @@ -7,9 +7,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 -import MeeGo.Connman 0.2 -import org.nemomobile.systemsettings 1.0 +import QtQuick 2.6 +import Connman 0.2 +import Nemo.Connectivity 1.0 QtObject { id: vpn diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/VpnStatusIndicator.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/VpnStatusIndicator.qml index f31c1080..3c191107 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/VpnStatusIndicator.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/VpnStatusIndicator.qml @@ -7,10 +7,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 -import MeeGo.Connman 0.2 -import org.nemomobile.systemsettings 1.0 +import Connman 0.2 +import Nemo.Connectivity 1.0 Item { id: vpnStatusIndicator diff --git a/usr/share/lipstick-jolla-home-qt5/statusarea/WlanStatus.qml b/usr/share/lipstick-jolla-home-qt5/statusarea/WlanStatus.qml index 6a252875..d3bd22a4 100644 --- a/usr/share/lipstick-jolla-home-qt5/statusarea/WlanStatus.qml +++ b/usr/share/lipstick-jolla-home-qt5/statusarea/WlanStatus.qml @@ -1,6 +1,6 @@ import QtQml 2.2 import com.jolla.lipstick 0.1 -import MeeGo.Connman 0.2 +import Connman 0.2 QtObject { id: wlan diff --git a/usr/share/lipstick-jolla-home-qt5/switcher/CloseAllAppsHint.qml b/usr/share/lipstick-jolla-home-qt5/switcher/CloseAllAppsHint.qml index 7d40fc8c..9c41834d 100644 --- a/usr/share/lipstick-jolla-home-qt5/switcher/CloseAllAppsHint.qml +++ b/usr/share/lipstick-jolla-home-qt5/switcher/CloseAllAppsHint.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 Loader { diff --git a/usr/share/lipstick-jolla-home-qt5/switcher/StartupWatcher.qml b/usr/share/lipstick-jolla-home-qt5/switcher/StartupWatcher.qml index bc3115c2..d692d08f 100644 --- a/usr/share/lipstick-jolla-home-qt5/switcher/StartupWatcher.qml +++ b/usr/share/lipstick-jolla-home-qt5/switcher/StartupWatcher.qml @@ -1,4 +1,4 @@ -import QtQuick 2.2 +import QtQuick 2.6 import com.jolla.lipstick 0.1 Timer { diff --git a/usr/share/lipstick-jolla-home-qt5/switcher/Switcher.qml b/usr/share/lipstick-jolla-home-qt5/switcher/Switcher.qml index d95dea4d..fc7b7e2f 100644 --- a/usr/share/lipstick-jolla-home-qt5/switcher/Switcher.qml +++ b/usr/share/lipstick-jolla-home-qt5/switcher/Switcher.qml @@ -5,9 +5,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import org.nemomobile.lipstick 0.1 -import org.nemomobile.ngf 1.0 +import Nemo.Ngf 1.0 import com.jolla.lipstick 0.1 import Sailfish.Silica 1.0 import Sailfish.Silica.private 1.0 @@ -33,9 +33,8 @@ SilicaFlickable { property int secondLastAppIndex - readonly property bool switcherVisible: Lipstick.compositor && Lipstick.compositor.switcherLayer.visible - onSwitcherVisibleChanged: { - if (!switcherVisible) { + onVisibleChanged: { + if (!visible) { housekeeping = false // The view is completely hidden. The delay is a grace period, so // that if you quickly exit and reenter the view has not moved. @@ -382,11 +381,19 @@ SilicaFlickable { onWidthChanged: switcherGrid.updateColumns() + ViewPlaceholder { + //% "No apps running" + text: qsTrId("lipstick-jolla-home-me-no_apps_running") + y: parent.height/3 - height/2 + opacity: !Lipstick.compositor.multitaskingHome && switcherRoot.count === 0 ? 1.0 : 0.0 + Behavior on opacity { FadeAnimator {}} + } + SwitcherGrid { id: switcherGrid columns: largeColumns - statusBarHeight: switcherRoot.statusBarHeight + statusBarHeight: Lipstick.compositor.multitaskingHome ? switcherRoot.statusBarHeight : 0 readonly property bool allowSmallCovers: !largeScreen readonly property int largeItemCount: largeColumns * largeRows @@ -396,7 +403,7 @@ SilicaFlickable { function updateColumns() { // use a timer since switcherModel and pendingWindows models aren't in sync. if (!switcherRoot.housekeeping) { - if (switcherRoot.switcherVisible) { + if (switcherRoot.visible) { columnUpdateTimer.restart() } else { doUpdateColumns() @@ -410,7 +417,7 @@ SilicaFlickable { cols = switcherGrid.smallColumns if (cols !== switcherGrid.columns) { scrollAnimation.stop() - if (desktop.orientationTransitionRunning || !switcherRoot.switcherVisible) { + if (desktop.orientationTransitionRunning || !switcherRoot.visible) { switcherGrid.columns = cols switcherGrid.coverSize = switcherGrid.columns == switcherGrid.largeColumns ? Theme.coverSizeLarge : Theme.coverSizeSmall } else { @@ -509,7 +516,7 @@ SilicaFlickable { showingWid: switcherRoot.showingWid columns: switcherGrid.columns - animateMovement: switcherRoot.switcherVisible + animateMovement: switcherRoot.visible && !columnChangeAnimation.running && !desktop.orientationTransitionRunning @@ -518,19 +525,24 @@ SilicaFlickable { onClicked: { if (switcherRoot.housekeeping) { switcherRoot.housekeeping = false - } else if (running) { - switcherRoot.minimizeLaunchingWindows() - minimized = false - Lipstick.compositor.windowToFront(windowId) - } else if (launcherItem) { - var wasLaunching = launching - switcherRoot.minimizeLaunchingWindows() - // App is not running. Launch it now. - launching = true - minimized = false - switcherRoot.launchingItem = switcherDelegate - if (!wasLaunching) { - launcherItem.launchApplication() + } else { + if (!Lipstick.compositor.multitaskingHome) { + Lipstick.compositor.launcherLayer.hide() + } + if (running) { + switcherRoot.minimizeLaunchingWindows() + minimized = false + Lipstick.compositor.windowToFront(windowId) + } else if (launcherItem) { + var wasLaunching = launching + switcherRoot.minimizeLaunchingWindows() + // App is not running. Launch it now. + launching = true + minimized = false + switcherRoot.launchingItem = switcherDelegate + if (!wasLaunching) { + launcherItem.launchApplication() + } } } } @@ -598,7 +610,7 @@ SilicaFlickable { Component.onCompleted: { // avoid hard dependency to ngf module - ngfEffect = Qt.createQmlObject("import org.nemomobile.ngf 1.0; NonGraphicalFeedback { event: 'push_gesture' }", + ngfEffect = Qt.createQmlObject("import Nemo.Ngf 1.0; NonGraphicalFeedback { event: 'push_gesture' }", switcherGrid, 'NonGraphicalFeedback') } } @@ -631,7 +643,7 @@ SilicaFlickable { var wasHousekeeping = switcherRoot.housekeeping if (switcherRoot.housekeeping && !switcherRoot.housekeepingMenuActive) switcherRoot.housekeeping = false - else if (!wasHousekeeping) + else if (!wasHousekeeping && Lipstick.compositor.multitaskingHome) Lipstick.compositor.launcherLayer.showHint() } diff --git a/usr/share/lipstick-jolla-home-qt5/switcher/SwitcherItem.qml b/usr/share/lipstick-jolla-home-qt5/switcher/SwitcherItem.qml index 0c91505d..73c9325b 100644 --- a/usr/share/lipstick-jolla-home-qt5/switcher/SwitcherItem.qml +++ b/usr/share/lipstick-jolla-home-qt5/switcher/SwitcherItem.qml @@ -5,10 +5,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import QtQuick.Window 2.1 as QtQuick import org.nemomobile.lipstick 0.1 -import org.nemomobile.ngf 1.0 +import Nemo.Ngf 1.0 import com.jolla.coveractions 0.1 import Sailfish.Silica 1.0 import Sailfish.Silica.Background 1.0 @@ -85,7 +85,7 @@ EditableGridDelegate { cancelAnimation() contentItem.opacity = 1.0 contentItem.x = x - contentItem.y = offsetY + contentItem.y = targetY _oldY = y _viewWidth = manager.view.width } @@ -167,7 +167,7 @@ EditableGridDelegate { opacity: wrapper.coverOpacity width: rotation % 180 == 0 ? wrapper.width : wrapper.height height: rotation % 180 == 0 ? wrapper.height : wrapper.width - windowId: wrapper.coverId?wrapper.coverId:wrapper.windowId + windowId: wrapper.coverId ? wrapper.coverId : wrapper.windowId radius: Theme.paddingMedium smooth: true anchors.centerIn: parent @@ -415,6 +415,11 @@ EditableGridDelegate { } } + Connections { + target: wrapper.window + onClosed: wrapper.close() + } + SequentialAnimation { id: closeAnimation ParallelAnimation { diff --git a/usr/share/lipstick-jolla-home-qt5/system/ShutdownScreen.qml b/usr/share/lipstick-jolla-home-qt5/system/ShutdownScreen.qml index f20ffe44..e3b89597 100644 --- a/usr/share/lipstick-jolla-home-qt5/system/ShutdownScreen.qml +++ b/usr/share/lipstick-jolla-home-qt5/system/ShutdownScreen.qml @@ -5,7 +5,7 @@ * License: Proprietary */ -import QtQuick 2.0 +import QtQuick 2.6 import org.nemomobile.lipstick 0.1 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 diff --git a/usr/share/lipstick-jolla-home-qt5/system/StartupScreenBlanker.qml b/usr/share/lipstick-jolla-home-qt5/system/StartupScreenBlanker.qml index 5d10f270..f80fdb76 100644 --- a/usr/share/lipstick-jolla-home-qt5/system/StartupScreenBlanker.qml +++ b/usr/share/lipstick-jolla-home-qt5/system/StartupScreenBlanker.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/systemwindow/SystemWindow.qml b/usr/share/lipstick-jolla-home-qt5/systemwindow/SystemWindow.qml index ed91a77c..3bb9371e 100644 --- a/usr/share/lipstick-jolla-home-qt5/systemwindow/SystemWindow.qml +++ b/usr/share/lipstick-jolla-home-qt5/systemwindow/SystemWindow.qml @@ -5,12 +5,14 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 FocusScope { id: systemWindow + + property int topmostWindowOrientation: Lipstick.compositor.topmostWindowOrientation property bool transpose: Lipstick.compositor.topmostWindowAngle % 180 != 0 property real contentHeight: height diff --git a/usr/share/lipstick-jolla-home-qt5/topmenu/AmbienceInstallPlaceholder.qml b/usr/share/lipstick-jolla-home-qt5/topmenu/AmbienceInstallPlaceholder.qml index 21d7c24f..3f37f851 100644 --- a/usr/share/lipstick-jolla-home-qt5/topmenu/AmbienceInstallPlaceholder.qml +++ b/usr/share/lipstick-jolla-home-qt5/topmenu/AmbienceInstallPlaceholder.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 Item { diff --git a/usr/share/lipstick-jolla-home-qt5/topmenu/AmbienceSelector.qml b/usr/share/lipstick-jolla-home-qt5/topmenu/AmbienceSelector.qml index fbf904da..fac4161b 100644 --- a/usr/share/lipstick-jolla-home-qt5/topmenu/AmbienceSelector.qml +++ b/usr/share/lipstick-jolla-home-qt5/topmenu/AmbienceSelector.qml @@ -5,15 +5,14 @@ ** ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Silica.private 1.0 import Sailfish.Ambience 1.0 import Sailfish.Gallery 1.0 import Nemo.DBus 2.0 import Nemo.Thumbnailer 1.0 -import org.nemomobile.notifications 1.0 as SystemNotifications -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import org.nemomobile.lipstick 0.1 import org.nemomobile.devicelock 1.0 import com.jolla.lipstick 0.1 @@ -35,17 +34,6 @@ Item { visible: ambiencesEnabled.value clip: ambienceList.y < 0 - Timer { - id: ambiencePreviewTimer - interval: 200 - onTriggered: ambiencePreviewNotification.publish() - } - - SystemNotifications.Notification { - id: ambiencePreviewNotification - category: "x-jolla.ambience.preview" - } - ConfigurationValue { id: ambiencesEnabled key: "/desktop/lipstick-jolla-home/topmenu_ambiences_enabled" @@ -85,19 +73,8 @@ Item { NumberAnimation { property: "x"; duration: 500; easing.type: Easing.InOutQuad } } - model: AmbienceInstallModel { - source: AmbienceModel { - id: ambienceModel - } - - onAmbienceInstalling: { - ambiencePreviewNotification.summary = displayName - ambiencePreviewNotification.body = coverImage - // Give some time for the TOH dialog to fade out - ambiencePreviewTimer.restart() - } - - onAmbienceInstalled: ambienceModel.makeCurrent(index) + model: AmbienceModel { + id: ambienceModel } delegate: ListItem { @@ -109,7 +86,6 @@ Item { width: root.itemSize contentHeight: width - highlightedColor: Theme.rgba(highlightBackgroundColor || Theme.highlightBackgroundColor, Theme.highlightBackgroundOpacity) openMenuOnPressAndHold: Desktop.deviceLockState === DeviceLock.Unlocked onClicked: { diff --git a/usr/share/lipstick-jolla-home-qt5/topmenu/DynamicSwitchModel.qml b/usr/share/lipstick-jolla-home-qt5/topmenu/DynamicSwitchModel.qml index 9097788f..7835a565 100644 --- a/usr/share/lipstick-jolla-home-qt5/topmenu/DynamicSwitchModel.qml +++ b/usr/share/lipstick-jolla-home-qt5/topmenu/DynamicSwitchModel.qml @@ -1,4 +1,4 @@ -import QtQuick 2.2 +import QtQuick 2.6 import com.jolla.settings 1.0 ListModel { diff --git a/usr/share/lipstick-jolla-home-qt5/topmenu/DynamicSwitches.qml b/usr/share/lipstick-jolla-home-qt5/topmenu/DynamicSwitches.qml index 7c2ce87c..e4cb98db 100644 --- a/usr/share/lipstick-jolla-home-qt5/topmenu/DynamicSwitches.qml +++ b/usr/share/lipstick-jolla-home-qt5/topmenu/DynamicSwitches.qml @@ -1,4 +1,4 @@ -import QtQuick 2.2 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 // BluetoothStatus import com.jolla.lipstick 0.1 // LocationStatus diff --git a/usr/share/lipstick-jolla-home-qt5/topmenu/FavoriteSettingsDelegate.qml b/usr/share/lipstick-jolla-home-qt5/topmenu/FavoriteSettingsDelegate.qml index a989debe..f50a02a4 100644 --- a/usr/share/lipstick-jolla-home-qt5/topmenu/FavoriteSettingsDelegate.qml +++ b/usr/share/lipstick-jolla-home-qt5/topmenu/FavoriteSettingsDelegate.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import com.jolla.lipstick 0.1 import com.jolla.settings 1.0 diff --git a/usr/share/lipstick-jolla-home-qt5/topmenu/FavoriteSettingsItem.qml b/usr/share/lipstick-jolla-home-qt5/topmenu/FavoriteSettingsItem.qml index 16eff949..de2cb961 100644 --- a/usr/share/lipstick-jolla-home-qt5/topmenu/FavoriteSettingsItem.qml +++ b/usr/share/lipstick-jolla-home-qt5/topmenu/FavoriteSettingsItem.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import com.jolla.settings 1.0 import org.nemomobile.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/topmenu/FavoriteSettingsLoader.qml b/usr/share/lipstick-jolla-home-qt5/topmenu/FavoriteSettingsLoader.qml index 401a496f..a47670f2 100644 --- a/usr/share/lipstick-jolla-home-qt5/topmenu/FavoriteSettingsLoader.qml +++ b/usr/share/lipstick-jolla-home-qt5/topmenu/FavoriteSettingsLoader.qml @@ -7,7 +7,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import com.jolla.settings 1.0 import Nemo.DBus 2.0 diff --git a/usr/share/lipstick-jolla-home-qt5/topmenu/PowerButton.qml b/usr/share/lipstick-jolla-home-qt5/topmenu/PowerButton.qml index 013e1acf..bfbfac15 100644 --- a/usr/share/lipstick-jolla-home-qt5/topmenu/PowerButton.qml +++ b/usr/share/lipstick-jolla-home-qt5/topmenu/PowerButton.qml @@ -1,4 +1,4 @@ -import QtQuick 2.2 +import QtQuick 2.6 import Sailfish.Silica 1.0 MouseArea { diff --git a/usr/share/lipstick-jolla-home-qt5/topmenu/SimSelector.qml b/usr/share/lipstick-jolla-home-qt5/topmenu/SimSelector.qml index 4279e2ff..cdcf5a5a 100644 --- a/usr/share/lipstick-jolla-home-qt5/topmenu/SimSelector.qml +++ b/usr/share/lipstick-jolla-home-qt5/topmenu/SimSelector.qml @@ -5,7 +5,7 @@ * License: Proprietary */ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Telephony 1.0 as Telephony import Sailfish.AccessControl 1.0 diff --git a/usr/share/lipstick-jolla-home-qt5/topmenu/TopMenu.qml b/usr/share/lipstick-jolla-home-qt5/topmenu/TopMenu.qml index d12d25d1..40693591 100644 --- a/usr/share/lipstick-jolla-home-qt5/topmenu/TopMenu.qml +++ b/usr/share/lipstick-jolla-home-qt5/topmenu/TopMenu.qml @@ -7,13 +7,13 @@ ** ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Silica.private 1.0 import Nemo.Notifications 1.0 as SystemNotifications import org.nemomobile.lipstick 0.1 import com.jolla.lipstick 0.1 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import org.nemomobile.devicelock 1.0 import org.nemomobile.systemsettings 1.0 import "../backgrounds" @@ -132,8 +132,15 @@ SilicaFlickable { id: column width: parent.width Item { - id: headerItem + id: topPadding + width: 1 + height: Lipstick.compositor.topmostWindowOrientation === Qt.PortraitOrientation + && Screen.topCutout.height > 0 + ? (Screen.topCutout.height + Theme.paddingSmall) : 0 + } + + Item { width: topMenu.width height: topMenu.itemSize @@ -172,11 +179,12 @@ SilicaFlickable { Row { id: shutdownOptions - y: Math.min(0, -height + topMenu.offset) + y: Math.min(0, -height - topPadding.height + topMenu.offset) width: topMenu.width height: topMenu.itemSize visible: Lipstick.compositor.powerKeyPressed + || Lipstick.compositor.experimentalFeatures.topmenu_shutdown_reboot_visible PowerButton { id: shutdownButton @@ -213,8 +221,7 @@ SilicaFlickable { PowerButton { id: lockButton - y: Math.min(0, -height + topMenu.offset) - + y: Math.min(0, -height - topPadding.height + topMenu.offset) width: topMenu.width height: topMenu.itemSize @@ -250,7 +257,7 @@ SilicaFlickable { Loader { id: shortcutsLoader width: parent.width - active: shortcutsEnabled.value || actionsEnabled.value || Desktop.showMultiSimSelector + active: shortcutsEnabled.value || actionsEnabled.value || Desktop.showMultiSimSelector ConfigurationValue { id: shortcutsEnabled diff --git a/usr/share/lipstick-jolla-home-qt5/topmenu/TopMenuWindow.qml b/usr/share/lipstick-jolla-home-qt5/topmenu/TopMenuWindow.qml index c1964368..79b30722 100644 --- a/usr/share/lipstick-jolla-home-qt5/topmenu/TopMenuWindow.qml +++ b/usr/share/lipstick-jolla-home-qt5/topmenu/TopMenuWindow.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Nemo.DBus 2.0 import org.nemomobile.lipstick 0.1 @@ -55,8 +55,9 @@ ApplicationWindow { } Image { - y: menu.expanded && menu.contentHeight >= page.height + height && menu.atYEnd ? page.height - height : - menu.exposedArea.height - height + y: menu.expanded && menu.contentHeight >= page.height + height && menu.atYEnd + ? page.height - height + : menu.exposedArea.height - height anchors.horizontalCenter: parent.horizontalCenter source: "image://theme/graphic-edge-swipe-handle-bottom" rotation: 180 diff --git a/usr/share/lipstick-jolla-home-qt5/topmenu/UserItem.qml b/usr/share/lipstick-jolla-home-qt5/topmenu/UserItem.qml index 584b0c00..bee73d33 100644 --- a/usr/share/lipstick-jolla-home-qt5/topmenu/UserItem.qml +++ b/usr/share/lipstick-jolla-home-qt5/topmenu/UserItem.qml @@ -4,7 +4,7 @@ * License: Proprietary */ -import QtQuick 2.5 +import QtQuick 2.6 import Sailfish.Silica 1.0 import com.jolla.settings.system 1.0 diff --git a/usr/share/lipstick-jolla-home-qt5/topmenu/UserSelector.qml b/usr/share/lipstick-jolla-home-qt5/topmenu/UserSelector.qml index bf14f762..1e0ae92b 100644 --- a/usr/share/lipstick-jolla-home-qt5/topmenu/UserSelector.qml +++ b/usr/share/lipstick-jolla-home-qt5/topmenu/UserSelector.qml @@ -4,7 +4,7 @@ * License: Proprietary */ -import QtQuick 2.5 +import QtQuick 2.6 import Sailfish.Silica 1.0 import org.nemomobile.lipstick 0.1 import org.nemomobile.systemsettings 1.0 diff --git a/usr/share/lipstick-jolla-home-qt5/volumecontrol/Screenshot.qml b/usr/share/lipstick-jolla-home-qt5/volumecontrol/Screenshot.qml index f05a582e..db90c046 100644 --- a/usr/share/lipstick-jolla-home-qt5/volumecontrol/Screenshot.qml +++ b/usr/share/lipstick-jolla-home-qt5/volumecontrol/Screenshot.qml @@ -7,11 +7,11 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import org.nemomobile.ngf 1.0 +import QtQuick 2.6 +import Nemo.Ngf 1.0 import com.jolla.lipstick 0.1 import org.nemomobile.lipstick 0.1 -import org.nemomobile.notifications 1.0 +import Nemo.Notifications 1.0 import org.nemomobile.systemsettings 1.0 import Sailfish.Silica 1.0 import Sailfish.Share 1.0 @@ -38,9 +38,7 @@ Item { fileUtils.mkdir(folderPath) } - //: Filename of a captured screenshot, e.g. "Screenshot_1" - //% "Screenshot_%1" - var filename = fileUtils.uniqueFileName(folderPath, qsTrId("lipstick-jolla-home-la-screenshot") + ".png") + var filename = fileUtils.uniqueFileName(folderPath, "Screenshot_%1" + ".png") var filePath = folderPath + filename shareAction.resources = [ filePath ] diff --git a/usr/share/lipstick-jolla-home-qt5/volumecontrol/ScreenshotToggle.qml b/usr/share/lipstick-jolla-home-qt5/volumecontrol/ScreenshotToggle.qml new file mode 100644 index 00000000..62a1ee38 --- /dev/null +++ b/usr/share/lipstick-jolla-home-qt5/volumecontrol/ScreenshotToggle.qml @@ -0,0 +1,16 @@ +import QtQuick 2.6 +import Sailfish.Silica 1.0 +import com.jolla.settings 1.0 +import com.jolla.settings.system 1.0 +import org.nemomobile.lipstick 0.1 + +SettingsToggle { + id: root + + //% "Screenshot" + name: qsTrId("settings_system-screenshot-button") + icon.source: "image://theme/icon-m-browser-camera" + checked: Lipstick.compositor.floatingScreenshotButtonActive + + onToggled: Lipstick.compositor.floatingScreenshotButtonActive = !Lipstick.compositor.floatingScreenshotButtonActive +} diff --git a/usr/share/lipstick-jolla-home-qt5/volumecontrol/VolumeControl.qml b/usr/share/lipstick-jolla-home-qt5/volumecontrol/VolumeControl.qml index 561f640e..6a467954 100644 --- a/usr/share/lipstick-jolla-home-qt5/volumecontrol/VolumeControl.qml +++ b/usr/share/lipstick-jolla-home-qt5/volumecontrol/VolumeControl.qml @@ -5,11 +5,11 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import org.nemomobile.lipstick 0.1 import Sailfish.Silica 1.0 import org.nemomobile.systemsettings 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import com.jolla.lipstick 0.1 import QtFeedback 5.0 import "../systemwindow" @@ -27,6 +27,7 @@ SystemWindow { volumeControl.callActive || showContinuousVolume property real statusBarPushDownY: volumeArea.y + volumeArea.height property bool showContinuousVolume: false + property bool suppressVolumeBar property int maximumVolume: controllingMedia ? volumeControl.maximumVolume : 100 property real initialChange: 0 property bool disableSmoothChange: true @@ -106,6 +107,13 @@ SystemWindow { defaultValue: false } + // FIXME: This should be something cleaner for API point of view. JB#59279 + ConfigurationValue { + id: swVolumeSliderActive + key: "/jolla/sound/sw_volume_slider/active" + defaultValue: false + } + HapticsEffect { id: silenceVibra intensity: 0.2 @@ -116,7 +124,9 @@ SystemWindow { id: volumeArea width: parent.width - height: Theme.iconSizeSmall + Theme.paddingMedium + height: volumeAnnotation.height + + (Screen.hasCutouts && Lipstick.compositor.topmostWindowOrientation === Qt.PortraitOrientation + ? Screen.topCutout.height : 0) y: -height Rectangle { @@ -171,9 +181,12 @@ SystemWindow { } Item { - objectName: "volumeAnnotation" + id: volumeAnnotation - anchors.fill: parent + objectName: "volumeAnnotation" + width: parent.width + height: Theme.iconSizeSmall + Theme.paddingMedium + anchors.bottom: parent.bottom property bool mute: controllingMedia ? (!volumeControl.callActive && volumeControl.volume === 0) @@ -188,7 +201,18 @@ SystemWindow { id: muteIcon anchors.verticalCenter: parent.verticalCenter - x: Theme.horizontalPageMargin + x: { + if (Screen.topCutout.height > Theme.paddingLarge + && Lipstick.compositor.topmostWindowOrientation === Qt.PortraitOrientation) { + return Theme.horizontalPageMargin + } + + var biggestCorner = Math.max(Screen.topLeftCorner.radius, + Screen.topRightCorner.radius, + Screen.bottomLeftCorner.radius, + Screen.bottomRightCorner.radius) + return Math.max(biggestCorner, Theme.horizontalPageMargin) + } opacity: parent.muteOpacity property string baseSource: controllingMedia ? "image://theme/icon-system-volume-mute" : "image://theme/icon-system-ringtone-mute" @@ -199,7 +223,7 @@ SystemWindow { id: volumeIcon anchors.verticalCenter: parent.verticalCenter - x: Theme.horizontalPageMargin + x: muteIcon.x opacity: 1 - parent.muteOpacity property string baseSource: controllingMedia ? "image://theme/icon-system-volume" : "image://theme/icon-system-ringtone" @@ -401,6 +425,10 @@ SystemWindow { property bool warningActive function showWarning(initial) { + if (swVolumeSliderActive.value) { + volumeBar.suppressVolumeBar = !volumeControl.windowVisible + volumeControl.windowVisible = true + } warningActive = true loader.item.initial = initial loader.item.dismiss.connect(function () { @@ -459,7 +487,7 @@ SystemWindow { Connections { target: volumeControl onWindowVisibleChanged: { - if (volumeControl.windowVisible) { + if (volumeControl.windowVisible && !suppressVolumeBar) { if (volumeBar.state == "") { if (Lipstick.compositor.volumeGestureFilterItem.active) { volumeBar.state = "showBarGesture" @@ -469,6 +497,7 @@ SystemWindow { } } } + suppressVolumeBar = false } onVolumeChanged: restartHideTimerIfWindowVisibleAndWarningNotVisible() onVolumeKeyPressed: { diff --git a/usr/share/lipstick-jolla-home-qt5/volumecontrol/WarningNote.qml b/usr/share/lipstick-jolla-home-qt5/volumecontrol/WarningNote.qml index 84cb47e2..60bd8e6b 100644 --- a/usr/share/lipstick-jolla-home-qt5/volumecontrol/WarningNote.qml +++ b/usr/share/lipstick-jolla-home-qt5/volumecontrol/WarningNote.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 import org.nemomobile.lipstick 0.1 diff --git a/usr/share/lipstick-jolla-home-qt5/windowwrappers/InProcWindowWrapper.qml b/usr/share/lipstick-jolla-home-qt5/windowwrappers/InProcWindowWrapper.qml index 46aa4ed6..8353bb33 100644 --- a/usr/share/lipstick-jolla-home-qt5/windowwrappers/InProcWindowWrapper.qml +++ b/usr/share/lipstick-jolla-home-qt5/windowwrappers/InProcWindowWrapper.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import QtQuick.Window 2.1 as QtQuick WindowWrapperBase { diff --git a/usr/share/lipstick-jolla-home-qt5/windowwrappers/WindowWrapper.qml b/usr/share/lipstick-jolla-home-qt5/windowwrappers/WindowWrapper.qml index 84082b88..52cf6f8f 100644 --- a/usr/share/lipstick-jolla-home-qt5/windowwrappers/WindowWrapper.qml +++ b/usr/share/lipstick-jolla-home-qt5/windowwrappers/WindowWrapper.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.6 import org.nemomobile.lipstick 0.1 import QtQuick.Window 2.1 as QtQuick import Sailfish.Silica 1.0 diff --git a/usr/share/lipstick-jolla-home-qt5/windowwrappers/WindowWrapperBase.qml b/usr/share/lipstick-jolla-home-qt5/windowwrappers/WindowWrapperBase.qml index f729d8df..74e83b0b 100644 --- a/usr/share/lipstick-jolla-home-qt5/windowwrappers/WindowWrapperBase.qml +++ b/usr/share/lipstick-jolla-home-qt5/windowwrappers/WindowWrapperBase.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import QtQuick.Window 2.1 as QtQuick import org.nemomobile.lipstick 0.1 diff --git a/usr/share/lipstick-obex-ui/IncomingFileConfirmationWindow.qml b/usr/share/lipstick-obex-ui/IncomingFileConfirmationWindow.qml index 93ca2b03..b39e18b5 100644 --- a/usr/share/lipstick-obex-ui/IncomingFileConfirmationWindow.qml +++ b/usr/share/lipstick-obex-ui/IncomingFileConfirmationWindow.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import QtQuick.Window 2.0 import Sailfish.Silica 1.0 import Sailfish.Bluetooth 1.0 diff --git a/usr/share/lipstick-obex-ui/main.qml b/usr/share/lipstick-obex-ui/main.qml index 0c9c8780..b1d64d83 100644 --- a/usr/share/lipstick-obex-ui/main.qml +++ b/usr/share/lipstick-obex-ui/main.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import QtQuick.Window 2.0 import Sailfish.Silica 1.0 import Nemo.DBus 2.0 diff --git a/usr/share/lipstick-security-ui/PasswordInputDialog.qml b/usr/share/lipstick-security-ui/PasswordInputDialog.qml index 16007d30..1fb333cf 100644 --- a/usr/share/lipstick-security-ui/PasswordInputDialog.qml +++ b/usr/share/lipstick-security-ui/PasswordInputDialog.qml @@ -28,6 +28,9 @@ SystemDialog { property alias suggestionText: suggestionLabel.text property int inputMethodHints + // extra toggle control for alphanumeric or digit codes + property bool digitsOnly + property bool alphanumericToggleEnabled property bool inputEnabled: true property bool requirePassword: true @@ -88,16 +91,32 @@ SystemDialog { width: header.width anchors.horizontalCenter: parent.horizontalCenter - Label { - id: descriptionLabel - + Item { x: (Screen.sizeCategory < Screen.Large) ? Theme.horizontalPageMargin : 0 width: header.width - 2*x - color: Theme.highlightColor - font.pixelSize: Theme.fontSizeMedium - wrapMode: Text.Wrap - horizontalAlignment: Text.AlignHCenter - height: implicitHeight + (root.suggestionsEnabled ? Theme.paddingSmall : Theme.paddingLarge) + height: alphanumericToggle.visible ? Math.max(alphanumericToggle.height, descriptionLabel.height) + : descriptionLabel.height + + IconButton { + id: alphanumericToggle + + visible: root.alphanumericToggleEnabled && passwordInput.visible + icon.source: root.digitsOnly ? "image://theme/icon-m-keyboard" + : "image://theme/icon-m-dialpad" + onClicked: root.digitsOnly = !root.digitsOnly + } + + Label { + id: descriptionLabel + + width: parent.width - 2 * (alphanumericToggle.visible ? (alphanumericToggle.width + Theme.paddingMedium) : 0) + color: Theme.highlightColor + font.pixelSize: Theme.fontSizeMedium + wrapMode: Text.Wrap + horizontalAlignment: Text.AlignHCenter + height: implicitHeight + (root.suggestionsEnabled ? Theme.paddingSmall : Theme.paddingLarge) + anchors.horizontalCenter: parent.horizontalCenter + } } BackgroundItem { @@ -133,6 +152,7 @@ SystemDialog { | Qt.ImhNoAutoUppercase | Qt.ImhHiddenText | Qt.ImhMultiLine // This stops the text input hiding the keyboard when enter is pressed. + | (root.digitsOnly ? Qt.ImhDigitsOnly : 0) _appWindow: undefined // suppresses warnings, TODO: fix password field magnifier color: Theme.highlightColor @@ -140,10 +160,10 @@ SystemDialog { placeholderColor: Theme.secondaryHighlightColor textMargin: 2*Theme.paddingLarge textTopMargin: Theme.paddingLarge - showEchoModeToggle: passwordEchoMode == TextInput.Normal + showEchoModeToggle: passwordEchoMode !== TextInput.Normal echoMode: (!showEchoModeToggle || _usePasswordEchoMode) && !root._showSuggestion ? passwordEchoMode - : TextInput.Password + : TextInput.Normal enabled: root.requirePassword && root.inputEnabled && !(root.suggestionsEnforced && root._showSuggestion) visible: root.requirePassword placeholderText: "" diff --git a/usr/share/lipstick-security-ui/SecurityCodeDialog.qml b/usr/share/lipstick-security-ui/SecurityCodeDialog.qml index 78ad337a..d332f562 100644 --- a/usr/share/lipstick-security-ui/SecurityCodeDialog.qml +++ b/usr/share/lipstick-security-ui/SecurityCodeDialog.qml @@ -23,7 +23,8 @@ PasswordInputDialog { minimumLength: agent.minimumCodeLength maximumLength: agent.maximumCodeLength - inputMethodHints: agent.codeInputIsKeyboard ? Qt.ImhPreferNumbers : Qt.ImhDigitsOnly + alphanumericToggleEnabled: true + digitsOnly: true passwordMaskDelay: 0 onConfirmed: { diff --git a/usr/share/lipstick-windowprompt/PermissionPrompt.qml b/usr/share/lipstick-windowprompt/PermissionPrompt.qml index 3a9ae8d6..87474b85 100644 --- a/usr/share/lipstick-windowprompt/PermissionPrompt.qml +++ b/usr/share/lipstick-windowprompt/PermissionPrompt.qml @@ -1,6 +1,6 @@ /* * Copyright (c) 2020 - 2021 Open Mobile Platform LLC. - * Copyright (c) 2021 Jolla Ltd. + * Copyright (c) 2021 - 2022 Jolla Ltd. * * License: Proprietary */ @@ -22,6 +22,7 @@ SystemDialog { function init(promptConfig) { root.promptConfig = promptConfig + // Column refreshes are lazy, so content.Height won't yet be correct at this point raise() show() // Trigger here to reset if another dialog is displayed without destructing the component @@ -39,26 +40,47 @@ SystemDialog { SilicaFlickable { id: flickable - readonly property real availableHeight: screenHeight - reservedHeight - buttons.height - autoDismissText.height - Theme.paddingSmall - property real originalContentHeight: content.height - property bool menuHasBeenOpened + + readonly property real availableHeight: screenHeight - reservedHeight - buttons.height + - autoDismissText.height - Theme.paddingSmall + property real originalContentHeight + property bool menuOpen + contentHeight: content.height height: Math.min(originalContentHeight, availableHeight) width: parent.width clip: contentHeight > availableHeight || contentHeight > originalContentHeight - onMenuHasBeenOpenedChanged: if (menuHasBeenOpened) originalContentHeight = content.height // break binding + + Binding on originalContentHeight { + when: !flickable.menuOpen + value: content.height + // Default restore mode in Qt 5 is Binding.RestoreBinding + // After Qt 6.0 the below line will need to be added + //restoreMode: Binding.RestoreNone + } Column { id: content topPadding: Theme.paddingLarge + + (Screen.hasCutouts && root.orientation === Qt.PortraitOrientation + ? Screen.topCutout.height : 0) spacing: Theme.paddingLarge width: parent.width Image { property string icon: root.promptConfig.icon || "" - source: icon != "" ? ((icon.indexOf("/") == 0 ? "file://" : "image://theme/") + icon) - : "" + source: { + if (icon !== "") { + if (icon.indexOf("/") === 0) { + return "file://" + icon + } else { + return LauncherUtil.resolveIconPath(icon) || "image://theme/" + icon + } + } else { + return "" + } + } anchors.horizontalCenter: parent.horizontalCenter height: Theme.iconSizeLauncher width: Theme.iconSizeLauncher @@ -90,10 +112,9 @@ SystemDialog { contentItem.clip: expanded contentHeight: description.implicitHeight + 2*description.y width: parent.width - onClicked: { - flickable.menuHasBeenOpened = true - openMenu() - } + onClicked: openMenu() + // We rely on the fact only one menu can be open at a time + onMenuOpenChanged: flickable.menuOpen = menuOpen Behavior on contentHeight { NumberAnimation { duration: 100; easing.type: Easing.InOutQuad } } Label { diff --git a/usr/share/lipstick-windowprompt/StorageDeviceSystemDialog.qml b/usr/share/lipstick-windowprompt/StorageDeviceSystemDialog.qml index b49de066..d285426e 100644 --- a/usr/share/lipstick-windowprompt/StorageDeviceSystemDialog.qml +++ b/usr/share/lipstick-windowprompt/StorageDeviceSystemDialog.qml @@ -7,7 +7,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import QtQuick.Window 2.1 as QtQuick import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 @@ -125,7 +125,7 @@ SystemDialog { //% "Unlock memory card" : qsTrId("lipstick-jolla-home-he-memory_card_encrypted_unlock") - topPadding: Screen.sizeCategory >= Screen.Large ? 2*Theme.paddingLarge : Theme.paddingLarge + tight: true bottomPadding: Theme.paddingLarge } diff --git a/usr/share/lipstick-windowprompt/TermsPromptWindow.qml b/usr/share/lipstick-windowprompt/TermsPromptWindow.qml index 4732bceb..a01b5cf4 100644 --- a/usr/share/lipstick-windowprompt/TermsPromptWindow.qml +++ b/usr/share/lipstick-windowprompt/TermsPromptWindow.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import QtQuick.Window 2.0 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 diff --git a/usr/share/lipstick-windowprompt/connectivity/AddNetworkView.qml b/usr/share/lipstick-windowprompt/connectivity/AddNetworkView.qml index 0dae6947..3b7d6810 100644 --- a/usr/share/lipstick-windowprompt/connectivity/AddNetworkView.qml +++ b/usr/share/lipstick-windowprompt/connectivity/AddNetworkView.qml @@ -1,13 +1,14 @@ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 import Sailfish.Settings.Networking 1.0 -import MeeGo.Connman 0.2 +import Connman 0.2 import Nemo.DBus 2.0 Column { id: root + property int horizontalMargin: Theme.paddingLarge property string path property bool canAccept: { if (network.ssid.length > 0 && (!identityField.required || network.identity.length > 0)) { @@ -61,12 +62,13 @@ Column { SystemDialogHeader { //% "Add network" title: qsTrId("lipstick_jolla_home-he-add_network") - topPadding: Screen.sizeCategory >= Screen.Large ? 2*Theme.paddingLarge : Theme.paddingLarge // align with ConnectionSelector + tight: true // align with ConnectionSelector } SsidField { id: ssidField + textMargin: root.horizontalMargin network: root.network property bool moveFocus: identityField.required || passphraseField.required @@ -87,10 +89,14 @@ Column { HiddenSwitch { network: root.network + leftMargin: root.horizontalMargin + rightMargin: root.horizontalMargin } EncryptionComboBox { network: root.network + leftMargin: root.horizontalMargin + rightMargin: root.horizontalMargin } Item { @@ -101,13 +107,18 @@ Column { EapComboBox { network: root.network + leftMargin: root.horizontalMargin + rightMargin: root.horizontalMargin } InnerAuthComboBox { network: root.network + leftMargin: root.horizontalMargin + rightMargin: root.horizontalMargin } CACertChooser { + horizontalMargin: root.horizontalMargin network: root.network onFromFileSelected: { @@ -124,12 +135,13 @@ Column { "clientCertFile": root.network.clientCertFile, "hidden": root.network.hidden }) - settingsDBus.call("showAddNetworkDialog"); + settingsDBus.call("showAddNetworkDialog") root.closeDialog() } } ClientCertChooser { + horizontalMargin: root.horizontalMargin network: root.network onKeyFromFileSelected: { @@ -147,7 +159,7 @@ Column { "clientCertFile": root.network.clientCertFile, "hidden": root.network.hidden }) - settingsDBus.call("showAddNetworkDialog"); + settingsDBus.call("showAddNetworkDialog") root.closeDialog() } onCertFromFileSelected: { @@ -165,7 +177,7 @@ Column { "clientCertFile": "custom", "hidden": root.network.hidden }) - settingsDBus.call("showAddNetworkDialog"); + settingsDBus.call("showAddNetworkDialog") root.closeDialog() } } @@ -173,6 +185,7 @@ Column { IdentityField { id: identityField + textMargin: root.horizontalMargin network: root.network immediateUpdate: true @@ -183,6 +196,7 @@ Column { PassphraseField { id: passphraseField + textMargin: root.horizontalMargin network: root.network immediateUpdate: true EnterKey.enabled: root.canAccept diff --git a/usr/share/lipstick-windowprompt/connectivity/ConnectionSelector.qml b/usr/share/lipstick-windowprompt/connectivity/ConnectionSelector.qml index 088ec726..cf3ef151 100644 --- a/usr/share/lipstick-windowprompt/connectivity/ConnectionSelector.qml +++ b/usr/share/lipstick-windowprompt/connectivity/ConnectionSelector.qml @@ -1,23 +1,23 @@ /**************************************************************************** ** -** Copyright (C) 2013 - 2019 Jolla Ltd. +** Copyright (C) 2013 - 2022 Jolla Ltd. ** Copyright (C) 2020 Open Mobile Platform LLC. ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Lipstick 1.0 import Sailfish.Telephony 1.0 import Sailfish.Settings.Networking 1.0 import Sailfish.Homescreen.UserAgent 1.0 -import MeeGo.Connman 0.2 -import MeeGo.QOfono 0.2 +import Connman 0.2 +import QOfono 0.2 import Nemo.Connectivity 1.0 import Nemo.DBus 2.0 import Nemo.Notifications 1.0 as SystemNotifications import org.nemomobile.ofono 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import org.nemomobile.systemsettings 1.0 import Sailfish.Policy 1.0 @@ -33,6 +33,9 @@ SystemDialog { property real keyboardHeight: transpose ? Qt.inputMethod.keyboardRectangle.width : Qt.inputMethod.keyboardRectangle.height readonly property real reservedHeight: Math.max( (Screen.sizeCategory < Screen.Large ? 0.2 : 0.4) * screenHeight, keyboardHeight) - 1 + property int horizontalMargin: Math.max(Theme.paddingLarge, + (transpose && Screen.topCutout.height > 0) + ? Screen.topCutout.height + Theme.paddingSmall : 0) property var delayedFields: ({}) property string delayedServicePath @@ -148,14 +151,16 @@ SystemDialog { property bool disablingTethering property string cellularErrorText - property bool busy: (connectingService || disablingTethering || wifiListModel.scanning || delayedScanRequest.running || - (wifiMode && (wifiListModel.count == 0 && (!_wifiTechnology || !_wifiTechnology.tethering))) ) && - !(invalidCredentials || errorCondition) && (!wifiMode || wifiListModel.powered) + property bool busy: (connectingService || disablingTethering || delayedScanRequest.running + || (wifiMode && (wifiListModel.count == 0 + && (!_wifiTechnology || !_wifiTechnology.tethering)))) + && !(invalidCredentials || errorCondition) + && (!wifiMode || wifiListModel.powered) - property bool stateInformation: (!wifiMode && networkManager.offlineMode) || - (wifiMode && (!wifiListModel.powered || - (_wifiTechnology && _wifiTechnology.tethering))) || - busy || invalidCredentials || errorCondition || cellularErrorText.length > 0 + property bool stateInformation: (!wifiMode && networkManager.offlineMode) + || (wifiMode && (!wifiListModel.powered + || (_wifiTechnology && _wifiTechnology.tethering))) + || busy || invalidCredentials || errorCondition || cellularErrorText.length > 0 property bool showStatus: expanded && stateInformation && !networkListWrapper.visible property bool showList: expanded && wifiMode && wifiListModel.powered && !stateInformation && !statusArea.visible property bool addingNetwork @@ -169,9 +174,10 @@ SystemDialog { } width: parent.width - height: (connectionDialog.visible && expanded) ? (showStatus ? listView.headerHeight + statusArea.height - : (addingNetwork ? Math.min(contentHeight, expandedHeight) : expandedHeight)) - : listView.headerHeight + height: (connectionDialog.visible && expanded) + ? (showStatus ? listView.headerHeight + statusArea.height + : (addingNetwork ? Math.min(contentHeight, expandedHeight) : expandedHeight)) + : listView.headerHeight contentHeight: addingNetwork ? addNetworkView.height : listView.height clip: true @@ -332,17 +338,25 @@ SystemDialog { property bool waitingPropertiesReady property bool waitingAutoConnect property bool provisioningEap + property bool wasAvailable property Timer outOfRangeTimer: Timer { interval: 5000 onTriggered: connections.connectingService = false } + // FIXME: This exists to workaround a shortcoming with libconnman-qt + // as that sends sometimes extra signals causing onAvailableChanged + // to fire even if the value was the same as on previous call. + // JB#57750 + Component.onCompleted: wasAvailable = available + onAvailableChanged: { - if (available && !waitingPropertiesReady && connections.connectingService) { + if (!wasAvailable && available && !waitingPropertiesReady && connections.connectingService) { outOfRangeTimer.stop() connections.connectService(selectedService) } + wasAvailable = available } onPropertiesReady: { @@ -395,6 +409,7 @@ SystemDialog { active: connections.addingNetwork || opacity > 0.0 width: parent.width sourceComponent: AddNetworkView { + horizontalMargin: connectionDialog.horizontalMargin onAccepted: { connections.provision(config) selectedService.provisioningEap = false @@ -437,7 +452,7 @@ SystemDialog { id: header //% "Select internet connection" title: qsTrId("lipstick-jolla-home-he-connection_select") - topPadding: Screen.sizeCategory >= Screen.Large ? 2*Theme.paddingLarge : Theme.paddingLarge + tight: true } Row { @@ -571,7 +586,8 @@ SystemDialog { anchors.horizontalCenter: parent.horizontalCenter Image { id: addIcon - x: Theme.paddingLarge + + x: connectionDialog.horizontalMargin anchors.verticalCenter: parent.verticalCenter source: "image://theme/icon-m-add" + (addNetworkItem.highlighted ? "?" + Theme.highlightColor : "") } @@ -601,10 +617,9 @@ SystemDialog { model: connections.wifiMode ? wifiListModel : null delegate: WlanItem { - id: item - width: header.width anchors.horizontalCenter: parent.horizontalCenter + horizontalMargin: connectionDialog.horizontalMargin onClicked: { if (selectedService.path !== networkService.path) { connections.resetState() @@ -626,8 +641,9 @@ SystemDialog { onSend: { if (eap) { - if (!formData['Name']) - formData['Name'] = selectedService.name; + if (!formData['Name']) { + formData['Name'] = selectedService.name + } connections.provision(formData) selectedService.provisioningEap = true } else { @@ -761,7 +777,7 @@ SystemDialog { text: qsTrId("lipstick-jolla-home-bt-disable_internet_sharing") onClicked: { connections.disablingTethering = true - connectionAgent.stopTethering() + connectionAgent.stopTethering("wifi") } } }, @@ -914,8 +930,10 @@ SystemDialog { name: "wifi" changesInhibited: networkList.contextMenuOpen || !connectionDialog.visible onPoweredChanged: { - if (powered) - delayedScanRequest.start() + if (powered) { + delayedScanRequest.stop() + requestScan() + } } onScanRequestFinished: { if (delayedServicePath.length > 0) { diff --git a/usr/share/lipstick-windowprompt/connectivity/CredentialsForm.qml b/usr/share/lipstick-windowprompt/connectivity/CredentialsForm.qml index 31b24389..3a4a8e83 100644 --- a/usr/share/lipstick-windowprompt/connectivity/CredentialsForm.qml +++ b/usr/share/lipstick-windowprompt/connectivity/CredentialsForm.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 ContextMenu { diff --git a/usr/share/lipstick-windowprompt/connectivity/DynamicFields.qml b/usr/share/lipstick-windowprompt/connectivity/DynamicFields.qml index 9090a32f..7c833796 100644 --- a/usr/share/lipstick-windowprompt/connectivity/DynamicFields.qml +++ b/usr/share/lipstick-windowprompt/connectivity/DynamicFields.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 Column { diff --git a/usr/share/lipstick-windowprompt/connectivity/EapForm.qml b/usr/share/lipstick-windowprompt/connectivity/EapForm.qml index 71e54362..99a26bc7 100644 --- a/usr/share/lipstick-windowprompt/connectivity/EapForm.qml +++ b/usr/share/lipstick-windowprompt/connectivity/EapForm.qml @@ -5,10 +5,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Settings.Networking 1.0 -import MeeGo.Connman 0.2 +import Connman 0.2 import Nemo.DBus 2.0 Column { @@ -100,7 +100,7 @@ Column { "clientCertFile": network.clientCertFile, "hidden": network.hidden }) - settingsDBus.call("showAddNetworkDialog"); + settingsDBus.call("showAddNetworkDialog") root.closeDialog() } } @@ -122,7 +122,7 @@ Column { "clientCertFile": network.clientCertFile, "hidden": network.hidden }) - settingsDBus.call("showAddNetworkDialog"); + settingsDBus.call("showAddNetworkDialog") root.closeDialog() } @@ -141,7 +141,7 @@ Column { "clientCertFile": "custom", "hidden": network.hidden }) - settingsDBus.call("showAddNetworkDialog"); + settingsDBus.call("showAddNetworkDialog") root.closeDialog() } } diff --git a/usr/share/lipstick-windowprompt/connectivity/WlanItem.qml b/usr/share/lipstick-windowprompt/connectivity/WlanItem.qml index e331a438..f94ff78e 100644 --- a/usr/share/lipstick-windowprompt/connectivity/WlanItem.qml +++ b/usr/share/lipstick-windowprompt/connectivity/WlanItem.qml @@ -5,7 +5,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.6 import Sailfish.Silica 1.0 import Sailfish.Settings.Networking 1.0 @@ -15,19 +15,22 @@ ListItem { property bool connected: modelData && (modelData.state == "online" || modelData.state == "ready") property bool highlightContent: connected || menuOpen || down property color baseColor: highlightContent ? Theme.highlightColor : Theme.primaryColor + property int horizontalMargin: Theme.paddingLarge openMenuOnPressAndHold: false highlightedColor: "transparent" Image { id: icon - x: Theme.paddingLarge + + x: listItem.horizontalMargin anchors.verticalCenter: parent.verticalCenter source: "image://theme/icon-m-wlan-" + WlanUtils.getStrengthString(modelData.strength) + "?" + listItem.baseColor } Label { id: serviceName + anchors { left: icon.right leftMargin: Theme.paddingSmall @@ -54,11 +57,12 @@ ListItem { Label { id: bssidLabel + anchors { leftMargin: Theme.paddingMedium verticalCenter: parent.verticalCenter right: secureIcon.visible ? secureIcon.left : parent.right - rightMargin: secureIcon.visible ? Theme.paddingSmall : Theme.paddingLarge + rightMargin: secureIcon.visible ? Theme.paddingSmall : listItem.horizontalMargin } font.pixelSize: Theme.fontSizeExtraSmall visible: !modelData.name @@ -68,7 +72,8 @@ ListItem { Image { id: secureIcon - x: parent.width - width - Theme.paddingLarge + + x: parent.width - width - listItem.horizontalMargin anchors.verticalCenter: parent.verticalCenter source: "image://theme/icon-s-secure?" + listItem.baseColor visible: modelData.security ? modelData.security.indexOf("none") == -1 : false diff --git a/usr/share/lipstick-windowprompt/main.qml b/usr/share/lipstick-windowprompt/main.qml index 08f43fda..c42b7334 100644 --- a/usr/share/lipstick-windowprompt/main.qml +++ b/usr/share/lipstick-windowprompt/main.qml @@ -5,7 +5,7 @@ * License: Proprietary */ -import QtQuick 2.0 +import QtQuick 2.6 import QtQuick.Window 2.0 import Sailfish.Silica 1.0 import com.jolla.lipstick 0.1 @@ -18,7 +18,7 @@ ApplicationWindow { property string _componentName function singleShot(timeout, callback) { - var timer = Qt.createQmlObject("import QtQuick 2.0; Timer {}", root, "singleShot") + var timer = Qt.createQmlObject("import QtQuick 2.6; Timer {}", root, "singleShot") timer.interval = timeout timer.repeat = false timer.triggered.connect(callback) diff --git a/usr/share/lipstick/eventfeed/VKFeedItem.qml b/usr/share/lipstick/eventfeed/VKFeedItem.qml deleted file mode 100644 index 244b3d5e..00000000 --- a/usr/share/lipstick/eventfeed/VKFeedItem.qml +++ /dev/null @@ -1,176 +0,0 @@ -/**************************************************************************** - ** - ** Copyright (C) 2014 - 2016 Jolla Ltd. - ** Copyright (C) 2020 Open Mobile Platform LLC. - ** - ****************************************************************************/ - -import QtQuick 2.0 -import Sailfish.Silica 1.0 -import Sailfish.TextLinking 1.0 -import "shared" - -SocialMediaFeedItem { - id: item - - contentHeight: Math.max(content.height, avatar.height) + Theme.paddingMedium * 3 - width: parent.width - avatarSource: model.icon - - property variant imageList - property bool isRepost: repostType.visible - property string formattedRepostTime - - onRefreshTimeCountChanged: formattedRepostTime = Format.formatDate(model.repostTimestamp, Format.DurationElapsed) - - Column { - id: content - x: item.avatar.width + Theme.paddingMedium - y: item.topMargin - width: parent.width - x - Theme.horizontalPageMargin - - SocialMediaPreviewRow { - downloader: item.downloader - imageList: item.imageList - connectedToNetwork: item.connectedToNetwork - eventsColumnMaxWidth: item.eventsColumnMaxWidth - item.avatar.width - } - - Label { - width: parent.width - truncationMode: TruncationMode.Fade - text: model.name - textFormat: Text.PlainText - } - - Label { - id: repostType - width: parent.width - truncationMode: TruncationMode.Fade - opacity: .6 - text: item.repostTypeText(model.repostType) - font.pixelSize: Theme.fontSizeSmall - color: Theme.primaryColor - visible: text !== "" - textFormat: Text.PlainText - } - - LinkedText { - width: parent.width - maximumLineCount: 15 - elide: Text.ElideRight - wrapMode: Text.Wrap - font.pixelSize: Theme.fontSizeSmall - shortenUrl: true - linkColor: Theme.highlightColor - plainText: model.body - visible: plainText !== "" - } - - Text { - width: parent.width - maximumLineCount: 1 - elide: Text.ElideRight - wrapMode: Text.Wrap - color: Theme.highlightColor - font.pixelSize: Theme.fontSizeSmall - text: item.formattedTime - } - - Column { - width: parent.width - visible: item.isRepost - spacing: Theme.paddingSmall - - Item { - width: 1 - height: Theme.paddingLarge - } - - Item { - width: parent.width - height: repostIcon.height - - Image { - id: repostIcon - source: "image://theme/icon-s-repost" + (item.highlighted ? "?" + Theme.highlightColor : "") - } - - Text { - anchors { - left: repostIcon.right - leftMargin: Theme.paddingMedium - right: parent.right - verticalCenter: repostIcon.verticalCenter - } - elide: Text.ElideRight - opacity: .6 - text: model.repostOwnerName - font.pixelSize: Theme.fontSizeSmall - color: Theme.primaryColor - textFormat: Text.PlainText - } - } - - Item { - width: 1 - height: Theme.paddingSmall - } - - SocialMediaPreviewRow { - downloader: item.downloader - imageList: model.repostImages - connectedToNetwork: item.connectedToNetwork - eventsColumnMaxWidth: item.eventsColumnMaxWidth - item.avatar.width - } - - LinkedText { - width: parent.width - maximumLineCount: 15 - elide: Text.ElideRight - wrapMode: Text.Wrap - font.pixelSize: Theme.fontSizeSmall - shortenUrl: true - color: item.pressed ? Theme.highlightColor : Theme.primaryColor - linkColor: Theme.highlightColor - plainText: model.repostText - visible: plainText !== "" - } - - Text { - text: item.formattedRepostTime - maximumLineCount: 1 - elide: Text.ElideRight - wrapMode: Text.Wrap - color: item.highlighted ? Theme.secondaryHighlightColor : Theme.highlightColor - font.pixelSize: Theme.fontSizeExtraSmall - textFormat: Text.PlainText - } - } - } - - function repostTypeText(repostType) { - if (repostType !== "") { - switch (repostType) { - case "link": - //: User shared a link in VK - //% "Shared link" - return qsTrId("lipstick-jolla-home-la-vk_shared_link") - case "video": - //: User shared a video in VK - //% "Shared video" - return qsTrId("lipstick-jolla-home-la-vk_shared_video") - case "photo": - //: User shared a photo in VK - //% "Shared photo" - return qsTrId("lipstick-jolla-home-la-vk_shared_photo") - } - - //: User shared a post in VK - //% "Shared post" - return qsTrId("lipstick-jolla-home-la-vk_shared_post") - } - - return "" - } -} diff --git a/usr/share/lipstick/eventfeed/shared/SocialMediaFeedItem.qml b/usr/share/lipstick/eventfeed/shared/SocialMediaFeedItem.qml index 0d1e387d..75966bca 100644 --- a/usr/share/lipstick/eventfeed/shared/SocialMediaFeedItem.qml +++ b/usr/share/lipstick/eventfeed/shared/SocialMediaFeedItem.qml @@ -45,7 +45,7 @@ NotificationGroupMember { } } - onRefreshTimeCountChanged: formattedTime = Format.formatDate(timestamp, Format.DurationElapsed) + onRefreshTimeCountChanged: formattedTime = Format.formatDate(timestamp, Format.TimeElapsed) SocialAvatar { id: _avatar diff --git a/usr/share/lipstick/eventfeed/vk-delegate.qml b/usr/share/lipstick/eventfeed/vk-delegate.qml deleted file mode 100644 index 48e99b2a..00000000 --- a/usr/share/lipstick/eventfeed/vk-delegate.qml +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** - ** - ** Copyright (C) 2014 - 2015 Jolla Ltd. - ** Copyright (C) 2020 Open Mobile Platform LLC. - ** - ****************************************************************************/ - -import QtQuick 2.0 -import Sailfish.Silica 1.0 -import org.nemomobile.social 1.0 -import org.nemomobile.socialcache 1.0 -import "shared" - -SocialMediaAccountDelegate { - id: delegateItem - - //: VK News - //% "News" - headerText: qsTrId("lipstick-jolla-home-la-vk_posts") - headerIcon: "image://theme/graphic-service-vk" - - services: ["Posts", "Notifications"] - socialNetwork: SocialSync.VK - dataType: SocialSync.Notifications - - model: VKPostsModel {} - - delegate: VKFeedItem { - downloader: delegateItem.downloader - imageList: model.images - accountId: model.accounts[0] - userRemovable: true - animateRemoval: defaultAnimateRemoval || delegateItem.removeAllInProgress - - onRemoveRequested: { - delegateItem.model.remove(model.vkId) - } - - onTriggered: { - Qt.openUrlExternally(model.link) - } - - Component.onCompleted: { - refreshTimeCount = Qt.binding(function() { return delegateItem.refreshTimeCount }) - connectedToNetwork = Qt.binding(function() { return delegateItem.connectedToNetwork }) - eventsColumnMaxWidth = Qt.binding(function() { return delegateItem.eventsColumnMaxWidth }) - } - } - - //% "Show more in VK" - expandedLabel: qsTrId("lipstick-jolla-home-la-show-more-in-vk") - userRemovable: true - - onHeaderClicked: Qt.openUrlExternally("https://m.vk.com/feed") - onExpandedClicked: Qt.openUrlExternally("https://m.vk.com/feed") - - onViewVisibleChanged: { - if (viewVisible) { - delegateItem.resetHasSyncableAccounts() - delegateItem.model.refresh() - } - } -} diff --git a/usr/share/maliit/plugins/com/jolla/ContextAwareCommaKey.qml b/usr/share/maliit/plugins/com/jolla/ContextAwareCommaKey.qml index 1fdb04a5..972bf66b 100644 --- a/usr/share/maliit/plugins/com/jolla/ContextAwareCommaKey.qml +++ b/usr/share/maliit/plugins/com/jolla/ContextAwareCommaKey.qml @@ -11,7 +11,7 @@ CharacterKey { captionShifted: caption symView: "," symView2: "," - implicitWidth: punctuationKeyWidthNarrow + implicitWidth: punctuationKeyWidth fixedWidth: !splitActive separator: SeparatorState.HiddenSeparator } diff --git a/usr/share/maliit/plugins/com/jolla/FunctionKey.qml b/usr/share/maliit/plugins/com/jolla/FunctionKey.qml index 688564d1..5eb89dd8 100644 --- a/usr/share/maliit/plugins/com/jolla/FunctionKey.qml +++ b/usr/share/maliit/plugins/com/jolla/FunctionKey.qml @@ -70,7 +70,7 @@ KeyBase { fontSizeMode: Text.HorizontalFit horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter - font.pixelSize: Theme.fontSizeMedium + font.pixelSize: Theme.fontSizeSmall font.family: Theme.fontFamily text: parent.caption } diff --git a/usr/share/maliit/plugins/com/jolla/HorizontalPredictionListView.qml b/usr/share/maliit/plugins/com/jolla/HorizontalPredictionListView.qml index 6f6ffc61..03830812 100644 --- a/usr/share/maliit/plugins/com/jolla/HorizontalPredictionListView.qml +++ b/usr/share/maliit/plugins/com/jolla/HorizontalPredictionListView.qml @@ -69,6 +69,7 @@ PredictionListView { IconButton { id: removeButton + x: label.x + label.width height: delegate.height width: delegate.height diff --git a/usr/share/maliit/plugins/com/jolla/HwrInputHandler.qml b/usr/share/maliit/plugins/com/jolla/HwrInputHandler.qml new file mode 100644 index 00000000..d945be1c --- /dev/null +++ b/usr/share/maliit/plugins/com/jolla/HwrInputHandler.qml @@ -0,0 +1,134 @@ +import QtQuick 2.0 +import com.meego.maliitquick 1.0 +import Sailfish.Silica 1.0 +import com.jolla.hwr 1.0 +import com.jolla.keyboard 1.0 + +InputHandler { + id: hwrHandler + + property string inputMode: keyboard.layout ? keyboard.layout.inputMode : "" + property string preedit: HwrModel.primaryCandidate + + onInputModeChanged: HwrModel.inputMode = inputMode + + onPreeditChanged: { + if (active) { + MInputMethodQuick.sendPreedit(preedit) + } + } + + Component { + id: pasteComponent + PasteButton { + onClicked: { + if (preedit !== "") { + MInputMethodQuick.sendCommit(preedit) + } + MInputMethodQuick.sendCommit(Clipboard.text) + HwrModel.clear() + keyboard.expandedPaste = false + } + } + } + + topItem: Component { + TopItem { + id: topItem + height: Theme.itemSizeSmall + + Rectangle { + height: parent.height + width: parent.width + color: Theme.rgba(Theme.highlightBackgroundColor, .05) + + ListView { + id: listView + model: HwrModel + orientation: ListView.Horizontal + anchors.fill: parent + header: pasteComponent + boundsBehavior: !keyboard.expandedPaste && Clipboard.hasText ? Flickable.DragOverBounds : Flickable.StopAtBounds + + onDraggingChanged: { + if (!dragging && !keyboard.expandedPaste && contentX < -(headerItem.width + Theme.paddingLarge)) { + keyboard.expandedPaste = true + positionViewAtBeginning() + } + } + + delegate: BackgroundItem { + onClicked: hwrHandler.applyCandidate(model.text) + width: candidateText.width + Theme.paddingLarge * 2 + height: topItem.height + + Text { + id: candidateText + anchors.centerIn: parent + color: highlighted ? Theme.highlightColor : Theme.primaryColor + font { pixelSize: Theme.fontSizeSmall; family: Theme.fontFamily } + text: model.text + } + } + } + + Connections { + target: Clipboard + onTextChanged: { + if (Clipboard.hasText) { + // need to have updated width before repositioning view + positionerTimer.restart() + } + } + } + + Connections { + target: HwrModel + onModelReset: keyboard.expandedPaste = false + onCharacterStarted: { + if (hwrHandler.preedit !== "") { + MInputMethodQuick.sendCommit(hwrHandler.preedit) + } + } + } + + Timer { + id: positionerTimer + interval: 10 + onTriggered: listView.positionViewAtBeginning() + } + } + } + } + + onActiveChanged: { + if (!active && preedit !== "") { + MInputMethodQuick.sendCommit(preedit) + HwrModel.clear() + } + } + + function handleKeyClick() { + keyboard.expandedPaste = false + if (preedit !== "") { + if (pressedKey.key === Qt.Key_Space || pressedKey.key === Qt.Key_Return) { + MInputMethodQuick.sendCommit(preedit) + HwrModel.clear() + return true + } else if (pressedKey.key === Qt.Key_Backspace) { + MInputMethodQuick.sendPreedit("") + HwrModel.clear() + return true + } + } + return false + } + + function applyCandidate(text) { + MInputMethodQuick.sendCommit(text) + HwrModel.clear() + if (canvas.phraseEngine) { + HwrModel.setPhraseCandidates(canvas.phraseEngine.phraseCandidates(text)) + } + } +} diff --git a/usr/share/maliit/plugins/com/jolla/HwrLayout.qml b/usr/share/maliit/plugins/com/jolla/HwrLayout.qml index 98f67924..12919a8e 100644 --- a/usr/share/maliit/plugins/com/jolla/HwrLayout.qml +++ b/usr/share/maliit/plugins/com/jolla/HwrLayout.qml @@ -173,7 +173,7 @@ KeyboardLayout { } IconButton { - visible: hwrCanvas.visible + visible: hwrCanvas.visible && !MInputMethodQuick.extensions.keyboardClosingDisabled anchors { right: parent.right top: parent.top @@ -297,7 +297,7 @@ KeyboardLayout { PasteButton { previewWidthLimit: geometry.hwrPastePreviewWidth - visible: !keyboard.inSymView && Clipboard.hasText + visible: !keyboard.inSymView && keyboard.pasteEnabled popupAnchor: 1 // = right anchors { right: parent.right diff --git a/usr/share/maliit/plugins/com/jolla/InputHandler.qml b/usr/share/maliit/plugins/com/jolla/InputHandler.qml index 0fdc0d88..8cab48f8 100644 --- a/usr/share/maliit/plugins/com/jolla/InputHandler.qml +++ b/usr/share/maliit/plugins/com/jolla/InputHandler.qml @@ -123,7 +123,9 @@ Silica.SilicaItem { MInputMethodQuick.sendKey(Qt.Key_Backspace, 0, "\b", Maliit.KeyClick) } else if (pressedKey.key === Qt.Key_Paste) { - MInputMethodQuick.sendCommit(Silica.Clipboard.text) + if (keyboard.pasteEnabled) { + MInputMethodQuick.sendCommit(Silica.Clipboard.text) + } } else { resetShift = false } diff --git a/usr/share/maliit/plugins/com/jolla/KeyboardBase.qml b/usr/share/maliit/plugins/com/jolla/KeyboardBase.qml index 1f966dee..c4e3a200 100644 --- a/usr/share/maliit/plugins/com/jolla/KeyboardBase.qml +++ b/usr/share/maliit/plugins/com/jolla/KeyboardBase.qml @@ -33,7 +33,7 @@ import Sailfish.Silica 1.0 import Sailfish.Silica.Background 1.0 import com.meego.maliitquick 1.0 import com.jolla.keyboard 1.0 -import org.nemomobile.configuration 1.0 +import Nemo.Configuration 1.0 import "touchpointarray.js" as ActivePoints PagedView { @@ -61,6 +61,13 @@ PagedView { property bool inSymView2 // allow chinese input handler to override enter key state property bool chineseOverrideForEnter + property bool pasteEnabled: !_pasteDisabled && Clipboard.hasText + property bool _pasteDisabled + Binding on _pasteDisabled { + // avoid change when keyboard is hiding + when: MInputMethodQuick.active + value: !!MInputMethodQuick.extensions.pasteDisabled + } property bool silenceFeedback property bool layoutChangeAllowed @@ -106,23 +113,23 @@ PagedView { } } - delegate: Loader { - id: layoutLoader + delegate: Item { + id: layoutDelegate - readonly property bool exposed: status === Loader.Ready && PagedView.exposed - readonly property bool current: status === Loader.Ready && PagedView.isCurrentItem + property Item loadedLayout: layoutLoader.item + property Item loader: layoutLoader + readonly property bool exposed: layoutLoader.status === Loader.Ready && PagedView.exposed + readonly property bool current: layoutLoader.status === Loader.Ready && PagedView.isCurrentItem width: keyboard.width - height: status === Loader.Error ? Theme.itemSizeHuge : implicitHeight - - source: keyboard.sourceDirectory + model.file + height: layoutLoader.height onExposedChanged: { // Reset the layout keyboard state when it is dragged into view. - var attributes = exposed && !PagedView.isCurrentItem ? item.attributes : null + var attributes = exposed && !PagedView.isCurrentItem ? layoutLoader.item.attributes : null if (attributes) { - attributes.isShifted = keyboard.shouldUseAutocaps(item) + attributes.isShifted = keyboard.shouldUseAutocaps(layoutLoader.item) attributes.inSymView = false attributes.inSymView2 = false attributes.isShiftLocked = false @@ -130,7 +137,7 @@ PagedView { } onCurrentChanged: { - var attributes = item.attributes + var attributes = layoutLoader.item.attributes if (current) { // Bind to the active keyboad state when made the current layout. @@ -149,16 +156,24 @@ PagedView { } KeyboardBackground { - z: -1 - width: layoutLoader.width - height: layoutLoader.height - + width: layoutDelegate.width + height: layoutDelegate.height transformItem: keyboard } + + Loader { + id: layoutLoader + + anchors.horizontalCenter: parent.horizontalCenter + width: keyboard.portraitMode ? keyboard.width : geometry.keyboardWidthLandscape + height: status === Loader.Error ? Theme.itemSizeHuge : implicitHeight + source: keyboard.sourceDirectory + model.file + } } Popper { id: popper + z: 10 target: lastPressedKey onExpandedChanged: { @@ -185,6 +200,7 @@ PagedView { Timer { id: languageSwitchTimer + interval: 500 onTriggered: { if (canvas.layoutModel.enabledCount > 1) { @@ -196,6 +212,7 @@ PagedView { Timer { id: autocapsTimer + interval: 1 onTriggered: applyAutocaps() } @@ -240,15 +257,22 @@ PagedView { anchors.fill: parent z: -1 - onPressed: keyboard.handlePressed(createPointArray(mouse.x, mouse.y)) + onPressed: { + startX = mouse.x + startY = mouse.y + keyboard.handlePressed(createPointArray(mouse.x, mouse.y)) + } onPositionChanged: keyboard.handleUpdated(createPointArray(mouse.x, mouse.y)) onReleased: keyboard.handleReleased(createPointArray(mouse.x, mouse.y)) onCanceled: keyboard.cancelAllTouchPoints() + property real startX + property real startY + function createPointArray(pointX, pointY) { var pointArray = new Array pointArray.push({"pointId": 1, "x": pointX, "y": pointY, - "startX": pointX, "startY": pointY }) + "startX": startX, "startY": startY }) return pointArray } } @@ -295,6 +319,10 @@ PagedView { var point = ActivePoints.addPoint(touchPoints[i]) updatePressedKey(point) } + + if (ActivePoints.array.length > 1) { + keyboard.interactive = false // disable keyboard drag until all the touchpoints are released + } } function handleUpdated(touchPoints) { @@ -320,7 +348,7 @@ PagedView { mouseArea.preventStealing = true } - if (yDiff > closeSwipeThreshold) { + if (yDiff > closeSwipeThreshold && !MInputMethodQuick.extensions.keyboardClosingDisabled) { // swiped down to close keyboard MInputMethodQuick.userHide() if (point.pressedKey) { @@ -450,9 +478,9 @@ PagedView { var item = layout var current = currentItem - if (current && current.item === layout) { - x -= current.x - y -= current.y + if (current && current.loadedLayout === layout) { + x -= current.x + current.loader.x + y -= current.y + current.loader.y } else { x -= item.x y -= item.y diff --git a/usr/share/maliit/plugins/com/jolla/KeyboardGeometry.qml b/usr/share/maliit/plugins/com/jolla/KeyboardGeometry.qml index 4cdd00d9..ef69d254 100644 --- a/usr/share/maliit/plugins/com/jolla/KeyboardGeometry.qml +++ b/usr/share/maliit/plugins/com/jolla/KeyboardGeometry.qml @@ -10,7 +10,23 @@ QtObject { property real scaleRatio: isLargeScreen ? screen.width / 580 : screen.width / 480 property real verticalScale: isLargeScreen ? screen.width / 768 : scaleRatio - property int keyboardWidthLandscape: screen.height + // extra paddings horizontally or vertically to avoid overlapping rounded corners + // using the biggest to keep symmetry + property int cornerPadding: { + // assuming the roundings are simple with x and y detached the radius amount from edges. + var biggestCorner = Math.max(Screen.topLeftCorner.radius, + Screen.topRightCorner.radius, + Screen.bottomLeftCorner.radius, + Screen.bottomRightCorner.radius) + // 0.7 assumed being enough of the rounding to avoid + return biggestCorner * 0.7 + } + + property int keyboardWidthLandscape: { + var avoidance = Math.max(Screen.topCutout.height, cornerPadding) + // avoiding in both sides to keep symmetry + return screen.height - (avoidance * 2) + } property int keyboardWidthPortrait: screen.width property int keyHeightLandscape: isLargeScreen ? keyHeightPortrait : 58*verticalScale @@ -21,17 +37,15 @@ QtObject { property int shiftKeyWidthLandscape: 110*scaleRatio property int shiftKeyWidthLandscapeNarrow: 98*scaleRatio property int shiftKeyWidthLandscapeSplit: 77*scaleRatio - property int punctuationKeyLandscape: 120*scaleRatio - property int punctuationKeyLandscapeNarrow: 80*scaleRatio - property int symbolKeyWidthLandscapeNarrow: 145*scaleRatio + property int punctuationKeyLandscape: 80*scaleRatio + property int symbolKeyWidthLandscapeNarrow: functionKeyWidthLandscape property int symbolKeyWidthLandscapeNarrowSplit: 100*scaleRatio - property int functionKeyWidthPortrait: 116*scaleRatio + property int functionKeyWidthPortrait: 95*scaleRatio property int shiftKeyWidthPortrait: 72*scaleRatio property int shiftKeyWidthPortraitNarrow: 60*scaleRatio - property int punctuationKeyPortait: 56*scaleRatio - property int punctuationKeyPortraitNarrow: 43*scaleRatio // 3*narrow + symbol narrow == 2*non-narrow + function key - property int symbolKeyWidthPortraitNarrow: 99*scaleRatio + property int punctuationKeyPortait: 43*scaleRatio + property int symbolKeyWidthPortraitNarrow: functionKeyWidthPortrait property int middleBarWidth: keyboardWidthLandscape / 4 diff --git a/usr/share/maliit/plugins/com/jolla/KeyboardLayout.qml b/usr/share/maliit/plugins/com/jolla/KeyboardLayout.qml index ef11ceaf..f39eaf90 100644 --- a/usr/share/maliit/plugins/com/jolla/KeyboardLayout.qml +++ b/usr/share/maliit/plugins/com/jolla/KeyboardLayout.qml @@ -1,7 +1,7 @@ // Copyright (C) 2013 Jolla Ltd. // Contact: Pekka Vuorela
Choose 'Skip' to set up openfortivpn manually." + message: qsTrId("settings_network-he-vpn_import_openfortivpn_desc") + //% "Choose 'Try again' to choose another file, or choose 'Skip' to set up openfortivpn manually." + failMessage: qsTrId("settings_network-he-vpn_import_openfortivpn_failed_desc") + + nameFilters: [ '*.conn', '*.conf' ] +} diff --git a/usr/share/sailfish-vpn/openfortivpn/listitem.qml b/usr/share/sailfish-vpn/openfortivpn/listitem.qml new file mode 100644 index 00000000..e0ab339d --- /dev/null +++ b/usr/share/sailfish-vpn/openfortivpn/listitem.qml @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2020 Jolla Ltd. + * Copyright (c) 2020 Open Mobile Platform LLC. + * + * License: Proprietary + */ + +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Settings.Networking.Vpn 1.0 +import Sailfish.Settings.Networking 1.0 + +VpnTypeItem { + canImport: true + onClicked: { + pageStack.animatorPush("OfvFileSettingsDialog.qml", { mainPage: _mainPage }) + } + + //% "Fortinet" + name: qsTrId("settings_network-me-vpn_type_openfortivpn") + + //% "An open implementation of Fortinet's proprietary PPP+SSL VPN solution" + description: qsTrId("settings_network-la-vpn_type_openfortivpn") +} diff --git a/usr/share/sailfish-vpn/openvpn/advanced.qml b/usr/share/sailfish-vpn/openvpn/advanced.qml index 0c103363..cc06ab13 100644 --- a/usr/share/sailfish-vpn/openvpn/advanced.qml +++ b/usr/share/sailfish-vpn/openvpn/advanced.qml @@ -17,6 +17,8 @@ Column { openVpnNSCertType.setValue(getProperty('OpenVPN.NSCertType')) openVpnRemoteCertTLS.setValue(getProperty('OpenVPN.RemoteCertTls')) openVpnCipher.text = getProperty('OpenVPN.Cipher') + openVpnDataCiphers.text = getProperty('OpenVPN.DataCiphers') + openVpnDataCiphersFallback.text = getProperty('OpenVPN.DataCiphersFallback') openVpnAuth.text = getProperty('OpenVPN.Auth') openVpnMTU.text = getProperty('OpenVPN.MTU') openVpnDeviceType.setValue(getProperty('OpenVPN.DeviceType')) @@ -39,6 +41,8 @@ Column { updateProvider('OpenVPN.NSCertType', openVpnNSCertType.selection) updateProvider('OpenVPN.RemoteCertTls', openVpnRemoteCertTLS.selection) updateProvider('OpenVPN.Cipher', openVpnCipher.text) + updateProvider('OpenVPN.DataCiphers', openVpnDataCiphers.text) + updateProvider('OpenVPN.DataCiphersFallback', openVpnDataCiphersFallback.text) updateProvider('OpenVPN.Auth', openVpnAuth.text) updateProvider('OpenVPN.MTU', openVpnMTU.filteredText) updateProvider('OpenVPN.DeviceType', openVpnDeviceType.selection) @@ -196,6 +200,22 @@ Column { //% "Cipher algorithm" label: qsTrId("settings_network-la-vpn_openvpn_cipher") + nextFocusItem: openVpnDataCiphers + } + + ConfigTextField { + id: openVpnDataCiphers + + //% "Available cipher algorithms to use" + label: qsTrId("settings_network-la-vpn_openvpn_data_ciphers") + nextFocusItem: openVpnDataCiphersFallback + } + + ConfigTextField { + id: openVpnDataCiphersFallback + + //% "Fallback cipher algorithm" + label: qsTrId("settings_network-la-vpn_openvpn_data_ciphers_fallback") nextFocusItem: openVpnAuth } diff --git a/usr/share/sailfish-vpn/openvpn/import.qml b/usr/share/sailfish-vpn/openvpn/import.qml index 8e1f4412..bdc9938a 100644 --- a/usr/share/sailfish-vpn/openvpn/import.qml +++ b/usr/share/sailfish-vpn/openvpn/import.qml @@ -1,11 +1,11 @@ import QtQuick 2.0 import Sailfish.Settings.Networking.Vpn 1.0 -import org.nemomobile.systemsettings 1.0 as SystemSettings +import Nemo.Connectivity 1.0 as Connectivity QtObject { property string mimeType: 'application/x-openvpn' property string vpnType: 'openvpn' function parseFile(fileName) { - return SystemSettings.SettingsVpnModel.processProvisioningFile(fileName, "openvpn") + return Connectivity.SettingsVpnModel.processProvisioningFile(fileName, "openvpn") } } diff --git a/usr/share/sailfish-vpn/pptp/import.qml b/usr/share/sailfish-vpn/pptp/import.qml index ba730e10..7172df2c 100644 --- a/usr/share/sailfish-vpn/pptp/import.qml +++ b/usr/share/sailfish-vpn/pptp/import.qml @@ -1,11 +1,11 @@ import QtQuick 2.0 import Sailfish.Settings.Networking.Vpn 1.0 -import org.nemomobile.systemsettings 1.0 as SystemSettings +import Nemo.Connectivity 1.0 as Connectivity QtObject { property string mimeType: 'application/x-pptp' property string vpnType: 'pptp' function parseFile(fileName) { - return SystemSettings.SettingsVpnModel.processProvisioningFile(fileName, "pptp") + return Connectivity.SettingsVpnModel.processProvisioningFile(fileName, "pptp") } } diff --git a/usr/share/sailfish-vpn/vpnc/import.qml b/usr/share/sailfish-vpn/vpnc/import.qml index 7caabeac..85fb296e 100644 --- a/usr/share/sailfish-vpn/vpnc/import.qml +++ b/usr/share/sailfish-vpn/vpnc/import.qml @@ -1,10 +1,10 @@ import QtQuick 2.0 import Sailfish.Settings.Networking.Vpn 1.0 -import org.nemomobile.systemsettings 1.0 as SystemSettings +import Nemo.Connectivity 1.0 as Connectivity QtObject { property string mimeType: 'application/x-vpnc' function parseFile(fileName) { - return SystemSettings.SettingsVpnModel.processProvisioningFile(fileName, "vpnc") + return Connectivity.SettingsVpnModel.processProvisioningFile(fileName, "vpnc") } } diff --git a/usr/share/sailfish-weather/cover/CurrentWeatherCover.qml b/usr/share/sailfish-weather/cover/CurrentWeatherCover.qml new file mode 100644 index 00000000..e9d0fe2e --- /dev/null +++ b/usr/share/sailfish-weather/cover/CurrentWeatherCover.qml @@ -0,0 +1,47 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Weather 1.0 + +Item { + WeatherCoverItem { + x: Theme.paddingLarge + width: parent.width - 2*x + topPadding: Theme.paddingLarge + text: (weather.status === Weather.Error || weather.status === Weather.Unauthorized) ? weather.city : TemperatureConverter.format(weather.temperature) + " " + weather.city + description: { + if (weather.status === Weather.Error) { + //% "Loading failed" + return qsTrId("weather-la-loading_failed") + } else if (weather.status === Weather.Unauthorized) { + //% "Invalid authentication credentials" + return qsTrId("weather-la-unauthorized") + } + + return weather.description + } + } + WeatherImage { + id: weatherImage + + height: width + width: parent.width - Theme.paddingLarge + sourceSize.width: width + sourceSize.height: width + weatherType: weather ? weather.weatherType : "" + anchors { + centerIn: parent + verticalCenterOffset: Theme.paddingSmall + } + } + Image { + scale: 0.5 + opacity: 0.5 + anchors { + bottom: parent.bottom + bottomMargin: Math.round(Theme.paddingSmall/2) + horizontalCenter: parent.horizontalCenter + } + source: "image://theme/graphic-foreca-small" + } + +} diff --git a/usr/share/sailfish-weather/cover/WeatherCover.qml b/usr/share/sailfish-weather/cover/WeatherCover.qml new file mode 100644 index 00000000..82d3b4c3 --- /dev/null +++ b/usr/share/sailfish-weather/cover/WeatherCover.qml @@ -0,0 +1,98 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Weather 1.0 + +CoverBackground { + id: cover + + property QtObject weather: savedWeathersModel.currentWeather + + property bool current: true + property bool ready: loaded && !error && !unauthorized + property bool loaded: weather + property bool error: loaded && savedWeathersModel.currentWeather.status == Weather.Error + property bool unauthorized: loaded && savedWeathersModel.currentWeather.status == Weather.Unauthorized + + function reload() { + if (current) { + if (savedWeathersModel.currentWeather && currentWeatherModel.updateAllowed()) { + currentWeatherModel.reload() + } + } else if (savedWeathersModel.count > 1) { + weatherApplication.reloadAllIfAllowed() + } + } + + onStatusChanged: if (status == Cover.Active) reload() + onCurrentChanged: reload() + + CoverPlaceholder { + visible: !ready + icon.source: "image://theme/graphic-foreca-large" + text: { + if (!loaded) { + //% "Select location to check weather" + return qsTrId("weather-la-select_location_to_check_weather") + } else if (error) { + //% "Unable to connect, try again" + return qsTrId("weather-la-unable_to_connect_try_again") + } else if (unauthorized) { + //% "Invalid authentication credentials" + return qsTrId("weather-la-unauthorized") + } + + return "" + } + } + Loader { + active: ready + opacity: ready && current ? 1.0 : 0.0 + source: "CurrentWeatherCover.qml" + Behavior on opacity { FadeAnimation {} } + anchors.fill: parent + } + Loader { + active: ready && savedWeathersModel.count > 0 + opacity: ready && !current ? 1.0 : 0.0 + source: "WeatherListCover.qml" + Behavior on opacity { FadeAnimation {} } + anchors.fill: parent + } + + CoverActionList { + enabled: !loaded + CoverAction { + iconSource: "image://theme/icon-cover-search" + onTriggered: { + var alreadyOpen = pageStack.currentPage && pageStack.currentPage.objectName === "LocationSearchPage" + if (!alreadyOpen) { + pageStack.push(Qt.resolvedUrl("../pages/LocationSearchPage.qml"), undefined, PageStackAction.Immediate) + } + weatherApplication.activate() + } + } + } + CoverActionList { + enabled: error + CoverAction { + iconSource: "image://theme/icon-cover-sync" + onTriggered: { + weatherApplication.reloadAll() + } + } + } + CoverActionList { + enabled: ready && savedWeathersModel.count > 0 + CoverAction { + iconSource: current ? "image://theme/icon-cover-previous" + : "image://theme/icon-cover-next" + onTriggered: { + current = !current + } + } + } + Connections { + target: savedWeathersModel + onCountChanged: if (savedWeathersModel.count === 0) current = true + } +} diff --git a/usr/share/sailfish-weather/cover/WeatherCoverItem.qml b/usr/share/sailfish-weather/cover/WeatherCoverItem.qml new file mode 100644 index 00000000..5f87a838 --- /dev/null +++ b/usr/share/sailfish-weather/cover/WeatherCoverItem.qml @@ -0,0 +1,25 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 + +Column { + property alias text: primaryLabel.text + property alias description: secondaryLabel.text + property alias topPadding: topPaddingItem.height + + Item { + id: topPaddingItem + width: parent.width + } + Label { + id: primaryLabel + width: parent.width + truncationMode: TruncationMode.Fade + } + Label { + id: secondaryLabel + width: parent.width + truncationMode: TruncationMode.Fade + font.pixelSize: Theme.fontSizeExtraSmall + color: Theme.secondaryColor + } +} diff --git a/usr/share/sailfish-weather/cover/WeatherListCover.qml b/usr/share/sailfish-weather/cover/WeatherListCover.qml new file mode 100644 index 00000000..d0d9e094 --- /dev/null +++ b/usr/share/sailfish-weather/cover/WeatherListCover.qml @@ -0,0 +1,84 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Weather 1.0 + +Item { + id: root + + property int visibleItemCount: 4 + property int maximumHeight: parent.height - Theme.itemSizeSmall/2 + property int itemHeight: Math.round(maximumHeight / visibleItemCount) + + PathView { + id: view + + property int rollIndex + property real rollOffset + + x: Theme.paddingLarge + model: savedWeathersModel + width: parent.width - 2*x + pathItemCount: count > 4 ? 5 : Math.min(visibleItemCount, count) + height: Math.min(visibleItemCount, count)/visibleItemCount*maximumHeight + offset: rollIndex + rollOffset + delegate: WeatherCoverItem { + property bool aboutToSlideIn: view.rollOffset === 0 && model.index === (view.count - view.rollIndex) % view.count + + width: view.width + visible: view.count <= 4 || !aboutToSlideIn + topPadding: Theme.paddingLarge + Theme.paddingMedium + text: (model.status === Weather.Error || model.status === Weather.Unauthorized) ? model.city : TemperatureConverter.format(model.temperature) + " " + model.city + description: { + if (model.status === Weather.Error) { + //% "Loading failed" + return qsTrId("weather-la-loading_failed") + } else if (model.status === Weather.Unauthorized) { + //% "Invalid authentication credentials" + return qsTrId("weather-la-unauthorized") + } + + return model.description + } + } + path: Path { + startX: view.width/2; startY: view.count > 4 ? -itemHeight/2 : itemHeight/2 + PathLine { x: view.width/2; y: view.height + (view.count > 4 ? itemHeight/2 : itemHeight/2) } + } + Binding { + when: view.count <= 4 + target: view + property: "offset" + value: 0 + } + SequentialAnimation on rollOffset { + id: rollAnimation + running: cover.status === Cover.Active && view.visible && view.count > 4 + loops: Animation.Infinite + NumberAnimation { + from: 0 + to: 1 + duration: 1000 + easing.type: Easing.InOutQuad + } + ScriptAction { + script: { + view.rollIndex = view.rollIndex + 1 + view.rollOffset = 0 + if (view.rollIndex >= view.count) { + view.rollIndex = 0 + } + } + } + PauseAnimation { duration: 3000 } + } + } + OpacityRampEffect { + enabled: view.count > 3 + sourceItem: root + parent: root.parent + direction: OpacityRamp.TopToBottom + slope: 3 + offset: 1 - 1 / slope + } +} + diff --git a/usr/share/sailfish-weather/model/ApplicationWeatherModel.qml b/usr/share/sailfish-weather/model/ApplicationWeatherModel.qml new file mode 100644 index 00000000..326e7d11 --- /dev/null +++ b/usr/share/sailfish-weather/model/ApplicationWeatherModel.qml @@ -0,0 +1,19 @@ +import QtQuick 2.1 +import Sailfish.Silica 1.0 +import Sailfish.Weather 1.0 + +WeatherModel { + id: model + + active: Qt.application.active + property Connections reloadOnUsersRequest: Connections { + target: weatherApplication + onReload: { + if (locationId === model.locationId) { + model.reload() + } + } + onReloadAll: model.reload(true) + onReloadAllIfAllowed: if (model.updateAllowed()) model.reload() + } +} diff --git a/usr/share/sailfish-weather/pages/LocationSearchPage.qml b/usr/share/sailfish-weather/pages/LocationSearchPage.qml new file mode 100644 index 00000000..9fee2edb --- /dev/null +++ b/usr/share/sailfish-weather/pages/LocationSearchPage.qml @@ -0,0 +1,166 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Weather 1.0 + +Page { + id: page + + property bool error: locationsModel.status === Weather.Error + property bool unauthorized: locationsModel.status === Weather.Unauthorized + property bool loading: locationsModel.status === Weather.Loading || loadingTimer.running + objectName: "LocationSearchPage" + + Timer { id: loadingTimer; interval: 600 } + + LocationsModel { + id: locationsModel + onStatusChanged: if (status === Weather.Loading) loadingTimer.restart() + onFilterChanged: delayedFilter.restart() + } + + SilicaListView { + id: locationListView + currentIndex: -1 + anchors.fill: parent + model: locationsModel + header: Column { + width: parent.width + PageHeader { + //% "New location" + title: qsTrId("weather-la-new_location") + } + SearchField { + id: searchField + + //% "Search locations" + placeholderText: qsTrId("weather-la-search_locations") + onFocusChanged: if (focus) forceActiveFocus() + width: parent.width + EnterKey.iconSource: "image://theme/icon-m-enter-close" + EnterKey.onClicked: focus = false + + Binding { + target: locationsModel + property: "filter" + value: searchField.text.toLowerCase().trim() + } + Binding { + target: searchField + property: "focus" + value: true + when: page.status == PageStatus.Active && locationListView.atYBeginning + } + } + } + BusyIndicator { + running: !error && loading && locationsModel.filter.length > 0 && locationsModel.count === 0 + anchors.horizontalCenter: parent.horizontalCenter + y: placeHolder.y + Math.round(height/2) + parent: placeHolder.parent + size: BusyIndicatorSize.Large + } + ViewPlaceholder { + id: placeHolder + text: { + if (error) { + //% "Loading failed" + return qsTrId("weather-la-loading_failed") + } else if (unauthorized) { + //% "Invalid authentication credentials" + return qsTrId("weather-la-unauthorized") + } else if (locationsModel.filter.length === 0) { + //: Placeholder displayed when user hasn't yet typed a search string + //% "Search and select new location" + return qsTrId("weather-la-search_and_select_location") + } else if (!loading && !delayedFilter.running && locationListView.count == 0) { + if (locationsModel.filter.length < 3) { + //% "Could not find the location. Type at least three characters to perform a partial word search." + return qsTrId("weather-la-search_three_characters_required") + } else { + //% "Sorry, we couldn't find anything" + return qsTrId("weather-la-could_not_find_anything") + } + } + return "" + } + + // Suppress error label flicker when filter has changed but model loading state hasn't yet had time to update + Timer { + id: delayedFilter + interval: 1 + } + + enabled: error || (locationListView.count == 0 && !loading) || locationsModel.filter.length < 1 + + y: locationListView.originY + Math.round(parent.height/14) + + (locationListView.headerItem ? locationListView.headerItem.height : 0) + Button { + //% "Try again" + text: error ? qsTrId("weather-la-try_again") + //% "Save current" + : qsTrId("weather-bt-save_current") + visible: error + onClicked: locationsModel.reload() + anchors { + top: parent.bottom + topMargin: Theme.paddingMedium + horizontalCenter: parent.horizontalCenter + } + } + } + delegate: BackgroundItem { + id: searchResultItem + height: Theme.itemSizeMedium + onClicked: { + var location = { + "locationId": model.id, + "city": model.name, + "state": "", + "country": model.country, + "adminArea": model.adminArea, + "adminArea2": model.adminArea2, + } + if (!savedWeathersModel.currentWeather + || savedWeathersModel.currentWeather.status === Weather.Error) { + savedWeathersModel.setCurrentWeather(location) + } else { + savedWeathersModel.addLocation(location) + } + + pageStack.pop() + } + ListView.onAdd: AddAnimation { target: searchResultItem; from: 0; to: 1 } + ListView.onRemove: FadeAnimation { target: searchResultItem; from: 1; to: 0 } + Column { + anchors { + left: parent.left + right: parent.right + rightMargin: Theme.horizontalPageMargin - Theme.paddingMedium + leftMargin: Theme.itemSizeSmall + Theme.horizontalPageMargin - Theme.paddingMedium + verticalCenter: parent.verticalCenter + } + Label { + width: parent.width + textFormat: Text.StyledText + text: Theme.highlightText(model.name, locationsModel.filter, Theme.highlightColor) + color: highlighted ? Theme.highlightColor : Theme.primaryColor + truncationMode: TruncationMode.Fade + } + Label { + // Order of location country string, "Country", "Admin Area", "Admin Area2" + // e.g. "United States, Nevada, Clark" + readonly property string countryString: model.country + + (model.adminArea ? (", " + model.adminArea) : "") + + (model.adminArea2 ? (", " + model.adminArea2) : "") + width: parent.width + textFormat: Text.StyledText + text: Theme.highlightText(countryString, locationsModel.filter, Theme.highlightColor) + color: highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor + font.pixelSize: Theme.fontSizeSmall + truncationMode: TruncationMode.Fade + } + } + } + VerticalScrollDecorator {} + } +} diff --git a/usr/share/sailfish-weather/pages/MainPage.qml b/usr/share/sailfish-weather/pages/MainPage.qml new file mode 100644 index 00000000..702a49bd --- /dev/null +++ b/usr/share/sailfish-weather/pages/MainPage.qml @@ -0,0 +1,275 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 +import Sailfish.Weather 1.0 +import Nemo.DBus 2.0 + +Page { + SilicaListView { + id: weatherListView + PullDownMenu { + visible: savedWeathersModel.currentWeather.status !== Weather.Unauthorized + MenuItem { + //% "New location" + text: qsTrId("weather-me-new_location") + onClicked: pageStack.animatorPush(Qt.resolvedUrl("LocationSearchPage.qml")) + } + MenuItem { + //% "Update" + text: qsTrId("weather-me-update") + onClicked: reloadTimer.restart() + enabled: savedWeathersModel.currentWeather || savedWeathersModel.count > 0 + Timer { + id: reloadTimer + interval: 500 + onTriggered: weatherApplication.reloadAll() + } + } + } + anchors.fill: parent + header: Column { + width: parent.width + spacing: Theme.paddingLarge + WeatherHeader { + opacity: currentWeatherAvailable ? 1.0 : 0.0 + weather: savedWeathersModel.currentWeather + onClicked: { + pageStack.animatorPush("WeatherPage.qml", {"weather": weather, "weatherModel": currentWeatherModel, "current": true }) + } + } + + Label { + visible: !placeholder.enabled && currentWeatherAvailable && currentWeatherModel.status === Weather.Unauthorized + x: Theme.horizontalPageMargin + width: parent.width - 2*x + horizontalAlignment: Text.AlignHCenter + wrapMode: Text.Wrap + font { + pixelSize: Theme.fontSizeLarge + family: Theme.fontFamilyHeading + } + + color: palette.highlightColor + opacity: 0.6 + + //% "Invalid authentication credentials" + text: qsTrId("weather-la-unauthorized") + } + + Item { + width: parent.width + height: Theme.paddingLarge + } + } + PlaceholderItem { + id: placeholder + flickable: weatherListView + parent: weatherListView.contentItem + y: weatherListView.originY + (currentWeatherAvailable ? Math.round(parent.height/12) + weatherListView.headerItem.height + : Math.round(Screen.height/4)) + enabled: !currentWeatherAvailable || (savedWeathersModel.count === 0 && counter.active) + error: savedWeathersModel.currentWeather && savedWeathersModel.currentWeather.status === Weather.Error + unauthorized: savedWeathersModel.currentWeather && savedWeathersModel.currentWeather.status === Weather.Unauthorized + empty: !savedWeathersModel.currentWeather || savedWeathersModel.count == 0 + text: { + if (error) { + //% "Loading failed" + return qsTrId("weather-la-loading_failed") + } else if (unauthorized) { + //% "Invalid authentication credentials" + return qsTrId("weather-la-unauthorized") + } else if (empty) { + if (currentWeatherAvailable) { + if (counter.active) { + //% "Pull down to add another weather location" + return qsTrId("weather-la-pull_down_to_add_another_location") + } else { + return "" + } + } else { + //% "Pull down to select your location" + return qsTrId("weather-la-pull_down_to_select_your_location") + } + } else { + //% "Loading" + return qsTrId("weather-la-loading") + } + } + onReload: weatherApplication.reload(savedWeathersModel.currentWeather.locationId) + + // Only show pull down to add another location hint twice on app startup + FirstTimeUseCounter { + id: counter + limit: 2 + key: "/sailfish/weather/pull_down_to_add_another_location_hint_count" + property bool showLocationHint: active && currentWeatherAvailable + onShowLocationHintChanged: if (showLocationHint) counter.increase() + } + } + model: savedWeathersModel + delegate: ListItem { + id: savedWeatherItem + + function remove() { + savedWeathersModel.remove(locationId) + } + ListView.onAdd: AddAnimation { target: savedWeatherItem } + ListView.onRemove: animateRemoval() + menu: contextMenuComponent + contentHeight: Math.max(Theme.itemSizeMedium, labelColumn.implicitHeight + 2 * Theme.paddingMedium) + onClicked: { + pageStack.animatorPush("WeatherPage.qml", {"weather": savedWeathersModel.get(model.locationId), + "weatherModel": weatherModels[model.locationId] }) + } + + Image { + id: icon + x: Theme.horizontalPageMargin + anchors.verticalCenter: labelColumn.verticalCenter + visible: model.status !== Weather.Loading + width: Theme.iconSizeMedium + height: Theme.iconSizeMedium + source: !!model.weatherType + && model.weatherType.length > 0 ? "image://theme/icon-m-weather-" + model.weatherType + + (highlighted ? "?" + Theme.highlightColor : "") + : "" + } + BusyIndicator { + running: model.status === Weather.Loading + anchors.centerIn: icon + } + Column { + id: labelColumn + + y: Theme.paddingMedium + height: cityLabel.height + descriptionLabel.lineHeight + anchors { + left: icon.right + right: temperatureLabel.left + leftMargin: Theme.paddingMedium + rightMargin: Theme.paddingSmall + } + Label { + id: cityLabel + width: parent.width + color: highlighted ? Theme.highlightColor : Theme.primaryColor + text: model.city + ", " + model.country + (model.adminArea ? (", " + model.adminArea) : "") + truncationMode: TruncationMode.Fade + } + Label { + id: descriptionLabel + + property real lineHeight: height/lineCount + width: parent.width + color: highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor + text: !model.populated && model.status === Weather.Error ? + //% "Loading current conditions failed" + qsTrId("weather-la-loading_current_conditions_failed") + : + model.description + font.pixelSize: Theme.fontSizeSmall + elide: Text.ElideRight + wrapMode: Text.Wrap + } + } + Label { + id: temperatureLabel + text: TemperatureConverter.format(model.temperature) + color: highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor + font.pixelSize: Theme.fontSizeHuge + anchors { + verticalCenter: labelColumn.verticalCenter + right: parent.right + rightMargin: Theme.horizontalPageMargin + } + width: visible ? implicitWidth : 0 + visible: model.populated + } + Component { + id: contextMenuComponent + ContextMenu { + property bool moveItemsWhenClosed + property bool setCurrentWhenClosed + property bool menuOpen: height > 0 + + onMenuOpenChanged: { + if (!menuOpen) { + if (moveItemsWhenClosed) { + savedWeathersModel.moveToTop(model.index) + moveItemsWhenClosed = false + } + if (setCurrentWhenClosed) { + var current = savedWeathersModel.currentWeather + if (!current || current.locationId !== model.locationId) { + var weather = { + "locationId": model.locationId, + "city": model.city, + "state": model.state, + "adminArea": model.adminArea, + "adminArea2": model.adminArea2, + "station": model.station, + "country": model.country, + "temperature": model.temperature, + "feelsLikeTemperature": model.feelsLikeTemperature, + "weatherType": model.weatherType, + "description": model.description, + "timestamp": model.timestamp, + "populated": model.populated + } + savedWeathersModel.setCurrentWeather(weather) + + } + setCurrentWhenClosed = false + } + } + } + + MenuItem { + //% "Remove" + text: qsTrId("weather-me-remove") + onClicked: remove() + } + MenuItem { + //% "Set as current" + text: qsTrId("weather-me-set_as_current") + visible: model.populated + onClicked: setCurrentWhenClosed = true + } + MenuItem { + //% "Move to top" + text: qsTrId("weather-me-move_to_top") + visible: model.index !== 0 + onClicked: moveItemsWhenClosed = true + } + } + } + } + footer: Item { + width: parent.width + height: provider.height + } + ProviderDisclaimer { + id: provider + y: weatherListView.originY - weatherListView.contentY - height + Math.max(Screen.height, weatherListView.contentHeight) + weather: savedWeathersModel.currentWeather + } + VerticalScrollDecorator {} + } + + DBusAdaptor { + service: "org.sailfishos.weather" + path: "/org/sailfishos/weather" + iface: "org.sailfishos.weather" + xml: "
This is a p
+ * @before $.metadata.setType("class") + * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label" + * @desc Reads metadata from the class attribute + * + * @exampleThis is a p
+ * @before $.metadata.setType("attr", "data") + * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label" + * @desc Reads metadata from a "data" attribute + * + * @exampleThis is a p
+ * @before $.metadata.setType("elem", "script") + * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label" + * @desc Reads metadata from a nested script element + * + * @exampleThis is a p
+ * @before $.metadata.setType("html5") + * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label" + * @desc Reads metadata from a series of data-* attributes + * + * @param String type The encoding type + * @param String name The name of the attribute to be used to get metadata (optional) + * @cat Plugins/Metadata + * @descr Sets the type of encoding to be used when loading metadata for the first time + * @type undefined + * @see metadata() + */ + +(function($) { + +$.extend({ + metadata : { + defaults : { + type: 'class', + name: 'metadata', + cre: /({.*})/, + single: 'metadata' + }, + setType: function( type, name ){ + this.defaults.type = type; + this.defaults.name = name; + }, + get: function( elem, opts ){ + var settings = $.extend({},this.defaults,opts); + // check for empty string in single property + if ( !settings.single.length ) settings.single = 'metadata'; + + var data = $.data(elem, settings.single); + // returned cached data if it already exists + if ( data ) return data; + + data = "{}"; + + var getData = function(data) { + if(typeof data != "string") return data; + + if( data.indexOf('{') < 0 ) { + data = eval("(" + data + ")"); + } + } + + var getObject = function(data) { + if(typeof data != "string") return data; + + data = eval("(" + data + ")"); + return data; + } + + if ( settings.type == "html5" ) { + var object = {}; + $( elem.attributes ).each(function() { + var name = this.nodeName; + if(name.match(/^data-/)) name = name.replace(/^data-/, ''); + else return true; + object[name] = getObject(this.nodeValue); + }); + } else { + if ( settings.type == "class" ) { + var m = settings.cre.exec( elem.className ); + if ( m ) + data = m[1]; + } else if ( settings.type == "elem" ) { + if( !elem.getElementsByTagName ) return; + var e = elem.getElementsByTagName(settings.name); + if ( e.length ) + data = $.trim(e[0].innerHTML); + } else if ( elem.getAttribute != undefined ) { + var attr = elem.getAttribute( settings.name ); + if ( attr ) + data = attr; + } + object = getObject(data.indexOf("{") < 0 ? "{" + data + "}" : data); + } + + $.data( elem, settings.single, object ); + return object; + } + } +}); + +/** + * Returns the metadata object for the first member of the jQuery object. + * + * @name metadata + * @descr Returns element's metadata object + * @param Object opts An object contianing settings to override the defaults + * @type jQuery + * @cat Plugins/Metadata + */ +$.fn.metadata = function( opts ){ + return $.metadata.get( this[0], opts ); +}; + +})(jQuery); \ No newline at end of file diff --git a/usr/share/sp-smaps-visualize/jquery.min.js b/usr/share/sp-smaps-visualize/jquery.min.js new file mode 100644 index 00000000..b2ac1747 --- /dev/null +++ b/usr/share/sp-smaps-visualize/jquery.min.js @@ -0,0 +1,18 @@ +/*! + * jQuery JavaScript Library v1.6.1 + * http://jquery.com/ + * + * Copyright 2011, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2011, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Thu May 12 15:04:36 2011 -0400 + */ +(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!cj[a]){var b=f("<"+a+">").appendTo("body"),d=b.css("display");b.remove();if(d==="none"||d===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),c.body.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write("");b=cl.createElement(a),cl.body.appendChild(b),d=f.css(b,"display"),c.body.removeChild(ck)}cj[a]=d}return cj[a]}function cu(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function ct(){cq=b}function cs(){setTimeout(ct,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g| t |
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Y,""):null;if(typeof a=="string"&&!bc.test(a)&&(f.support.leadingWhitespace||!Z.test(a))&&!bg[(_.exec(a)||["",""])[1].toLowerCase()]){a=a.replace($,"<$1>");try{for(var c=0,d=this.length;c