Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor ButtonLayout module components

Browse Source 
- Rename ButtonLayout module to just Buttons

- Rename ButtonLayout into AutoDirectionLayout and move it to Base,
  it's useful not just for buttons

- Rename OtherButton into GroupButton, which is now the base of all
  other Buttons buttons

- Add generic (Positive|Middle|Negative)Button components, which are now
  the base for (Apply|Cancel)Button
This commit is contained in:
miruka
2020-07-11 22:52:14 -04:00
parent 67f1572a18
commit ed030f7dd9
33 changed files with 90 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/Popups/ClearMessagesPopup.qml
View File

@@ -1,7 +1,8 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
import QtQuick 2.12
import "../Base/ButtonLayout"
import "../Base"
import "../Base/Buttons"
HFlickableColumnPopup {
id: popup
@@ -12,7 +13,7 @@ HFlickableColumnPopup {
property var preClearCallback: null
page.footer: ButtonLayout {
page.footer: AutoDirectionLayout {
ApplyButton {
id: clearButton
text: qsTr("Clear")

2
src/gui/Popups/DeleteDevicesPopup.qml
View File

@@ -2,7 +2,7 @@
import QtQuick 2.12
import "../Base"
import "../Base/ButtonLayout"
import "../Base/Buttons"
import "../PythonBridge"
PasswordPopup {

5
src/gui/Popups/ForgetRoomPopup.qml
View File

@@ -1,7 +1,8 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
import QtQuick 2.12
import "../Base/ButtonLayout"
import "../Base"
import "../Base/Buttons"
HFlickableColumnPopup {
id: popup
@@ -29,7 +30,7 @@ HFlickableColumnPopup {
}
page.footer: ButtonLayout {
page.footer: AutoDirectionLayout {
ApplyButton {
id: forgetButton
text: qsTr("Forget")

4
src/gui/Popups/InviteToRoomPopup.qml
View File

@@ -4,7 +4,7 @@ import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import "../Base"
import "../Base/ButtonLayout"
import "../Base/Buttons"
HColumnPopup {
id: popup
@@ -46,7 +46,7 @@ HColumnPopup {
}
page.footer: ButtonLayout {
page.footer: AutoDirectionLayout {
ApplyButton {
id: inviteButton
text: qsTr("Invite")

8
src/gui/Popups/KeyVerificationPopup.qml
View File

@@ -3,7 +3,7 @@
import QtQuick 2.12
import QtQuick.Layouts 1.12
import "../Base"
import "../Base/ButtonLayout"
import "../Base/Buttons"
HFlickableColumnPopup {
id: popup
@@ -18,8 +18,8 @@ HFlickableColumnPopup {
property var blacklistedCallback: null
page.footer: ButtonLayout {
ApplyButton {
page.footer: AutoDirectionLayout {
PositiveButton {
visible: ! deviceIsCurrent
text: qsTr("They match")
icon.name: "device-verified"
@@ -37,7 +37,7 @@ HFlickableColumnPopup {
}
}
CancelButton {
NegativeButton {
visible: ! popup.deviceIsCurrent
text: qsTr("They differ")
icon.name: "device-blacklisted"

5
src/gui/Popups/LeaveRoomPopup.qml
View File

@@ -1,7 +1,8 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
import QtQuick 2.12
import "../Base/ButtonLayout"
import "../Base"
import "../Base/Buttons"
HFlickableColumnPopup {
id: popup
@@ -13,7 +14,7 @@ HFlickableColumnPopup {
property var leftCallback: null
page.footer: ButtonLayout {
page.footer: AutoDirectionLayout {
ApplyButton {
id: leaveButton
icon.name: "room-leave"

4
src/gui/Popups/PasswordPopup.qml
View File

@@ -3,7 +3,7 @@
import QtQuick 2.12
import QtQuick.Layouts 1.12
import "../Base"
import "../Base/ButtonLayout"
import "../Base/Buttons"
HFlickableColumnPopup {
id: popup
@@ -51,7 +51,7 @@ HFlickableColumnPopup {
}
page.footer: ButtonLayout {
page.footer: AutoDirectionLayout {
ApplyButton {
id: validateButton
text: qsTr("Confirm")

4
src/gui/Popups/RedactPopup.qml
View File

@@ -3,7 +3,7 @@
import QtQuick 2.12
import QtQuick.Layouts 1.12
import "../Base"
import "../Base/ButtonLayout"
import "../Base/Buttons"
HFlickableColumnPopup {
id: popup
@@ -38,7 +38,7 @@ HFlickableColumnPopup {
}
page.footer: ButtonLayout {
page.footer: AutoDirectionLayout {
ApplyButton {
text: qsTr("Remove")
icon.name: "remove-message"

4
src/gui/Popups/RemoveMemberPopup.qml
View File

@@ -3,7 +3,7 @@
import QtQuick 2.12
import QtQuick.Layouts 1.12
import "../Base"
import "../Base/ButtonLayout"
import "../Base/Buttons"
HFlickableColumnPopup {
id: popup
@@ -30,7 +30,7 @@ HFlickableColumnPopup {
}
page.footer: ButtonLayout {
page.footer: AutoDirectionLayout {
ApplyButton {
text:
operation === "disinvite" ? qsTr("Disinvite") :

10
src/gui/Popups/SignOutPopup.qml
View File

@@ -2,7 +2,8 @@
import QtQuick 2.12
import ".."
import "../Base/ButtonLayout"
import "../Base"
import "../Base/Buttons"
HFlickableColumnPopup {
id: popup
@@ -11,8 +12,8 @@ HFlickableColumnPopup {
property string userId: ""
page.footer: ButtonLayout {
ApplyButton {
page.footer: AutoDirectionLayout {
PositiveButton {
id: exportButton
text: qsTr("Export keys")
icon.name: "export-keys"
@@ -29,11 +30,10 @@ HFlickableColumnPopup {
)
}
OtherButton {
MiddleButton {
id: signOutButton
text: qsTr("Sign out now")
icon.name: "sign-out"
icon.color: theme.colors.middleBackground
onClicked: {
if (ModelStore.get("accounts").count < 2 ||

6
src/gui/Popups/UnexpectedErrorPopup.qml
View File

@@ -4,7 +4,7 @@ import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import "../Base"
import "../Base/ButtonLayout"
import "../Base/Buttons"
HColumnPopup {
id: popup
@@ -15,8 +15,8 @@ HColumnPopup {
property string traceback: ""
page.footer: ButtonLayout {
ApplyButton {
page.footer: AutoDirectionLayout {
PositiveButton {
text: qsTr("Report")
icon.name: "report-error"
enabled: false // TODO