#746 GUI - Mac- Restore screen - Resolution issue fixed

BeamMW · Jul 11, 2019 · 96914ac · 96914ac
1 parent 126fb8e
commit 96914ac
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 13 deletions.
diff --git a/ui/i18n/en_US.ts b/ui/i18n/en_US.ts
@@ -978,7 +978,7 @@
     <message id="settings-general-language">
         <source>Language</source>
         <extracomment>settings tab, general section, language label</extracomment>
-        <translation>Language</translation>
+        <translation type="vanished">Language</translation>
     </message>
     <message id="open-external-open">
         <source>Open</source>

diff --git a/ui/i18n/es_ES.ts b/ui/i18n/es_ES.ts
@@ -978,7 +978,7 @@
     <message id="settings-general-language">
         <source>Language</source>
         <extracomment>settings tab, general section, language label</extracomment>
-        <translation>Idioma</translation>
+        <translation type="vanished">Idioma</translation>
     </message>
     <message id="open-external-open">
         <source>Open</source>

diff --git a/ui/i18n/fr_FR.ts b/ui/i18n/fr_FR.ts
@@ -979,7 +979,7 @@ Vous essayez de restaurer un portefeuille Beam existant. Veuillez noter que si v
     <message id="settings-general-language">
         <source>Language</source>
         <extracomment>settings tab, general section, language label</extracomment>
-        <translation>Langue</translation>
+        <translation type="vanished">Langue</translation>
     </message>
     <message id="open-external-open">
         <source>Open</source>

diff --git a/ui/i18n/ko_KR.ts b/ui/i18n/ko_KR.ts
@@ -978,7 +978,7 @@
     <message id="settings-general-language">
         <source>Language</source>
         <extracomment>settings tab, general section, language label</extracomment>
-        <translation>언어</translation>
+        <translation type="vanished">언어</translation>
     </message>
     <message id="open-external-open">
         <source>Open</source>

diff --git a/ui/i18n/ru_RU.ts b/ui/i18n/ru_RU.ts
@@ -978,7 +978,7 @@
     <message id="settings-general-language">
         <source>Language</source>
         <extracomment>settings tab, general section, language label</extracomment>
-        <translation>Язык</translation>
+        <translation type="vanished">Язык</translation>
     </message>
     <message id="open-external-open">
         <source>Open</source>

diff --git a/ui/i18n/vi_VI.ts b/ui/i18n/vi_VI.ts
@@ -978,7 +978,7 @@
     <message id="settings-general-language">
         <source>Language</source>
         <extracomment>settings tab, general section, language label</extracomment>
-        <translation>Ngôn ngữ</translation>
+        <translation type="vanished">Ngôn ngữ</translation>
     </message>
     <message id="open-external-open">
         <source>Open</source>

diff --git a/ui/i18n/zh_CN.ts b/ui/i18n/zh_CN.ts
@@ -978,7 +978,7 @@
     <message id="settings-general-language">
         <source>Language</source>
         <extracomment>settings tab, general section, language label</extracomment>
-        <translation>语言</translation>
+        <translation type="vanished">语言</translation>
     </message>
     <message id="open-external-open">
         <source>Open</source>

diff --git a/ui/view/loading.qml b/ui/view/loading.qml
@@ -4,6 +4,7 @@ import QtQuick.Controls 2.4
 import QtQuick.Controls.Styles 1.2
 import QtGraphicalEffects 1.0
 import "controls"
+import "utils.js" as Utils
 import Beam.Wallet 1.0
 import QtQuick.Layouts 1.3
 
@@ -113,7 +114,7 @@ Item
             anchors.fill: parent
             spacing: 0
             Item {
-                Layout.preferredHeight: parent.height * 0.18
+                Layout.preferredHeight: Utils.getLogoTopGapSize(parent.height)
             }
 
             LogoComponent {
@@ -176,7 +177,7 @@ Item
                     }
                     Row {
                         Layout.alignment: Qt.AlignHCenter
-                        Layout.topMargin: 25
+                        Layout.topMargin: 20
                         SFText {
                             horizontalAlignment: Text.AlignHCenter
                             width: 548

diff --git a/ui/view/start.qml b/ui/view/start.qml
@@ -4,6 +4,7 @@ import QtQuick.Controls 2.4
 import QtQuick.Controls.Styles 1.2
 import QtGraphicalEffects 1.0
 import "controls"
+import "utils.js" as Utils
 import Beam.Wallet 1.0
 import QtQuick.Layouts 1.3
 
@@ -110,7 +111,7 @@ Item
                     anchors.fill: parent
                     spacing: 0
                     Item {
-                        Layout.preferredHeight: parent.height * 0.18
+                        Layout.preferredHeight: Utils.getLogoTopGapSize(parent.height)
                     }
 
                     LogoComponent {
@@ -216,7 +217,7 @@ Item
                     anchors.fill: parent
                     spacing: 0
                     Item {
-                        Layout.preferredHeight: parent.height * 0.18
+                        Layout.preferredHeight: Utils.getLogoTopGapSize(parent.height)
                     }
 
                     LogoComponent {
@@ -1715,7 +1716,7 @@ Item
                     anchors.fill: parent
                     spacing: 0
                     Item {
-                        Layout.preferredHeight: parent.height * 0.18
+                        Layout.preferredHeight: Utils.getLogoTopGapSize(parent.height)
                     }
 
                     LogoComponent {

diff --git a/ui/view/utils.js b/ui/view/utils.js
@@ -13,3 +13,7 @@ function formatDateTime(datetime, localeName) {
          + timeZoneShort
          + ")";
 }
+
+function getLogoTopGapSize(parentHeight) {
+    return parentHeight * (parentHeight < 768 ? 0.13 : 0.18)
+}
diff --git a/ui/view/wallet.qml b/ui/view/wallet.qml
@@ -910,7 +910,7 @@ Item {
                                 Layout.fillWidth: true
 
                                 SFText {
-                                    //% "The minimum fee is %1 groth"
+                                    //% "The minimum fee is %1 GROTH"
                                     text: qsTrId("send-fee-fail").arg(viewModel.minimumFeeInGroth)
                                     color: Style.validator_error
                                     font.pixelSize: 14