splash pane now has new cwtch font logo and animated knot

This commit is contained in:
Dan Ballard 2020-11-19 15:37:19 -08:00
parent 4805507014
commit aadcb0d7c6
10 changed files with 78 additions and 8 deletions

View File

@ -12,6 +12,7 @@ import (
"git.openprivacy.ca/openprivacy/log"
"os"
"strconv"
"time"
)
func App(gcd *ui.GrandCentralDispatcher, subscribed chan bool, reloadingAccounts bool) {
@ -23,6 +24,7 @@ func App(gcd *ui.GrandCentralDispatcher, subscribed chan bool, reloadingAccounts
the.AppBus.Subscribe(event.ReloadDone, q)
subscribed <- true
time.Sleep(5 * time.Second)
gcd.Loaded()
for {

View File

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

Binary file not shown.

View File

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

View File

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

View File

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

View File

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

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: 845 KiB

View File

@ -6,6 +6,8 @@ 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
@ -14,12 +16,40 @@ Item {
Image {
id: splashImage
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
//anchors.verticalCenter: parent.verticalCenter
anchors.top: parent.top
anchors.topMargin: 200
source: "qrc:/qml/images/cwtch_logo.png"
source: "qrc:/qml/images/cwtch_title.png"
}
ProgressBar {
AnimatedImage {
id: aniKnot
playing: sp.running
source: "qrc:/qml/images/knot_animated.gif"
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: splashImage.bottom
anchors.topMargin: 20 * gcd.themeScale
width: 250
height: 250
}
Opaque.ScalingLabel {
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: aniKnot.bottom
anchors.topMargin: 30 * gcd.themeScale
//: Loading tor...
text: qsTr("loading-tor")
size: Theme.primaryTextSize
color: Theme.mainTextColor
}
/*ProgressBar {
id: progressBar
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: splashImage.bottom
@ -32,5 +62,5 @@ Item {
style: ProgressBarStyle {
progress: CwtchProgress { running: sp.running }
}
}
}*/
}