Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

Wizard redesign

Browse Source
This commit is contained in:
dsc
2019-01-14 01:02:44 +01:00
parent 333f4aaf83
commit f329a71029
79 changed files with 4670 additions and 3098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pages/Receive.qml
View File

@@ -325,6 +325,7 @@ Rectangle {
}
function clearFields() {
// @TODO: add fields
}
function onPageClosed() {

11
pages/Transfer.qml
View File

@@ -443,6 +443,7 @@ Rectangle {
enabled: !viewOnly || pageRoot.enabled
RowLayout {
visible: appWindow.walletMode >= 2
CheckBox2 {
id: showAdvancedCheckbox
checked: persistentSettings.transferShowAdvanced
@@ -454,7 +455,7 @@ Rectangle {
}
GridLayout {
visible: persistentSettings.transferShowAdvanced
visible: persistentSettings.transferShowAdvanced && appWindow.walletMode >= 2
columns: (isMobile) ? 2 : 6
StandardButton {
@@ -676,9 +677,11 @@ Rectangle {
//TODO: enable send page when we're connected and daemon is synced
function updateStatus() {
var messageNotConnected = qsTr("Wallet is not connected to daemon.");
if(appWindow.walletMode >= 2) messageNotConnected += root.startLinkText;
pageRoot.enabled = true;
if(typeof currentWallet === "undefined") {
root.warningContent = qsTr("Wallet is not connected to daemon.") + root.startLinkText
root.warningContent = messageNotConnected;
return;
}
@@ -690,7 +693,7 @@ Rectangle {
switch (currentWallet.connected()) {
case Wallet.ConnectionStatus_Disconnected:
root.warningContent = qsTr("Wallet is not connected to daemon.") + root.startLinkText
root.warningContent = messageNotConnected;
break
case Wallet.ConnectionStatus_WrongVersion:
root.warningContent = qsTr("Connected daemon is not compatible with GUI. \n" +
@@ -698,7 +701,7 @@ Rectangle {
break
default:
if(!appWindow.daemonSynced){
root.warningContent = qsTr("Waiting on daemon synchronization to finish")
root.warningContent = qsTr("Waiting on daemon synchronization to finish.")
} else {
// everything OK, enable transfer page
// Light wallet is always ready

4
pages/settings/Navbar.qml
View File

@@ -182,6 +182,7 @@ Rectangle {
ColumnLayout {
// NODE
id: navNode
visible: appWindow.walletMode >= 2
Layout.preferredWidth: navNodeText.width + grid.textMargin
Layout.preferredHeight: 32
Layout.minimumWidth: 72 * scaleRatio
@@ -225,6 +226,7 @@ Rectangle {
}
}
Rectangle{
visible: appWindow.walletMode >= 2
Layout.preferredWidth: 1
Layout.preferredHeight: 32
color: grid.borderColor
@@ -232,6 +234,7 @@ Rectangle {
ColumnLayout {
// LOG
id: navLog
visible: appWindow.walletMode >= 2
Layout.preferredWidth: navLogText.width + grid.textMargin
Layout.preferredHeight: 32
Layout.minimumWidth: 72 * scaleRatio
@@ -275,6 +278,7 @@ Rectangle {
}
}
Rectangle{
visible: appWindow.walletMode >= 2
Layout.preferredWidth: 1
Layout.preferredHeight: 32
color: grid.borderColor

40
pages/settings/SettingsInfo.qml
View File

@@ -39,6 +39,15 @@ Rectangle {
color: "transparent"
height: 1400 * scaleRatio
Layout.fillWidth: true
property string walletModeString: {
if(appWindow.walletMode === 0){
return qsTr("Simple mode") + translationManager.emptyString;
} else if(appWindow.walletMode === 1){
return qsTr("Simple mode") + " (bootstrap)" + translationManager.emptyString;
} else if(appWindow.walletMode === 2){
return qsTr("Advanced mode") + translationManager.emptyString;
}
}
ColumnLayout {
id: infoLayout
@@ -239,6 +248,36 @@ Rectangle {
font.pixelSize: 14 * scaleRatio
text: walletLogPath
}
Rectangle {
height: 1
Layout.topMargin: 2 * scaleRatio
Layout.bottomMargin: 2 * scaleRatio
Layout.fillWidth: true
color: MoneroComponents.Style.dividerColor
opacity: MoneroComponents.Style.dividerOpacity
}
Rectangle {
height: 1
Layout.topMargin: 2 * scaleRatio
Layout.bottomMargin: 2 * scaleRatio
Layout.fillWidth: true
color: MoneroComponents.Style.dividerColor
opacity: MoneroComponents.Style.dividerOpacity
}
MoneroComponents.TextBlock {
Layout.fillWidth: true
font.pixelSize: 14 * scaleRatio
text: qsTr("Wallet mode: ") + translationManager.emptyString
}
MoneroComponents.TextBlock {
Layout.fillWidth: true
font.pixelSize: 14 * scaleRatio
text: walletModeString
}
}
// Copy info to clipboard
@@ -261,6 +300,7 @@ Rectangle {
data += currentWallet.walletCreationHeight;
data += "\nWallet log path: " + walletLogPath;
data += "\nWallet mode: " + walletModeString;
console.log("Copied to clipboard");
clipboard.setText(data);

11
pages/settings/SettingsLayout.qml
View File

@@ -164,6 +164,17 @@ Rectangle {
}
}
MoneroComponents.StandardButton {
visible: !persistentSettings.customDecorations
Layout.topMargin: 10 * scaleRatio
small: true
text: "Change language"
onClicked: {
languageSidebar.isOpened ? languageSidebar.close() : languageSidebar.open();
}
}
MoneroComponents.TextBlock {
visible: isMobile
font.pixelSize: 14

2
pages/settings/SettingsWallet.qml
View File

@@ -258,6 +258,7 @@ Rectangle {
}
GridLayout {
visible: appWindow.walletMode >= 2
Layout.fillWidth: true
Layout.preferredHeight: settingsWallet.itemHeight
columnSpacing: 0
@@ -326,6 +327,7 @@ Rectangle {
}
Rectangle {
// divider
visible: appWindow.walletMode >= 2
Layout.preferredHeight: 1 * scaleRatio
Layout.fillWidth: true
Layout.topMargin: 8 * scaleRatio