gifSplash #383

Merged
sarah merged 2 commits from :gifSplash into master 2020-11-20 20:29:41 +00:00
11 changed files with 80 additions and 16 deletions

View File

@ -110,7 +110,7 @@
</application> </application>
<uses-sdk android:minSdkVersion="21" /><!-- android:targetSdkVersion="26"/> --> <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/> -->
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>

View File

@ -694,6 +694,15 @@ Name</extracomment>
<translation>Klein</translation> <translation>Klein</translation>
</message> </message>
</context> </context>
<context>
<name>SplashPane</name>
<message>
<location filename="../qml/panes/SplashPane.qml" line="45"/>
<source>loading-tor</source>
<extracomment>Loading tor...</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>Statusbar</name> <name>Statusbar</name>
<message> <message>
@ -724,7 +733,7 @@ Name</extracomment>
<context> <context>
<name>main</name> <name>main</name>
<message> <message>
<location filename="../qml/main.qml" line="279"/> <location filename="../qml/main.qml" line="277"/>
<source>new-connection-pane-title</source> <source>new-connection-pane-title</source>
<extracomment>New Connection</extracomment> <extracomment>New Connection</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

Binary file not shown.

View File

@ -809,6 +809,15 @@ Right-click to reset.</translation>
<translation>Small</translation> <translation>Small</translation>
</message> </message>
</context> </context>
<context>
<name>SplashPane</name>
<message>
<location filename="../qml/panes/SplashPane.qml" line="45"/>
<source>loading-tor</source>
<extracomment>Loading tor...</extracomment>
<translation>Loading tor...</translation>
</message>
</context>
<context> <context>
<name>StackToolbar</name> <name>StackToolbar</name>
<message> <message>
@ -847,7 +856,7 @@ Right-click to reset.</translation>
<context> <context>
<name>main</name> <name>main</name>
<message> <message>
<location filename="../qml/main.qml" line="279"/> <location filename="../qml/main.qml" line="277"/>
<source>new-connection-pane-title</source> <source>new-connection-pane-title</source>
<extracomment>New Connection</extracomment> <extracomment>New Connection</extracomment>
<translation>New Connection</translation> <translation>New Connection</translation>

View File

@ -694,6 +694,15 @@ Name</extracomment>
<translation>Petit</translation> <translation>Petit</translation>
</message> </message>
</context> </context>
<context>
<name>SplashPane</name>
<message>
<location filename="../qml/panes/SplashPane.qml" line="45"/>
<source>loading-tor</source>
<extracomment>Loading tor...</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>Statusbar</name> <name>Statusbar</name>
<message> <message>
@ -724,7 +733,7 @@ Name</extracomment>
<context> <context>
<name>main</name> <name>main</name>
<message> <message>
<location filename="../qml/main.qml" line="279"/> <location filename="../qml/main.qml" line="277"/>
<source>new-connection-pane-title</source> <source>new-connection-pane-title</source>
<extracomment>New Connection</extracomment> <extracomment>New Connection</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

View File

@ -694,6 +694,15 @@ Name</extracomment>
<translation>Pequeno</translation> <translation>Pequeno</translation>
</message> </message>
</context> </context>
<context>
<name>SplashPane</name>
<message>
<location filename="../qml/panes/SplashPane.qml" line="45"/>
<source>loading-tor</source>
<extracomment>Loading tor...</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>Statusbar</name> <name>Statusbar</name>
<message> <message>
@ -724,7 +733,7 @@ Name</extracomment>
<context> <context>
<name>main</name> <name>main</name>
<message> <message>
<location filename="../qml/main.qml" line="279"/> <location filename="../qml/main.qml" line="277"/>
<source>new-connection-pane-title</source> <source>new-connection-pane-title</source>
<extracomment>New Connection</extracomment> <extracomment>New Connection</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

View File

@ -26,5 +26,8 @@
<file>i18n/translation_fr.qm</file> <file>i18n/translation_fr.qm</file>
<file>i18n/translation_pt.qm</file> <file>i18n/translation_pt.qm</file>
<file>qml/images/cwtch_logo.png</file> <file>qml/images/cwtch_logo.png</file>
<file>qml/images/cwtch_title.png</file>
<file>qml/images/Open_Privacy_Logo_lightoutline.png</file>
<file>qml/images/knot_animated.gif</file>
</qresource> </qresource>
</RCC> </RCC>

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
qml/images/cwtch_title.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 859 KiB

View File

@ -6,31 +6,56 @@ import QtQuick.Window 2.11
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import "../opaque/styles" import "../opaque/styles"
import "../opaque" as Opaque
import "../opaque/theme"
Item { Item {
id: sp id: sp
property bool running 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 { Image {
id: splashImage id: splashImage
anchors.horizontalCenter: parent.horizontalCenter 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.horizontalCenter: parent.horizontalCenter
anchors.top: splashImage.bottom anchors.top: splashImage.bottom
anchors.topMargin: 10 anchors.topMargin: 10 * gcd.themeScale
width: splashImage.width
indeterminate: true //: Loading tor...
visible: sp.running text: qsTr("loading-tor")
style: ProgressBarStyle { size: Theme.secondaryTextSize
progress: CwtchProgress { running: sp.running } 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"
} }
} }