#!/usr/bin/env bash # # Wrapper for git to handle more subdirs at the same time # if [ -n "$g_debug" ] ; then set -x fi SUBMODULES_ALL="dictionaries helpcontent2 translations" pushd $(dirname $0) > /dev/null if [ -f config_host.mk ] ; then # we are in the BUILDDIR SRC_ROOT=$(< config_host.mk grep -a SRC_ROOT | sed -e "s/.*=//") else SRC_ROOT=$(pwd) fi popd > /dev/null COREDIR="$SRC_ROOT" usage() { git echo echo "Usage: g [options] [git (checkout|clone|fetch|grep|pull|push|reset) [git options/args..]]" echo "" echo " -z restore the git hooks and do other sanity checks" } refresh_submodule_hooks() { local repo=$1 local hook local hook_name if [ -d "${repo?}"/.git ] ; then # use core's hook by default for hook_name in "${COREDIR?}/.git-hooks"/* ; do hook="${repo?}/.git/hooks/${hook_name##*/}" if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then rm -f "${hook?}" ln -sf "${hook_name}" "${hook?}" fi done # override if need be by the submodules' own hooks for hook_name in "${COREDIR?}/${repo?}/.git-hooks"/* ; do hook="${repo?}/.git/hooks/${hook_name##*/}" if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then rm -f "${hook?}" ln -sf "${hook_name}" "${hook?}" fi done elif [ -d .git/modules/"${repo}"/hooks ] ; then for hook_name in "${COREDIR?}/.git-hooks"/* ; do hook=".git/modules/${repo?}/hooks/${hook_name##*/}" if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then rm -f "${hook?}" ln -sf "${hook_name}" "${hook?}" fi done # override if need be by the submodules' own hooks for hook_name in "${COREDIR?}/${repo?}/.git-hooks"/* ; do hook=".git/modules/${repo?}/hooks/${hook_name##*/}" if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then rm -f "${hook?}" ln -sf "${hook_name}" "${hook?}" fi done fi } refresh_all_hooks() { local repo local hook_name local hook pushd "${COREDIR?}" > /dev/null for hook_name in "${COREDIR?}/.git-hooks"/* ; do hook=".git/hooks/${hook_name##*/}" if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then rm -f "${hook?}" ln -sf "${hook_name}" "${hook?}" fi done for repo in ${SUBMODULES_ALL?} ; do refresh_submodule_hooks "$repo" done popd > /dev/null } set_push_url() { local repo repo="$1" if [ -n "$repo" ] ; then pushd "${COREDIR?}/${repo?}" > /dev/null else pushd "${COREDIR?}" > /dev/null repo="core" fi echo "setting up push url for ${repo?}" if [ "${repo?}" = "helpcontent2" ] ; then git config remote.origin.pushurl "ssh://${PUSH_USER}logerrit/help" else git config remote.origin.pushurl "ssh://${PUSH_USER}logerrit/${repo?}" fi popd > /dev/null } set_push_urls() { PUSH_USER="$1" set_push_url for repo in ${SUBMODULES_ACTIVE?} ; do set_push_url "${repo?}" done } get_active_submodules() { SUBMODULES_ACTIVE="" local repo for repo in ${SUBMODULES_ALL?} ; do if [ -d "${repo?}"/.git ] || [ -f "${repo?}"/.git ] ; then SUBMODULES_ACTIVE="${repo?} ${SUBMODULES_ACTIVE?}" fi done } get_configured_submodules() { SUBMODULES_CONFIGURED="" if [ -f config_host.mk ] ; then SUBMODULES_CONFIGURED=$(< config_host.mk grep -a GIT_NEEDED_SUBMODULES | sed -e "s/.*=//") else # if we need the configured submodule before the configuration is done. we assumed you want them all SUBMODULES_CONFIGURED=${SUBMODULES_ALL?} fi } get_git_reference() { REFERENCED_GIT="" if [ -f config_host.mk ]; then REFERENCED_GIT=$(< config_host.mk grep -a GIT_REFERENCE_SRC | sed -e "s/.*=//") fi LINKED_GIT="" if [ -f config_host.mk ]; then LINKED_GIT=$(< config_host.mk grep -a GIT_LINK_SRC | sed -e "s/.*=//") fi } do_shortcut_update() { local module local repo for module in $SUBMODULES_CONFIGURED ; do if [ ! -d "${module?}"/.git ] ; then case "${module?}" in helpcontent2) if [ -d clone/help/.git ] ; then repo="clone/help/.git" fi ;; *) if [ -d clone/"${module?}"/.git ] ; then repo="clone/${module?}/.git" fi ;; esac if [ -n "$repo" ] ; then cp -r "${repo?}" "${module?}/." fi fi done } do_git_cmd() { echo "cmd:$*" git "$@" git submodule foreach git "$@" $KEEP_GOING } do_checkout() { local cmd local create_branch="0" local branch local module git checkout "$@" || return $? for cmd in "$@" ; do if [ "$cmd" = "-f" ]; then return 0 elif [ "$cmd" = "-b" ] ; then create_branch=1 elif [ "$create_branch" = "1" ] ; then branch="$cmd" create_branch=0 fi done if [ -f .gitmodules ] ; then git submodule update if [ -n "$branch" ] ; then git submodule foreach git checkout -b "${branch}" HEAD || return $? fi else # now that is the nasty case we moved prior to submodules # delete the submodules left over if any for module in $SUBMODULES_ALL ; do echo "clean-up submodule $module" rm -fr "${module}" done # make sure we have the needed repo in clone ./g clone && ./g -f checkout "$@" || return $? fi return $? } do_reset() { git reset "$@" || return $? if [ -f .gitmodules ] ; then git submodule update || return $? else # now that is the nasty case we moved prior to submodules # delete the submodules left over if any for module in $SUBMODULES_ALL ; do echo "clean-up submodule $module" rm -fr "${module}" done # make sure we have the needed repo in clone ./g clone && ./g -f reset "$@" fi return $?; } do_init_modules() { local module local configured do_shortcut_update for module in $SUBMODULES_CONFIGURED ; do if [ -n "$LINKED_GIT" ] ; then if ! [ -d ".git/modules/${module}" ]; then ./bin/git-new-module-workdir "${LINKED_GIT}/${module}" "${module}" fi fi configured=$(git config --local --get submodule."${module}".url) if [ -z "$configured" ] ; then git submodule init "$module" || return $? fi done for module in $SUBMODULES_CONFIGURED ; do if [ -n "$REFERENCED_GIT" ] ; then git submodule update --reference "$REFERENCED_GIT/.git/modules/$module" "$module" || return $? else git submodule update "$module" || return $? fi done return 0 } # no params, no action if [ "$#" -eq "0" ] ; then usage fi if [ ! "$(type -p git)" ]; then echo "Cannot find the git binary! Is git installed and is in PATH?" exit 1 fi get_active_submodules get_configured_submodules get_git_reference # extra params for some commands, like log EXTRA= COMMAND="$1" PAGER= RELATIVIZE=1 PUSH_ALL= PUSH_USER= PUSH_NOTES= LAST_WORKING= SET_LAST_WORKING= ALLOW_EMPTY= KEEP_GOING= REPORT_REPOS=1 REPORT_COMMANDS=0 REPORT_COMPACT=0 DO_HOOK_REFRESH=false while [ "${COMMAND:0:1}" = "-" ] ; do case "$COMMAND" in -f )KEEP_GOING="||:" ;; -z) refresh_all_hooks exit 0; ;; --set-push-urls) shift PUSH_USER="$1" if [ -n "${PUSH_USER}" ] ; then PUSH_USER="${PUSH_USER}@" fi set_push_urls "$PUSH_USER" exit 0; ;; -*) echo "option: $COMMAND not supported" 1>&2 exit 1 esac shift COMMAND="$1" done shift case "$COMMAND" in branch) do_git_cmd "${COMMAND}" "$@" ;; checkout) do_checkout "$@" ;; clone) do_init_modules && refresh_all_hooks ;; fetch) (git fetch "$@" && git submodule foreach git fetch "$@" ) && git submodule update ;; grep) KEEP_GOING="||:" do_git_cmd "${COMMAND}" "$@" ;; pull) git pull "$@" && git submodule update && refresh_all_hooks ;; push) git submodule foreach git push "$@" if [ "$?" = "0" ] ; then git push "$@" fi ;; reset) do_reset ;; tag) do_git_cmd "${COMMAND}" "$@" ;; "") ;; *) echo "./g does not support command: $COMMAND" 1>&2 exit 1; ;; esac exit $? # vi:set shiftwidth=4 expandtab: ro/mimo/mimo-7-6'>distro/mimo/mimo-7-6 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/icon-themes/elementary/chart2
AgeCommit message (Collapse)Author
2024-07-29tdf#161090 - Spec how many / which values are in remainder of-Pie chartKurt Nordback
This commit moves bar-of-pie and pie-of-pie chart types into a separate line in the chart type selection UI from 'plain' pie chart types. This allows for separate UI controls, including a spin button added in this commit for of-pie types to specify the number of entries to be included in the composite wedge and broken out in the right-hand subchart. Per discussion in this and related bugs, this may not be the long-term best approach for specifying which entries go into the composite, and it still only allows for the last entries in the composite. But it is a step towards allowing greater control. I've also changed the default number in the composite from 3 to 2, to better match MSO. I/O of the 'number in the composite wedge' parameter is not included in this commit. Implementing that for ODF and OOXML perhaps should be a separate bug or bugs. Change-Id: If4afc1417ea94c15e86a9a4dfe967a6f8ecb7ca8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168690 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2024-05-23tdf#161092 elementary: Graphics for bar-of-pie and pie-of-pie chart typeRizal Muttaqin
Change-Id: I70cef278536b3a64551d0b0e4548f666bbdac373 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167978 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <rizmut@libreoffice.org>
2024-02-19tdf#50934: Rudimentary UI images for pie-of-pie and bar-of-pieKurt Nordback
Change-Id: If2ddf1ea12804717583ab6df18dc7fbfffc37d31 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160740 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-01-04elementary: tdf#139056 update color to follow upstream brandRizal Muttaqin
- Update some icons with green triangle ruler - Update chart type colors - Update some icons with save modifier Change-Id: I76191846901d8116c4f2d256cd9e0908a794ef63 Change-Id: I47eb705e9bd8d8b15ffc2579c66c80d938faf403 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108650 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2020-12-26elementary: tdf#139020 update arrow color to be more coherentRizal Muttaqin
Change-Id: I6c1782f1ef2349b1cc66a4308e5b95155ac8ae5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108327 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2020-12-21elementary: tdf#139056 Update color to follow upstream's brandingRizal Muttaqin
- Update some arrow element Change-Id: Iecda4e7efbac6a8cb2416bdd70edc5f8edd07894 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108070 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2018-11-13elementary: Fix non insert table, fix 3D pie chartRizal Muttaqin
Change-Id: I877b548678d40916b406ddffdd4f209bfe4c4a8d Reviewed-on: https://gerrit.libreoffice.org/63315 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2018-10-28elementary: Refix for tdf#119731, update presentation/slide related icons, ↵Rizal Muttaqin
add envelope, etc Change-Id: Iae01c3e889ea38034332fc29e4cc397941930ac1 Reviewed-on: https://gerrit.libreoffice.org/62466 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2018-10-22elementary: Finalize chart graphics, separate dbtable & regulaaaaaaaaaaaaar ↵Rizal Muttaqin
table, etc Change-Id: Ib3c5a5a09eff26acabf64e4cbc2e7019ca3264e7 Reviewed-on: https://gerrit.libreoffice.org/62142 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2018-09-24Remove accidental addition of executable bit under icon-themes/*Adolfo Jayme Barrientos
Change-Id: I6a2bcdd8403494490a44c11179bf87411f73d32a
2018-09-24elementary: improve many icons, add more 32 pxRizal Muttaqin
Change-Id: I28f0e7b964a229320ede7accfd3a98e35ef113b6 Reviewed-on: https://gerrit.libreoffice.org/60920 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2018-07-17remove the GL based 3D chartsMarkus Mohrhard
Change-Id: Ia578c71ae70aa0a85b49fa50138edf90f961b1e9 Reviewed-on: https://gerrit.libreoffice.org/57533 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-12-11Elementary-icons 1.0 beta releaseandreas kainz
Change-Id: Ie1e82545d7e6374acaab17470c0d84383a82ec8c Reviewed-on: https://gerrit.libreoffice.org/46174 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2016-12-21Add move column right and move row up in DataTablebansan85
Change-Id: Ib224a99636dfbb4451aa26263573af2f3d31b84a Reviewed-on: https://gerrit.libreoffice.org/32265 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2015-12-028 bit palettes are on the slow path for quartz/svp/gtk3Caolán McNamara
Change-Id: Id2ed21b397a3f56413c344dcf9211ab64a939286
2015-10-05move elementary bitmaps in placeBjoern Michaelsen
Change-Id: I3ee20b70d2b231ca620fa2309de4135d9f425edd