mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 06:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/scripts/mobilecomponents.sh

82 lines
3 KiB
Bash
Raw Normal View History

Add helper script to pull Plasma Mobile Components and icons Normally this is done in the build.sh script when building Subsurface-mobile - but some people might have set up their build enviroment differently and for them this allows to pull (and update) these components from upstream without having to run build.sh Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-08 17:55:32 +00:00
#!/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)
Move subsurface-core to core and qt-mobile to mobile-widgets Having subsurface-core as a directory name really messes with autocomplete and is obviously redundant. Simmilarly, qt-mobile caused an autocomplete conflict and also was inconsistent with the desktop-widget name for the directory containing the "other" UI. And while cleaning up the resulting change in the path name for include files, I decided to clean up those even more to make them consistent overall. This could have been handled in more commits, but since this requires a make clean before the build, it seemed more sensible to do it all in one. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-05 05:02:03 +00:00
if [ ! -d "$SRC/subsurface" ] || [ ! -d "mobile-widgets" ] || [ ! -d "core" ] ; then
Add helper script to pull Plasma Mobile Components and icons Normally this is done in the build.sh script when building Subsurface-mobile - but some people might have set up their build enviroment differently and for them this allows to pull (and update) these components from upstream without having to run build.sh Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-08 17:55:32 +00:00
echo "please start this script from the Subsurface source directory (which needs to be named \"subsurface\")."
exit 1
fi
Minor tweak to script to pull Kirigami This just allows the script to be used when you are working locally on Kirigami to test changes - no point in waiting for a pull from upstream then. The only goal is to copy the files over. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-02 01:11:56 +00:00
if [ "$1" = "-nopull" ] ; then
NOPULL=1
fi
correctly build on android
2016-03-10 13:40:19 +00:00
# now bring in the latest Kirigami mobile components plus a couple of icons that we need
Add helper script to pull Plasma Mobile Components and icons Normally this is done in the build.sh script when building Subsurface-mobile - but some people might have set up their build enviroment differently and for them this allows to pull (and update) these components from upstream without having to run build.sh Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-08 17:55:32 +00:00
# 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
cd $SRC
Update script to pull Kirigami Now with it's own repository and slightly different paths. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-31 23:10:24 +00:00
if [ ! -d kirigami ] ; then
Change protocoll for any git clone from Github to https Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-04-15 10:33:38 +00:00
git clone -b master https://github.com/KDE/kirigami.git
Add helper script to pull Plasma Mobile Components and icons Normally this is done in the build.sh script when building Subsurface-mobile - but some people might have set up their build enviroment differently and for them this allows to pull (and update) these components from upstream without having to run build.sh Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-08 17:55:32 +00:00
fi
Minor tweak to script to pull Kirigami This just allows the script to be used when you are working locally on Kirigami to test changes - no point in waiting for a pull from upstream then. The only goal is to copy the files over. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-02 01:11:56 +00:00
if [ "$NOPULL" = "" ] ; then
pushd kirigami
QML UI: Fully port dive edit to Kirigami2 Completely adapt to the api changes of OverlaySheet in Kirigami2 in order to achieve the same look and behavior for the dive edits that had with kirigami1 Port most components to QtQuickContrls2, except comboboxes in the dive edit sheet that will need a new control type Signed-off-by: Marco Martin <notmart@gmail.com>
2017-03-31 14:15:14 +00:00
git checkout master
git pull origin master
Switch back to latest Kirigami And fix the build issue. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-10-04 15:20:14 +00:00
# if we want to pin a specific Kirigami version, we can do this here
Revert "QML UIL: go back to older Kirigami" This reverts commit 893ff019dbabf356a477da0bdf7d954123759018. Thanks to the amazing support from Marco Martin the theming issue in Kirigami master has been fixed. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-10-06 18:59:05 +00:00
# git checkout v2.2.0
Minor tweak to script to pull Kirigami This just allows the script to be used when you are working locally on Kirigami to test changes - no point in waiting for a pull from upstream then. The only goal is to copy the files over. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-02 01:11:56 +00:00
popd
fi
Add helper script to pull Plasma Mobile Components and icons Normally this is done in the build.sh script when building Subsurface-mobile - but some people might have set up their build enviroment differently and for them this allows to pull (and update) these components from upstream without having to run build.sh Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-08 17:55:32 +00:00
if [ ! -d breeze-icons ] ; then
git clone git://anongit.kde.org/breeze-icons
fi
Minor tweak to script to pull Kirigami This just allows the script to be used when you are working locally on Kirigami to test changes - no point in waiting for a pull from upstream then. The only goal is to copy the files over. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-02 01:11:56 +00:00
if [ "$NOPULL" = "" ] ; then
pushd breeze-icons
git pull
popd
fi
Add helper script to pull Plasma Mobile Components and icons Normally this is done in the build.sh script when building Subsurface-mobile - but some people might have set up their build enviroment differently and for them this allows to pull (and update) these components from upstream without having to run build.sh Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-08 17:55:32 +00:00
# now copy the components and a couple of icons into plae
Move subsurface-core to core and qt-mobile to mobile-widgets Having subsurface-core as a directory name really messes with autocomplete and is obviously redundant. Simmilarly, qt-mobile caused an autocomplete conflict and also was inconsistent with the desktop-widget name for the directory containing the "other" UI. And while cleaning up the resulting change in the path name for include files, I decided to clean up those even more to make them consistent overall. This could have been handled in more commits, but since this requires a make clean before the build, it seemed more sensible to do it all in one. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-05 05:02:03 +00:00
MC=$SRC/subsurface/mobile-widgets/qml/kirigami
Use kirigami built in static mode Now kirigami needs to be built with a C++ plugin. In cases of mobile operating systems such as iOS (and in a lesser measuse, Android) having a proper plugin loaded at runtime may be difficult, so statically link it together with all of its qml files compiled as a qresource inside the static library. Signed-off-by: Marco Martin <notmart@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-06-22 16:17:25 +00:00
PMMC=kirigami
Add helper script to pull Plasma Mobile Components and icons Normally this is done in the build.sh script when building Subsurface-mobile - but some people might have set up their build enviroment differently and for them this allows to pull (and update) these components from upstream without having to run build.sh Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-08 17:55:32 +00:00
BREEZE=breeze-icons
rm -rf $MC
mkdir -p $MC/icons
Update script to pull Kirigami Now with it's own repository and slightly different paths. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-31 23:10:24 +00:00
cp -R $PMMC/* $MC/
Disable kirigami plugin when copying the components Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-01 21:40:07 +00:00
Add helper script to pull Plasma Mobile Components and icons Normally this is done in the build.sh script when building Subsurface-mobile - but some people might have set up their build enviroment differently and for them this allows to pull (and update) these components from upstream without having to run build.sh Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-08 17:55:32 +00:00
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/actions/24/go-next.svg $MC/icons
cp $BREEZE/icons/actions/24/go-previous.svg $MC/icons
QML UI: add missing go-up icon Now the 'Reachability' feature should be more obvious. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-22 15:52:33 +00:00
cp $BREEZE/icons/actions/24/go-up.svg $MC/icons
Add helper script to pull Plasma Mobile Components and icons Normally this is done in the build.sh script when building Subsurface-mobile - but some people might have set up their build enviroment differently and for them this allows to pull (and update) these components from upstream without having to run build.sh Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-08 17:55:32 +00:00
cp $BREEZE/icons/actions/16/view-readermode.svg $MC/icons
QML UI: support sliding action to allow the user to delete GPS fixes This is just the UI, the actual deletion is not yet implemented. I really like this interaction with the list items. Slide them to the left and you see icons for actions. Right now we have just one and that may seem like overkill (hey, we could just have the delete icon instead of the application menu icon, right?) but once we allow the ability to show the GPS location on a map we'll have two operations and this will make more sense. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-09 05:48:53 +00:00
cp $BREEZE/icons/actions/24/application-menu.svg $MC/icons
QML UI: add second action to GPS list entries This one will allow people to see the location on a map. Also not implemented, yet. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-09 07:17:48 +00:00
cp $BREEZE/icons/actions/22/gps.svg $MC/icons
QML UI: better icon for delete The cancel picture was odd - the trash can is much more typical. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-09 07:16:19 +00:00
cp $BREEZE/icons/actions/24/trash-empty.svg $MC/icons
QML UI: add an "add" icon Again, proudly borrowing from the breeze icon set. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-02 03:30:28 +00:00
cp $BREEZE/icons/actions/24/list-add.svg $MC/icons
QML UI: update for latest Kirigami Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-06-12 14:31:14 +00:00
cp $BREEZE/icons/actions/22/handle-left.svg $MC/icons
QML UI: Add right handle icon This adds the right handle icon that is needed for the swipe list items not to report an error when activated. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-07-14 13:41:00 +00:00
cp $BREEZE/icons/actions/22/handle-right.svg $MC/icons
QML UI: add missing icon Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-10-10 04:09:54 +00:00
cp $BREEZE/icons/actions/22/overflow-menu.svg $MC/icons
Add helper script to pull Plasma Mobile Components and icons Normally this is done in the build.sh script when building Subsurface-mobile - but some people might have set up their build enviroment differently and for them this allows to pull (and update) these components from upstream without having to run build.sh Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-08 17:55:32 +00:00
Kirigami integration: create missing link This (plus an update to kirigami.pri, a patch for which I just sent to the plasma-devel list) allows the iOS version of Subsurface-mobile to build again. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-02 20:55:13 +00:00
# kirigami now needs the breeze-icons internally as well
pushd $MC
ln -s $SRC/$BREEZE .
QML UI: hide action button when keyboard is visible Until we get some solution from upstream this patch to Kirigami hides the action button when the keyboard is visible. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-08-01 16:21:11 +00:00
sed -i -e "s/visible: root.action/visible: root.action \&\& \!Qt.inputMethod.visible/g" src/controls/private/ActionButton.qml
QML UI: hide all buttons when keyboard is visible This extends the hack in commit 2e057bc29a ("QML UI: hide action button when keyboard is visible") to the left and right button as well. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-10-04 19:35:33 +00:00
sed -i -e "s/visible: root.leftAction/visible: root.leftAction \&\& \!Qt.inputMethod.visible/g" src/controls/private/ActionButton.qml
sed -i -e "s/visible: root.rightAction/visible: root.rightAction \&\& \!Qt.inputMethod.visible/g" src/controls/private/ActionButton.qml
Kirigami integration: create missing link This (plus an update to kirigami.pri, a patch for which I just sent to the plasma-devel list) allows the iOS version of Subsurface-mobile to build again. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-02 20:55:13 +00:00
popd
Update script to pull Kirigami Now with it's own repository and slightly different paths. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-31 23:10:24 +00:00
echo org.kde.plasma.kirigami synced from upstream
Reference in a new issue Copy permalink