Docs: Update docs to change progress to bar

This commit is contained in:
Dylan Araps 2016-11-13 21:36:24 +11:00
parent 2ab56e8570
commit a7ed58970c
3 changed files with 3194 additions and 27 deletions

3167
;w Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1066,7 +1066,7 @@ get_memory() {
esac esac
memory="${memused}MB / ${memtotal}MB" memory="${memused}MB / ${memtotal}MB"
# Progress bars # Bars
case "$memory_display" in case "$memory_display" in
"bar") memory="$(bar "${memused}" "${memtotal}")" ;; "bar") memory="$(bar "${memused}" "${memtotal}")" ;;
"infobar") memory="${memory} $(bar "${memused}" "${memtotal}")" ;; "infobar") memory="${memory} $(bar "${memused}" "${memtotal}")" ;;
@ -2580,7 +2580,7 @@ set_colors() {
info_color="$(color "${colors[5]}")" info_color="$(color "${colors[5]}")"
fi fi
# Progress Bar colors # Bar colors
if [[ "$bar_color_elapsed" == "distro" ]]; then if [[ "$bar_color_elapsed" == "distro" ]]; then
bar_color_elapsed="$(color fg)" bar_color_elapsed="$(color fg)"
else else
@ -2696,7 +2696,7 @@ bar() {
prog="$(printf %"$elapsed"s)" prog="$(printf %"$elapsed"s)"
total="$(printf %"$((bar_length - elapsed))"s)" total="$(printf %"$((bar_length - elapsed))"s)"
# Set the colors and swap the spaces for $progress_char # Set the colors and swap the spaces for $bar_char_
bar+="${bar_color_elapsed}${prog// /$bar_char_elapsed}" bar+="${bar_color_elapsed}${prog// /$bar_char_elapsed}"
bar+="${bar_color_total}${total// /$bar_char_total}" bar+="${bar_color_total}${total// /$bar_char_total}"
@ -2879,20 +2879,20 @@ usage() { printf "%s" "
--block_height num Height of color blocks in lines --block_height num Height of color blocks in lines
--block_range start end Range of colors to print as blocks --block_range start end Range of colors to print as blocks
Progress Bars: Bars:
--progress_char 'elapsed char' 'total char' --bar_char 'elapsed char' 'total char'
Characters to use when drawing progress bars. Characters to use when drawing bars.
--bar_border on/off Whether or not to surround the bar with '[]' --bar_border on/off Whether or not to surround the bar with '[]'
--bar_length num Length in spaces to make the progress bars. --bar_length num Length in spaces to make the bars.
--progress_colors num num Colors to make the progress bar. --bar_colors num num Colors to make the bar.
Set in this order: elapsed, total Set in this order: elapsed, total
--cpu_display mode Progress bar mode. --cpu_display mode Bar mode.
Takes: bar, infobar, barinfo, off Takes: bar, infobar, barinfo, off
--memory_display mode Progress bar mode. --memory_display mode Bar mode.
Takes: bar, infobar, barinfo, off Takes: bar, infobar, barinfo, off
--battery_display mode Progress bar mode. --battery_display mode Bar mode.
Takes: bar, infobar, barinfo, off Takes: bar, infobar, barinfo, off
--disk_display mode Progress bar mode. --disk_display mode Bar mode.
Takes: bar, infobar, barinfo, off Takes: bar, infobar, barinfo, off
Image: Image:
@ -3017,14 +3017,14 @@ get_args() {
--block_width) block_width="$2" ;; --block_width) block_width="$2" ;;
--block_height) block_height="$2" ;; --block_height) block_height="$2" ;;
# Progress Bars # Bars
--progress_char) --bar_char)
bar_char_elapsed="$2" bar_char_elapsed="$2"
bar_char_total="$3" bar_char_total="$3"
;; ;;
--bar_border) bar_border="$2" ;; --bar_border) bar_border="$2" ;;
--bar_length) bar_length="$2" ;; --bar_length) bar_length="$2" ;;
--progress_colors) --bar_colors)
bar_color_elapsed="$2" bar_color_elapsed="$2"
bar_color_total="$3" bar_color_total="$3"
;; ;;

View File

@ -132,39 +132,39 @@ Height of color blocks in lines
.B \--block_range 'start' 'end' .B \--block_range 'start' 'end'
Range of colors to print as blocks Range of colors to print as blocks
.SH PROGRESS BARS .SH BARS
.TP .TP
.B \--progress_char 'elapsed char' 'total char' .B \--bar_char 'elapsed char' 'total char'
Characters to use when drawing progress bars. Characters to use when drawing bars.
.TP .TP
.B \--progress_border on/off .B \--bar_border on/off
Whether or not to surround the bar with '[]' Whether or not to surround the bar with '[]'
.TP .TP
.B \--progress_length 'num' .B \--bar_length 'num'
Length in spaces to make the progress bars. Length in spaces to make the bars.
.TP .TP
.B \--progress_colors 'num' 'num' .B \--bar_colors 'num' 'num'
Colors to make the progress bar. Colors to make the bar.
.br .br
Set in this order: elapsed, total Set in this order: elapsed, total
.TP .TP
.B \--cpu_display 'mode' .B \--cpu_display 'mode'
Progress bar mode. Bar mode.
.br .br
Takes: bar, infobar, barinfo, off Takes: bar, infobar, barinfo, off
.TP .TP
.B \--memory_display 'mode' .B \--memory_display 'mode'
Progress bar mode. Bar mode.
.br .br
Takes: bar, infobar, barinfo, off Takes: bar, infobar, barinfo, off
.TP .TP
.B \--battery_display 'mode' .B \--battery_display 'mode'
Progress bar mode. Bar mode.
.br .br
Takes: bar, infobar, barinfo, off Takes: bar, infobar, barinfo, off
.TP .TP
.B \--disk_display 'mode' .B \--disk_display 'mode'
Progress bar mode. Bar mode.
.br .br
Takes: bar, infobar, barinfo, off Takes: bar, infobar, barinfo, off