diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-08-31 21:10:31 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-08-31 21:10:31 +0200 |
| commit | 9662f464074b2cb57d7e95e852adc090cf8b8a25 (patch) | |
| tree | 74565538e30ffce8b1d12fcd5eac7026eb84d320 /components | |
| parent | 0429aac7adb73742dad85120b537ef1f6f4edf8a (diff) | |
| parent | 6d2e1a8ca386fce3389730c5748cadc39382b49f (diff) | |
| download | monzero-gui-9662f464074b2cb57d7e95e852adc090cf8b8a25.tar.gz monzero-gui-9662f464074b2cb57d7e95e852adc090cf8b8a25.tar.xz monzero-gui-9662f464074b2cb57d7e95e852adc090cf8b8a25.zip | |
Merge pull request #6
c519c7e Fix typo (dEBRUYNE-1)
5d17513 Fix typo (dEBRUYNE-1)
93285c2 Fix typo (dEBRUYNE-1)
f66a765 Fix typo (dEBRUYNE-1)
f8f1d28 Fix typo (dEBRUYNE-1)
cb6bcdf Fix typo (dEBRUYNE-1)
efba470 Fix typo (dEBRUYNE-1)
1cc7d35 Fix typo (dEBRUYNE-1)
497a6b8 Restored build by using develop bitmonero (Ilya Kitaev)
4fa8ad3 Transfer page: validate amount (Ilya Kitaev)
23c4c95 Update README.md (ferretinjapan)
57ad092 Update README.md with linux build instructions (ferretinjapan)
376db6c Display "processing.." splashscreen while wallet initializing (Ilya Kitaev)
6b9afcf extra debug logging (Ilya Kitaev)
8d93f01 WalletManager::openWalletAsync integrating with UI (Ilya Kitaev)
d3234bb WalletManager::openWalletAsync in progress (Ilya Kitaev)
c126930 Ask for password in wallet is password protected. closes #26 (Ilya Kitaev)
6f1343a ask user for the password if wallet is password-protected (Ilya Kitaev)
fc7a7dd BasicPanel: embedding/reusing "Transfer" page (Ilya Kitaev)
983317b Basic view: real wallet's balance (Ilya Kitaev)
d0a5339 Removed: hardcoded "Monero - Donations" (Ilya Kitaev)
b199c5f bugfix: empty transfer page (Ilya Kitaev)
a3fc55e mac application icon (Ilya Kitaev)
35d7661 Windows application icon (Ilya Kitaev)
4ee5d78 Deploy additional mingw dependencies (Ilya Kitaev)
7c33ea9 msys64 deploy fix (Ilya Kitaev)
f640809 macdeployqt app bundle crash fixed. (Ilya Kitaev)
9cd73df Translations are separate qm files (Ilya Kitaev)
1b35a1a build automation script. tested on macos (Ilya Kitaev)
c7c06a5 removing "bitmonero" directory in "distclean" target (Ilya Kitaev)
aa0ea18 translation files moved to resources (Ilya Kitaev)
e5d5a60 Wizard refactoring (Ilya Kitaev)
ecf8441 cleaning "auto-generated" bitmonero directory on "make clean". closes #22 (Ilya Kitaev)
32ebf18 dynamic translation support. closes #24 (Ilya Kitaev)
39b88da Apply translation for "normal" mode (Ilya Kitaev)
a933983 TranslationManager, Russian translation example (Ilya Kitaev)
de7bd2e Polish translation file (Ilya Kitaev)
5737114 update/build transations with release build. closes #23 (Ilya Kitaev)
b0f77c8 separate LIBS sections for macx, linux and win32 (Ilya Kitaev)
8b26bc4 Update network status dynamically (closes #17) (Ilya Kitaev)
71da777 Init wallet asynchronously (Ilya Kitaev)
7df82af New flags images, added IT,RU,ZH translation files (Ilya Kitaev)
d9f031e Async API integration in progress (Ilya Kitaev)
c027922 fixed multicore build; statically link boost, libcrypto and libssl for Linux; (Ilya Kitaev)
5b1ab69 Mac OSX build steps added (Ilya Kitaev)
fca82f3 Cross-plaftorm number of cpu cores (Ilya Kitaev)
da43e9a "Compiling" section stub added to documentation (Ilya Kitaev)
d880441 MSYS2/Win64 build fixed (Ilya Kitaev)
0c09342 Fixed for MSYS2 build (Ilya Kitaev)
f846935 Fix typo (dEBRUYNE-1)
a594e25 Clean up text (dEBRUYNE-1)
39cb75e Send money: confirmation popups added (Ilya Kitaev)
409c570 Priority aka fee multiplier integrated (Ilya Kitaev)
17f38a9 Added "Receive" page. Hide all pages except "Transfer" and "Receive". (Ilya Kitaev)
88d9be9 Lazy loading for the tweets (Ilya Kitaev)
37c1c0b disable right panel by default, don't perform Twitter https call if panel is disabled (Riccardo Spagni)
2696e49 mixin count for Wallet::createTransaction (Ilya Kitaev)
e3985da Transfer page: priority dropdown hidded (Ilya Kitaev)
8ac86a8 Balance on UI updated by the signal (Ilya Kitaev)
eaf5924 basic "send money" functionality implemented in GUI (Ilya Kitaev)
3ddd9be main application: initialize wallet, display balance (Ilya Kitaev)
2151f13 Persistent storage for common settings. closes #10 (Ilya Kitaev)
1eac46a "new wallet" and "recovery wallet" flows are implemented using libwallet api (Ilya Kitaev)
b7787dc Moving wallet to the user defined location at the "donation" page (pre- final) (Ilya Kitaev)
fd50e6f new wallet wizard: wallet created in temporary directory and moved to the destination at the final step (Ilya Kitaev)
5c10be3 Qt wrappers for libwallet API classes (Ilya Kitaev)
da1b74a Start in normal mode if wallet exists. Resolves #9 (Ilya Kitaev)
493e290 libwallet integration (Ilya Kitaev)
238d582 build against libwallet_merged and boost libs (Ilya Kitaev)
f9e0916 integrating libwallet (Ilya Kitaev)
382fa30 explicitely enabled c++11 for g++ compiler (Ilya Kitaev)
6d0179f wizard: saving locale instead of language; wallet interface continued (Ilya Kitaev)
7d9306c Qt wrapper for libwallet - in-progress (Ilya Kitaev)
625041d integrating cpp wallet mockups with QML (Ilya Kitaev)
1195a89 started integrating wallet library (Ilya Kitaev)
921d16a Forgotten file with password strength related functions (Ilya Kitaev)
e555631 wallet directrory in "Documents" for Windows and in "home" for *nix (Ilya Kitaev)
16020ae Wizard: "next button" visibility in backward direction fixed (Ilya Kitaev)
8bc411c wordings and text alignment according to design (Ilya Kitaev)
1364c2b Password strength level updated (Ilya Kitaev)
1571118 Refactored wizard paths internal handling (Ilya Kitaev)
496a34c Language (qt linguist) files actually added to project. (Ilya Kitaev)
e3bea0d "word mnemonic input" with clipboard button and hint is reusable component; (Ilya Kitaev)
6289e18 fix for window drag bug on ubuntu, only tested on windows (unknown)
fce88a8 Selection (branching) for recovery path (Ilya Kitaev)
bbc35ff Next button is in "disabled" state on password page (Ilya Kitaev)
46db771 German and English translation files (Ilya Kitaev)
Diffstat (limited to 'components')
| -rw-r--r-- | components/AddressBookTable.qml | 4 | ||||
| -rw-r--r-- | components/DashboardTable.qml | 8 | ||||
| -rw-r--r-- | components/HistoryTable.qml | 10 | ||||
| -rw-r--r-- | components/IconButton.qml | 72 | ||||
| -rw-r--r-- | components/Input.qml | 1 | ||||
| -rw-r--r-- | components/LineEdit.qml | 4 | ||||
| -rw-r--r-- | components/NetworkStatusItem.qml | 2 | ||||
| -rw-r--r-- | components/PasswordDialog.qml | 68 | ||||
| -rw-r--r-- | components/PrivacyLevelSmall.qml | 16 | ||||
| -rw-r--r-- | components/ProcessingSplash.qml | 63 | ||||
| -rw-r--r-- | components/SearchInput.qml | 2 | ||||
| -rw-r--r-- | components/StandardButton.qml | 11 | ||||
| -rw-r--r-- | components/TickDelegate.qml | 6 | ||||
| -rw-r--r-- | components/TitleBar.qml | 2 |
14 files changed, 246 insertions, 23 deletions
diff --git a/components/AddressBookTable.qml b/components/AddressBookTable.qml index ab4bf61d..756445f7 100644 --- a/components/AddressBookTable.qml +++ b/components/AddressBookTable.qml @@ -44,7 +44,7 @@ ListView { font.family: "Arial" font.pixelSize: 14 color: "#545454" - text: qsTr("No more results") + text: qsTr("No more results") + translationManager.emptyString } } @@ -103,7 +103,7 @@ ListView { font.pixelSize: 12 font.letterSpacing: -1 color: "#535353" - text: qsTr("Payment ID:") + text: qsTr("Payment ID:") + + translationManager.emptyString } Text { diff --git a/components/DashboardTable.qml b/components/DashboardTable.qml index 07fe6ac2..05b23c6e 100644 --- a/components/DashboardTable.qml +++ b/components/DashboardTable.qml @@ -44,7 +44,7 @@ ListView { font.family: "Arial" font.pixelSize: 14 color: "#545454" - text: qsTr("No more results") + text: qsTr("No more results") + translationManager.emptyString } } @@ -134,7 +134,7 @@ ListView { font.family: "Arial" font.pixelSize: 12 color: "#545454" - text: qsTr("Date") + text: qsTr("Date") + translationManager.emptyString } Row { @@ -169,7 +169,7 @@ ListView { font.family: "Arial" font.pixelSize: 12 color: "#545454" - text: qsTr("Balance") + text: qsTr("Balance") + translationManager.emptyString } Text { @@ -190,7 +190,7 @@ ListView { font.family: "Arial" font.pixelSize: 12 color: "#545454" - text: qsTr("Amount") + text: qsTr("Amount") + translationManager.emptyString } Row { diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml index 3ee8c82c..db92aa69 100644 --- a/components/HistoryTable.qml +++ b/components/HistoryTable.qml @@ -44,7 +44,7 @@ ListView { font.family: "Arial" font.pixelSize: 14 color: "#545454" - text: qsTr("No more results") + text: qsTr("No more results") + translationManager.emptyString } } @@ -126,7 +126,7 @@ ListView { font.pixelSize: 12 font.letterSpacing: -1 color: "#535353" - text: paymentId !== "" ? qsTr("Payment ID:") : "" + text: paymentId !== "" ? qsTr("Payment ID:") + translationManager.emptyString : "" } Text { @@ -164,7 +164,7 @@ ListView { font.family: "Arial" font.pixelSize: 12 color: "#545454" - text: qsTr("Date") + text: qsTr("Date") + translationManager.emptyString } Row { @@ -199,7 +199,7 @@ ListView { font.family: "Arial" font.pixelSize: 12 color: "#545454" - text: qsTr("Balance") + text: qsTr("Balance") + translationManager.emptyString } Text { @@ -220,7 +220,7 @@ ListView { font.family: "Arial" font.pixelSize: 12 color: "#545454" - text: qsTr("Amount") + text: qsTr("Amount") + translationManager.emptyString } Row { diff --git a/components/IconButton.qml b/components/IconButton.qml new file mode 100644 index 00000000..042439f1 --- /dev/null +++ b/components/IconButton.qml @@ -0,0 +1,72 @@ +// Copyright (c) 2014-2015, The Monero Project +// +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, this list of +// conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other +// materials provided with the distribution. +// +// 3. Neither the name of the copyright holder nor the names of its contributors may be +// used to endorse or promote products derived from this software without specific +// prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF +// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +import QtQuick 2.0 + +Item { + property alias imageSource : buttonImage.source + + signal clicked(var mouse) + + + id: button + width: parent.height + height: parent.height + anchors.right: parent.right + anchors.top: parent.top + anchors.bottom: parent.bottom + + Image { + id: buttonImage + source: "" + x : (parent.width - width) / 2 + y : (parent.height - height) /2 + z: 100 + } + + MouseArea { + id: buttonArea + anchors.fill: parent + + + onPressed: { + buttonImage.x = buttonImage.x + 2 + buttonImage.y = buttonImage.y + 2 + } + onReleased: { + buttonImage.x = buttonImage.x - 2 + buttonImage.y = buttonImage.y - 2 + } + + onClicked: { + parent.clicked(mouse) + } + } + +} diff --git a/components/Input.qml b/components/Input.qml index c10994d0..78bec8ea 100644 --- a/components/Input.qml +++ b/components/Input.qml @@ -32,6 +32,7 @@ import QtQuick 2.2 TextField { font.family: "Arial" + horizontalAlignment: TextInput.AlignLeft style: TextFieldStyle { textColor: "#3F3F3F" diff --git a/components/LineEdit.qml b/components/LineEdit.qml index 6994b75f..81786881 100644 --- a/components/LineEdit.qml +++ b/components/LineEdit.qml @@ -31,7 +31,11 @@ import QtQuick 2.0 Item { property alias placeholderText: input.placeholderText property alias text: input.text + property alias validator: input.validator + property alias readOnly : input.readOnly property int fontSize: 18 + + height: 37 Rectangle { diff --git a/components/NetworkStatusItem.qml b/components/NetworkStatusItem.qml index 720fe536..6fb1d2eb 100644 --- a/components/NetworkStatusItem.qml +++ b/components/NetworkStatusItem.qml @@ -63,7 +63,7 @@ Row { font.family: "Arial" font.pixelSize: 18 color: item.connected ? "#FF6C3B" : "#AAAAAA" - text: item.connected ? qsTr("Connected") : qsTr("Disconnected") + text: (item.connected ? qsTr("Connected") : qsTr("Disconnected")) + translationManager.emptyString } } } diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml new file mode 100644 index 00000000..a8ff294a --- /dev/null +++ b/components/PasswordDialog.qml @@ -0,0 +1,68 @@ +// Copyright (c) 2014-2015, The Monero Project +// +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, this list of +// conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other +// materials provided with the distribution. +// +// 3. Neither the name of the copyright holder nor the names of its contributors may be +// used to endorse or promote products derived from this software without specific +// prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF +// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import QtQuick 2.0 +import QtQuick.Controls 1.4 +import QtQuick.Dialogs 1.2 +import QtQuick.Layouts 1.1 +import QtQuick.Controls.Styles 1.4 + +// import "../components" + +Dialog { + id: root + readonly property alias password: passwordInput.text + standardButtons: StandardButton.Ok + StandardButton.Cancel + ColumnLayout { + id: column + height: 40 + anchors.fill: parent + + Label { + text: qsTr("Please enter wallet password") + Layout.columnSpan: 2 + Layout.fillWidth: true + font.family: "Arial" + font.pixelSize: 32 + } + + TextField { + id : passwordInput + + echoMode: TextInput.Password + focus: true + Layout.fillWidth: true + font.family: "Arial" + font.pixelSize: 24 + style: TextFieldStyle { + passwordCharacter: "•" + } + } + } +} + diff --git a/components/PrivacyLevelSmall.qml b/components/PrivacyLevelSmall.qml index 21c794ef..cb1cd36e 100644 --- a/components/PrivacyLevelSmall.qml +++ b/components/PrivacyLevelSmall.qml @@ -36,6 +36,13 @@ Item { height: 40 clip: true + onFillLevelChanged: { + if (!interactive) { + //print("fillLevel: " + fillLevel) + fillRect.width = row.positions[fillLevel].currentX + row.x + } + } + Rectangle { anchors.left: parent.left anchors.right: parent.right @@ -92,7 +99,7 @@ Item { font.bold: true color: "#000000" x: row.x + (row.positions[0] !== undefined ? row.positions[0].currentX - 3 : 0) - width - text: qsTr("LOW") + text: qsTr("LOW") + translationManager.emptyString } Text { @@ -103,7 +110,7 @@ Item { font.bold: true color: "#000000" x: row.x + (row.positions[4] !== undefined ? row.positions[4].currentX - 3 : 0) - width - text: qsTr("MEDIUM") + text: qsTr("MEDIUM") + translationManager.emptyString } Text { @@ -114,7 +121,7 @@ Item { font.bold: true color: "#000000" x: row.x + (row.positions[13] !== undefined ? row.positions[13].currentX - 3 : 0) - width - text: qsTr("HIGH") + text: qsTr("HIGH") + translationManager.emptyString } MouseArea { @@ -134,6 +141,7 @@ Item { if(index !== -1) { fillRect.width = Qt.binding(function(){ return row.positions[index].currentX + row.x }) item.fillLevel = index + print ("fillLevel: " + item.fillLevel) } } @@ -148,7 +156,7 @@ Item { anchors.rightMargin: 8 anchors.top: bar.bottom anchors.topMargin: 5 - property var positions: new Array() + property var positions: [] Row { id: row2 diff --git a/components/ProcessingSplash.qml b/components/ProcessingSplash.qml new file mode 100644 index 00000000..f98feb3b --- /dev/null +++ b/components/ProcessingSplash.qml @@ -0,0 +1,63 @@ +// Copyright (c) 2014-2015, The Monero Project +// +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, this list of +// conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other +// materials provided with the distribution. +// +// 3. Neither the name of the copyright holder nor the names of its contributors may be +// used to endorse or promote products derived from this software without specific +// prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF +// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import QtQuick 2.0 +import QtQuick.Window 2.1 +import QtQuick.Controls 1.4 +import QtQuick.Layouts 1.1 + +Window { + id: splash + modality: Qt.ApplicationModal + flags: Qt.SplashScreen + property alias message: message.text + width: 200 + height: 100 + opacity: 0.5 + + ColumnLayout { + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + + BusyIndicator { + running: parent.visible + Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter + } + + Text { + id: message + text: "Please wait..." + font { + pointSize: 22 + } + horizontalAlignment: Text.AlignHCenter + } + } + + +} diff --git a/components/SearchInput.qml b/components/SearchInput.qml index b104247c..35be896f 100644 --- a/components/SearchInput.qml +++ b/components/SearchInput.qml @@ -66,7 +66,7 @@ Item { anchors.leftMargin: 45 font.pixelSize: 18 verticalAlignment: TextInput.AlignVCenter - placeholderText: qsTr("Search by...") + placeholderText: qsTr("Search by...") + translationManager.emptyString } Item { diff --git a/components/StandardButton.qml b/components/StandardButton.qml index 208d90d3..5a088fbf 100644 --- a/components/StandardButton.qml +++ b/components/StandardButton.qml @@ -47,7 +47,10 @@ Item { height: parent.height - 1 y: buttonArea.pressed ? 0 : 1 //radius: 4 - color: buttonArea.pressed ? parent.shadowPressedColor : parent.shadowReleasedColor + color: { + parent.enabled ? (buttonArea.pressed ? parent.shadowPressedColor : parent.shadowReleasedColor) + : Qt.lighter(parent.shadowReleasedColor) + } } Rectangle { @@ -55,7 +58,11 @@ Item { anchors.right: parent.right height: parent.height - 1 y: buttonArea.pressed ? 1 : 0 - color: buttonArea.pressed ? parent.pressedColor : parent.releasedColor + color: { + parent.enabled ? (buttonArea.pressed ? parent.pressedColor : parent.releasedColor) + : Qt.lighter(parent.releasedColor) + + } //radius: 4 } diff --git a/components/TickDelegate.qml b/components/TickDelegate.qml index 70ef1b50..2163d3e7 100644 --- a/components/TickDelegate.qml +++ b/components/TickDelegate.qml @@ -52,9 +52,9 @@ Item { font.pixelSize: 12 color: "#4A4949" text: { - if(currentIndex === 0) return qsTr("LOW") - if(currentIndex === 3) return qsTr("MEDIUM") - if(currentIndex === 13) return qsTr("HIGH") + if(currentIndex === 0) return qsTr("LOW") + translationManager.emptyString + if(currentIndex === 3) return qsTr("MEDIUM") + translationManager.emptyString + if(currentIndex === 13) return qsTr("HIGH") + translationManager.emptyString return "" } } diff --git a/components/TitleBar.qml b/components/TitleBar.qml index f27caf73..8e1c9e32 100644 --- a/components/TitleBar.qml +++ b/components/TitleBar.qml @@ -35,7 +35,7 @@ Rectangle { color: "#000000" y: -height property int mouseX: 0 - property string title: "Monero - Donations" + property string title property bool containsMouse: false property alias maximizeButtonVisible: maximizeButton.visible property alias basicButtonVisible: goToBasicVersionButton.visible |
