diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 130cfd35..94247421 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -21,15 +21,23 @@ _Steps on how to reproduce the behaviour:_ _If relevant, please provide information on:_ -**Operating System:** +**Operating System and Version:** **Terminal:** **Shell:** -**bottom version (use `btm -V`):** +**System Info:** -**Any other relevant information (more details are always good!):** +_Information about your system specifically (in case I have to replicate your system via VM):_ + +- _Total RAM:_ + +- _Total SWAP:_ + +- _CPU:_ + +**bottom version (use `btm -V`):** ## Additional context diff --git a/.vscode/settings.json b/.vscode/settings.json index 895f2975..b0d22c02 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -38,6 +38,7 @@ "nuget", "paren", "pmem", + "prepush", "processthreadsapi", "regexes", "rsplitn", diff --git a/CHANGELOG.md b/CHANGELOG.md index 96432f03..c3061c04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.5.0] - Unreleased -## [0.4.6] - Unreleased +## [0.4.6] - 2020-08-24 ### Features @@ -15,21 +15,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#183](https://github.com/ClementTsang/bottom/pull/183): Added sorting capabilities to any column. -- Add (estimated) memory usage values, toggle this from percent to values for processes with `%`. +- [#188](https://github.com/ClementTsang/bottom/pull/188): Add (estimated) memory usage values, toggle this from percent to values for processes with `%`. -- Support searching processes by process state. +- [#196](https://github.com/ClementTsang/bottom/pull/196): Support searching processes by process state. ### Changes - Added `WASD` as an alternative widget movement system. -- Changed to just support stable (and newer) Rust, due to library incompatibilities. +- [#181](https://github.com/ClementTsang/bottom/pull/181): Changed to just support stable (and newer) Rust, due to library incompatibilities. -- For macOS, support `$HOME/Library/Application Support` instead of `$HOME/.config` for config files. For - backwards compatibility's sake, for macOS, this will still check `.config` if it exists first, - but otherwise, it will default to the new location. +- [#182](https://github.com/ClementTsang/bottom/pull/182): For macOS, support `$HOME/Library/Application Support` instead of `$HOME/.config` for config files. For backwards compatibility's sake, for macOS, this will still check `.config` if it exists first, but otherwise, it will default to the new location. -- Allow `e` to also escape expanded mode. +- [#198](https://github.com/ClementTsang/bottom/pull/198): Allow `e` to also escape expanded mode. ### Bug Fixes diff --git a/Cargo.lock b/Cargo.lock index cb50bc78..863a5bf2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -130,7 +130,7 @@ dependencies = [ [[package]] name = "bottom" -version = "0.4.5" +version = "0.4.6" dependencies = [ "assert_cmd", "backtrace", diff --git a/Cargo.toml b/Cargo.toml index 0bf5e0ac..0f0ac0fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bottom" -version = "0.4.5" +version = "0.4.6" authors = ["Clement Tsang "] edition = "2018" repository = "https://github.com/ClementTsang/bottom" diff --git a/README.md b/README.md index 146079c1..5401b5e8 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ 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, expanding, 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.4.0. +![Quick demo recording showing off searching, expanding, 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.4.6. **Note**: If you are reading this on the master branch, then it may refer to in-development or un-released features/changes. 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. @@ -55,7 +55,7 @@ A cross-platform graphical process/system monitor with a customizable interface Note that bottom is: - Built on the stable version of Rust -- Tested and released for only `x86_64` (and `i686` for Windows) +- Officially tested and released for only `x86_64` (and `i686` for Windows) - Developed mainly for macOS, Windows, and Linux As such, support beyond that is not guaranteed. @@ -77,7 +77,7 @@ cd bottom cargo install --path . # Download from releases and install -curl -LO https://github.com/ClementTsang/bottom/releases/download/0.4.5/bottom_source_code.tar.gz +curl -LO https://github.com/ClementTsang/bottom/releases/download/0.4.6/bottom_source_code.tar.gz tar -xzvf bottom_source_code.tar.gz cargo install --path . ``` @@ -108,8 +108,8 @@ yay -S bottom-bin A `.deb` file is provided on each [release](https://github.com/ClementTsang/bottom/releases/latest): ```bash -curl -LO https://github.com/ClementTsang/bottom/releases/download/0.4.5/bottom_0.4.5_amd64.deb -sudo dpkg -i bottom_0.4.5_amd64.deb +curl -LO https://github.com/ClementTsang/bottom/releases/download/0.4.6/bottom_0.4.6_amd64.deb +sudo dpkg -i bottom_0.4.6_amd64.deb ``` ### Homebrew @@ -136,7 +136,7 @@ Choco package located [here](https://chocolatey.org/packages/bottom). choco install bottom # Version number may be required for newer releases, if available: -choco install bottom --version=0.4.5 +choco install bottom --version=0.4.6 ``` ## Usage diff --git a/assets/summary_and_search.gif b/assets/summary_and_search.gif index 416a29d0..730d07e1 100644 Binary files a/assets/summary_and_search.gif and b/assets/summary_and_search.gif differ diff --git a/src/canvas/canvas_colours.rs b/src/canvas/canvas_colours.rs index d7724568..86c96f4b 100644 --- a/src/canvas/canvas_colours.rs +++ b/src/canvas/canvas_colours.rs @@ -1,4 +1,5 @@ -use tui::style::{Color, Modifier, Style}; +use tui::style::{Color, Style}; +// use tui::style::Modifier; use colour_utils::*; @@ -85,7 +86,9 @@ impl CanvasColours { } pub fn set_table_header_colour(&mut self, colour: &str) -> error::Result<()> { - self.table_header_style = get_style_from_config(colour)?.modifier(Modifier::BOLD); + self.table_header_style = get_style_from_config(colour)?; + // Disabled as it seems to be bugged when I go into full command mode...? It becomes huge lol + // self.table_header_style = get_style_from_config(colour)?.modifier(Modifier::BOLD); Ok(()) }