From 1d296224eb129c14c8dd28c6c6d3be13fab94e00 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 6 Sep 2023 13:25:01 +0200 Subject: Drop testing/coverage options fixes https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth/issues/46 --- .build.yml | 2 +- CMakeLists.txt | 31 ++----------------------------- INSTALL.md | 23 ----------------------- debian/rules | 2 -- tests/manual | 24 ------------------------ 5 files changed, 3 insertions(+), 79 deletions(-) delete mode 100644 tests/manual diff --git a/.build.yml b/.build.yml index e52d988..a0ca81b 100644 --- a/.build.yml +++ b/.build.yml @@ -112,7 +112,7 @@ build_scripts: # - - if [ -e ./CMakeLists.txt ]; then - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then - - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON -DENABLE_TESTS=ON + - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON - else - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON - fi diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a23841..f3a5ada 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -project(ayatana-indicator-bluetooth C CXX) cmake_minimum_required(VERSION 3.13) +project (ayatana-indicator-bluetooth VERSION 22.9.1 LANGUAGES C CXX) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE) @@ -7,21 +7,10 @@ endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}") -set(PACKAGE ${CMAKE_PROJECT_NAME}) -set(PROJECT_VERSION 22.9.1) - # Options -option(ENABLE_TESTS "Enable all tests and checks" OFF) -option(ENABLE_COVERAGE "Enable coverage reports (includes enabling all tests and checks)" OFF) option(ENABLE_WERROR "Treat all build warnings as errors" OFF) - -if(ENABLE_COVERAGE) - set(ENABLE_TESTS ON) - set(CMAKE_BUILD_TYPE "Coverage") -else() - set(CMAKE_BUILD_TYPE "Release") -endif() +set (CMAKE_BUILD_TYPE "Release") if(ENABLE_WERROR) add_definitions("-Werror") @@ -71,23 +60,7 @@ add_subdirectory(data) add_subdirectory(src) add_subdirectory(po) -# testing & coverage - -if (ENABLE_TESTS) - - include(CTest) - enable_testing() - - if (ENABLE_COVERAGE) - - find_package(CoverageReport) - - endif() - -endif() - # Display config info message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}") -message(STATUS "Unit tests: ${ENABLE_TESTS}") message(STATUS "Build with -Werror: ${ENABLE_WERROR}") diff --git a/INSTALL.md b/INSTALL.md index 9cef72a..cb52543 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -24,26 +24,3 @@ sudo make install ``` **The install prefix defaults to `/usr`, change it with `-DCMAKE_INSTALL_PREFIX=/some/path`** - -## For testers - unit tests only - -``` -cd ayatana-indicator-bluetooth-X.Y.Z -mkdir build -cd build -cmake .. -DENABLE_TESTS=ON -make -make test -make cppcheck -``` - -## For testers - both unit tests and code coverage - -``` -cd ayatana-indicator-bluetooth-X.Y.Z -mkdir build-coverage -cd build-coverage -cmake .. -DENABLE_COVERAGE=ON -make -make coverage-html -``` diff --git a/debian/rules b/debian/rules index 4ebd031..d10a551 100755 --- a/debian/rules +++ b/debian/rules @@ -4,8 +4,6 @@ NULL = DEB_CMAKE_EXTRA_FLAGS = \ -DCMAKE_INSTALL_LOCALSTATEDIR="/var" \ - -DENABLE_TESTS=ON \ - -DENABLE_COVERAGE=OFF \ $(NULL) export DPKG_GENSYMBOLS_CHECK_LEVEL=4 diff --git a/tests/manual b/tests/manual deleted file mode 100644 index 6a98842..0000000 --- a/tests/manual +++ /dev/null @@ -1,24 +0,0 @@ - -Test-case indicator-bluetooth/unity7-items-check -
-
Log in to a Unity 7 user session
-
Go to the panel and click on the Bluetooth indicator
-
Ensure there are items in the menu
-
- -Test-case indicator-bluetooth/unity7-greeter-items-check -
-
Start a system and wait for the greeter or logout of the current user session
-
Go to the panel and click on the Bluetooth indicator
-
Ensure there are items in the menu
-
- -Test-case indicator-bluetooth/unity8-items-check -
-
Login to a user session running Unity 8
-
Pull down the top panel until it sticks open
-
Navigate through the tabs until "Bluetooth" is shown
-
Bluetooth is at the top of the menu
-
The menu is populated with items
-
- -- cgit v1.2.3 From 145f43c243938383a44931f2894e911547440e16 Mon Sep 17 00:00:00 2001 From: Kieran W Date: Wed, 6 Sep 2023 17:05:32 +0000 Subject: Translated using Weblate (English (United Kingdom)) Currently translated at 100.0% (13 of 13 strings) Translation: Ayatana Indicators/Bluetooth Indicator Applet Translate-URL: https://hosted.weblate.org/projects/ayatana-indicators/bluetooth-applet/en_GB/ --- po/en_GB.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 9b86205..f44040d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-09-14 08:25+0200\n" -"PO-Revision-Date: 2020-12-31 10:29+0000\n" -"Last-Translator: J. Lavoie \n" +"PO-Revision-Date: 2023-09-07 05:05+0000\n" +"Last-Translator: Kieran W \n" "Language-Team: English (United Kingdom) \n" "Language: en_GB\n" @@ -17,17 +17,15 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.4.1-dev\n" +"X-Generator: Weblate 5.0.1-dev\n" #: data/org.ayatana.indicator.bluetooth.gschema.xml.in:1 -#, fuzzy msgid "Bluetooth indicator in the menu bar." -msgstr "Whether or not to show the bluetooth indicator in the menu bar." +msgstr "Bluetooth indicator in the menu bar." #: data/org.ayatana.indicator.bluetooth.gschema.xml.in:2 -#, fuzzy msgid "Whether or not to show the Bluetooth indicator in the menu bar." -msgstr "Whether or not to show the bluetooth indicator in the menu bar." +msgstr "Whether or not to show the Bluetooth indicator in the menu bar." #: src/bluez.vala:310 msgid "Unknown" @@ -72,4 +70,4 @@ msgstr "Bluetooth" #: src/profile.vala:180 msgid "Bluetooth status & device connections" -msgstr "" +msgstr "Bluetooth status & device connections" -- cgit v1.2.3 From 0f4312d54665e46ca9b6e5d6bc98e37c18ea4a58 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Fri, 8 Sep 2023 08:18:58 +0200 Subject: src/desktop.vala: Use blueman-manager for settings on XFCE fixes https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth/issues/49 --- src/desktop.vala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/desktop.vala b/src/desktop.vala index b7b48fd..fd690df 100644 --- a/src/desktop.vala +++ b/src/desktop.vala @@ -1,6 +1,6 @@ /* * Copyright 2013 Canonical Ltd. - * Copyright 2021-2022 Robert Tari + * Copyright 2021-2023 Robert Tari * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -267,6 +267,10 @@ class Desktop: Profile { AyatanaCommon.utils_execute_command("blueman-manager"); } + else if (AyatanaCommon.utils_is_xfce() && AyatanaCommon.utils_have_program("blueman-manager")) + { + AyatanaCommon.utils_execute_command("blueman-manager"); + } else { AyatanaCommon.utils_execute_command("gnome-control-center " + panel); -- cgit v1.2.3