Applications
/
libublsettings
10
0
Fork 1
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

deletion of old files

Browse Source
pull/1/head
Ivan Dmitrievich Yartsev 2 years ago
parent 497d5e677b
commit 3d8c7b2baf
13 changed files with 10 additions and 130 deletions
Show Stats Download Patch File Download Diff File

2
Makefile
Unescape View File

@ -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"; \ 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 done
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" @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 \ @if [ -z ${DESTDIR} ]; then \
[ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ [ -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; \ update-desktop-database --quiet &>/dev/null || true; \

24
com.ublinux.ublsettings-ui.policy
Unescape View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policyconfig PUBLIC
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
<policyconfig>
<vendor>UBLinux</vendor>
<vendor_url>https://ublinux.ru</vendor_url>
<action id="com.ublinux.ublsettings-ui.run">
<description>Run ublsettings-ui as root</description>
<description xml:lang="ru">Запуск утилиты ublsettings-ui с правами root</description>
<message>Authentication is required to run ublsettings-ui</message>
<message xml:lang="ru">Требуется авторизация для запуска утилиты ublsettings-ui с правами root</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
<allow_active>auth_admin</allow_active>
</defaults>
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/ublsettings-ui</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
</action>
</policyconfig>

2
gresource.xml
Unescape View File

@ -11,5 +11,7 @@
</gresource> </gresource>
<gresource prefix="/com/ublinux/images"> <gresource prefix="/com/ublinux/images">
<file>ublsettings-ui-banner.png</file> <file>ublsettings-ui-banner.png</file>
<file>com.ublinux.ublsettings-ui.checked.svg</file>
<file>com.ublinux.ublsettings-ui.warning.svg</file>
</gresource> </gresource>
</gresources> </gresources>

12
source/CMakeLists.txt
Unescape View File

@ -25,10 +25,6 @@ if(WEBKIT_LIBRARIES_FOUND)
add_definitions(${WEBKIT_CFLAGS_OTHER}) add_definitions(${WEBKIT_CFLAGS_OTHER})
endif() 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_C resources.c)
set(GRESOURCE_XML gresource.xml) set(GRESOURCE_XML gresource.xml)
@ -43,6 +39,8 @@ set(DEPENDFILES
../gresource.xml ../gresource.xml
../ublsettings-ui-banner.png ../ublsettings-ui-banner.png
../ublsettings-ui.css ../ublsettings-ui.css
../com.ublinux.ublsettings-ui.checked.svg
../com.ublinux.ublsettings-ui.warning.svg
) )
file(COPY ${DEPENDFILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) file(COPY ${DEPENDFILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
@ -99,8 +97,4 @@ install(TARGETS ${PROJECT_NAME}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 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.
# Set pkg-config file to install.
install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)

1
source/ubl-cmake.in
Unescape View File

@ -1 +0,0 @@
#cmakedefine WEBKIT_FOUND

3
source/ublsettings-ui.h
Unescape View File

@ -8,10 +8,7 @@
#include <libintl.h> #include <libintl.h>
#include <getopt.h> #include <getopt.h>
#include <libintl.h> #include <libintl.h>
#include "../compile/ubl-cmake.h"
#ifdef WEBKIT_FOUND
#include <webkit2/webkit2.h> #include <webkit2/webkit2.h>
#endif
#define ui_WIKI_LINK "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ublsettings-ui" #define ui_WIKI_LINK "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ublsettings-ui"

10
source/ublsettings-ui.pc.in
Unescape View File

@ -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}

7
ubl-utils/CMakeLists.txt
Unescape View File

@ -25,7 +25,6 @@ if(WEBKIT_LIBRARIES_FOUND)
add_definitions(${WEBKIT_CFLAGS_OTHER}) add_definitions(${WEBKIT_CFLAGS_OTHER})
endif() 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 -std=c++2a")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -lm") #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} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} 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.
# Set pkg-config file to install.
install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)

1
ubl-utils/ubl-cmake.in
Unescape View File

@ -1 +0,0 @@
/home/superadmin/Документы/libublsettings-ui/source/ubl-cmake.in

23
ubl-utils/ubl-utils.c
Unescape View File

@ -1169,14 +1169,8 @@ void yon_launch(char *command)
// Gtk functions // Gtk functions
#ifdef __GTK_H__
static render_data render; static render_data render;
#ifdef VTE_TERMINAL
static void child_ready(VteTerminal *terminal, GPid pid, GError *error, gpointer user_data) static void child_ready(VteTerminal *terminal, GPid pid, GError *error, gpointer user_data)
{ {
if (!terminal) return; 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); vte_terminal_set_scroll_on_keystroke(VTE_TERMINAL(terminal), TRUE);
gtk_widget_show_all(terminal); gtk_widget_show_all(terminal);
} }
#endif
// Window config functions // 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){ void yon_ubl_browser_window_open(char *link, char *browser_window_name){
GtkWidget *browser=gtk_window_new(GTK_WINDOW_TOPLEVEL); GtkWidget *browser=gtk_window_new(GTK_WINDOW_TOPLEVEL);
GtkWidget *web_place=gtk_box_new(GTK_ORIENTATION_VERTICAL,0); 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); webkit_web_view_load_uri(WEBKIT_WEB_VIEW(WebView),link);
gtk_box_pack_start(GTK_BOX(web_place),WebView,1,1,0); gtk_box_pack_start(GTK_BOX(web_place),WebView,1,1,0);
gtk_widget_show_all(browser); 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

30
ubl-utils/ubl-utils.h
Unescape View File

@ -17,10 +17,7 @@
#include <vte/vte.h> #include <vte/vte.h>
#include <time.h> #include <time.h>
#include "../compile/ubl-cmake.h" #include <webkit2/webkit2.h>
#ifdef WEBKIT_FOUND
#include <webkit2/webkit2.h>
#endif
#define DesktopPath "/usr/share/applications/" #define DesktopPath "/usr/share/applications/"
/**for_dictionaries(element, stack) /**for_dictionaries(element, stack)
@ -38,9 +35,7 @@
typedef enum typedef enum
{ {
#ifdef __GTK_H__
DICTIONARY_GTK_WIDGETS_TYPE, DICTIONARY_GTK_WIDGETS_TYPE,
#endif
DICTIONARY_OTHER_TYPE=0, DICTIONARY_OTHER_TYPE=0,
DICTIONARY_CHAR_TYPE, DICTIONARY_CHAR_TYPE,
DICTIONARY_INT_TYPE, DICTIONARY_INT_TYPE,
@ -651,7 +646,7 @@ int yon_config_set(char *key, void *data);
* [RU] * [RU]
* Производит поиск по конфигу и дополняет значение параметра с ключом [key] значением [data]; * Производит поиск по конфигу и дополняет значение параметра с ключом [key] значением [data];
*/ */
int yon_config_append(char *key, char *data) int yon_config_append(char *key, char *data);
/**yon_config_clean() /**yon_config_clean()
* [EN] * [EN]
@ -714,9 +709,6 @@ void yon_launch(char *command);
// Gtk functions // Gtk functions
#ifdef __GTK_H__
#ifdef VTE_TERMINAL
/** /**
* void yon_terminal_integrated_launch(GtkWidget *place_to_show, void *endwork_function, void* endwork_function_argument) * void yon_terminal_integrated_launch(GtkWidget *place_to_show, void *endwork_function, void* endwork_function_argument)
* [EN] * [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); void yon_terminal_integrated_start(GtkWidget *terminal, char* command, void *endwork_function, void* endwork_function_argument);
#endif
/**YON_TYPE /**YON_TYPE
* [EN] * [EN]
* *
@ -755,8 +745,7 @@ enum YON_TYPE{
YON_TYPE_STRING_LIST, YON_TYPE_STRING_LIST,
YON_TYPE_INT, YON_TYPE_INT,
YON_TYPE_BOOLEAN, YON_TYPE_BOOLEAN,
YON_TYPE_OTHER YON_TYPE_OTHER};
};
/**yon_gtk_builder_get_widget(builder, widget_name) /**yon_gtk_builder_get_widget(builder, widget_name)
* [EN] * [EN]
@ -1090,7 +1079,6 @@ void _yon_ubl_header_setup_resource(GtkWidget *Overlay, GtkWidget *Head, GtkWidg
* [socket_right_id] - id сокета для [right_window]. * [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); 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) /**yon_ubl_browser_window_open(char *link, char *browser_window_name)
* [EN] * [EN]
@ -1099,16 +1087,4 @@ void yon_ubl_setup_sockets(GtkWidget *main_window, GtkWidget *left_window, GtkWi
* Открывает встроенный браузер с именем [browser_window_name] и показываемой страницей по ссылке [link] * Открывает встроенный браузер с именем [browser_window_name] и показываемой страницей по ссылке [link]
*/ */
void yon_ubl_browser_window_open(char *link, char *browser_window_name); 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 #endif

10
ubl-utils/ubl-utils.pc.in
Unescape View File

@ -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}

15
ublsettings-ui.desktop
Unescape View File

@ -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;
Write Preview
Loading…
Cancel
Save