diff --git a/components/TitleBar.qml b/components/TitleBar.qml
index 65398d71..be1ef37c 100644
--- a/components/TitleBar.qml
+++ b/components/TitleBar.qml
@@ -197,16 +197,7 @@ Rectangle {
onExited: parent.color = "transparent";
onClicked: {
releaseFocus();
-
- // Show welcome screen if on home
- if(wizard.wizardState === "wizardHome" || wizard.wizardState === "wizardModeSelection"){
- wizard.skipModeSelection = true;
- wizard.wizardState = 'wizardLanguage';
- return;
- }
-
- languageSidebar.isOpened ? languageSidebar.close() : languageSidebar.open();
- console.log('change language');
+ appWindow.toggleLanguageView();
}
}
}
diff --git a/main.qml b/main.qml
index 85cf38ef..8ee4d564 100644
--- a/main.qml
+++ b/main.qml
@@ -1604,6 +1604,12 @@ ApplicationWindow {
}
}
+ WizardLang {
+ id: languageView
+ visible: false
+ anchors.fill: parent
+ }
+
property int minWidth: 326
property int minHeight: 400
MouseArea {
@@ -1732,6 +1738,11 @@ ApplicationWindow {
}
}
+ function toggleLanguageView(){
+ middlePanel.visible = !middlePanel.visible;
+ languageView.visible = !languageView.visible
+ }
+
// TODO: Make the callback dynamic
Timer {
id: statusMessageTimer
@@ -1994,7 +2005,8 @@ ApplicationWindow {
opacity: 0.8
}
- MoneroComponents.LanguageSidebar {
- id: languageSidebar
- }
+// @TODO: QML type 'Drawer' has issues with buildbot; debug after Qt 5.9 migration
+// MoneroComponents.LanguageSidebar {
+// id: languageSidebar
+// }
}
diff --git a/pages/settings/SettingsLayout.qml b/pages/settings/SettingsLayout.qml
index 91ada533..f8d25467 100644
--- a/pages/settings/SettingsLayout.qml
+++ b/pages/settings/SettingsLayout.qml
@@ -171,7 +171,7 @@ Rectangle {
text: "Change language"
onClicked: {
- languageSidebar.isOpened ? languageSidebar.close() : languageSidebar.open();
+ appWindow.toggleLanguageView();
}
}
diff --git a/qml.qrc b/qml.qrc
index 98521f20..b9893e18 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -241,6 +241,7 @@
wizard/WizardHeader.qml
wizard/WizardHome.qml
wizard/WizardLanguage.qml
+ wizard/WizardLang.qml
wizard/WizardNav.qml
wizard/WizardWalletInput.qml
wizard/WizardRestoreWallet1.qml
diff --git a/wizard/WizardHome.qml b/wizard/WizardHome.qml
index 10f07dd0..655a53e2 100644
--- a/wizard/WizardHome.qml
+++ b/wizard/WizardHome.qml
@@ -152,9 +152,7 @@ Rectangle {
text: qsTr("Change language") + translationManager.emptyString
onClicked: {
- wizardController.skipModeSelection = true;
- wizardController.wizardState = 'wizardLanguage';
- languageSidebar.open();
+ appWindow.toggleLanguageView();
}
}
}
diff --git a/wizard/WizardLang.qml b/wizard/WizardLang.qml
new file mode 100644
index 00000000..44bcb187
--- /dev/null
+++ b/wizard/WizardLang.qml
@@ -0,0 +1,238 @@
+// Copyright (c) 2014-2019, 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.7
+import QtQuick.Dialogs 1.2
+import QtQuick.Layouts 1.2
+import QtQuick.XmlListModel 2.0
+import QtQuick.Controls 2.0
+
+import "../js/Wizard.js" as Wizard
+import "../components" as MoneroComponents
+
+Rectangle {
+ id: langScreen
+ color: "transparent"
+ anchors.fill: parent
+ property int layoutScale: {
+ if(isMobile){
+ return 0;
+ } else if(appWindow.width < 800){
+ return 1;
+ } else {
+ return 2;
+ }
+ }
+
+ Image {
+ anchors.fill: parent
+ source: "../images/middlePanelBg.jpg"
+ }
+
+ ColumnLayout {
+ anchors.top: parent.top
+ anchors.topMargin: persistentSettings.customDecorations ? 90 * scaleRatio : 32 * scaleRatio
+ width: parent.width - 100 * scaleRatio
+ anchors.horizontalCenter: parent.horizontalCenter;
+
+ TextArea {
+ text: qsTr("Language settings") + translationManager.emptyString
+ Layout.fillWidth: true
+ font.family: MoneroComponents.Style.fontRegular.name
+ color: MoneroComponents.Style.defaultFontColor
+ font.pixelSize: {
+ if(langScreen.layoutScale === 2 ){
+ return 34 * scaleRatio;
+ } else {
+ return 28 * scaleRatio;
+ }
+ }
+
+ selectionColor: MoneroComponents.Style.dimmedFontColor
+ selectedTextColor: MoneroComponents.Style.defaultFontColor
+
+ selectByMouse: true
+ wrapMode: Text.WordWrap
+ textMargin: 0
+ leftPadding: 0
+ topPadding: 0
+ bottomPadding: 0
+ readOnly: true
+ }
+
+ TextArea {
+ Layout.fillWidth: true
+ visible: parent.subtitle !== ""
+
+ color: MoneroComponents.Style.dimmedFontColor
+ text: qsTr("Change the language of the Monero GUI.") + translationManager.emptyString
+
+ font.family: MoneroComponents.Style.fontRegular.name
+ font.pixelSize: {
+ if(langScreen.layoutScale === 2 ){
+ return 16 * scaleRatio;
+ } else {
+ return 14 * scaleRatio;
+ }
+ }
+
+ selectionColor: MoneroComponents.Style.dimmedFontColor
+ selectedTextColor: MoneroComponents.Style.defaultFontColor
+
+ selectByMouse: true
+ wrapMode: Text.WordWrap
+ textMargin: 0
+ leftPadding: 0
+ topPadding: 0
+ readOnly: true
+ }
+
+ Flow {
+ id: flow
+ height: 800 * scaleRatio
+ Layout.fillWidth: true
+ Layout.topMargin: 20 * scaleRatio
+
+ spacing: 5 * scaleRatio
+
+ Repeater {
+ model: langModel
+ delegate: Rectangle {
+ id: item
+ color: "transparent"
+ width: {
+ var minimumWidth = img.width + langRect.width;
+ if(minimumWidth < 200 * scaleRatio) return 200 * scaleRatio;
+ return minimumWidth;
+ }
+
+ height: 48 * scaleRatio
+
+ Rectangle {
+ id: img
+ anchors.top: parent.top
+ color: "transparent"
+ width: 32 * scaleRatio
+ height: parent.height
+
+ Image {
+ source: flag
+ mipmap: true
+ smooth: true
+ width: 32 * scaleRatio
+ height: 32 * scaleRatio
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.horizontalCenter: parent.horizontalCenter
+ }
+ }
+
+ Rectangle {
+ id: langRect
+ anchors.top: parent.top
+ anchors.left: img.right
+ color: "transparent"
+ height: parent.height
+ width: langText.width + 22 * scaleRatio
+
+ Text {
+ id: langText
+ font.bold: true
+ font.pixelSize: 14 * scaleRatio
+ color: MoneroComponents.Style.defaultFontColor
+ text: display_name
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.horizontalCenter: parent.horizontalCenter
+ }
+ }
+
+ MouseArea {
+ anchors.fill: parent
+ cursorShape: Qt.PointingHandCursor
+ onClicked: {
+ var locale_spl = locale.split("_");
+
+ // reload active translations
+ console.log(locale_spl[0]);
+ translationManager.setLanguage(locale_spl[0]);
+
+ // set wizard language settings
+ wizard.language_locale = locale;
+ wizard.language_wallet = wallet_language;
+ wizard.language_language = display_name + " (" + locale_spl[1] + ") ";
+
+ appWindow.showStatusMessage(qsTr("Language changed."), 3);
+ appWindow.toggleLanguageView();
+ }
+ hoverEnabled: true
+ onEntered: {
+ parent.opacity = 0.75
+ }
+ onExited: {
+ parent.opacity = 1
+ }
+ }
+ }
+ }
+ }
+
+ RowLayout {
+ Layout.fillWidth: true
+ Layout.topMargin: 32 * scaleRatio
+ spacing: 20 * scaleRatio
+
+ MoneroComponents.StandardButton {
+ small: true
+ text: qsTr("Close") + translationManager.emptyString
+
+ onClicked: {
+ appWindow.toggleLanguageView();
+ }
+ }
+ }
+
+ XmlListModel {
+ id: langModel
+ source: "/lang/languages.xml"
+ query: "/languages/language"
+
+ XmlRole { name: "display_name"; query: "@display_name/string()" }
+ XmlRole { name: "locale"; query: "@locale/string()" }
+ XmlRole { name: "wallet_language"; query: "@wallet_language/string()" }
+ XmlRole { name: "flag"; query: "@flag/string()" }
+ // TODO: XmlListModel is read only, we should store current language somewhere else
+ // and set current language accordingly
+ XmlRole { name: "isCurrent"; query: "@enabled/string()" }
+
+ onStatusChanged: {
+ if(status === XmlListModel.Ready){
+ console.log("languages available: ",count);
+ }
+ }
+ }
+ }
+}
diff --git a/wizard/WizardLanguage.qml b/wizard/WizardLanguage.qml
index 4bd55dc6..49319a15 100644
--- a/wizard/WizardLanguage.qml
+++ b/wizard/WizardLanguage.qml
@@ -164,7 +164,7 @@ Rectangle {
text: "Language"
onClicked: {
- languageSidebar.open();
+ appWindow.toggleLanguageView();
}
}