Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-13 06:06:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change rectangle to column in global settings GODT-677

Browse Source
This commit is contained in:
Jakub
2020-10-27 10:12:04 +01:00
parent 8985738af5
commit 5c48332b0e
2 changed files with 63 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -9,6 +9,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
* GODT-834 Info about tags in BUILDS.md and link to Import-Export page in README.md. * GODT-834 Info about tags in BUILDS.md and link to Import-Export page in README.md.
### Fixed ### Fixed
* GODT-677 Windows IE: global import settings not fit in window
* GODT-749 Don't force PGP/Inline when sending plaintext messages. * GODT-749 Don't force PGP/Inline when sending plaintext messages.
* GODT-764 Fix deadlock in integration tests for Import-Export. * GODT-764 Fix deadlock in integration tests for Import-Export.
* GODT-662 Do not resume paused transfer progress after dismissing cancel popup. * GODT-662 Do not resume paused transfer progress after dismissing cancel popup.

132
internal/frontend/qml/ImportExportUI/DialogImport.qml
View File

@ -279,9 +279,8 @@ Dialog {
titleTo : root.address titleTo : root.address
} }
Rectangle { Column {
id: masterImportSettings id: masterImportSettings
height: 150 // fixme
anchors { anchors {
right : parent.right right : parent.right
left : parent.left left : parent.left
@ -291,45 +290,47 @@ Dialog {
rightMargin : Style.main.leftMargin rightMargin : Style.main.leftMargin
bottomMargin : Style.main.bottomMargin bottomMargin : Style.main.bottomMargin
} }
color: Style.dialog.background
Text { spacing: Style.main.bottomMargin
id: labelMasterImportSettings
text: qsTr("Master import settings:")
font { Row {
bold: true spacing: masterImportSettings.width - labelMasterImportSettings.width - resetSourceButton.width
family: Style.fontawesome.name
pointSize: Style.main.fontSize * Style.pt
}
color: Style.main.text
InfoToolTip { Text {
info: qsTr( id: labelMasterImportSettings
"If master import date range is selected only emails within this range will be imported, unless it is specified differently in folder date range.", text: qsTr("Master import settings:")
"Text in master import settings tooltip."
) font {
anchors { bold: true
left: parent.right family: Style.fontawesome.name
bottom: parent.bottom pointSize: Style.main.fontSize * Style.pt
leftMargin : Style.dialog.leftMargin }
color: Style.main.text
InfoToolTip {
anchors {
left: parent.right
bottom: parent.bottom
leftMargin : Style.dialog.leftMargin
}
info: qsTr(
"If master import date range is selected only emails within this range will be imported, unless it is specified differently in folder date range.",
"Text in master import settings tooltip."
)
} }
} }
}
// Reset all to default // Reset all to default
ClickIconText { ClickIconText {
anchors { id: resetSourceButton
right: parent.right text:qsTr("Reset all settings to default")
bottom: labelMasterImportSettings.bottom iconText: Style.fa.refresh
} textColor: Style.main.textBlue
text:qsTr("Reset all settings to default") onClicked: {
iconText: Style.fa.refresh go.resetSource()
textColor: Style.main.textBlue root.decrementCurrentIndex()
onClicked: { timer.start()
go.resetSource() }
root.decrementCurrentIndex()
timer.start()
} }
} }
@ -348,49 +349,40 @@ Dialog {
InlineDateRange { InlineDateRange {
id: globalDateRange id: globalDateRange
anchors {
left : parent.left
top : line.bottom
topMargin : Style.dialog.topMargin
}
} }
// Add global label (inline) // Add global label (inline)
InlineLabelSelect { InlineLabelSelect {
id: globalLabels id: globalLabels
anchors { }
left : parent.left }
top : globalDateRange.bottom
topMargin : Style.dialog.topMargin // Buttons
} Row {
//labelWidth : globalDateRange.labelWidth spacing: Style.dialog.spacing
anchors {
right: parent.right
bottom: parent.bottom
rightMargin: Style.main.leftMargin
bottomMargin: Style.main.bottomMargin
} }
// Buttons ButtonRounded {
Row { id: buttonCancelThree
spacing: Style.dialog.spacing fa_icon : Style.fa.times
anchors{ text : qsTr("Cancel", "todo")
bottom : parent.bottom color_main : Style.dialog.textBlue
right : parent.right onClicked : root.cancel()
} }
ButtonRounded { ButtonRounded {
id: buttonCancelThree id: buttonNextThree
fa_icon : Style.fa.times fa_icon : Style.fa.check
text : qsTr("Cancel", "todo") text : qsTr("Import", "todo")
color_main : Style.dialog.textBlue color_main : Style.dialog.background
onClicked : root.cancel() color_minor : Style.dialog.textBlue
} isOpaque : true
onClicked : root.okay()
ButtonRounded {
id: buttonNextThree
fa_icon : Style.fa.check
text : qsTr("Import", "todo")
color_main : Style.dialog.background
color_minor : Style.dialog.textBlue
isOpaque : true
onClicked : root.okay()
}
} }
} }
} }