lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-04-21 21:52:03 +02:00
Code Activity

jamiidentifier: minor fixes

Browse source 
+ Fix bottom margin
+ Add copy icon from media-resources
+ Wrap ID in read only
+ remove fieldLayoutWidth/fieldLayoutHeight

GitLab: #770
Change-Id: I65743ca488d3bc601ac7d74d920d0944f03e0ace
This commit is contained in:
Sébastien Blin 2022-08-05 15:21:42 -04:00
parent ae7b446dda
commit 8e2d1e5cc8
10 changed files with 13 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
resources/icons/content_copy_24dp.svg
View file

@ -1 +1,9 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"/></svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<path d="M20.4,2.2H8.5c-0.9,0-1.6,0.7-1.6,1.6v2.9H3.6C2.7,6.7,2,7.4,2,8.3v11.9c0,0.9,0.7,1.6,1.6,1.6h11.9c0.9,0,1.6-0.7,1.6-1.6
v-2.9h3.3c0.9,0,1.6-0.7,1.6-1.6V3.8C22,2.9,21.3,2.2,20.4,2.2z M15.8,20.2c0,0.2-0.1,0.3-0.3,0.3H3.6c-0.2,0-0.3-0.1-0.3-0.3V8.3
C3.3,8.2,3.4,8,3.6,8h11.9c0.2,0,0.3,0.1,0.3,0.3V20.2z M20.7,15.7c0,0.2-0.1,0.3-0.3,0.3h-3.3V8.3c0-0.9-0.7-1.6-1.6-1.6H8.2V3.8
c0-0.2,0.1-0.3,0.3-0.3h11.9c0.2,0,0.3,0.1,0.3,0.3V15.7z"/>
</svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 265 B

After

Width:  |  Height:  |  Size: 793 B

6
src/app/commoncomponents/EditableLineEdit.qml
View file

@ -37,8 +37,6 @@ Item {
property alias underlined: lineEdit.underlined
property alias wrapMode: lineEdit.wrapMode
property alias padding: lineEdit.padding
property alias fieldLayoutWidth: lineEdit.fieldLayoutWidth
property alias fieldLayoutHeight: lineEdit.fieldLayoutHeight
property alias echoMode: lineEdit.echoMode
property string inactiveColor: JamiTheme.tintedBlue
property string hoveredColor: "#03B9E9"
@ -161,16 +159,14 @@ Item {
id: lineEdit
anchors.horizontalCenter: row.horizontalCenter
width: row.width - firstIco_.width - thirdIco_.width - secIco_.width - thirdIco_.anchors.rightMargin
height: row.height
readOnly: !editable || root.readOnly
underlined: true
verticalAlignment: Text.AlignBottom
borderColor: root.editIconColor
fieldLayoutHeight: row.height
placeholderText: readOnly? root.placeholderText : ""
wrapMode: Text.NoWrap
wrapMode: readOnly? TextEdit.WrapAnywhere : TextEdit.NoWrap
horizontalAlignment: !readOnly || text !== "" ? Qt.AlignLeft : Qt.AlignHCenter
onFocusChanged: function(focus) {

2
src/app/commoncomponents/MaterialLineEdit.qml
View file

@ -26,8 +26,6 @@ TextField {
id: root
property int fontSize: JamiTheme.materialLineEditPointSize
property int fieldLayoutWidth: 256
property int fieldLayoutHeight: 48
property var backgroundColor: JamiTheme.secondaryBackgroundColor
property var borderColor: JamiTheme.greyBorderColor

3
src/app/commoncomponents/UsernameLineEdit.qml
View file

@ -35,9 +35,6 @@ EditableLineEdit {
informationToolTip: JamiStrings.usernameToolTip
fieldLayoutWidth: 200
fieldLayoutHeight: 50
enum NameRegistrationState {
BLANK,
INVALID,

4
src/app/mainview/components/JamiIdentifier.qml
View file

@ -46,12 +46,10 @@ Rectangle {
Layout.leftMargin: JamiTheme.jamiIdMargins
property var minWidth: mainRectangle.width + secondLine.implicitWidth
width: Math.max(minWidth, jamiRegisteredNameText.width + 2 * JamiTheme.preferredMarginSize)
height: component.implicitHeight
height: firstLine.implicitHeight + jamiRegisteredNameText.height + 12
color: JamiTheme.secondaryBackgroundColor
ColumnLayout {
id: component
RowLayout {
id: firstLine
Layout.alignment: Qt.AlignTop

2
src/app/mainview/components/NewSwarmPage.qml
View file

@ -128,8 +128,6 @@ Rectangle {
verticalAlignment: Text.AlignVCenter
fieldLayoutWidth: 10
placeholderText: JamiStrings.swarmName
tooltipText: JamiStrings.swarmName
backgroundColor: root.color

6
src/app/mainview/components/SwarmDetailsPanel.qml
View file

@ -72,9 +72,6 @@ Rectangle {
firstIco: JamiResources.round_edit_24dp_svg
secondIco: editable ? JamiResources.close_black_24dp_svg : ""
fieldLayoutWidth: 15
fieldLayoutHeight: 30
fontSize: 20
borderColor: "transparent"
@ -121,9 +118,6 @@ Rectangle {
verticalAlignment: Text.AlignVCenter
Layout.preferredWidth: JamiTheme.preferredFieldWidth
fieldLayoutWidth: 15
fieldLayoutHeight: 30
fontSize: 16
firstIco: JamiResources.round_edit_24dp_svg

1
src/app/settingsview/components/AccountProfile.qml
View file

@ -76,6 +76,7 @@ ColumnLayout {
font.pointSize: JamiTheme.textFontSize
font.kerning: true
text: CurrentAccount.alias
placeholderText: JamiStrings.enterNickname
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter

7
src/app/settingsview/components/JamiUserIdentity.qml
View file

@ -122,12 +122,7 @@ ColumnLayout {
anchors.verticalCenter: parent.verticalCenter
height: JamiTheme.preferredFieldHeight
width: {
var maximumWidth = parent.width - lblRegisteredName.width
- JamiTheme.preferredMarginSize
return fieldLayoutWidth < maximumWidth ?
fieldLayoutWidth : maximumWidth
}
width: JamiTheme.preferredFieldWidth
padding: 8
horizontalAlignment: CurrentAccount.registeredName === "" ? Text.AlignLeft :

4
src/app/wizardview/components/ProfilePage.qml
View file

@ -129,8 +129,6 @@ Rectangle {
property string lastFirstChar
Layout.preferredHeight: fieldLayoutHeight
Layout.preferredWidth: fieldLayoutWidth
Layout.alignment: Qt.AlignCenter
focus: visible
@ -147,8 +145,6 @@ Rectangle {
font.pointSize: JamiTheme.textFontSize
font.kerning: true
fieldLayoutWidth: saveProfileBtn.width
KeyNavigation.tab: saveProfileBtn
KeyNavigation.down: KeyNavigation.tab