diff --git a/Makefile b/Makefile index 5cfec29..eb1d9e0 100644 --- a/Makefile +++ b/Makefile @@ -8,13 +8,10 @@ MAKEFILE_PATH := $(dir $(MAKEFILE_FILEPATH)) CMAKE_COMMAND = cmake CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile -#CMAKE_SOURCE_DIR = ./source -#CMAKE_BUILD_DIR = ./compile FILE_VERSION = VERSION.md -DEPENDS = /bin/cmake +DEPENDS = /bin/cmake PREFIX ?= /usr PKGNAME = $(MAKEFILE_DIR) -#PKGNAME = ubl-settings-manager default_target: all @@ -35,8 +32,8 @@ depend: exit 1; \ fi; \ done; \ + $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B${CMAKE_BUILD_DIR} --check-build-system CMakeFiles/Makefile.cmake 1 || exit 1; \ echo "Check depends: OK" -# $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 debug: @echo "Debug ..." @@ -84,10 +81,16 @@ uninstall: done; \ done @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" - @$(RM) "${DESTDIR}/etc/xdg/${PKGNAME}/${PKGNAME}.conf" @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg" - @$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}/images" + @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/devices/com.ublinux.${PKGNAME}.display.svg" + @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/devices/com.ublinux.${PKGNAME}.video-card.svg" + @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/emblems/com.ublinux.${PKGNAME}.nvidia-logo.svg" + @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/emblems/com.ublinux.${PKGNAME}.intel-logo.svg" + @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/emblems/com.ublinux.${PKGNAME}.amd-logo.svg" + @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/com.ublinux.${PKGNAME}.checked.svg" + @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/com.ublinux.${PKGNAME}.warning.svg" + @$(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy" @$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ @@ -120,14 +123,13 @@ install: check uninstall @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" @install -dm755 "${DESTDIR}${PREFIX}/share/polkit-1/actions" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.pkexec.${PKGNAME}.exec.policy" - @install -Dm655 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy" + @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" @install -dm755 "${DESTDIR}${PREFIX}/share/applications" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" - @install -dm655 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images} + @install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images,csv} @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css" - @install -dm655 "${DESTDIR}${PREFIX}/share/${PKGNAME}/images" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "${PKGNAME}-banner.png" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/csv/" "resolutions.csv" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/csv/" "video-drivers.csv" diff --git a/README.md b/README.md index 87f9650..92e3459 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,11 @@ # ubl-settings-video -# Настройки видеоадаптера и дисплея +# Настройка видеоадаптера и дисплея +[RU] Утилита для настройки видеоадаптера и дисплея + +Utility for configuring the video adapter and display + +![alt text](screenshot/screenshot.png) + # Build In order to build ubl-settings-video you will need: @@ -7,23 +13,42 @@ In order to build ubl-settings-video you will need: - C compiler - GTK+ 3 & dependencies - vte-2.91 +- webkit2gtk + +Options for compiling: +`--nowebkit2gtk` - Compiling without webkit2gtk Once you have all the necessary dependencies, you can use: -```sh +```bash $ make ``` # Installation After a successful build, just use: -```sh +```bash $ sudo make install clean ``` # Uninstallation After a successful build, just use: -```sh +```bash $ sudo make uninstall ``` -![alt text](desc/ubl-settings-video-screenshot.png) +# Usage +```bash +$ ubl-settings-video --help +Configuring the video adapter and display for UBLinux + +Usage: ubl-settings-video [OPTIONS...] +Options: + -h, --help Show this help + -V, --version Show package version + --lock-save Lock saving local and global configuration + --lock-save-local Lock save global configuration + --lock-save-global Lock load global configuration + --lock-load-global Lock load global configuration +$ ubl-settings-video --version +ubl-settings-video version: x.xx +``` diff --git a/VERSION.md b/VERSION.md index 12ebd01..2923038 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -VERSION 1.0 +VERSION 2.1 diff --git a/com.ublinux.pkexec.ubl-settings-video.exec.policy b/com.ublinux.ubl-settings-video.policy similarity index 62% rename from com.ublinux.pkexec.ubl-settings-video.exec.policy rename to com.ublinux.ubl-settings-video.policy index 58a198c..4907138 100644 --- a/com.ublinux.pkexec.ubl-settings-video.exec.policy +++ b/com.ublinux.ubl-settings-video.policy @@ -7,11 +7,11 @@ UBLinux https://ublinux.ru - - Run "ubl-settings-video" as root - Запуск утилиты "ubl-settings-video" с правами root - Authentication is required to run "ubl-settings-video" - Требуется авторизация для запуска утилиты "ubl-settings-video" с правами root + + Run ubl-settings-video as root + Запуск утилиты ubl-settings-video с правами root + Authentication is required to run ubl-settings-video + Требуется авторизация для запуска утилиты ubl-settings-video с правами root auth_admin auth_admin diff --git a/desc/ubl-settings-video-screenshot.png b/screenshot/screenshot.png similarity index 100% rename from desc/ubl-settings-video-screenshot.png rename to screenshot/screenshot.png diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 29d9ec6..ff6b8b4 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,17 +1,21 @@ -cmake_minimum_required(VERSION 3.7) +cmake_minimum_required(VERSION 3.23) project(ubl-settings-video) find_package(PkgConfig REQUIRED) -pkg_check_modules(GTK REQUIRED gtk+-3.0) -include_directories(${GTK_INCLUDE_DIRS}) -link_directories(${GTK_LIBRARY_DIRS}) -add_definitions(${GTK_CFLAGS_OTHER}) +pkg_check_modules(GTK3 REQUIRED gtk+-3.0) +include_directories(${GTK3_INCLUDE_DIRS}) +link_directories(${GTK3_LIBRARY_DIRS}) +add_definitions(${GTK3_CFLAGS_OTHER}) -option(WEBKIT_FOUND "No" OFF) +pkg_check_modules(VTE291 REQUIRED vte-2.91) +include_directories(${VTE291_INCLUDE_DIRS}) +link_directories(${VTE291_LIBRARY_DIRS}) +add_definitions(${VTE291_CFLAGS_OTHER}) find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) +option(WEBKIT_FOUND "No" OFF) if(WEBKIT_LIBRARIES_FOUND) option(WEBKIT_FOUND "Yes" ON) PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0) @@ -35,15 +39,12 @@ set(SOURCE_FILES ubl-settings-video-cm.h) set(LIBRARIES - ${GTK_LIBRARIES} - pthread - vte-2.91) - - -add_executable(ubl-settings-video ${SOURCE_FILES}) -target_link_libraries(ubl-settings-video PUBLIC ${WEBKIT_LIBRARIES} ${LIBRARIES}) -target_include_directories(ubl-settings-video PUBLIC - "${PROJECT_BINARY_DIR}" - ${WEBKIT_INCLUDE_DIRS} - ) -install(TARGETS ubl-settings-video DESTINATION bin) \ No newline at end of file + ${GTK3_LIBRARIES} + ${WEBKIT_LIBRARIES} + ${VTE291_LIBRARIES} + pthread) + +add_executable(${PROJECT_NAME} ${SOURCE_FILES}) +target_link_libraries(${PROJECT_NAME} PUBLIC ${LIBRARIES}) +target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_BINARY_DIR}) +install(TARGETS ${PROJECT_NAME} DESTINATION bin) diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h index 62eb651..204ab5d 100644 --- a/source/ubl-settings-video.h +++ b/source/ubl-settings-video.h @@ -90,7 +90,7 @@ char *local; typedef char *string; -string version_application = "1.6"; +string version_application = "1.8"; #define _(String) gettext(String) diff --git a/ubl-settings-video.desktop b/ubl-settings-video.desktop index c19f6f0..c68d568 100644 --- a/ubl-settings-video.desktop +++ b/ubl-settings-video.desktop @@ -3,7 +3,7 @@ Encoding=UTF-8 Name=ubl-settings-video Name[ru]=Настройки видеоадаптера и дисплея GenericName=ubl-settings-video -GenericName[ru]=Настройки Видеоадаптера и дисплея +GenericName[ru]=Настройки видеоадаптера и дисплея Comment=Application for managing video adapter and display settings Comment[ru]=Приложение для управления настройками видеоадаптера и дисплея Type=Application @@ -12,4 +12,4 @@ Icon=com.ublinux.ubl-settings-video Terminal=false X-XfcePluggable=true X-UBLPluggable=true -Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;X-UBL-SettingsManager;X-UBL-HardwareSettings; +Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;X-UBL-SettingsManager;X-UBL-HardwareSettings;