diff --git a/i18n/translation_de.qm b/i18n/translation_de.qm index 7292b66e..077e1a73 100644 Binary files a/i18n/translation_de.qm and b/i18n/translation_de.qm differ diff --git a/i18n/translation_de.ts b/i18n/translation_de.ts index 16d4c781..0e069f67 100644 --- a/i18n/translation_de.ts +++ b/i18n/translation_de.ts @@ -31,55 +31,55 @@ AddPeerGroupPane - + profile-oniblon-label Send this address to peers you want to connect with - + copy-btn Kopieren - + copied-to-clipboard-notification notification: copied to clipboard in die Zwischenablage kopiert - + add-peer-tab Add a peer - + create-group-tab Create a group - + join-group-tab Join a group - + peer-address Address - + peer-name Name - - + + group-name Group Name ---------- @@ -87,36 +87,36 @@ Name - + server Server - + invitation Invitation - + group-addr Address - + add-peer Add Peer | Create Group | Join Group - + create-group - + join-group @@ -144,13 +144,12 @@ Name ContactList - paste-address-to-add-contact ex: "... paste an address here to add a contact ..." - Adresse hier hinzufügen, um einen Kontakt aufzunehmen + Adresse hier hinzufügen, um einen Kontakt aufzunehmen - + blocked @@ -568,7 +567,7 @@ Name enter-profile-password - Please enter password: + Enter a password to view your profiles @@ -577,25 +576,25 @@ Name - + error-0-profiles-loaded-for-password 0 profiles loaded with that password - + your-profiles Your Profiles - + your-servers Your Profiles - + unlock Unlock @@ -725,7 +724,7 @@ Name main - + new-connection-pane-title New Connection diff --git a/i18n/translation_en.qm b/i18n/translation_en.qm index 1af0d504..373f4aa1 100644 Binary files a/i18n/translation_en.qm and b/i18n/translation_en.qm differ diff --git a/i18n/translation_en.ts b/i18n/translation_en.ts index a70d2884..86446243 100644 --- a/i18n/translation_en.ts +++ b/i18n/translation_en.ts @@ -31,55 +31,55 @@ AddPeerGroupPane - + profile-oniblon-label Send this address to peers you want to connect with Send this address to peers you want to connect with - + copy-btn Copy - + copied-to-clipboard-notification notification: copied to clipboard Copied to Clipboard - + add-peer-tab Add a peer Add a peer - + create-group-tab Create a group Create a group - + join-group-tab Join a group Join a group - + peer-address Address Address - + peer-name Name Name - - + + group-name Group Name ---------- @@ -87,36 +87,36 @@ Name Group name - + server Server Server - + invitation Invitation Invitation - + group-addr Address Address - + add-peer Add Peer | Create Group | Join Group Add Peer - + create-group Create group - + join-group Join group @@ -144,13 +144,12 @@ Name ContactList - paste-address-to-add-contact ex: "... paste an address here to add a contact ..." - ... paste an address here to add a contact... + ... paste an address here to add a contact... - + blocked Blocked @@ -674,8 +673,8 @@ Right-click to reset. enter-profile-password - Please enter password: - Please enter password + Enter a password to view your profiles + Enter a password to view your profiles @@ -683,25 +682,25 @@ Right-click to reset. Password - + error-0-profiles-loaded-for-password 0 profiles loaded with that password 0 profiles loaded with that password - + your-profiles Your Profiles Your Profiles - + your-servers Your Profiles Your Servers - + unlock Unlock Unlock @@ -848,7 +847,7 @@ Right-click to reset. main - + new-connection-pane-title New Connection New Connection diff --git a/i18n/translation_fr.qm b/i18n/translation_fr.qm index 766fe009..83a7d406 100644 Binary files a/i18n/translation_fr.qm and b/i18n/translation_fr.qm differ diff --git a/i18n/translation_fr.ts b/i18n/translation_fr.ts index 084342b7..38b483cf 100644 --- a/i18n/translation_fr.ts +++ b/i18n/translation_fr.ts @@ -31,55 +31,55 @@ AddPeerGroupPane - + profile-oniblon-label Send this address to peers you want to connect with - + copy-btn Copier - + copied-to-clipboard-notification notification: copied to clipboard Copié dans le presse-papier - + add-peer-tab Add a peer - + create-group-tab Create a group - + join-group-tab Join a group - + peer-address Address - + peer-name Name - - + + group-name Group Name ---------- @@ -87,36 +87,36 @@ Name - + server Server - + invitation Invitation - + group-addr Address - + add-peer Add Peer | Create Group | Join Group - + create-group - + join-group @@ -144,13 +144,12 @@ Name ContactList - paste-address-to-add-contact ex: "... paste an address here to add a contact ..." - ... coller une adresse ici pour ajouter un contact... + ... coller une adresse ici pour ajouter un contact... - + blocked @@ -568,7 +567,7 @@ Name enter-profile-password - Please enter password: + Enter a password to view your profiles @@ -577,25 +576,25 @@ Name - + error-0-profiles-loaded-for-password 0 profiles loaded with that password - + your-profiles Your Profiles - + your-servers Your Profiles - + unlock Unlock @@ -725,7 +724,7 @@ Name main - + new-connection-pane-title New Connection diff --git a/i18n/translation_pt.qm b/i18n/translation_pt.qm index 3f79a093..5faa645e 100644 Binary files a/i18n/translation_pt.qm and b/i18n/translation_pt.qm differ diff --git a/i18n/translation_pt.ts b/i18n/translation_pt.ts index 6bc36e0f..e8a8d3a0 100644 --- a/i18n/translation_pt.ts +++ b/i18n/translation_pt.ts @@ -31,55 +31,55 @@ AddPeerGroupPane - + profile-oniblon-label Send this address to peers you want to connect with - + copy-btn Copiar - + copied-to-clipboard-notification notification: copied to clipboard Copiado - + add-peer-tab Add a peer - + create-group-tab Create a group - + join-group-tab Join a group - + peer-address Address - + peer-name Name - - + + group-name Group Name ---------- @@ -87,36 +87,36 @@ Name - + server Server - + invitation Invitation - + group-addr Address - + add-peer Add Peer | Create Group | Join Group - + create-group - + join-group @@ -144,13 +144,12 @@ Name ContactList - paste-address-to-add-contact ex: "... paste an address here to add a contact ..." - … cole um endereço aqui para adicionar um contato… + … cole um endereço aqui para adicionar um contato… - + blocked @@ -568,7 +567,7 @@ Name enter-profile-password - Please enter password: + Enter a password to view your profiles @@ -577,25 +576,25 @@ Name - + error-0-profiles-loaded-for-password 0 profiles loaded with that password - + your-profiles Your Profiles - + your-servers Your Profiles - + unlock Unlock @@ -725,7 +724,7 @@ Name main - + new-connection-pane-title New Connection diff --git a/qml/images/cwtch-icon.png b/qml/images/cwtch-icon.png index 37bcf0fe..ef922530 100644 Binary files a/qml/images/cwtch-icon.png and b/qml/images/cwtch-icon.png differ diff --git a/qml/main.qml b/qml/main.qml index 645574a8..af59a17b 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -86,7 +86,7 @@ ApplicationWindow { // Splash pane initialItem: Rectangle { - anchors.fill: parent + //anchors.fill: rootStack color: Theme.backgroundMainColor visible: true @@ -103,7 +103,7 @@ ApplicationWindow { property: "opacity" from: 0 to: 1 - duration: 500 + duration: 200 } } @@ -112,13 +112,13 @@ ApplicationWindow { property: "opacity" from: 1 to: 0 - duration: 450 + duration: 200 } } // The actual app property Item mainLayout: Rectangle { - anchors.fill: parent + //anchors.fill: rootStack color: Theme.backgroundMainColor Toolbar { diff --git a/qml/opaque b/qml/opaque index 80eaf1a0..b8d01338 160000 --- a/qml/opaque +++ b/qml/opaque @@ -1 +1 @@ -Subproject commit 80eaf1a0d22efb3b6835599368bc288a9e0aa592 +Subproject commit b8d01338786625a41ba430ede6430715f5c82b33 diff --git a/qml/panes/ProfileManagerPane.qml b/qml/panes/ProfileManagerPane.qml index 572d7c2a..7c039151 100644 --- a/qml/panes/ProfileManagerPane.qml +++ b/qml/panes/ProfileManagerPane.qml @@ -21,8 +21,8 @@ import "../utils.js" as Utils ColumnLayout { id: thecol anchors.fill: parent - //leftPadding: 10 - //spacing: 5 + + spacing: 20 * gcd.themeScale Opaque.ScalingLabel { anchors.horizontalCenter: parent.horizontalCenter @@ -32,8 +32,8 @@ ColumnLayout { font.family: Fonts.applicationFontRegular.name font.styleName: "Bold" - //: Please enter password: - text: qsTr("enter-profile-password")+":" + //: Enter a password to view your profiles + text: qsTr("enter-profile-password") } RowLayout { @@ -60,7 +60,6 @@ ColumnLayout { width: 100 * gcd.themeScale - icon: "solid/unlock-alt" //: Unlock text: qsTr("unlock") @@ -94,13 +93,17 @@ ColumnLayout { } } - + // space + Rectangle { + width: 1 + height: 20 * gcd.themeScale + color: Theme.backgroundMainColor + } Opaque.ResponsiveContainer { Layout.fillHeight: true Layout.fillWidth: true - Rectangle { color: Theme.backgroundMainColor @@ -109,11 +112,12 @@ ColumnLayout { Opaque.ScalingLabel { id: profileLabel - size: Theme.primaryTextSize + size: Theme.subHeaderSize font.family: Fonts.applicationFontRegular.name font.styleName: "Bold" anchors.left: parent.left anchors.leftMargin: 25 * gcd.themeScale + bottomPadding: 10 * gcd.themeScale //: Your Profiles text: qsTr("your-profiles") @@ -137,11 +141,12 @@ ColumnLayout { Opaque.ScalingLabel { id: serverLabel - size: Theme.primaryTextSize + size: Theme.subHeaderSize font.family: Fonts.applicationFontRegular.name font.styleName: "Bold" anchors.left: parent.left anchors.leftMargin: 25 * gcd.themeScale + bottomPadding: 10 * gcd.themeScale //: Your Profiles text: qsTr("your-servers") diff --git a/qml/widgets/ProfileList.qml b/qml/widgets/ProfileList.qml index a854857b..6fa1aa9e 100644 --- a/qml/widgets/ProfileList.qml +++ b/qml/widgets/ProfileList.qml @@ -101,17 +101,19 @@ ColumnLayout { handle: "" displayName: qsTr("add-new-profile-btn") nameColor: Theme.mainTextColor - image: "/fontawesome/regular/user.svg" + image: "/core/account_circle-24px_negative_space.svg" //"/fontawesome/regular/user.svg" tag: "" - portraitBorderColor: Theme.portraitOnlineBorderColor - portraitColor: Theme.portraitOnlineBackgroundColor + portraitBorderColor: Theme.defaultButtonColor + portraitColor: Theme.defaultButtonColor + portraitOverlayColor: Theme.defaultButtonTextColor + portraitPerformTransform: true badgeVisible: true badgeContent: Image { source: gcd.assetPath + "/fontawesome/solid/plus.svg" height: Theme.badgeTextSize * gcd.themeScale width: height } - badgeColor: Theme.defaultButtonColor + badgeColor: Theme.portraitProfileBadgeColor onClicked: function(handle) { profileAddEditPane.reset(); parentStack.pane = parentStack.addEditProfilePane } } diff --git a/qml/widgets/ProfileRow.qml b/qml/widgets/ProfileRow.qml index 37d48549..18422731 100644 --- a/qml/widgets/ProfileRow.qml +++ b/qml/widgets/ProfileRow.qml @@ -53,7 +53,6 @@ Opaque.PortraitRow { onHover: function (hover) { root.isHover = hover } - } onClicked: function openClick(handle) {