Tack-Support
/
powerlevel10k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47 from sm11963/master

Browse Source 
Add VCS_LOADING_ICON to the icons map (fixes #46)
pull/50/head
Roman Perepelitsa 6 years ago committed by GitHub
parent 04abd44e6c 2801642436
commit ecbe8d99e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File

5
functions/icons.zsh
Unescape Escape View File

@ -96,6 +96,7 @@ function _p9k_init_icons() {
VCS_COMMIT_ICON $'\uE821 ' #  VCS_COMMIT_ICON $'\uE821 ' # 
VCS_BRANCH_ICON $'\uE220 ' #  VCS_BRANCH_ICON $'\uE220 ' # 
VCS_REMOTE_BRANCH_ICON $'\u2192' # → VCS_REMOTE_BRANCH_ICON $'\u2192' # →
VCS_LOADING_ICON ''
VCS_GIT_ICON $'\uE20E ' #  VCS_GIT_ICON $'\uE20E ' # 
VCS_GIT_GITHUB_ICON $'\uE20E ' # VCS_GIT_GITHUB_ICON $'\uE20E ' #
VCS_GIT_BITBUCKET_ICON $'\uE20E ' # VCS_GIT_BITBUCKET_ICON $'\uE20E ' #
@ -192,6 +193,7 @@ function _p9k_init_icons() {
VCS_COMMIT_ICON $'\uF221 ' #  VCS_COMMIT_ICON $'\uF221 ' # 
VCS_BRANCH_ICON $'\uF126 ' #  VCS_BRANCH_ICON $'\uF126 ' # 
VCS_REMOTE_BRANCH_ICON $'\u2192' # → VCS_REMOTE_BRANCH_ICON $'\u2192' # →
VCS_LOADING_ICON ''
VCS_GIT_ICON $'\uF1D3 ' #  VCS_GIT_ICON $'\uF1D3 ' # 
VCS_GIT_GITHUB_ICON $'\uF113 ' #  VCS_GIT_GITHUB_ICON $'\uF113 ' # 
VCS_GIT_BITBUCKET_ICON $'\uF171 ' #  VCS_GIT_BITBUCKET_ICON $'\uF171 ' # 
@ -294,6 +296,7 @@ function _p9k_init_icons() {
VCS_COMMIT_ICON '\u'$CODEPOINT_OF_OCTICONS_GIT_COMMIT' ' #  VCS_COMMIT_ICON '\u'$CODEPOINT_OF_OCTICONS_GIT_COMMIT' ' # 
VCS_BRANCH_ICON '\u'$CODEPOINT_OF_OCTICONS_GIT_BRANCH' ' #  VCS_BRANCH_ICON '\u'$CODEPOINT_OF_OCTICONS_GIT_BRANCH' ' # 
VCS_REMOTE_BRANCH_ICON '\u'$CODEPOINT_OF_OCTICONS_REPO_PUSH #  VCS_REMOTE_BRANCH_ICON '\u'$CODEPOINT_OF_OCTICONS_REPO_PUSH # 
VCS_LOADING_ICON ''
VCS_GIT_ICON '\u'$CODEPOINT_OF_AWESOME_GIT' ' #  VCS_GIT_ICON '\u'$CODEPOINT_OF_AWESOME_GIT' ' # 
VCS_GIT_GITHUB_ICON '\u'$CODEPOINT_OF_AWESOME_GITHUB_ALT' ' #  VCS_GIT_GITHUB_ICON '\u'$CODEPOINT_OF_AWESOME_GITHUB_ALT' ' # 
VCS_GIT_BITBUCKET_ICON '\u'$CODEPOINT_OF_AWESOME_BITBUCKET' ' #  VCS_GIT_BITBUCKET_ICON '\u'$CODEPOINT_OF_AWESOME_BITBUCKET' ' # 
@ -390,6 +393,7 @@ function _p9k_init_icons() {
VCS_COMMIT_ICON $'\uE729 ' #  VCS_COMMIT_ICON $'\uE729 ' # 
VCS_BRANCH_ICON $'\uF126 ' #  VCS_BRANCH_ICON $'\uF126 ' # 
VCS_REMOTE_BRANCH_ICON $'\uE728 ' #  VCS_REMOTE_BRANCH_ICON $'\uE728 ' # 
VCS_LOADING_ICON ''
VCS_GIT_ICON $'\uF1D3 ' #  VCS_GIT_ICON $'\uF1D3 ' # 
VCS_GIT_GITHUB_ICON $'\uF113 ' #  VCS_GIT_GITHUB_ICON $'\uF113 ' # 
VCS_GIT_BITBUCKET_ICON $'\uE703 ' #  VCS_GIT_BITBUCKET_ICON $'\uE703 ' # 
@ -486,6 +490,7 @@ function _p9k_init_icons() {
VCS_COMMIT_ICON '' VCS_COMMIT_ICON ''
VCS_BRANCH_ICON $'\uE0A0 ' #  VCS_BRANCH_ICON $'\uE0A0 ' # 
VCS_REMOTE_BRANCH_ICON $'\u2192' # → VCS_REMOTE_BRANCH_ICON $'\u2192' # →
VCS_LOADING_ICON ''
VCS_GIT_ICON '' VCS_GIT_ICON ''
VCS_GIT_GITHUB_ICON '' VCS_GIT_GITHUB_ICON ''
VCS_GIT_BITBUCKET_ICON '' VCS_GIT_BITBUCKET_ICON ''

16
powerlevel9k.zsh-theme
Unescape Escape View File

@ -111,7 +111,7 @@ set_default -i POWERLEVEL9K_MAX_CACHE_SIZE 10000
# _p9k_cache_set "$val1" "$val2" # _p9k_cache_set "$val1" "$val2"
# fi # fi
# # Here ${_P9K_CACHE_VAL[1]} and ${_P9K_CACHE_VAL[2]} are $val1 and $val2 respectively. # # Here ${_P9K_CACHE_VAL[1]} and ${_P9K_CACHE_VAL[2]} are $val1 and $val2 respectively.
# #
# Limitations: # Limitations:
# #
# * Calling _p9k_cache_set without arguments clears the cache entry. Subsequent calls to # * Calling _p9k_cache_set without arguments clears the cache entry. Subsequent calls to
@ -242,7 +242,7 @@ left_prompt_segment() {
pre+="\${\${_P9K_N:=\${\${\$((!\${#\${:-0\$_P9K_BG}:#0$bg_color})):#0}:+$((t+3))}}+}" # 3 pre+="\${\${_P9K_N:=\${\${\$((!\${#\${:-0\$_P9K_BG}:#0$bg_color})):#0}:+$((t+3))}}+}" # 3
pre+="\${\${_P9K_N:=\${\${_P9K_F::=%F{\$_P9K_BG\}}+$((t+4))}}+}" # 4 pre+="\${\${_P9K_N:=\${\${_P9K_F::=%F{\$_P9K_BG\}}+$((t+4))}}+}" # 4
pre+="\$_P9K_F\${_P9K_T[\$_P9K_N]}" pre+="\$_P9K_F\${_P9K_T[\$_P9K_N]}"
local post="\${_P9K_C}$space\${\${_P9K_I::=$2}+}\${\${_P9K_BG::=$bg_color}+}}" local post="\${_P9K_C}$space\${\${_P9K_I::=$2}+}\${\${_P9K_BG::=$bg_color}+}}"
_p9k_cache_set $has_icon $fg $pre $post _p9k_cache_set $has_icon $fg $pre $post
@ -295,7 +295,7 @@ right_prompt_segment() {
has_icon=1 has_icon=1
fi fi
fi fi
# Segment separator logic is the same as in left_prompt_segment except that here #4 and #1 are # Segment separator logic is the same as in left_prompt_segment except that here #4 and #1 are
# identical. # identical.
@ -317,7 +317,7 @@ right_prompt_segment() {
pre+="\${\${_P9K_N:=\${\${\$((!\${#\${:-0\$_P9K_BG}:#0$bg_color})):#0}:+$((t+3))}}+}" # 3 pre+="\${\${_P9K_N:=\${\${\$((!\${#\${:-0\$_P9K_BG}:#0$bg_color})):#0}:+$((t+3))}}+}" # 3
pre+="\${\${_P9K_N:=$((t+1))}+}" # 4 == 1 pre+="\${\${_P9K_N:=$((t+1))}+}" # 4 == 1
pre+="\${_P9K_T[\$_P9K_N]}\${_P9K_C}$icon_fg" pre+="\${_P9K_T[\$_P9K_N]}\${_P9K_C}$icon_fg"
_p9k_escape_rcurly $POWERLEVEL9K_WHITESPACE_BETWEEN_RIGHT_SEGMENTS _p9k_escape_rcurly $POWERLEVEL9K_WHITESPACE_BETWEEN_RIGHT_SEGMENTS
local post="$icon$_P9K_RETVAL\${\${_P9K_I::=$2}+}\${\${_P9K_BG::=$bg_color}+}}" local post="$icon$_P9K_RETVAL\${\${_P9K_I::=$2}+}\${\${_P9K_BG::=$bg_color}+}}"
@ -1205,8 +1205,8 @@ prompt_node_version() {
if [ "$P9K_NODE_VERSION_PROJECT_ONLY" = true ] ; then if [ "$P9K_NODE_VERSION_PROJECT_ONLY" = true ] ; then
local foundProject=false # Variable to stop searching if a project is found local foundProject=false # Variable to stop searching if a project is found
local currentDir=$(pwd) # Variable to iterate through the path ancestry tree local currentDir=$(pwd) # Variable to iterate through the path ancestry tree
# Search as long as no project could been found or until the root directory # Search as long as no project could been found or until the root directory
# has been reached # has been reached
while [ "$foundProject" = false -a ! "$currentDir" = "/" ] ; do while [ "$foundProject" = false -a ! "$currentDir" = "/" ] ; do
@ -1442,7 +1442,7 @@ prompt_status() {
if (( $#_P9K_PIPE_EXIT_CODES > 1 )); then if (( $#_P9K_PIPE_EXIT_CODES > 1 )); then
ec_sum=${_P9K_PIPE_EXIT_CODES[1]} ec_sum=${_P9K_PIPE_EXIT_CODES[1]}
exit_code_or_status "${_P9K_PIPE_EXIT_CODES[1]}" exit_code_or_status "${_P9K_PIPE_EXIT_CODES[1]}"
else else
ec_sum=${_P9K_EXIT_CODE} ec_sum=${_P9K_EXIT_CODE}
exit_code_or_status "${_P9K_EXIT_CODE}" exit_code_or_status "${_P9K_EXIT_CODE}"
@ -1686,7 +1686,7 @@ function _p9k_vcs_render() {
if [[ $#msg -lt 2 && -z ${msg[1]} ]]; then if [[ $#msg -lt 2 && -z ${msg[1]} ]]; then
_p9k_get_icon VCS_LOADING_ICON _p9k_get_icon VCS_LOADING_ICON
if [[ -n $_P9K_RETVAL || -n $POWERLEVEL9K_VCS_LOADING_TEXT ]]; then if [[ -n $_P9K_RETVAL || -n $POWERLEVEL9K_VCS_LOADING_TEXT ]]; then
$2_prompt_segment $1_LOADING $3 "${vcs_states[loading]}" "$DEFAULT_COLOR" "$_P9K_RETVAL" 0 '' "$POWERLEVEL9K_VCS_LOADING_TEXT" $2_prompt_segment $1_LOADING $3 "${vcs_states[loading]}" "$DEFAULT_COLOR" VCS_LOADING_ICON 0 '' "$POWERLEVEL9K_VCS_LOADING_TEXT"
fi fi
else else
$2_prompt_segment $1_LOADING $3 "${vcs_states[loading]}" "$DEFAULT_COLOR" '' 0 '' "${msg[@]}" $2_prompt_segment $1_LOADING $3 "${vcs_states[loading]}" "$DEFAULT_COLOR" '' 0 '' "${msg[@]}"

Write Preview
Loading…
Cancel
Save