splash pane now has new cwtch font logo and animated knot
This commit is contained in:
parent
4805507014
commit
aadcb0d7c6
|
@ -12,6 +12,7 @@ import (
|
||||||
"git.openprivacy.ca/openprivacy/log"
|
"git.openprivacy.ca/openprivacy/log"
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
func App(gcd *ui.GrandCentralDispatcher, subscribed chan bool, reloadingAccounts bool) {
|
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)
|
the.AppBus.Subscribe(event.ReloadDone, q)
|
||||||
subscribed <- true
|
subscribed <- true
|
||||||
|
|
||||||
|
time.Sleep(5 * time.Second)
|
||||||
gcd.Loaded()
|
gcd.Loaded()
|
||||||
|
|
||||||
for {
|
for {
|
||||||
|
|
|
@ -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.
|
@ -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>
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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>
|
||||||
|
|
2
qml.qrc
2
qml.qrc
|
@ -26,5 +26,7 @@
|
||||||
<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/knot_animated.gif</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 5.0 KiB |
Binary file not shown.
After Width: | Height: | Size: 845 KiB |
|
@ -6,6 +6,8 @@ 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
|
||||||
|
@ -14,12 +16,40 @@ Item {
|
||||||
Image {
|
Image {
|
||||||
id: splashImage
|
id: splashImage
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
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
|
id: progressBar
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.top: splashImage.bottom
|
anchors.top: splashImage.bottom
|
||||||
|
@ -32,5 +62,5 @@ Item {
|
||||||
style: ProgressBarStyle {
|
style: ProgressBarStyle {
|
||||||
progress: CwtchProgress { running: sp.running }
|
progress: CwtchProgress { running: sp.running }
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue