diff --git a/Makefile b/Makefile index fdce4f1..3b68851 100644 --- a/Makefile +++ b/Makefile @@ -142,8 +142,6 @@ install: check install-util build-ui install-ui rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ done @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" - @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" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ diff --git a/com.ublinux.ublsettings-ui.policy b/com.ublinux.ublsettings-ui.policy deleted file mode 100644 index eaa2b92..0000000 --- a/com.ublinux.ublsettings-ui.policy +++ /dev/null @@ -1,24 +0,0 @@ - - - - - UBLinux - https://ublinux.ru - - - Run ublsettings-ui as root - Запуск утилиты ublsettings-ui с правами root - Authentication is required to run ublsettings-ui - Требуется авторизация для запуска утилиты ublsettings-ui с правами root - - auth_admin - auth_admin - auth_admin - - /usr/bin/ublsettings-ui - true - - - diff --git a/gresource.xml b/gresource.xml index f24a0e6..ce32b3b 100644 --- a/gresource.xml +++ b/gresource.xml @@ -11,5 +11,7 @@ ublsettings-ui-banner.png + com.ublinux.ublsettings-ui.checked.svg + com.ublinux.ublsettings-ui.warning.svg \ No newline at end of file diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 2a6b49a..495d810 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -25,10 +25,6 @@ if(WEBKIT_LIBRARIES_FOUND) add_definitions(${WEBKIT_CFLAGS_OTHER}) endif() -configure_file(ubl-cmake.in ubl-cmake.h) - -file(COPY ${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h DESTINATION ../compile) - set(GRESOURCE_C resources.c) set(GRESOURCE_XML gresource.xml) @@ -43,6 +39,8 @@ set(DEPENDFILES ../gresource.xml ../ublsettings-ui-banner.png ../ublsettings-ui.css + ../com.ublinux.ublsettings-ui.checked.svg + ../com.ublinux.ublsettings-ui.warning.svg ) file(COPY ${DEPENDFILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) @@ -99,8 +97,4 @@ install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) -configure_file(${PROJECT_NAME}.pc.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY) -# Set pkg-config file to install. -install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig -) \ No newline at end of file +# Set pkg-config file to install. \ No newline at end of file diff --git a/source/ubl-cmake.in b/source/ubl-cmake.in deleted file mode 100644 index d4623a7..0000000 --- a/source/ubl-cmake.in +++ /dev/null @@ -1 +0,0 @@ -#cmakedefine WEBKIT_FOUND diff --git a/source/ublsettings-ui.h b/source/ublsettings-ui.h index 2da844a..debdfb3 100644 --- a/source/ublsettings-ui.h +++ b/source/ublsettings-ui.h @@ -8,10 +8,7 @@ #include #include #include -#include "../compile/ubl-cmake.h" -#ifdef WEBKIT_FOUND #include -#endif #define ui_WIKI_LINK "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ublsettings-ui" diff --git a/source/ublsettings-ui.pc.in b/source/ublsettings-ui.pc.in deleted file mode 100644 index a170ac9..0000000 --- a/source/ublsettings-ui.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -Name: @PROJECT_NAME@ -Description: @PROJECT_DESCRIPTION@ -Version: @PROJECT_VERSION@ -Requires: -Libs: -L${libdir} -l@PROJECT_NAME@ -Cflags: -I${includedir} \ No newline at end of file diff --git a/ubl-utils/CMakeLists.txt b/ubl-utils/CMakeLists.txt index 9286eef..def0f63 100644 --- a/ubl-utils/CMakeLists.txt +++ b/ubl-utils/CMakeLists.txt @@ -25,7 +25,6 @@ if(WEBKIT_LIBRARIES_FOUND) add_definitions(${WEBKIT_CFLAGS_OTHER}) endif() -file(COPY ${CMAKE_CURRENT_BINARY_DIR}/../ui-compile/ubl-cmake.h DESTINATION ./) #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -lm") @@ -60,8 +59,4 @@ install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) -configure_file(${PROJECT_NAME}.pc.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY) -# Set pkg-config file to install. -install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig -) \ No newline at end of file +# Set pkg-config file to install. \ No newline at end of file diff --git a/ubl-utils/ubl-cmake.in b/ubl-utils/ubl-cmake.in deleted file mode 120000 index 393ccdb..0000000 --- a/ubl-utils/ubl-cmake.in +++ /dev/null @@ -1 +0,0 @@ -/home/superadmin/Документы/libublsettings-ui/source/ubl-cmake.in \ No newline at end of file diff --git a/ubl-utils/ubl-utils.c b/ubl-utils/ubl-utils.c index dccd9cf..95c5662 100644 --- a/ubl-utils/ubl-utils.c +++ b/ubl-utils/ubl-utils.c @@ -1169,14 +1169,8 @@ void yon_launch(char *command) // Gtk functions - -#ifdef __GTK_H__ - - static render_data render; -#ifdef VTE_TERMINAL - static void child_ready(VteTerminal *terminal, GPid pid, GError *error, gpointer user_data) { if (!terminal) return; @@ -1271,7 +1265,6 @@ void yon_terminal_integrated_start(GtkWidget *terminal, char* command, void *end vte_terminal_set_scroll_on_keystroke(VTE_TERMINAL(terminal), TRUE); gtk_widget_show_all(terminal); } -#endif // Window config functions @@ -1925,8 +1918,6 @@ void yon_ubl_setup_sockets(GtkWidget *main_window, GtkWidget *left_window, GtkWi } } -#ifdef WEBKIT_FOUND - void yon_ubl_browser_window_open(char *link, char *browser_window_name){ GtkWidget *browser=gtk_window_new(GTK_WINDOW_TOPLEVEL); GtkWidget *web_place=gtk_box_new(GTK_ORIENTATION_VERTICAL,0); @@ -1942,16 +1933,4 @@ void yon_ubl_browser_window_open(char *link, char *browser_window_name){ webkit_web_view_load_uri(WEBKIT_WEB_VIEW(WebView),link); gtk_box_pack_start(GTK_BOX(web_place),WebView,1,1,0); gtk_widget_show_all(browser); -} -#else - -void yon_ubl_browser_window_open(char *link, char *browser_window_name){ - char *user=getenv("SUDO_USER"); - if (!user) - user=getlogin(); - char *command=yon_char_unite("sudo -u ",user," xdg-open ", link,NULL); - yon_launch_app(command); -} -#endif - -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/ubl-utils/ubl-utils.h b/ubl-utils/ubl-utils.h index 61edb75..059aaf1 100644 --- a/ubl-utils/ubl-utils.h +++ b/ubl-utils/ubl-utils.h @@ -17,10 +17,7 @@ #include #include -#include "../compile/ubl-cmake.h" -#ifdef WEBKIT_FOUND - #include -#endif + #include #define DesktopPath "/usr/share/applications/" /**for_dictionaries(element, stack) @@ -38,9 +35,7 @@ typedef enum { - #ifdef __GTK_H__ DICTIONARY_GTK_WIDGETS_TYPE, - #endif DICTIONARY_OTHER_TYPE=0, DICTIONARY_CHAR_TYPE, DICTIONARY_INT_TYPE, @@ -651,7 +646,7 @@ int yon_config_set(char *key, void *data); * [RU] * Производит поиск по конфигу и дополняет значение параметра с ключом [key] значением [data]; */ -int yon_config_append(char *key, char *data) +int yon_config_append(char *key, char *data); /**yon_config_clean() * [EN] @@ -714,9 +709,6 @@ void yon_launch(char *command); // Gtk functions -#ifdef __GTK_H__ -#ifdef VTE_TERMINAL - /** * void yon_terminal_integrated_launch(GtkWidget *place_to_show, void *endwork_function, void* endwork_function_argument) * [EN] @@ -742,8 +734,6 @@ void yon_terminal_integrated_launch(GtkWidget *place_to_show, char* command, voi */ void yon_terminal_integrated_start(GtkWidget *terminal, char* command, void *endwork_function, void* endwork_function_argument); -#endif - /**YON_TYPE * [EN] * @@ -755,8 +745,7 @@ enum YON_TYPE{ YON_TYPE_STRING_LIST, YON_TYPE_INT, YON_TYPE_BOOLEAN, - YON_TYPE_OTHER -}; + YON_TYPE_OTHER}; /**yon_gtk_builder_get_widget(builder, widget_name) * [EN] @@ -1090,7 +1079,6 @@ void _yon_ubl_header_setup_resource(GtkWidget *Overlay, GtkWidget *Head, GtkWidg * [socket_right_id] - id сокета для [right_window]. */ void yon_ubl_setup_sockets(GtkWidget *main_window, GtkWidget *left_window, GtkWidget *right_window, int socket_main_id, int socket_left_id, int socket_right_id); -#ifdef WEBKIT_FOUND /**yon_ubl_browser_window_open(char *link, char *browser_window_name) * [EN] @@ -1099,16 +1087,4 @@ void yon_ubl_setup_sockets(GtkWidget *main_window, GtkWidget *left_window, GtkWi * Открывает встроенный браузер с именем [browser_window_name] и показываемой страницей по ссылке [link] */ void yon_ubl_browser_window_open(char *link, char *browser_window_name); -#else -/**yon_ubl_browser_window_open(char *link, char *browser_window_name) - * [EN] - * Launches browser with [link]. - * [browser_window_name] is't used. It's needed for compatibility with webkit version of that function. - * [RU] - * Открывает браузер со страницей по ссылке [link] - * [browser_window_name] не используется. Нужна для совместимости с webkit версией этой функции. -*/ -void yon_ubl_browser_window_open(char *link, char *browser_window_name); -#endif -#endif #endif \ No newline at end of file diff --git a/ubl-utils/ubl-utils.pc.in b/ubl-utils/ubl-utils.pc.in deleted file mode 100644 index a170ac9..0000000 --- a/ubl-utils/ubl-utils.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -Name: @PROJECT_NAME@ -Description: @PROJECT_DESCRIPTION@ -Version: @PROJECT_VERSION@ -Requires: -Libs: -L${libdir} -l@PROJECT_NAME@ -Cflags: -I${includedir} \ No newline at end of file diff --git a/ublsettings-ui.desktop b/ublsettings-ui.desktop deleted file mode 100644 index d82afc3..0000000 --- a/ublsettings-ui.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=TEMPLATE Manager -Name[ru]=TEMPLATE -GenericName=ublsettings-ui -GenericName[ru]=TEMPLATE -Comment=TEMPLATE management app -Comment[ru]=Приложение для TEMPLATE -Type=Application -Exec=pkexec ublsettings-ui -Icon=com.ublinux.ublsettings-ui -Terminal=false -X-XfcePluggable=true -X-UBLPluggable=true -Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;X-UBL-SettingsManager;X-UBL-Personal-Settings;