aboutsummaryrefslogtreecommitdiff
path: root/qml
diff options
context:
space:
mode:
Diffstat (limited to 'qml')
-rw-r--r--qml/cover/CoverPage.qml15
-rw-r--r--qml/pages/MainPage.qml12
-rw-r--r--qml/pages/ProfileEditor.qml59
-rw-r--r--qml/pages/ProfilesPage.qml4
-rw-r--r--qml/pages/SettingsEditor.qml8
5 files changed, 64 insertions, 34 deletions
diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml
index 5b5af6c..4207138 100644
--- a/qml/cover/CoverPage.qml
+++ b/qml/cover/CoverPage.qml
@@ -6,7 +6,7 @@ CoverBackground {
x: Theme.paddingLarge
y: Theme.paddingLarge
width: parent.width - 2 * x
- spacing: Theme.paddingLarge
+ spacing: Theme.paddingMedium
Label {
id: label
text: qsTr("PassFish")
@@ -23,7 +23,7 @@ CoverBackground {
Label {
id: urlLabel
color: Theme.highlightColor
- text: qsTr("Used Text:")
+ text: qsTr("Used text:")
font.pixelSize: Theme.fontSizeSmall
truncationMode: TruncationMode.Fade
width: parent.width
@@ -42,10 +42,17 @@ CoverBackground {
Label {
id: readyLabel
color: Theme.highlightColor
+ text: qsTr("Status:")
+ font.pixelSize: Theme.fontSizeSmall
+ truncationMode: TruncationMode.Fade
+ width: parent.width
+ }
+ Label {
+ id: ready
text: passwordmaker.generated_password.length > 0
&& passwordmaker.generator_state === 0
- ? qsTr("Pass Ready")
- : qsTr("Input Needed")
+ ? qsTr("Password ready")
+ : qsTr("Input needed")
font.pixelSize: Theme.fontSizeSmall
truncationMode: TruncationMode.Fade
width: parent.width
diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml
index 1195ef8..2a28eff 100644
--- a/qml/pages/MainPage.qml
+++ b/qml/pages/MainPage.qml
@@ -35,7 +35,7 @@ Page {
PullDownMenu {
MenuItem {
- text: qsTr("App Settings")
+ text: qsTr("App settings")
onClicked: {
var pg = pageStack.animatorPush(Qt.resolvedUrl("SettingsEditor.qml"),
{
@@ -103,8 +103,8 @@ Page {
text: passwordmaker.master_password
- label: qsTr("Master Password")
- placeholderText: qsTr("Master Password")
+ label: qsTr("Master password")
+ placeholderText: qsTr("Master password")
EnterKey.iconSource: "image://theme/icon-m-enter-close"
EnterKey.onClicked: focus = false
Binding {
@@ -119,11 +119,11 @@ Page {
inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase
- label: qsTr("Used Text")
+ label: qsTr("Used text")
hideLabelOnEmptyField: passwordmaker.used_text === ""
onFocusChanged: if(focus) text = passwordmaker.used_text
onPlaceholderTextChanged: if(!focus) text = ""
- placeholderText: passwordmaker.used_text === "" ? qsTr("Used Text") : passwordmaker.used_text
+ placeholderText: passwordmaker.used_text === "" ? qsTr("Used text") : passwordmaker.used_text
EnterKey.iconSource: "image://theme/icon-m-enter-close"
EnterKey.onClicked: focus = false
Binding {
@@ -167,7 +167,7 @@ Page {
showEchoModeToggle: passwordmaker.settings.hide_generated_password
readOnly: true
focusOnClick: true
- label: qsTr("Generated Password")
+ label: qsTr("Generated password")
hideLabelOnEmptyField: false
placeholderText:
password_text_from_generator_state(
diff --git a/qml/pages/ProfileEditor.qml b/qml/pages/ProfileEditor.qml
index 5dd28e0..d3b8f24 100644
--- a/qml/pages/ProfileEditor.qml
+++ b/qml/pages/ProfileEditor.qml
@@ -53,7 +53,7 @@ Dialog {
width: parent.width
bottomPadding: Theme.paddingLarge
DialogHeader {
- title: qsTr("Edit Profile")
+ title: qsTr("Edit profile")
}
TextField {
id: profileNameField
@@ -62,14 +62,14 @@ Dialog {
//description doesn't work on Sailfish 3. Use label instead if unavailable.
readonly property bool descriptionAvailable : typeof(description) !== "undefined"
- label: !descriptionAvailable && errorHighlight ? qsTr("Required Field") : qsTr("Profile Name")
+ label: !descriptionAvailable && errorHighlight ? qsTr("Required field") : qsTr("Profile name")
hideLabelOnEmptyField: descriptionAvailable
- placeholderText: qsTr("Profile Name")
+ placeholderText: qsTr("Profile name")
Binding {
target: profileNameField
property: "description"
- value: profileNameField.errorHighlight ? qsTr("Required Field") : ""
+ value: profileNameField.errorHighlight ? qsTr("Required field") : ""
when: profileNameField.descriptionAvailable
}
@@ -90,10 +90,19 @@ Dialog {
bottomPadding: Theme.paddingLarge
property bool anySelected : (useProtocol || useSubdomain || useDomain || usePortPath || useUserInfo)
+ Label {
+ id: urlPartLabel
+ text: qsTr("URL parts to use")
+ color: Theme.highlightColor
+
+ x: Theme.paddingLarge
+ width: parent.width - 2*Theme.paddingSmall
+ bottomPadding: Theme.paddingSmall
+ }
TextSwitch {
id: protocolField
- text: qsTr("Use Protocol")
+ text: qsTr("Protocol")
description: qsTr("Include URL protocol (e.g. \"http://\")")
palette.highlightColor : down || urlPartsColumn.anySelected ? Theme.highlightColor : Theme.errorColor
highlighted: down || !urlPartsColumn.anySelected
@@ -102,34 +111,34 @@ Dialog {
id: useDefaultFallbackForProtocolField
visible: protocolField.checked
text: qsTr("Use \"undefined\" if protocol is missing")
- description: qsTr("Enable to mimic weird behaviour of PasswordMaker Pro.")
+ description: qsTr("Enable to mimic behaviour of JavaScript PasswordMaker Pro.")
palette.highlightColor : down ? Theme.highlightColor : Theme.errorColor
highlighted: down
}
TextSwitch {
id: userInfoField
- text: qsTr("Use Userinfo")
- description: qsTr("Include userinfo (e.g \"jane_doe:12345\"")
+ text: qsTr("Userinfo")
+ description: qsTr("Include userinfo (e.g \"jane_doe:12345\")")
palette.highlightColor : down || urlPartsColumn.anySelected ? Theme.highlightColor : Theme.errorColor
highlighted: down || !urlPartsColumn.anySelected
}
TextSwitch {
id: subdomainField
- text: qsTr("Use Subomain(s)")
+ text: qsTr("Subomain(s)")
description: qsTr("Include URL subdomain(s) (e.g. \"www.\")")
palette.highlightColor : down || urlPartsColumn.anySelected ? Theme.highlightColor : Theme.errorColor
highlighted: down || !urlPartsColumn.anySelected
}
TextSwitch {
id: domainField
- text: qsTr("Use Domain")
+ text: qsTr("Domain")
description: qsTr("Include URL domain (e.g. \"example.com\")")
palette.highlightColor : down || urlPartsColumn.anySelected ? Theme.highlightColor : Theme.errorColor
highlighted: down || !urlPartsColumn.anySelected
}
TextSwitch {
id: portPathField
- text: qsTr("Use Port/Path")
+ text: qsTr("Port and path")
description: qsTr("Include port and path (e.g \":8080/file\")")
palette.highlightColor : down || urlPartsColumn.anySelected ? Theme.highlightColor : Theme.errorColor
highlighted: down || !urlPartsColumn.anySelected
@@ -137,14 +146,28 @@ Dialog {
}
NoticeOptional {
id: urlNotice
- text: qsTr("At least one URL part required.")
+ text: qsTr("At least one URL part is required.")
useNotificationFallback: false
}
}
+ Separator {
+ width: parent.width
+ horizontalAlignment:Qt.AlignHCenter
+ color: Theme.secondaryColor
+ }
Column {
width: parent.width
topPadding: Theme.paddingLarge
bottomPadding: Theme.paddingLarge
+ Label {
+ id: generationSettingsLabel
+ text: qsTr("Password generation settings")
+ color: Theme.highlightColor
+
+ x: Theme.paddingLarge
+ width: parent.width - 2*Theme.paddingSmall
+ bottomPadding: Theme.paddingSmall
+ }
Slider {
id: passwordLengthSlider
minimumValue: 1
@@ -152,11 +175,11 @@ Dialog {
stepSize: 1
width: parent.width
valueText : value
- label: qsTr("Password Length")
+ label: qsTr("Password length")
}
ComboBox {
id: hashAlgorithmComboBox
- label: qsTr("Hash Algorithm")
+ label: qsTr("Hash algorithm")
menu: ContextMenu {
MenuItem { text: "MD4" }
MenuItem { text: "HMAC-MD4" }
@@ -174,7 +197,7 @@ Dialog {
}
ComboBox {
id: useLeetComboBox
- label: qsTr("Use L33t")
+ label: qsTr("Use l33t")
menu: ContextMenu {
MenuItem { text: qsTr("not at all") }
MenuItem { text: qsTr("before generating") }
@@ -190,7 +213,7 @@ Dialog {
width: parent.width
valueText: value
visible: useLeetComboBox.currentIndex > 0
- label: qsTr("Leet Level")
+ label: qsTr("Leet level")
}
}
Column {
@@ -201,7 +224,7 @@ Dialog {
ListModel {
id: defaultCharacterValues
ListElement {
- name: qsTr("Default Characters")
+ name: qsTr("Default characters")
chars: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789`~!@#$%^&*()_-+={}|[]\\:\";'<>?,./"
userFacing: true
}
@@ -252,7 +275,7 @@ Dialog {
value: defaultCharactersMenu.matchIndex(charactersField.text)
}
- label: qsTr("Characters Preset")
+ label: qsTr("Characters preset")
menu: ContextMenu {
Repeater {
model: defaultCharacterValues
diff --git a/qml/pages/ProfilesPage.qml b/qml/pages/ProfilesPage.qml
index a2df8af..b9a8425 100644
--- a/qml/pages/ProfilesPage.qml
+++ b/qml/pages/ProfilesPage.qml
@@ -18,7 +18,7 @@ Page {
PullDownMenu {
MenuItem {
- text: qsTr("Add Profile")
+ text: qsTr("Add profile")
onClicked: {
profilesView.model.insertRows(profilesView.model.rowCount(),1);
profilesView.store_profile_with_error_message();
@@ -26,7 +26,7 @@ Page {
}
}
header: PageHeader {
- title: qsTr("Select/Edit Profiles")
+ title: qsTr("Select/edit profiles")
}
delegate: ListItem {
id: delegate
diff --git a/qml/pages/SettingsEditor.qml b/qml/pages/SettingsEditor.qml
index 9baa51c..f350160 100644
--- a/qml/pages/SettingsEditor.qml
+++ b/qml/pages/SettingsEditor.qml
@@ -31,11 +31,11 @@ Dialog {
width: parent.width
bottomPadding: Theme.paddingLarge
DialogHeader {
- title: qsTr("Edit Settings")
+ title: qsTr("App settings")
}
TextSwitch {
id: hide_generated_passwordBox
- text: qsTr("Hide Generated Password")
+ text: qsTr("Hide generated password")
palette.highlightColor : Theme.highlightColor
highlighted: down
}
@@ -54,7 +54,7 @@ Dialog {
width: parent.width
valueText: value + " min"
visible: clear_generated_passwordBox.checked
- label: qsTr("Auto-clear generated pass timeout")
+ label: qsTr("Auto-clear generated password timeout")
value: clear_generated_password/60 || 1
}
TextSwitch {
@@ -74,7 +74,7 @@ Dialog {
width: parent.width
valueText: sliderValue + " min"
visible: clear_master_passwordBox.checked
- label: qsTr("Auto-clear master pass timeout")
+ label: qsTr("Auto-clear master password timeout")
value: clear_master_password/60 || 5
}
Label {