Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: [UI] Modify pop-up window style #216

Merged
merged 1 commit into from
Jul 22, 2024
Merged

fix: [UI] Modify pop-up window style #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/qml/Control/DeleteDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ DialogWindow {

minimumWidth: 400
maximumWidth: 400
minimumHeight: 190
maximumHeight: 190
minimumHeight: 160
maximumHeight: 160

width: 400
height: 190
height: 160

icon : "deepin-album"

Expand Down Expand Up @@ -67,7 +67,7 @@ DialogWindow {
top: parent.top
horizontalCenter: parent.horizontalCenter
}
font: DTK.fontManager.t6
font: DTK.fontManager.t5
verticalAlignment: Text.AlignBottom
horizontalAlignment: Text.AlignHCenter
}
Expand All @@ -88,14 +88,14 @@ DialogWindow {
id: cancelbtn
anchors {
top: deleteTips.bottom
topMargin: 30
topMargin: 15
left: parent.left
leftMargin: 0
}
text: qsTr("Cancel")
width: 185
height: 36
font.pixelSize: 16
font: DTK.fontManager.t6
onClicked: {
deleteDialog.visible = false
}
Expand All @@ -105,13 +105,14 @@ DialogWindow {
id: enterbtn
anchors {
top: deleteTips.bottom
topMargin: 30
topMargin: 15
left: cancelbtn.right
leftMargin: 10
}
text: qsTr("Delete")
width: 185
height: 36
font: DTK.fontManager.t6

onClicked: {
deleteDialog.visible = false
Expand Down
19 changes: 10 additions & 9 deletions src/qml/Control/NewAlbumDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,23 @@ DialogWindow {
leftMargin: 46
top: parent.top
}
font.pixelSize: 16
font: DTK.fontManager.t5
text: qsTr("New Album")
verticalAlignment: Text.AlignBottom
horizontalAlignment: Text.AlignHCenter
}
Label{
id:nameLabel
width:42
height: 20
font.pixelSize: 14
height: 36
font: DTK.fontManager.t6
anchors {
left: parent.left
leftMargin: 0
top: nameedit.top
topMargin:5
topMargin:0
}
verticalAlignment: Text.AlignVCenter
text:qsTr("Name:")
}
LineEdit {
Expand All @@ -78,7 +79,7 @@ DialogWindow {
}
width: 328
height: 36
font: DTK.fontManager.t5
font: DTK.fontManager.t6
focus: true
maximumLength: 255
validator: RegExpValidator {regExp: /^[^\\.\\\\/\':\\*\\?\"<>|%&][^\\\\/\':\\*\\?\"<>|%&]*/ }
Expand All @@ -93,7 +94,7 @@ DialogWindow {
id: cancelbtn
anchors {
top: nameedit.bottom
topMargin: 20
topMargin: 15
left: parent.left
leftMargin: 0
}
Expand All @@ -106,18 +107,18 @@ DialogWindow {
}
}

Button {
RecommandButton {
id: enterbtn
anchors {
top: nameedit.bottom
topMargin: 20
topMargin: 14
left: cancelbtn.right
leftMargin: 10
}
text: qsTr("Confirm")
enabled: nameedit.text !== "" ? true : false
width: 185
height: 36
height: 38

onClicked: {
albumControl.createAlbum(nameedit.text )
Expand Down
11 changes: 5 additions & 6 deletions src/qml/Control/RemoveAlbumDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ DialogWindow {

minimumWidth: 400
maximumWidth: 400
minimumHeight: 190
maximumHeight: 190
minimumHeight: 140
maximumHeight: 140

width: 400
height: 190
height: 140

icon : "deepin-album"

Expand All @@ -35,7 +35,6 @@ DialogWindow {
id: deleteTitle
anchors {
top: parent.top
topMargin: 20
horizontalCenter: parent.horizontalCenter
}
font: DTK.fontManager.t5
Expand All @@ -48,7 +47,7 @@ DialogWindow {
id: cancelbtn
anchors {
top: deleteTitle.bottom
topMargin: 50
topMargin: 15
left: parent.left
leftMargin: 0
}
Expand All @@ -65,7 +64,7 @@ DialogWindow {
id: enterbtn
anchors {
top: deleteTitle.bottom
topMargin: 50
topMargin: 15
left: cancelbtn.right
leftMargin: 10
}
Expand Down
Loading