Skip to content

feat(ui): update button appearance by setting ColorSelector inactive state #237

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

Closed
add-uos wants to merge 1 commit into from
Closed

feat(ui): update button appearance by setting ColorSelector inactive state #237

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
1 change: 1 addition & 0 deletions src/dcc-update-plugin/qml/CheckUpdate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ ColumnLayout {
}

D.Button {
D.ColorSelector.inactived: false
Layout.alignment: Qt.AlignHCenter
implicitWidth: 200
visible: text.length !== 0
Expand Down
2 changes: 2 additions & 0 deletions src/dcc-update-plugin/qml/QuitTestingChannelDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,15 @@ D.DialogWindow {
Layout.bottomMargin: 10
spacing: 10
D.Button {
D.ColorSelector.inactived: false
Layout.fillWidth: true
text: qsTr("Cancel")
onClicked: {
close()
}
}
D.RecommandButton {
D.ColorSelector.inactived: false
Layout.fillWidth: true
text: qsTr("Exit")
onClicked: {
Expand Down
4 changes: 4 additions & 0 deletions src/dcc-update-plugin/qml/UpdateControl.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ ColumnLayout {
}

D.Button {
D.ColorSelector.inactived: false
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
visible: showLogButton
text: qsTr("View Update Log")
Expand Down Expand Up @@ -119,6 +120,7 @@ ColumnLayout {
Repeater {
model: btnActions
delegate: D.Button {
D.ColorSelector.inactived: false
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
text: modelData
font: D.DTK.fontManager.t6
Expand Down Expand Up @@ -157,6 +159,7 @@ ColumnLayout {

D.ToolButton {
id: pauseIcon
D.ColorSelector.inactived: false
icon.name: isPauseOrNot ? "update_start" : "update_pause"
icon.width: 24
icon.height: 24
Expand All @@ -175,6 +178,7 @@ ColumnLayout {

D.ToolButton {
id: stopIcon
D.ColorSelector.inactived: false
icon.name: "update_stop"
icon.width: 24
icon.height: 24
Expand Down
2 changes: 2 additions & 0 deletions src/dcc-update-plugin/qml/UpdateLogDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ D.DialogWindow {
spacing: 10

Button {
D.ColorSelector.inactived: false
Layout.fillWidth: true
text: qsTr("Close")
onClicked: {
Expand All @@ -69,6 +70,7 @@ D.DialogWindow {
}

D.RecommandButton {
D.ColorSelector.inactived: false
Layout.fillWidth: true
text: qsTr("Export to desktop")
onClicked: {
Expand Down
2 changes: 1 addition & 1 deletion src/dcc-update-plugin/qml/UpdateSelectDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ D.DialogWindow {

component ButtonWithToolTip: D.Button {
id: customButton

D.ColorSelector.inactived: false
contentItem: Text {
id: buttonText
text: customButton.text
Expand Down
4 changes: 4 additions & 0 deletions src/dcc-update-plugin/qml/UpdateSetting.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ DccObject {
Layout.fillWidth: true
}
D.ToolButton {
D.ColorSelector.inactived: false
textColor: D.Palette {
normal {
common: D.DTK.makeColor(D.Color.Highlight)
Expand Down Expand Up @@ -197,6 +198,7 @@ DccObject {
page: RowLayout {
D.LineEdit {
id: lineEdit
D.ColorSelector.inactived: false
maximumLength: 5
validator: RegularExpressionValidator { regularExpression: /^\d*$/ }
alertText: qsTr("Only numbers between 1-99999 are allowed")
Expand Down Expand Up @@ -378,6 +380,7 @@ DccObject {
pageType: DccObject.Editor
page: D.Button {
implicitWidth: fm.advanceWidth(text) + fm.averageCharacterWidth * 2
D.ColorSelector.inactived: false
text: qsTr("View")
onClicked: {
dccData.model().historyModel.refreshHistory()
Expand Down Expand Up @@ -503,6 +506,7 @@ DccObject {
visible: dccData.model().testingChannelStatus === Common.WaitJoined
pageType: DccObject.Editor
page: D.ToolButton {
D.ColorSelector.inactived: false
text: qsTr("Click here to complete the application")
textColor: D.Palette {
normal {
Expand Down