diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 9e64880d..3504fa2d 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -110,7 +110,7 @@ - + --> diff --git a/i18n/translation_de.ts b/i18n/translation_de.ts index 0e069f67..743a717b 100644 --- a/i18n/translation_de.ts +++ b/i18n/translation_de.ts @@ -694,6 +694,15 @@ Name Klein + + SplashPane + + + loading-tor + Loading tor... + + + Statusbar @@ -724,7 +733,7 @@ Name main - + new-connection-pane-title New Connection diff --git a/i18n/translation_en.qm b/i18n/translation_en.qm index 373f4aa1..fd89b959 100644 Binary files a/i18n/translation_en.qm and b/i18n/translation_en.qm differ diff --git a/i18n/translation_en.ts b/i18n/translation_en.ts index 86446243..904bb3a1 100644 --- a/i18n/translation_en.ts +++ b/i18n/translation_en.ts @@ -809,6 +809,15 @@ Right-click to reset. Small + + SplashPane + + + loading-tor + Loading tor... + Loading tor... + + StackToolbar @@ -847,7 +856,7 @@ Right-click to reset. main - + new-connection-pane-title New Connection New Connection diff --git a/i18n/translation_fr.ts b/i18n/translation_fr.ts index 38b483cf..ff072a80 100644 --- a/i18n/translation_fr.ts +++ b/i18n/translation_fr.ts @@ -694,6 +694,15 @@ Name Petit + + SplashPane + + + loading-tor + Loading tor... + + + Statusbar @@ -724,7 +733,7 @@ Name main - + new-connection-pane-title New Connection diff --git a/i18n/translation_pt.ts b/i18n/translation_pt.ts index e8a8d3a0..ab11775a 100644 --- a/i18n/translation_pt.ts +++ b/i18n/translation_pt.ts @@ -694,6 +694,15 @@ Name Pequeno + + SplashPane + + + loading-tor + Loading tor... + + + Statusbar @@ -724,7 +733,7 @@ Name main - + new-connection-pane-title New Connection diff --git a/qml.qrc b/qml.qrc index 74382f52..7db9c7bb 100644 --- a/qml.qrc +++ b/qml.qrc @@ -26,5 +26,8 @@ i18n/translation_fr.qm i18n/translation_pt.qm qml/images/cwtch_logo.png + qml/images/cwtch_title.png + qml/images/Open_Privacy_Logo_lightoutline.png + qml/images/knot_animated.gif diff --git a/qml/images/Open_Privacy_Logo_lightoutline.png b/qml/images/Open_Privacy_Logo_lightoutline.png new file mode 100644 index 00000000..9a34aa63 Binary files /dev/null and b/qml/images/Open_Privacy_Logo_lightoutline.png differ diff --git a/qml/images/cwtch_title.png b/qml/images/cwtch_title.png new file mode 100644 index 00000000..a9647415 Binary files /dev/null and b/qml/images/cwtch_title.png differ diff --git a/qml/images/knot_animated.gif b/qml/images/knot_animated.gif new file mode 100644 index 00000000..5cffbd48 Binary files /dev/null and b/qml/images/knot_animated.gif differ diff --git a/qml/panes/SplashPane.qml b/qml/panes/SplashPane.qml index 27f23db2..d7167210 100644 --- a/qml/panes/SplashPane.qml +++ b/qml/panes/SplashPane.qml @@ -6,31 +6,56 @@ import QtQuick.Window 2.11 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import "../opaque/styles" +import "../opaque" as Opaque +import "../opaque/theme" Item { id: sp property bool running + + AnimatedImage { + id: aniKnot + playing: sp.running + source: "qrc:/qml/images/knot_animated.gif" + + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: parent.top + anchors.topMargin: 100 * gcd.themeScale + + width: 200 + height: 200 + } + Image { id: splashImage anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter + anchors.top: aniKnot.bottom + anchors.topMargin: 20 * gcd.themeScale - source: "qrc:/qml/images/cwtch_logo.png" + source: "qrc:/qml/images/cwtch_title.png" } - ProgressBar { - id: progressBar + + Opaque.ScalingLabel { + id: loadingLabel anchors.horizontalCenter: parent.horizontalCenter anchors.top: splashImage.bottom - anchors.topMargin: 10 - width: splashImage.width + anchors.topMargin: 10 * gcd.themeScale - indeterminate: true - visible: sp.running + //: Loading tor... + text: qsTr("loading-tor") - style: ProgressBarStyle { - progress: CwtchProgress { running: sp.running } - } + size: Theme.secondaryTextSize + color: Theme.mainTextColor + } + + Image { + id: opImage + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottom: parent.bottom + anchors.bottomMargin: 20 * gcd.themeScale + + source: "qrc:/qml/images/Open_Privacy_Logo_lightoutline.png" } }