From 25addaee63233ade04a49f0cc394a94c98036d41 Mon Sep 17 00:00:00 2001 From: ClementTsang Date: Wed, 22 Apr 2020 17:13:05 -0400 Subject: [PATCH 1/3] chore: Add some words to VS Code dict --- README.md | 2 ++ src/canvas/drawing_utils.rs | 1 + 2 files changed, 3 insertions(+) diff --git a/README.md b/README.md index 8767a79e..6dfdf70e 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ A cross-platform graphical process/system monitor with a customizable interface and a multitude of features. Supports Linux, macOS, and Windows. Inspired by both [gtop](https://github.com/aksakalli/gtop) and [gotop](https://github.com/cjbassi/gotop). + + ![Quick demo recording showing off searching, maximizing, and process killing.](assets/summary_and_search.gif) _Theme based on [gruvbox](https://github.com/morhetz/gruvbox) (see [sample config](./sample_configs/demo_config.toml))._ Recorded on version 0.2.0. **Note**: This documentation is relevant to version 0.4.0 and may refer to in-development features, especially if you are reading this on the master branch. Please refer to [release branch](https://github.com/ClementTsang/bottom/tree/release/README.md) or [crates.io](https://crates.io/crates/bottom) for the most up-to-date _release_ documentation. diff --git a/src/canvas/drawing_utils.rs b/src/canvas/drawing_utils.rs index 6c008724..25a6ad66 100644 --- a/src/canvas/drawing_utils.rs +++ b/src/canvas/drawing_utils.rs @@ -1,6 +1,7 @@ use crate::app; use itertools::izip; +// TODO: Reverse intrinsic? /// A somewhat jury-rigged solution to simulate a variable intrinsic layout for /// table widths. Note that this will do one main pass to try to properly /// allocate widths. This will thus potentially cut off latter elements From 121370e9f4e6f610bc07ac83139b9289038583fc Mon Sep 17 00:00:00 2001 From: ClementTsang Date: Wed, 22 Apr 2020 17:19:36 -0400 Subject: [PATCH 2/3] docs: update default config --- README.md | 2 -- sample_configs/default_config.toml | 53 +++++++++++++++++------------- src/canvas/drawing_utils.rs | 1 - 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 6dfdf70e..8767a79e 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,6 @@ A cross-platform graphical process/system monitor with a customizable interface and a multitude of features. Supports Linux, macOS, and Windows. Inspired by both [gtop](https://github.com/aksakalli/gtop) and [gotop](https://github.com/cjbassi/gotop). - - ![Quick demo recording showing off searching, maximizing, and process killing.](assets/summary_and_search.gif) _Theme based on [gruvbox](https://github.com/morhetz/gruvbox) (see [sample config](./sample_configs/demo_config.toml))._ Recorded on version 0.2.0. **Note**: This documentation is relevant to version 0.4.0 and may refer to in-development features, especially if you are reading this on the master branch. Please refer to [release branch](https://github.com/ClementTsang/bottom/tree/release/README.md) or [crates.io](https://crates.io/crates/bottom) for the most up-to-date _release_ documentation. diff --git a/sample_configs/default_config.toml b/sample_configs/default_config.toml index fb692df7..911f2601 100644 --- a/sample_configs/default_config.toml +++ b/sample_configs/default_config.toml @@ -59,6 +59,12 @@ # Use basic mode #basic = false +# Use the old network legend style +#use_old_network_legend = false + +# Remove space in tables +#hide_table_gap = false + ########################################################## # These are all the components that support custom theming. Note that colour support @@ -67,7 +73,7 @@ [colors] # Represents the colour of table headers (processes, CPU, disks, temperature). -#table_header_color="LightBlue" +#table_header_color="Light Blue" # Represents the colour of the label each widget has. #widget_title_color="Gray" @@ -94,7 +100,7 @@ #border_color="Gray" # Represents the colour of the border of selected widgets. -#highlighted_border_color="LightBlue" +#highlighted_border_color="Light Blue" # Represents the colour of most text. #text_color="Gray" @@ -103,11 +109,14 @@ #selected_text_color="Black" # Represents the background colour of text that is selected. -#selected_bg_color="Cyan" +#selected_bg_color="Light Blue" # Represents the colour of the lines and text of the graph. #graph_color="Gray" +# Represents the colours of the battery based on charge +#battery_colors = ["red", "yellow", "yellow", "green", "green", "green"] + ########################################################## # Layout - layouts follow a pattern like this: @@ -120,24 +129,24 @@ # The default widget layout: #[[row]] -# ratio=30 -# [[row.child]] -# type="cpu" +# ratio=30 +# [[row.child]] +# type="cpu" #[[row]] -# ratio=40 -# [[row.child]] -# ratio=4 -# type="mem" -# [[row.child]] -# ratio=3 -# [[row.child.child]] -# type="temp" -# [[row.child.child]] -# type="disk" +# ratio=40 +# [[row.child]] +# ratio=4 +# type="mem" +# [[row.child]] +# ratio=3 +# [[row.child.child]] +# type="temp" +# [[row.child.child]] +# type="disk" #[[row]] -# ratio=30 -# [[row.child]] -# type="net" -# [[row.child]] -# type="proc" -# default=true +# ratio=30 +# [[row.child]] +# type="net" +# [[row.child]] +# type="proc" +# default=true diff --git a/src/canvas/drawing_utils.rs b/src/canvas/drawing_utils.rs index 25a6ad66..6c008724 100644 --- a/src/canvas/drawing_utils.rs +++ b/src/canvas/drawing_utils.rs @@ -1,7 +1,6 @@ use crate::app; use itertools::izip; -// TODO: Reverse intrinsic? /// A somewhat jury-rigged solution to simulate a variable intrinsic layout for /// table widths. Note that this will do one main pass to try to properly /// allocate widths. This will thus potentially cut off latter elements From 87dba602f9657a5761d8bbbf895d8d49e96a9ffb Mon Sep 17 00:00:00 2001 From: ClementTsang Date: Wed, 22 Apr 2020 17:26:50 -0400 Subject: [PATCH 3/3] fix: Fixes typo in config generation --- sample_configs/default_config.toml | 6 +++--- src/constants.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sample_configs/default_config.toml b/sample_configs/default_config.toml index 911f2601..106d1796 100644 --- a/sample_configs/default_config.toml +++ b/sample_configs/default_config.toml @@ -73,7 +73,7 @@ [colors] # Represents the colour of table headers (processes, CPU, disks, temperature). -#table_header_color="Light Blue" +#table_header_color="LightBlue" # Represents the colour of the label each widget has. #widget_title_color="Gray" @@ -100,7 +100,7 @@ #border_color="Gray" # Represents the colour of the border of selected widgets. -#highlighted_border_color="Light Blue" +#highlighted_border_color="LightBlue" # Represents the colour of most text. #text_color="Gray" @@ -109,7 +109,7 @@ #selected_text_color="Black" # Represents the background colour of text that is selected. -#selected_bg_color="Light Blue" +#selected_bg_color="LightBlue" # Represents the colour of the lines and text of the graph. #graph_color="Gray" diff --git a/src/constants.rs b/src/constants.rs index 7c019c22..a94dcc78 100644 --- a/src/constants.rs +++ b/src/constants.rs @@ -164,7 +164,7 @@ pub const DEFAULT_CONFIG_CONTENT: &str = r##" [colors] # Represents the colour of table headers (processes, CPU, disks, temperature). -#table_header_color="Light Blue" +#table_header_color="LightBlue" # Represents the colour of the label each widget has. #widget_title_color="Gray" @@ -191,7 +191,7 @@ pub const DEFAULT_CONFIG_CONTENT: &str = r##" #border_color="Gray" # Represents the colour of the border of selected widgets. -#highlighted_border_color="Light Blue" +#highlighted_border_color="LightBlue" # Represents the colour of most text. #text_color="Gray" @@ -200,7 +200,7 @@ pub const DEFAULT_CONFIG_CONTENT: &str = r##" #selected_text_color="Black" # Represents the background colour of text that is selected. -#selected_bg_color="Light Blue" +#selected_bg_color="LightBlue" # Represents the colour of the lines and text of the graph. #graph_color="Gray"