diff --git a/icons/connection_censored.svg b/icons/connection_censored.svg
new file mode 100644
index 00000000..34075f00
--- /dev/null
+++ b/icons/connection_censored.svg
@@ -0,0 +1,165 @@
+
+
+
+
diff --git a/icons/connection_ok.svg b/icons/connection_ok.svg
new file mode 100644
index 00000000..3fd89e8e
--- /dev/null
+++ b/icons/connection_ok.svg
@@ -0,0 +1,161 @@
+
+
+
+
diff --git a/icons/icons.qrc b/icons/icons.qrc
index b0548c12..3c956901 100644
--- a/icons/icons.qrc
+++ b/icons/icons.qrc
@@ -2,5 +2,7 @@
ricochet.svg
ricochet_icons.ttf
+ connection_ok.svg
+ connection_censored.svg
diff --git a/src/ui/qml/NetworkSetupWizard.qml b/src/ui/qml/NetworkSetupWizard.qml
index 024e67d6..861ddfdf 100644
--- a/src/ui/qml/NetworkSetupWizard.qml
+++ b/src/ui/qml/NetworkSetupWizard.qml
@@ -6,9 +6,9 @@ ApplicationWindow {
id: window
width: minimumWidth
height: minimumHeight
- minimumWidth: 400
+ minimumWidth: 600
maximumWidth: minimumWidth
- minimumHeight: visibleItem.height + 16
+ minimumHeight: visibleItem.height + 32
maximumHeight: minimumHeight
title: "Ricochet"
@@ -93,43 +93,110 @@ ApplicationWindow {
id: firstPage
Column {
- spacing: 8
+ width: parent.width
+ spacing: 20
+ anchors {
+ left: parent.left
+ right: parent.right
+ margins: parent.width/10
+ }
+
- Label {
+ Column {
width: parent.width
- text: qsTr("This computer's Internet connection is free of obstacles. I would like to connect directly to the Tor network.")
- wrapMode: Text.Wrap
- horizontalAlignment: Qt.AlignHCenter
- }
+ spacing: 10
- Button {
- anchors.horizontalCenter: parent.horizontalCenter
- text: qsTr("Connect")
- isDefault: true
- onClicked: {
- // Reset to defaults and proceed to bootstrap page
- configPage.reset()
- configPage.save()
+ Image {
+ anchors.horizontalCenter: parent.horizontalCenter
+ source: "../icons/ricochet.svg"
+ sourceSize.width: parent.width / 10
+ sourceSize.height: 60
}
- }
- Rectangle {
- height: 1
- width: parent.width
- color: palette.mid
+ Label {
+ width: parent.width
+ horizontalAlignment: Qt.AlignHCenter
+ text: qsTr("Welcome to Ricochet. Before we start, we need to know about your connection to the Internet.")
+ wrapMode: Text.Wrap
+ }
+
+ Label {
+ width: parent.width
+ horizontalAlignment: Qt.AlignHCenter
+ text: qsTr("Please try Connect first if you do not require bridges or special network settings.")
+ wrapMode: Text.Wrap
+ }
}
- Label {
+ Row {
width: parent.width
- text: qsTr("This computer's Internet connection is censored, filtered, or proxied. I need to configure network settings.")
- wrapMode: Text.Wrap
- horizontalAlignment: Qt.AlignHCenter
- }
+ spacing: 10
+
+ Column {
+ width: parent.width/2.5
+ spacing: 10
+
+ Image {
+ anchors.horizontalCenter: parent.horizontalCenter
+ source: "../icons/connection_ok.svg"
+ sourceSize.width: parent.width
+ sourceSize.height: 50
+ }
+
+ Button {
+ anchors.horizontalCenter: parent.horizontalCenter
+ text: qsTr("Connect")
+ isDefault: true
+ onClicked: {
+ // Reset to defaults and proceed to bootstrap page
+ configPage.reset()
+ configPage.save()
+ }
+ }
+
+ Label {
+ width: parent.width
+ text: qsTr("This computer can freely access the Internet")
+ wrapMode: Text.Wrap
+ horizontalAlignment: Qt.AlignHCenter
+ }
+ }
- Button {
- anchors.horizontalCenter: parent.horizontalCenter
- text: qsTr("Configure")
- onClicked: window.openConfig()
+ Column {
+ width: parent.width/5
+
+ // We need something in this column such that the
+ // width will be rendered.
+ Label {
+ width: parent.width
+ }
+ }
+
+
+ Column {
+ width: parent.width/2.5
+ spacing: 10
+
+ Image {
+ anchors.horizontalCenter: parent.horizontalCenter
+ source: "../icons/connection_censored.svg"
+ sourceSize.width: parent.width
+ sourceSize.height: 50
+ }
+
+ Button {
+ anchors.horizontalCenter: parent.horizontalCenter
+ text: qsTr("Configure")
+ onClicked: window.openConfig()
+ }
+
+ Label {
+ width: parent.width
+ text: qsTr("My connection is censored, filtered, or requires a proxy.")
+ wrapMode: Text.Wrap
+ horizontalAlignment: Qt.AlignHCenter
+ }
+ }
}
}
}