diff --git a/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb b/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb index b721ec7..89a89e8 100644 --- a/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb +++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb @@ -9,6 +9,7 @@ S = "${WORKDIR}" SRC_URI = "\ file://gsettings/90_citadel.gschema.override \ + file://gsettings/com.subgraph.RealmConfig.gschema.xml \ file://dconf/build.d/realms.d/initial-realm-dconf.conf \ file://dconf/build.d/citadel.d/citadel-dconf.conf \ " @@ -29,6 +30,7 @@ do_install() { install -m 0755 -d ${D}${datadir}/factory/storage/citadel-state/citadel-dconf install -m 644 ${S}/gsettings/90_citadel.gschema.override ${D}${datadir}/glib-2.0/schemas + install -m 644 ${S}/gsettings/com.subgraph.RealmConfig.gschema.xml ${D}${datadir}/glib-2.0/schemas install -m 644 ${WORKDIR}/dconf-output/user ${D}${sysconfdir}/skel/.config/dconf install -m 644 ${WORKDIR}/dconf-output/citadel ${D}${datadir}/factory/storage/citadel-state/citadel-dconf/user } diff --git a/meta-citadel/recipes-citadel/citadel-config/files/gsettings/com.subgraph.RealmConfig.gschema.xml b/meta-citadel/recipes-citadel/citadel-config/files/gsettings/com.subgraph.RealmConfig.gschema.xml new file mode 100644 index 0000000..eb211c2 --- /dev/null +++ b/meta-citadel/recipes-citadel/citadel-config/files/gsettings/com.subgraph.RealmConfig.gschema.xml @@ -0,0 +1,33 @@ + + + + + [ + 'rgb(153,193,241)', + 'rgb(143,240,164)', + 'rgb(249,240,107)', + 'rgb(255,190,111)', + 'rgb(246,97,81)', + 'rgb(220,138,221)', + 'rgb(205,171,143)' + ] + + + + + ['main:rgb(153,193,241)'] + + + true + Show label on Citadel windows + + + false + Show labels on all windows including windows belonging to current realm context + + + true + Display labels above application icons in overview + + + diff --git a/meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb b/meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb index 536fcb2..585ff8f 100644 --- a/meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb +++ b/meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb @@ -511,7 +511,6 @@ do_install() { install -d ${D}${libexecdir} install -d ${D}${systemd_system_unitdir} install -d ${D}${datadir}/applications - install -d ${D}${datadir}/glib-2.0/schemas # Services desktop sync install -m 644 ${S}/systemd/citadel-desktop-watcher.path ${D}${systemd_system_unitdir} @@ -535,7 +534,6 @@ do_install() { # realm-config-ui install -m 0755 ${TARGET_BIN}/realm-config-ui ${D}${libexecdir} install -m 0644 ${S}/data/com.subgraph.RealmConfig.desktop ${D}${datadir}/applications - install -m 0644 ${S}/data/com.subgraph.RealmConfig.gschema.xml ${D}${datadir}/glib-2.0/schemas # /usr/libexec/citadel-tool install -m 755 ${TARGET_BIN}/citadel-tool ${D}${libexecdir}