diff --git a/libublsettingsui-gtk3.glade b/libublsettingsui-gtk3.glade index 4eff111..892fd09 100644 --- a/libublsettingsui-gtk3.glade +++ b/libublsettingsui-gtk3.glade @@ -234,150 +234,163 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 600 com.ublinux.libublsettingsui-gtk3 - + True - False - vertical + True + in - + True False - vertical - - True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 25 - - - False - True - 0 - - - - - True - False - start - 5 - 5 - 5 - 5 - 6 - 6 - True - 0 - - - - - - - False - True - 1 - - - - - True - False - 5 - 5 - 5 - 5 - 25 - com.ublinux.libublsettingsui-gtk3.statemode-yellow-symbolic - 6 - - - False - True - end - 2 - - - - - False - True - 0 - - - - + True False vertical - - 81 + True False + vertical + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 25 + + + False + True + 0 + + + + + True + False + start + 5 + 5 + 5 + 5 + 6 + 6 + True + 0 + + + + + + + False + True + 1 + + + + + True + False + 5 + 5 + 5 + 5 + 25 + com.ublinux.libublsettingsui-gtk3.statemode-yellow-symbolic + 6 + + + False + True + end + 2 + + + + + False + True + 0 + + - + True False - start + vertical + + + 81 + True + False + + + True + False + start + + + -1 + + + + + False + True + 0 + + - -1 + False + True + 1 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + True + True + vertical + + + + + + False + True + 2 - False + True True 0 - - False - True - 1 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - True - True - vertical - - - - - - False - True - 2 - - - True - True - 0 - diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 94043ac..8fdee64 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -14,6 +14,11 @@ include_directories(${VTE291_INCLUDE_DIRS}) link_directories(${VTE291_LIBRARY_DIRS}) add_definitions(${VTE291_CFLAGS_OTHER}) +pkg_check_modules(POLKIT REQUIRED polkit-agent-1) +include_directories(${POLKIT_INCLUDE_DIRS}) +link_directories(${POLKIT_LIBRARY_DIRS}) +add_definitions(${POLKIT_CFLAGS_OTHER}) + find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) option(WEBKIT_FOUND "No" OFF) @@ -40,8 +45,6 @@ set(DEPENDFILES ../gresource.xml ../libublsettingsui-gtk3-banner.png ../libublsettingsui-gtk3.css - ../com.ublinux.libublsettingsui-gtk3.checked.svg - ../com.ublinux.libublsettingsui-gtk3.warning.svg ) file(COPY ${DEPENDFILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) @@ -80,11 +83,14 @@ set(LIBRARIES ${GTK_LIBRARIES} ${WEBKIT_LIBRARIES} ${VTE291_LIBRARIES} + ${POLKIT_LIBRARIES} ublsettings ublsettings-gtk3 pthread) add_definitions(-DVTE_INCLUDE) +add_definitions(-DLIBUBLSETTINGSUI_VERSION=${VERSION}) +message(STATUS ${VERSION}) message(${CMAKE_INSTALL_LIBDIR}) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_BINARY_DIR})