monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 16:28:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #547

Browse source 
3c8a552 fix addressbook button width (Jaquee)
6a666ea fix dynamic width on send btn (Jaquee)
1918c5e fix dynamic button width (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-03-11 20:30:23 +01:00
commit fd4619628c
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
4 changed files with 54 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/StandardButton.qml
View file

@ -43,8 +43,8 @@ Item {
signal clicked() signal clicked()
// Dynamic label width // Dynamic label width
width: label.contentWidth + 20 Layout.minimumWidth: (label.contentWidth > 100)? label.contentWidth + 20 : 100
Layout.minimumWidth: 100
Rectangle { Rectangle {

9
pages/AddressBook.qml
View file

@ -27,6 +27,7 @@
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Layouts 1.1
import "../components" import "../components"
import moneroComponents.AddressBook 1.0 import moneroComponents.AddressBook 1.0
import moneroComponents.AddressBookModel 1.0 import moneroComponents.AddressBookModel 1.0
@ -138,14 +139,15 @@ Rectangle {
placeholderText: qsTr("Give this entry a name or description") + translationManager.emptyString placeholderText: qsTr("Give this entry a name or description") + translationManager.emptyString
} }
StandardButton {
RowLayout {
id: addButton id: addButton
anchors.left: parent.left anchors.left: parent.left
anchors.top: descriptionLine.bottom anchors.top: descriptionLine.bottom
anchors.leftMargin: 17 anchors.leftMargin: 17
anchors.topMargin: 17 anchors.topMargin: 17
width: 60
StandardButton {
shadowReleasedColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C" releasedColor: "#FF6C3C"
@ -173,6 +175,9 @@ Rectangle {
} }
} }
} }
}
Item { Item {
id: expandItem id: expandItem

2
pages/Settings.qml
View file

@ -84,7 +84,6 @@ Rectangle {
RowLayout { RowLayout {
StandardButton { StandardButton {
id: closeWalletButton id: closeWalletButton
width: 100
text: qsTr("Close wallet") + translationManager.emptyString text: qsTr("Close wallet") + translationManager.emptyString
shadowReleasedColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
@ -118,7 +117,6 @@ Rectangle {
releasedColor: "#FF6C3C" releasedColor: "#FF6C3C"
pressedColor: "#FF4304" pressedColor: "#FF4304"
text: qsTr("Show seed") + translationManager.emptyString text: qsTr("Show seed") + translationManager.emptyString
Layout.alignment: Qt.AlignRight
onClicked: { onClicked: {
settingsPasswordDialog.open(); settingsPasswordDialog.open();
} }

11
pages/Transfer.qml
View file

@ -375,13 +375,15 @@ Rectangle {
return amount_ok && address_ok && payment_id_ok return amount_ok && address_ok && payment_id_ok
} }
StandardButton {
id: sendButton RowLayout {
anchors.left: parent.left anchors.left: parent.left
anchors.top: descriptionLine.bottom anchors.top: descriptionLine.bottom
anchors.leftMargin: 17 anchors.leftMargin: 17
anchors.topMargin: 17 anchors.topMargin: 17
width: 60
StandardButton {
id: sendButton
text: qsTr("Send") + translationManager.emptyString text: qsTr("Send") + translationManager.emptyString
shadowReleasedColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
@ -400,6 +402,9 @@ Rectangle {
} }
} }
}
} // pageRoot } // pageRoot
Rectangle { Rectangle {