From 98d18b337b0310810ab5e551b6bed3069366b883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20=C3=87etin?= Date: Mon, 15 Jan 2024 10:02:49 +0300 Subject: [PATCH 1/2] fix typos + whitespaces --- .github/workflows/continuous-build-linux.yml | 2 +- .github/workflows/test-snap-can-build.yml | 6 +++--- CHANGELOG.md | 6 +++--- CMakeLists.txt | 6 +++--- README.md | 8 ++++---- snap/snapcraft.yaml | 2 +- src/btop.cpp | 4 ++-- src/btop_input.hpp | 2 +- src/btop_menu.cpp | 16 ++++++++-------- src/btop_theme.hpp | 2 +- src/btop_tools.cpp | 4 ++-- src/btop_tools.hpp | 6 +++--- src/freebsd/btop_collect.cpp | 4 ++-- src/linux/btop_collect.cpp | 4 ++-- src/openbsd/btop_collect.cpp | 2 +- src/osx/btop_collect.cpp | 6 +++--- src/osx/smc.cpp | 2 +- themes/adapta.theme | 2 +- themes/adwaita.theme | 4 ++-- themes/dusklight.theme | 4 ++-- themes/elementarish.theme | 2 +- themes/everforest-dark-hard.theme | 2 +- themes/flat-remix-light.theme | 2 +- themes/flat-remix.theme | 2 +- themes/greyscale.theme | 4 ++-- themes/gruvbox_dark.theme | 2 +- themes/gruvbox_dark_v2.theme | 2 +- themes/gruvbox_material_dark.theme | 2 +- themes/matcha-dark-sea.theme | 2 +- themes/monokai.theme | 2 +- themes/night-owl.theme | 2 +- themes/nord.theme | 2 +- themes/onedark.theme | 2 +- themes/paper.theme | 2 +- themes/solarized_dark.theme | 4 ++-- themes/solarized_light.theme | 4 ++-- themes/tokyo-night.theme | 2 +- themes/tokyo-storm.theme | 2 +- themes/tomorrow-night.theme | 2 +- themes/whiteout.theme | 4 ++-- 40 files changed, 70 insertions(+), 70 deletions(-) diff --git a/.github/workflows/continuous-build-linux.yml b/.github/workflows/continuous-build-linux.yml index 39de640..944c948 100644 --- a/.github/workflows/continuous-build-linux.yml +++ b/.github/workflows/continuous-build-linux.yml @@ -113,7 +113,7 @@ jobs: mkdir .artifacts mkdir .package - - name: Create binary atrifacts + - name: Create binary artifacts run: | TOOLCHAIN=${{ matrix.toolchain }} GIT_HASH=$(git rev-parse --short "${{ github.sha }}") diff --git a/.github/workflows/test-snap-can-build.yml b/.github/workflows/test-snap-can-build.yml index c66df73..ca4f306 100644 --- a/.github/workflows/test-snap-can-build.yml +++ b/.github/workflows/test-snap-can-build.yml @@ -5,7 +5,7 @@ on: push: branches: [ main ] tags-ignore: - - '*.*' + - '*.*' paths: - 'src/**' - '!src/osx/**' @@ -22,14 +22,14 @@ on: - 'include/**' - 'Makefile' - '.github/workflows/test-snap-can-build.yml' - + jobs: build: runs-on: ubuntu-latest strategy: matrix: node-version: [16.x] - + steps: - uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 00273c1..45e646d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -158,7 +158,7 @@ * Fixed: Wrong memory unit when shorten and size is less than 10, by @mohi001 -* Fixed: Use cpu cores avarage temp if missing cpu package temp for FreeBSD +* Fixed: Use cpu cores average temp if missing cpu package temp for FreeBSD * Changed: Enter symbol to a more common variant @@ -408,7 +408,7 @@ * Changed: Moved check for valid terminal dimensions to before platform init -* Added: Check for empty percentage deques +* Added: Check for empty percentage dequeues * Changed: Cpu temp values check for existing values @@ -454,7 +454,7 @@ * Fixed: Sizing constraints bug on start and boxes can be toggled from size error screen -* Fixed: UTF-8 check crashing if LANG was set to non existant locale +* Fixed: UTF-8 check crashing if LANG was set to non existent locale ## v1.0.4 diff --git a/CMakeLists.txt b/CMakeLists.txt index c82b462..fa8d0d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,7 +129,7 @@ if(LINUX AND BTOP_GPU) if(BTOP_RSMI_STATIC) # ROCm doesn't properly add it's folders to the module path if `CMAKE_MODULE_PATH` is already # set - # We could also manully append ROCm's path here + # We could also manually append ROCm's path here set(_CMAKE_MODULE_PATH CMAKE_MODULE_PATH) unset(CMAKE_MODULE_PATH) @@ -161,7 +161,7 @@ if(BTOP_STATIC) target_link_options(btop PRIVATE -static LINKER:--fatal-warnings) endif() -# Other platform depdendent flags +# Other platform dependent flags if(APPLE) target_link_libraries(btop $ $ @@ -169,7 +169,7 @@ if(APPLE) elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") # Avoid version mismatch for libstdc++ when a specific version of GCC is installed and not the # default one since all use the default ones RPATH - if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") string(REGEX MATCH "^[0-9]+" GCC_VERSION_MAJOR "${CMAKE_CXX_COMPILER_VERSION}") set_target_properties(btop PROPERTIES INSTALL_RPATH "/usr/local/lib/gcc${GCC_VERSION_MAJOR}" diff --git a/README.md b/README.md index 0b351a2..811f714 100644 --- a/README.md +++ b/README.md @@ -408,7 +408,7 @@ Also needs a UTF8 locale and a font that covers: | `GPU_SUPPORT=` | Enable/disable GPU support (Enabled by default on X86_64 Linux) | | `RSMI_STATIC=true` | To statically link the ROCm SMI library used for querying AMDGPU | | `ADDFLAGS=` | For appending flags to both compiler and linker | - | `CXX=` | Manualy set which compiler to use | + | `CXX=` | Manually set which compiler to use | Example: `make ADDFLAGS=-march=native` might give a performance boost if compiling only for your own system. @@ -577,7 +577,7 @@ Also needs a UTF8 locale and a font that covers: | `DEBUG=true` | Sets OPTFLAGS to `-O0 -g` and enables more verbose debug logging | | `ARCH=` | To manually set the target architecture | | `ADDFLAGS=` | For appending flags to both compiler and linker | - | `CXX=` | Manualy set which compiler to use | + | `CXX=` | Manually set which compiler to use | Example: `gmake ADDFLAGS=-march=native` might give a performance boost if compiling only for your own system. @@ -743,7 +743,7 @@ Also needs a UTF8 locale and a font that covers: | `DEBUG=true` | Sets OPTFLAGS to `-O0 -g` and enables more verbose debug logging | | `ARCH=` | To manually set the target architecture | | `ADDFLAGS=` | For appending flags to both compiler and linker | - | `CXX=` | Manualy set which compiler to use | + | `CXX=` | Manually set which compiler to use | Example: `gmake ADDFLAGS=-march=native` might give a performance boost if compiling only for your own system. @@ -922,7 +922,7 @@ Also needs a UTF8 locale and a font that covers: | `DEBUG=true` | Sets OPTFLAGS to `-O0 -g` and enables more verbose debug logging | | `ARCH=` | To manually set the target architecture | | `ADDFLAGS=` | For appending flags to both compiler and linker | - | `CXX=` | Manualy set which compiler to use | + | `CXX=` | Manually set which compiler to use | Example: `gmake ADDFLAGS=-march=native` might give a performance boost if compiling only for your own system. diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 2e76ba5..342cd43 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -56,7 +56,7 @@ parts: - build-essential - gcc-11 - g++-11 - + override-pull: | snapcraftctl pull snapcraftctl set-version "$(git describe --tags | sed 's/^v//' | cut -d "-" -f1)" diff --git a/src/btop.cpp b/src/btop.cpp index 736854f..2d2e69b 100644 --- a/src/btop.cpp +++ b/src/btop.cpp @@ -403,7 +403,7 @@ namespace Runner { } }; - //* Wrapper for raising priviliges when using SUID bit + //* Wrapper for raising privileges when using SUID bit class gain_priv { int status = -1; public: @@ -836,7 +836,7 @@ int main(int argc, char **argv) { Global::start_time = time_s(); - //? Save real and effective userid's and drop priviliges until needed if running with SUID bit set + //? Save real and effective userid's and drop privileges until needed if running with SUID bit set Global::real_uid = getuid(); Global::set_uid = geteuid(); if (Global::real_uid != Global::set_uid) { diff --git a/src/btop_input.hpp b/src/btop_input.hpp index 13f14fe..91b9dc9 100644 --- a/src/btop_input.hpp +++ b/src/btop_input.hpp @@ -56,7 +56,7 @@ namespace Input { //* Last entered key extern deque history; - //* Poll keyboard & mouse input for ms and return input availabilty as a bool + //* Poll keyboard & mouse input for ms and return input availability as a bool bool poll(const uint64_t timeout=0); //* Get a key or mouse action from input diff --git a/src/btop_menu.cpp b/src/btop_menu.cpp index fb119aa..8b4ea8c 100644 --- a/src/btop_menu.cpp +++ b/src/btop_menu.cpp @@ -484,7 +484,7 @@ namespace Menu { "Kelvin, 0 = absolute zero, 1 degree change", "equals 1 degree change in Celsius.", "", - "Rankine, 0 = abosulte zero, 1 degree change", + "Rankine, 0 = absolute zero, 1 degree change", "equals 1 degree change in Fahrenheit."}, {"show_cpu_freq", "Show CPU frequency.", @@ -645,7 +645,7 @@ namespace Menu { "", "Begin line with \"exclude=\" to change to", "exclude filter.", - "Oterwise defaults to \"most include\" filter.", + "Otherwise defaults to \"most include\" filter.", "", "Example:", "\"exclude=/boot /home/user\""}, @@ -1148,7 +1148,7 @@ namespace Menu { } int optionsMenu(const string& key) { - enum Predispositions { isBool, isInt, isString, is2D, isBrowseable, isEditable}; + enum Predispositions { isBool, isInt, isString, is2D, isBrowsable, isEditable}; static int y{}; static int x{}; static int height{}; @@ -1353,7 +1353,7 @@ namespace Menu { recollect = true; } } - else if (selPred.test(isBrowseable)) { + else if (selPred.test(isBrowsable)) { auto& optList = optionsList.at(option).get(); int i = v_index(optList, Config::getS(option)); @@ -1405,9 +1405,9 @@ namespace Menu { if (not selPred.test(isString)) selPred.set(is2D); else if (optionsList.contains(selOption)) { - selPred.set(isBrowseable); + selPred.set(isBrowsable); } - if (not selPred.test(isBrowseable) and (selPred.test(isString) or selPred.test(isInt))) + if (not selPred.test(isBrowsable) and (selPred.test(isString) or selPred.test(isInt))) selPred.set(isEditable); } @@ -1442,14 +1442,14 @@ namespace Menu { out += Mv::to(cy++, x + 1) + (c-1 == selected ? Theme::c("selected_bg") + Theme::c("selected_fg") : Theme::c("title")) + Fx::b + cjust(capitalize(s_replace(option, "_", " ")) - + (c-1 == selected and selPred.test(isBrowseable) + + (c-1 == selected and selPred.test(isBrowsable) ? ' ' + to_string(v_index(optionsList.at(option).get(), (option == "color_theme" ? Config::getS("color_theme") : value)) + 1) + '/' + to_string(optionsList.at(option).get().size()) : ""), 29); out += Mv::to(cy++, x + 1) + (c-1 == selected ? "" : Theme::c("main_fg")) + Fx::ub + " " + (c-1 == selected and editing ? cjust(editor(24), 34, true) : cjust(value, 25, true)) + " "; if (c-1 == selected) { - if (not editing and (selPred.test(is2D) or selPred.test(isBrowseable))) { + if (not editing and (selPred.test(is2D) or selPred.test(isBrowsable))) { out += Fx::b + Mv::to(cy-1, x+2) + Symbols::left + Mv::to(cy-1, x+28) + Symbols::right; mouse_mappings["left"] = {cy-2, x, 2, 5}; mouse_mappings["right"] = {cy-2, x+25, 2, 5}; diff --git a/src/btop_theme.hpp b/src/btop_theme.hpp index cc3fbdf..dcc00e4 100644 --- a/src/btop_theme.hpp +++ b/src/btop_theme.hpp @@ -32,7 +32,7 @@ namespace Theme { extern std::filesystem::path theme_dir; extern std::filesystem::path user_theme_dir; - //* Contains "Default" and "TTY" at indeces 0 and 1, otherwise full paths to theme files + //* Contains "Default" and "TTY" at indices 0 and 1, otherwise full paths to theme files extern vector themes; //* Generate escape sequence for 24-bit or 256 color and return as a string diff --git a/src/btop_tools.cpp b/src/btop_tools.cpp index 8a85ed4..d1351e4 100644 --- a/src/btop_tools.cpp +++ b/src/btop_tools.cpp @@ -89,7 +89,7 @@ namespace Term { } bool refresh(bool only_check) { - // Query dimensions of '/dev/tty' of the 'STDOUT_FILENO' isn't avaiable. + // Query dimensions of '/dev/tty' of the 'STDOUT_FILENO' isn't available. // This variable is set in those cases to avoid calls to ioctl constinit static bool uses_dev_tty = false; struct winsize wsize {}; @@ -644,7 +644,7 @@ namespace Logger { size_t loglevel; fs::path logfile; - //* Wrapper for lowering priviliges if using SUID bit and currently isn't using real userid + //* Wrapper for lowering privileges if using SUID bit and currently isn't using real userid class lose_priv { int status = -1; public: diff --git a/src/btop_tools.hpp b/src/btop_tools.hpp index 705a5eb..b9f40f4 100644 --- a/src/btop_tools.hpp +++ b/src/btop_tools.hpp @@ -112,7 +112,7 @@ namespace Mv { //* Save cursor position const string save = Fx::e + "s"; - //* Restore saved cursor postion + //* Restore saved cursor position const string restore = Fx::e + "u"; } @@ -207,7 +207,7 @@ namespace Tools { //* Replace in with and return new string string s_replace(const string& str, const string& from, const string& to); - //* Capatilize + //* Capitalize inline string capitalize(string str) { str.at(0) = toupper(str.at(0)); return str; @@ -284,7 +284,7 @@ namespace Tools { return is_in(str, "true", "True"); } - //* Check if a string is a valid integer value (only postive) + //* Check if a string is a valid integer value (only positive) inline bool isint(const string& str) { return all_of(str.begin(), str.end(), ::isdigit); } diff --git a/src/freebsd/btop_collect.cpp b/src/freebsd/btop_collect.cpp index 2db49a2..400ba7a 100644 --- a/src/freebsd/btop_collect.cpp +++ b/src/freebsd/btop_collect.cpp @@ -277,7 +277,7 @@ namespace Cpu { got_sensors = true; int temp; size_t size = sizeof(temp); - sysctlbyname("dev.cpu.0.coretemp.tjmax", &temp, &size, nullptr, 0); //asuming the max temp is same for all cores + sysctlbyname("dev.cpu.0.coretemp.tjmax", &temp, &size, nullptr, 0); //assuming the max temp is same for all cores temp = (temp - 2732) / 10; // since it's an int, it's multiplied by 10, and offset to absolute zero... current_cpu.temp_max = temp; } @@ -925,7 +925,7 @@ namespace Net { } } - //? Get total recieved and transmitted bytes + device address if no ip was found + //? Get total received and transmitted bytes + device address if no ip was found for (const auto &iface : interfaces) { for (const string dir : {"download", "upload"}) { auto &saved_stat = net.at(iface).stat.at(dir); diff --git a/src/linux/btop_collect.cpp b/src/linux/btop_collect.cpp index 0c1ab66..61dc63f 100644 --- a/src/linux/btop_collect.cpp +++ b/src/linux/btop_collect.cpp @@ -1946,7 +1946,7 @@ namespace Mem { if (access(zfs_pool_stat_path.c_str(), R_OK) == 0) { return zfs_pool_stat_path; } else { - Logger::debug("Cant access folder: " + zfs_pool_stat_path.string()); + Logger::debug("Can't access folder: " + zfs_pool_stat_path.string()); return ""; } } @@ -2161,7 +2161,7 @@ namespace Net { } //else, ignoring family==AF_PACKET (see man 3 getifaddrs) which is the first one in the `for` loop. } - //? Get total recieved and transmitted bytes + device address if no ip was found + //? Get total received and transmitted bytes + device address if no ip was found for (const auto& iface : interfaces) { if (net.at(iface).ipv4.empty() and net.at(iface).ipv6.empty()) net.at(iface).ipv4 = readfile("/sys/class/net/" + iface + "/address"); diff --git a/src/openbsd/btop_collect.cpp b/src/openbsd/btop_collect.cpp index df35662..241938f 100644 --- a/src/openbsd/btop_collect.cpp +++ b/src/openbsd/btop_collect.cpp @@ -882,7 +882,7 @@ namespace Net { } } - //? Get total recieved and transmitted bytes + device address if no ip was found + //? Get total received and transmitted bytes + device address if no ip was found for (const auto &iface : interfaces) { for (const string dir : {"download", "upload"}) { auto &saved_stat = net.at(iface).stat.at(dir); diff --git a/src/osx/btop_collect.cpp b/src/osx/btop_collect.cpp index 76b63c0..473faad 100644 --- a/src/osx/btop_collect.cpp +++ b/src/osx/btop_collect.cpp @@ -144,7 +144,7 @@ namespace Shared { mach_timebase_info_data_t convf; if (mach_timebase_info(&convf) == KERN_SUCCESS) { - machTck = convf.numer / convf.denom; + machTck = convf.number / convf.denom; } else { Logger::warning("Could not get mach clock tick conversion factor. Defaulting to 100, processes cpu usage might be incorrect."); machTck = 100; @@ -606,7 +606,7 @@ namespace Mem { mach_port_t libtop_master_port; if (IOMasterPort(bootstrap_port, &libtop_master_port)) { - Logger::error("errot getting master port"); + Logger::error("error getting master port"); return; } /* Get the list of all drive objects. */ @@ -940,7 +940,7 @@ namespace Net { } } - //? Get total recieved and transmitted bytes + device address if no ip was found + //? Get total received and transmitted bytes + device address if no ip was found for (const auto &iface : interfaces) { for (const string dir : {"download", "upload"}) { auto &saved_stat = net.at(iface).stat.at(dir); diff --git a/src/osx/smc.cpp b/src/osx/smc.cpp index 6c483db..c972d29 100644 --- a/src/osx/smc.cpp +++ b/src/osx/smc.cpp @@ -147,7 +147,7 @@ namespace Cpu { return IOConnectCallStructMethod(conn, index, // inputStructure inputStructure, structureInputSize, - // ouputStructure + // outputStructure outputStructure, &structureOutputSize); } diff --git a/themes/adapta.theme b/themes/adapta.theme index e3e2128..4448228 100644 --- a/themes/adapta.theme +++ b/themes/adapta.theme @@ -18,7 +18,7 @@ theme[main_fg]="#cfd8dc" # Title color for boxes theme[title]="#ff" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#90" # Background color of selected item in processes box diff --git a/themes/adwaita.theme b/themes/adwaita.theme index 25e6bbf..6eeda09 100644 --- a/themes/adwaita.theme +++ b/themes/adwaita.theme @@ -18,11 +18,11 @@ theme[main_fg]="#2e3436" # Title color for boxes theme[title]="#2e3436" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#1a5fb4" # Background color of selected item in processes box -theme[selected_bg]="#1c71d8" +theme[selected_bg]="#1c71d8" # Foreground color of selected item in processes box theme[selected_fg]="#ffffff" diff --git a/themes/dusklight.theme b/themes/dusklight.theme index be60f1a..286aeb4 100644 --- a/themes/dusklight.theme +++ b/themes/dusklight.theme @@ -18,11 +18,11 @@ theme[main_fg]="#99DFFF" # Title color for boxes theme[title]="#99FFFF" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#FF7F00" # Background color of selected item in processes box -theme[selected_bg]="#722B01" +theme[selected_bg]="#722B01" # Foreground color of selected item in processes box theme[selected_fg]="#99FFFF" diff --git a/themes/elementarish.theme b/themes/elementarish.theme index 0fe5398..436b6f8 100644 --- a/themes/elementarish.theme +++ b/themes/elementarish.theme @@ -11,7 +11,7 @@ theme[main_fg]="#eee8d5" # Title color for boxes theme[title]="#eee8d5" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#d1302c" # Background color of selected item in processes box diff --git a/themes/everforest-dark-hard.theme b/themes/everforest-dark-hard.theme index eb8147a..b9fccfc 100644 --- a/themes/everforest-dark-hard.theme +++ b/themes/everforest-dark-hard.theme @@ -22,7 +22,7 @@ theme[selected_bg]="#374145" theme[selected_fg]="#dbbc7f" # Color of inactive/disabled text -theme[inactive_fg]="#272e33" +theme[inactive_fg]="#272e33" # Color of text appearing on top of graphs, i.e uptime and current network graph scaling theme[graph_text]="#d3c6aa" diff --git a/themes/flat-remix-light.theme b/themes/flat-remix-light.theme index db1afe4..8344a96 100644 --- a/themes/flat-remix-light.theme +++ b/themes/flat-remix-light.theme @@ -18,7 +18,7 @@ theme[main_fg]="#737680" # Title color for boxes theme[title]="#272a34" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#90" # Background color of selected item in processes box diff --git a/themes/flat-remix.theme b/themes/flat-remix.theme index 54585e7..0a53a95 100644 --- a/themes/flat-remix.theme +++ b/themes/flat-remix.theme @@ -18,7 +18,7 @@ theme[main_fg]="#E6E6E6" # Title color for boxes theme[title]="#ff" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#90" # Background color of selected item in processes box diff --git a/themes/greyscale.theme b/themes/greyscale.theme index 442a82f..a24c081 100644 --- a/themes/greyscale.theme +++ b/themes/greyscale.theme @@ -18,11 +18,11 @@ theme[main_fg]="#bb" # Title color for boxes theme[title]="#cc" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#90" # Background color of selected item in processes box -theme[selected_bg]="#ff" +theme[selected_bg]="#ff" # Foreground color of selected item in processes box theme[selected_fg]="#00" diff --git a/themes/gruvbox_dark.theme b/themes/gruvbox_dark.theme index feed893..8cd9d37 100644 --- a/themes/gruvbox_dark.theme +++ b/themes/gruvbox_dark.theme @@ -18,7 +18,7 @@ theme[main_fg]="#a89984" # Title color for boxes theme[title]="#ebdbb2" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#d79921" # Background color of selected items diff --git a/themes/gruvbox_dark_v2.theme b/themes/gruvbox_dark_v2.theme index a3a0c9e..da0d79a 100644 --- a/themes/gruvbox_dark_v2.theme +++ b/themes/gruvbox_dark_v2.theme @@ -29,7 +29,7 @@ theme[selected_bg]="#32302F" theme[selected_fg]="#D3869B" # Color of inactive/disabled text -theme[inactive_fg]="#3C3836" +theme[inactive_fg]="#3C3836" # Color of text appearing on top of graphs, i.e uptime and current network graph scaling theme[graph_text]="#A89984" diff --git a/themes/gruvbox_material_dark.theme b/themes/gruvbox_material_dark.theme index 749c7a7..5dc5822 100644 --- a/themes/gruvbox_material_dark.theme +++ b/themes/gruvbox_material_dark.theme @@ -18,7 +18,7 @@ theme[main_fg]="#d4be98" # Title color for boxes theme[title]="#d4be98" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#ea6962" # Background color of selected items diff --git a/themes/matcha-dark-sea.theme b/themes/matcha-dark-sea.theme index 34889ff..07a0b38 100644 --- a/themes/matcha-dark-sea.theme +++ b/themes/matcha-dark-sea.theme @@ -18,7 +18,7 @@ theme[main_fg]="#F8F8F2" # Title color for boxes theme[title]="#F8F8F2" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#2eb398" # Background color of selected item in processes box diff --git a/themes/monokai.theme b/themes/monokai.theme index f379dc9..29299f5 100644 --- a/themes/monokai.theme +++ b/themes/monokai.theme @@ -18,7 +18,7 @@ theme[main_fg]="#F8F8F2" # Title color for boxes theme[title]="#F8F8F2" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#F92672" # Background color of selected item in processes box diff --git a/themes/night-owl.theme b/themes/night-owl.theme index 7537fea..0de70ae 100644 --- a/themes/night-owl.theme +++ b/themes/night-owl.theme @@ -18,7 +18,7 @@ theme[main_fg]="#d6deeb" # Title color for boxes theme[title]="#ffffff" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#addb67" # Background color of selected items diff --git a/themes/nord.theme b/themes/nord.theme index 07c43c2..fbd0af1 100644 --- a/themes/nord.theme +++ b/themes/nord.theme @@ -18,7 +18,7 @@ theme[main_fg]="#D8DEE9" # Title color for boxes theme[title]="#8FBCBB" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#5E81AC" # Background color of selected item in processes box diff --git a/themes/onedark.theme b/themes/onedark.theme index f4441de..5a5ad01 100644 --- a/themes/onedark.theme +++ b/themes/onedark.theme @@ -10,7 +10,7 @@ theme[main_fg]="#abb2bf" # Title color for boxes theme[title]="#abb2bf" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#61afef" # Background color of selected item in processes box diff --git a/themes/paper.theme b/themes/paper.theme index 111289d..00f96a2 100644 --- a/themes/paper.theme +++ b/themes/paper.theme @@ -12,7 +12,7 @@ theme[main_fg]="#00" # Title color for boxes theme[title]="#00" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#CC3E28" # Background color of selected item in processes box diff --git a/themes/solarized_dark.theme b/themes/solarized_dark.theme index 6069823..5ccd0a1 100644 --- a/themes/solarized_dark.theme +++ b/themes/solarized_dark.theme @@ -18,11 +18,11 @@ theme[main_fg]="#eee8d5" # Title color for boxes theme[title]="#fdf6e3" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#b58900" # Background color of selected items -theme[selected_bg]="#073642" +theme[selected_bg]="#073642" # Foreground color of selected items theme[selected_fg]="#d6a200" diff --git a/themes/solarized_light.theme b/themes/solarized_light.theme index 9478410..ccb0adc 100644 --- a/themes/solarized_light.theme +++ b/themes/solarized_light.theme @@ -18,11 +18,11 @@ theme[main_fg]="#586e75" # Title color for boxes theme[title]="#002b36" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#b58900" # Background color of selected items -theme[selected_bg]="#eee8d5" +theme[selected_bg]="#eee8d5" # Foreground color of selected items theme[selected_fg]="#b58900" diff --git a/themes/tokyo-night.theme b/themes/tokyo-night.theme index aae6a3b..b8200ec 100644 --- a/themes/tokyo-night.theme +++ b/themes/tokyo-night.theme @@ -10,7 +10,7 @@ theme[main_fg]="#cfc9c2" # Title color for boxes theme[title]="#cfc9c2" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#7dcfff" # Background color of selected item in processes box diff --git a/themes/tokyo-storm.theme b/themes/tokyo-storm.theme index a4edfcf..e987f1c 100644 --- a/themes/tokyo-storm.theme +++ b/themes/tokyo-storm.theme @@ -10,7 +10,7 @@ theme[main_fg]="#cfc9c2" # Title color for boxes theme[title]="#cfc9c2" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#7dcfff" # Background color of selected item in processes box diff --git a/themes/tomorrow-night.theme b/themes/tomorrow-night.theme index a745005..5900044 100644 --- a/themes/tomorrow-night.theme +++ b/themes/tomorrow-night.theme @@ -18,7 +18,7 @@ theme[main_fg]="#c5c8c6" # Title color for boxes theme[title]="#c5c8c6" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#81beb7" # Background color of selected item in processes box diff --git a/themes/whiteout.theme b/themes/whiteout.theme index 23c8ebe..ab41464 100644 --- a/themes/whiteout.theme +++ b/themes/whiteout.theme @@ -18,11 +18,11 @@ theme[main_fg]="#30" # Title color for boxes theme[title]="#10" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#284d75" # Background color of selected item in processes box -theme[selected_bg]="#15283d" +theme[selected_bg]="#15283d" # Foreground color of selected item in processes box theme[selected_fg]="#ff" From 7fea4f17d920dd13f4255623fa636197b04e51e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20=C3=87etin?= Date: Mon, 15 Jan 2024 20:18:49 +0300 Subject: [PATCH 2/2] revert numer --- src/osx/btop_collect.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osx/btop_collect.cpp b/src/osx/btop_collect.cpp index 473faad..7e64da5 100644 --- a/src/osx/btop_collect.cpp +++ b/src/osx/btop_collect.cpp @@ -144,7 +144,7 @@ namespace Shared { mach_timebase_info_data_t convf; if (mach_timebase_info(&convf) == KERN_SUCCESS) { - machTck = convf.number / convf.denom; + machTck = convf.numer / convf.denom; } else { Logger::warning("Could not get mach clock tick conversion factor. Defaulting to 100, processes cpu usage might be incorrect."); machTck = 100;