From 94ee1a6c6403db718a65f699374d7957c931f6da Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 29 Jan 2024 12:40:24 +0600 Subject: [PATCH] Added icons for buttons --- Makefile | 2 + ...l-settings-services.important-symbolic.svg | 55 +++++++++++++++++++ ....ubl-settings-services.lookup-symbolic.svg | 55 +++++++++++++++++++ source/ubl-settings-services.c | 23 ++++---- ubl-settings-services.css | 6 -- ubl-settings-services.glade | 4 +- 6 files changed, 128 insertions(+), 17 deletions(-) create mode 100644 icons/com.ublinux.ubl-settings-services.important-symbolic.svg create mode 100644 icons/com.ublinux.ubl-settings-services.lookup-symbolic.svg diff --git a/Makefile b/Makefile index 50a853c..5e79ef1 100644 --- a/Makefile +++ b/Makefile @@ -133,6 +133,8 @@ install: check uninstall @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.stop-symbolic.svg" @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.uncheck-symbolic.svg" @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.launch-symbolic.svg" + @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.important-symbolic.svg" + @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.lookup-symbolic.svg" @install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \ diff --git a/icons/com.ublinux.ubl-settings-services.important-symbolic.svg b/icons/com.ublinux.ubl-settings-services.important-symbolic.svg new file mode 100644 index 0000000..ff8d4b3 --- /dev/null +++ b/icons/com.ublinux.ubl-settings-services.important-symbolic.svg @@ -0,0 +1,55 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/icons/com.ublinux.ubl-settings-services.lookup-symbolic.svg b/icons/com.ublinux.ubl-settings-services.lookup-symbolic.svg new file mode 100644 index 0000000..f442cd0 --- /dev/null +++ b/icons/com.ublinux.ubl-settings-services.lookup-symbolic.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c index c664547..021e110 100644 --- a/source/ubl-settings-services.c +++ b/source/ubl-settings-services.c @@ -72,16 +72,16 @@ void yon_terminal_integrated_start(GtkWidget *terminal, char* command, void *end child_ready, install_command); vte_pty_spawn_async(pty, - NULL, - commands, - NULL, - 0, - NULL, NULL, - NULL, - -1, - NULL, - NULL, - NULL); + NULL, + commands, + NULL, + 0, + NULL, NULL, + NULL, + -1, + NULL, + NULL, + NULL); vte_terminal_set_scrollback_lines(VTE_TERMINAL(terminal), -1); vte_terminal_set_scroll_on_output(VTE_TERMINAL(terminal), TRUE); vte_terminal_set_scroll_on_keystroke(VTE_TERMINAL(terminal), TRUE); @@ -315,6 +315,9 @@ void on_type_changed(GtkWidget *self, main_window *widgets){ void on_service_update(GtkWidget *self, terminal_window* window){ if (self){}; yon_terminal_integrated_start(window->SystemTerminal,service_info_command(window->target),NULL,NULL); + GdkRGBA rgba; + vte_terminal_get_color_background_for_draw(VTE_TERMINAL(window->SystemTerminal),&rgba); + vte_terminal_set_color_cursor(VTE_TERMINAL(window->SystemTerminal),&rgba); } void on_search(){ diff --git a/ubl-settings-services.css b/ubl-settings-services.css index 88e8c57..5853948 100644 --- a/ubl-settings-services.css +++ b/ubl-settings-services.css @@ -49,19 +49,16 @@ background:transparent; .menuitemtop>*{ margin:2px 2px 0 2px; padding: 3px 10px 3px 5px; - /* padding: 5px 0px 3px 5px; */ border:transparent; } .menuitemmiddle>*{ margin:0 2px 0 2px; padding: 3px 10px 3px 5px; - /* padding: 3px 0px 3px 5px; */ border:transparent; } .menuitembottom>*{ margin:0 2px 2px 2px; padding: 3px 10px 3px 5px; - /* padding: 3px 0px 5px 5px; */ } .menuitemtop:hover { background:@theme_bg_color; @@ -87,21 +84,18 @@ background:transparent; .menuitemtop:hover>* { margin:2px 2px 0 2px; padding: 3px 10px 3px 5px; - /* padding: 5px 0 3px 5px; */ background:@theme_selected_bg_color; border-radius:2px; } .menuitemmiddle:hover>* { margin:0 2px 0px 2px; padding: 3px 10px 3px 5px; - /* padding: 3px 0px 3px 5px; */ background:@theme_selected_bg_color; border-radius:2px; } .menuitembottom:hover>* { margin:0 2px 2px 2px; padding: 3px 10px 3px 5px; - /* padding: 3px 0px 5px 5px; */ background:@theme_selected_bg_color; border-radius:2px; } diff --git a/ubl-settings-services.glade b/ubl-settings-services.glade index dbbb622..4b2b7b1 100644 --- a/ubl-settings-services.glade +++ b/ubl-settings-services.glade @@ -31,10 +31,12 @@ True False + com.ublinux.ubl-settings-services.important-symbolic True False + com.ublinux.ubl-settings-services.lookup-symbolic True @@ -333,7 +335,7 @@ fixed - Confugure in system + Configure in system