diff --git a/.contemporary.json b/.contemporary.json index 9328956..9d1a6a8 100644 --- a/.contemporary.json +++ b/.contemporary.json @@ -1,4 +1,4 @@ { "desktop-id": "com.vicr123.theheartbeat", - "theme-colors": ["#00c800", "#006400"] + "theme-colors": ["#006400", "#00c800"] } diff --git a/CMakeLists.txt b/CMakeLists.txt index 4947a12..06a367f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,4 +7,6 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") link_directories(/usr/local/lib) ENDIF() +find_package(QT REQUIRED NAMES Qt6) + add_subdirectory(heartbeat) diff --git a/README.md b/README.md index 01fca86..2478ee6 100644 --- a/README.md +++ b/README.md @@ -2,43 +2,39 @@ ---

-Travis CI Build Status

-theHeartbeat is a system monitor, designed to integrate well with theShell. +theHeartbeat is a system monitor, designed to integrate well with theDesk. --- # Dependencies -- Qt 5 +- Qt 6 - Qt Core - Qt GUI - Qt Widgets - Qt SVG -- [the-libs](https://github.com/vicr123/the-libs) +- [libcontemporary](https://github.com/vicr123/libcontemporary) # Get If you're using a supported operating system, we may have binaries available: | System | Package | |-------------------|---------------------------------------------------------------------------------------------------------| -| Arch Linux | ~~`theheartbeat` on the AUR~~ Coming soon! | -| Other Linux | [AppImage on GitHub Releases](https://github.com/vicr123/theHeartbeat/releases) | - -For more information, visit the [website](https://vicr123.com/theslate/download.html). +| Arch Linux | `theheartbeat` on the AUR Coming soon! | ## Build Run the following commands in your terminal. ``` -qmake -make +cmake -B build -S . +cmake --build build ``` ## Install On Linux, run the following command in your terminal (with superuser permissions) ``` -make install +cmake --install build ``` # Contributing @@ -46,6 +42,6 @@ Thanks for your interest in theHeartbeat! Check out the [CONTRIBUTING.md](CONTRI --- -> © Victor Tran, 2019. This project is licensed under the GNU General Public License, version 3, or at your option, any later version. +> © Victor Tran, 2023. This project is licensed under the GNU General Public License, version 3, or at your option, any later version. > -> Check the [LICENSE](LICENSE) file for more information. \ No newline at end of file +> Check the [LICENSE](LICENSE) file for more information. diff --git a/heartbeat/CMakeLists.txt b/heartbeat/CMakeLists.txt index 588ffb1..1d55442 100644 --- a/heartbeat/CMakeLists.txt +++ b/heartbeat/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.21.0) project(theheartbeat VERSION 1.0.0 LANGUAGES CXX) -find_package(Qt6 REQUIRED COMPONENTS Widgets DBus Sql Concurrent) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets DBus Sql Concurrent) find_package(libcontemporary REQUIRED) set(SOURCES @@ -69,7 +69,7 @@ cntp_target_desktop_file(theheartbeat cntp_defaults_file(theheartbeat DEFAULTS_FILE theheartbeat.conf) -target_link_libraries(theheartbeat Qt6::Widgets Qt6::DBus Qt6::Concurrent libcontemporary) +target_link_libraries(theheartbeat Qt::Widgets Qt::DBus Qt::Concurrent libcontemporary) install(TARGETS theheartbeat RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} diff --git a/heartbeat/main.cpp b/heartbeat/main.cpp index cb6725b..57f6ade 100644 --- a/heartbeat/main.cpp +++ b/heartbeat/main.cpp @@ -35,9 +35,8 @@ int main(int argc, char* argv[]) { a.setOrganizationName("theSuite"); a.setOrganizationDomain("vicr123.com"); - a.setApplicationVersion("1.1"); + a.setApplicationVersion("2.0"); a.setGenericName(QApplication::translate("main", "System Monitor")); - a.setAboutDialogSplashGraphic(a.aboutDialogSplashGraphicFromSvg(":/icons/aboutsplash.svg")); a.setApplicationLicense(tApplication::Gpl3OrLater); a.setCopyrightHolder("Victor Tran"); a.setCopyrightYear("2023"); diff --git a/heartbeat/theheartbeat.conf b/heartbeat/theheartbeat.conf new file mode 100644 index 0000000..e69de29