mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
85d810119b
QML has ways to style icons - and we use that for the main theme color, but it doesn't seem to work (anymore?) for the edit and save icons. Instead of tracking down what changed there, simply switch between icons with different foreground color, depending on theme. All the other icons seem to work well in all three themes. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
92 lines
4 KiB
Bash
Executable file
92 lines
4 KiB
Bash
Executable file
#!/bin/bash
|
|
#
|
|
# if you run the build.sh script to build Subsurface you'll never need
|
|
# this, but if you build your binaries differently for some reason and
|
|
# you want to build Subsurface-mobile, running this from within the
|
|
# checked out source directory (not your build directory) should do the
|
|
# trick - you can also run this to update to the latest upstream when
|
|
# you don't want to rerun the whole build.sh script.
|
|
|
|
SRC=$(cd .. ; pwd)
|
|
|
|
if [ ! -d "$SRC/subsurface" ] || [ ! -d "mobile-widgets" ] || [ ! -d "core" ] ; then
|
|
echo "please start this script from the Subsurface source directory (which needs to be named \"subsurface\")."
|
|
exit 1
|
|
fi
|
|
|
|
# now bring in the latest Kirigami mobile components plus a couple of icons that we need
|
|
# first, get the latest from upstream
|
|
# yes, this is a bit overkill as we clone a lot of stuff for just a few files, but this way
|
|
# we stop having to manually merge our code with upstream all the time
|
|
# as we get closer to shipping a production version we'll likely check out specific tags
|
|
# or SHAs from upstream
|
|
./scripts/get-dep-lib.sh single .. kirigami
|
|
./scripts/get-dep-lib.sh single .. breeze-icons
|
|
|
|
# now copy the components and a couple of icons into plae
|
|
MC=$SRC/subsurface/mobile-widgets/qml/kirigami
|
|
PMMC=../kirigami
|
|
BREEZE=../breeze-icons
|
|
|
|
rm -rf $MC
|
|
mkdir -p $MC/icons
|
|
mkdir -p $MC/icons-dark
|
|
cp -R $PMMC/* $MC/
|
|
|
|
cp $BREEZE/icons/actions/22/map-globe.svg $MC/icons
|
|
cp $BREEZE/icons/actions/24/dialog-cancel.svg $MC/icons
|
|
cp $BREEZE/icons/actions/24/distribute-horizontal-x.svg $MC/icons
|
|
cp $BREEZE/icons/actions/24/document-edit.svg $MC/icons
|
|
cp $BREEZE/icons/actions/24/document-save.svg $MC/icons
|
|
cp $BREEZE/icons-dark/actions/24/document-edit.svg $MC/icons-dark
|
|
cp $BREEZE/icons-dark/actions/24/document-save.svg $MC/icons-dark
|
|
cp $BREEZE/icons/actions/24/go-next.svg $MC/icons
|
|
cp $BREEZE/icons/actions/24/go-previous.svg $MC/icons
|
|
cp $BREEZE/icons/actions/24/go-up.svg $MC/icons
|
|
cp $BREEZE/icons/actions/16/view-readermode.svg $MC/icons
|
|
cp $BREEZE/icons/actions/24/application-menu.svg $MC/icons
|
|
cp $BREEZE/icons/actions/22/gps.svg $MC/icons
|
|
cp $BREEZE/icons/actions/24/trash-empty.svg $MC/icons
|
|
cp $BREEZE/icons/actions/24/edit-copy.svg $MC/icons
|
|
cp $BREEZE/icons/actions/24/edit-paste.svg $MC/icons
|
|
cp $BREEZE/icons/actions/24/list-add.svg $MC/icons
|
|
cp $BREEZE/icons/actions/22/handle-left.svg $MC/icons
|
|
cp $BREEZE/icons/actions/22/handle-right.svg $MC/icons
|
|
cp $BREEZE/icons/actions/22/overflow-menu.svg $MC/icons
|
|
|
|
# kirigami now needs the breeze-icons internally as well
|
|
pushd $MC
|
|
ln -s $SRC/breeze-icons .
|
|
|
|
# kirigami hack: passive notification hijacks area even after disabled.
|
|
# https://bugs.kde.org/show_bug.cgi?id=394204
|
|
sed -i -e "s/width: backgroundRect/enabled: root.enabled; width: backgroundRect/g" src/controls/templates/private/PassiveNotification.qml
|
|
|
|
# four more hacks - as a diff file for simplicity
|
|
# (1) Do not include the Kirigami resources (on static build). It causes
|
|
# double defined symbols in our setting. I would like a nicer fix for this
|
|
# issue, but failed to find one. For example, not adding the resource in
|
|
# our build causes the qrc file not to be generated. Manual generation
|
|
# of the resource file (using rcc) introduces the double symbols again.
|
|
# so it seems some Kirigami weirdness (but their staticcmake example compiles
|
|
# correctly).
|
|
|
|
# (2) we want to use the topContent in the GlobalDrawer for our
|
|
# own image / logo / text (in part because the logo display got broken, in
|
|
# part because we want a second line of text to show the account ID
|
|
# for this to work we need to remove the margin that the GlobalDrawer
|
|
# forces around the topContent
|
|
|
|
# (3) theming the toolbar fails. It should get the background color from
|
|
# the theme, but somehow that always gets overwritten with the default
|
|
# value for 'active' set in qtquickcontrols2.conf
|
|
|
|
# (4) add a source line mirroring the name line for the forward and
|
|
# backward icons in the global tool bar. Otherwise those icons aren't
|
|
# found
|
|
|
|
patch -p0 < $SRC/subsurface/scripts/kirigami.diff
|
|
|
|
popd
|
|
|
|
echo org.kde.plasma.kirigami synced from upstream
|