Unverified Commit df9d9f99 authored by Kali Kaneko's avatar Kali Kaneko
Browse files

[ux] customize background for calyxvpn

parent 39eb4a17
Pipeline #61729 failed with stages
in 52 minutes
...@@ -353,7 +353,11 @@ gen_pkg_deb: ...@@ -353,7 +353,11 @@ gen_pkg_deb:
ifeq (${PLATFORM}, linux) ifeq (${PLATFORM}, linux)
@cp -r ${TEMPLATES}/debian build/${PROVIDER} @cp -r ${TEMPLATES}/debian build/${PROVIDER}
@VERSION=${VERSION} VENDOR_PATH=${VENDOR_PATH} ${SCRIPTS}/generate-debian build/${PROVIDER}/debian/data.json @VERSION=${VERSION} VENDOR_PATH=${VENDOR_PATH} ${SCRIPTS}/generate-debian build/${PROVIDER}/debian/data.json
ifeq (${VENDOR_PATH}, providers)
@mkdir -p build/${PROVIDER}/debian/icons/scalable && cp ${VENDOR_PATH}/${PROVIDER}/assets/icon.svg build/${PROVIDER}/debian/icons/scalable/icon.svg @mkdir -p build/${PROVIDER}/debian/icons/scalable && cp ${VENDOR_PATH}/${PROVIDER}/assets/icon.svg build/${PROVIDER}/debian/icons/scalable/icon.svg
else
@mkdir -p build/${PROVIDER}/debian/icons/scalable && cp ${VENDOR_PATH}/assets/icon.svg build/${PROVIDER}/debian/icons/scalable/icon.svg
endif
@cd build/${PROVIDER}/debian && python3 generate.py @cd build/${PROVIDER}/debian && python3 generate.py
@cd build/${PROVIDER}/debian && rm app.desktop-template changelog-template rules-template control-template generate.py data.json && chmod +x rules @cd build/${PROVIDER}/debian && rm app.desktop-template changelog-template rules-template control-template generate.py data.json && chmod +x rules
endif endif
......
...@@ -6,10 +6,19 @@ Rectangle { ...@@ -6,10 +6,19 @@ Rectangle {
anchors.fill: parent; anchors.fill: parent;
anchors.topMargin: 40; anchors.topMargin: 40;
property var backgroundSrc
property var backgroundVisible
Image { Image {
source: "qrc:/assets/img/bird.jpg"; source: parent.backgroundSrc;
visible: parent.backgroundVisible;
fillMode: Image.PreserveAspectCrop; fillMode: Image.PreserveAspectCrop;
anchors.fill: parent; anchors.fill: parent;
opacity: 0.8; opacity: 0.8;
} }
Component.onCompleted: {
/* default for riseup, needs customizing */
backgroundSrc = "qrc:/assets/img/bird.jpg";
}
} }
...@@ -65,6 +65,11 @@ function shouldAllowEmptyPass(providers) { ...@@ -65,6 +65,11 @@ function shouldAllowEmptyPass(providers) {
return false return false
} }
function getSelectedProvider(providers) {
let obj = JSON.parse(providers.getJson())
return obj['default']
}
function debugInit() { function debugInit() {
console.debug("Platform:", Qt.platform.os) console.debug("Platform:", Qt.platform.os)
console.debug("DEBUG: Pre-seeded providers:") console.debug("DEBUG: Pre-seeded providers:")
......
...@@ -276,6 +276,14 @@ ApplicationWindow { ...@@ -276,6 +276,14 @@ ApplicationWindow {
allowEmptyPass = Logic.shouldAllowEmptyPass(providers) allowEmptyPass = Logic.shouldAllowEmptyPass(providers)
needsRestart = false; needsRestart = false;
shownDonate = false; shownDonate = false;
/* this is a temporary workaround until general GUI revamp for 0.21.8 */
let provider = Logic.getSelectedProvider(providers);
if (provider == "calyx") {
background.backgroundVisible = false;
background.color = "#8EA844";
}
if (!systrayAvailable) { if (!systrayAvailable) {
app.visible = true app.visible = true
app.raise() app.raise()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment