diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-15 14:58:47 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-15 14:58:47 -0500 |
| commit | 98ca4f1a70051447c39d5f9161db2e1741fdceb9 (patch) | |
| tree | 620c481c47e094d34990fe1c210f1fd0b2fa6f90 /components | |
| parent | 7cbd61dae21fdf8a27081d28ebb130195d77ed69 (diff) | |
| parent | ae5c21ef17b5585e1c90423a9f45b62b3b678f46 (diff) | |
| download | monzero-gui-98ca4f1a70051447c39d5f9161db2e1741fdceb9.tar.gz monzero-gui-98ca4f1a70051447c39d5f9161db2e1741fdceb9.tar.xz monzero-gui-98ca4f1a70051447c39d5f9161db2e1741fdceb9.zip | |
Merge pull request #398
ae5c21e export/import key images when cold signing (Jaquee)
24ccd27 Add rescan spent button (Jaquee)
15c79df GUI cold signing (Jaquee)
fd98395 view only wallets (Jaquee)
8f56e98 save wallet name in appwindow (Jaquee)
842e4df adjust button size dynamically (Jaquee)
Diffstat (limited to 'components')
| -rw-r--r-- | components/PasswordDialog.qml | 9 | ||||
| -rw-r--r-- | components/StandardButton.qml | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml index 19414987..1b83bcfa 100644 --- a/components/PasswordDialog.qml +++ b/components/PasswordDialog.qml @@ -52,13 +52,6 @@ Window { show() } - function usefulName(path) { - // arbitrary "short enough" limit - if (path.length < 32) - return path - return path.replace(/.*[\/\\]/, '').replace(/\.keys$/, '') - } - // TODO: implement without hardcoding sizes width: 480 height: walletName ? 240 : 200 @@ -74,7 +67,7 @@ Window { Layout.alignment: Qt.AlignHCenter Label { - text: root.walletName.length > 0 ? qsTr("Please enter wallet password for:<br>") + usefulName(root.walletName) : qsTr("Please enter wallet password") + text: root.walletName.length > 0 ? qsTr("Please enter wallet password for:<br>") + root.walletName : qsTr("Please enter wallet password") Layout.alignment: Qt.AlignHCenter Layout.columnSpan: 2 Layout.fillWidth: true diff --git a/components/StandardButton.qml b/components/StandardButton.qml index 17f56c3d..1d3f8192 100644 --- a/components/StandardButton.qml +++ b/components/StandardButton.qml @@ -27,6 +27,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import QtQuick 2.0 +import QtQuick.Layouts 1.1 Item { id: button @@ -41,6 +42,10 @@ Item { property alias text: label.text signal clicked() + // Dynamic label width + width: label.contentWidth + 20 + Layout.minimumWidth: 100 + Rectangle { anchors.left: parent.left @@ -78,13 +83,13 @@ Item { anchors.left: parent.left anchors.right: parent.right horizontalAlignment: Text.AlignHCenter - elide: Text.ElideRight font.family: "Arial" font.bold: true font.letterSpacing: -1 font.pixelSize: button.fontSize color: parent.textColor visible: parent.icon === "" + font.capitalization : Font.AllUppercase } Image { |