From 306e00b7764a25aab2d5126217b464d8ee1264e1 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 27 Mar 2023 09:20:39 +0600 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20logo-background.png?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 4 +- bg_top.png => logo-background.png | Bin source/ubl-settings-bootloader.cc | 22 +++-- source/ubl-settings-bootloader.h | 3 + source/ubl-util-standard.c | 25 ++++-- style.css | 89 ------------------- ubl-settings-bootloader.css | 143 ++++++++++++++++++++++++++++++ ubl-settings-bootloader.glade | 91 +++++++++++-------- 8 files changed, 237 insertions(+), 140 deletions(-) rename bg_top.png => logo-background.png (100%) delete mode 100644 style.css create mode 100644 ubl-settings-bootloader.css diff --git a/Makefile b/Makefile index fc5b27c..226c241 100644 --- a/Makefile +++ b/Makefile @@ -111,8 +111,8 @@ install: check uninstall @install -Dm644 -t /usr/share/polkit-1/actions/ com.ublinux.pkexec.${PKGNAME}.exec.policy @install -dm755 /usr/share/${PKGNAME}/{ui,css,images} @install -Dm644 -t /usr/share/${PKGNAME}/ui/ ${PKGNAME}.glade - @install -Dm644 -t /usr/share/${PKGNAME}/css/ style.css - @install -Dm644 -t /usr/share/${PKGNAME}/images/ bg_top.png + @install -Dm644 -t /usr/share/${PKGNAME}/css/ ubl-settings-bootloader.css + @install -Dm644 -t /usr/share/${PKGNAME}/images/ logo-background.png # @install -Dm644 -t /usr/share/${PKGNAME}/images/ ${PKGNAME}.svg # @install -Dm644 -t /usr/share/${PKGNAME}/images/ ${PKGNAME}.png @install -Dm644 -t /usr/share/${PKGNAME}/ boot-options.csv diff --git a/bg_top.png b/logo-background.png similarity index 100% rename from bg_top.png rename to logo-background.png diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index c741732..093418c 100644 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -4,9 +4,10 @@ using namespace std; string path_app = "/usr/bin/"; string path_glade= "/usr/share/ubl-settings-bootloader/ui/ubl-settings-bootloader.glade"; -string path_css = "/usr/share/ubl-settings-bootloader/css/style.css"; +string path_css = "/usr/share/ubl-settings-bootloader/css/ubl-settings-bootloader.css"; string app_name = "ubl-settings-bootloader"; string path_resources = "/usr/share/ubl-settings-bootloader"; +const string path_img_head_background = "/usr/share/ubl-settings-bootloader/images/logo-background.png"; int socket_ext_id_I = 0; int socket_trd_id_I = 0; @@ -70,7 +71,9 @@ void MainWindow::settings(){ this->get_builder(); this->localization(); this->add_CSS(); - + Gtk::Widget *boxWidget; + builder->get_widget("boxColor", boxWidget); + overHead->add_overlay(*boxWidget); btnBoxAboutDialog->set_visible(false); ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I); if (this->check_root() == 0) { @@ -215,6 +218,8 @@ void MainWindow::get_builder(){ builder->get_widget("treeViewKernel", treeViewKernel); builder->get_widget("treeViewOTT", treeViewOTT); builder->get_widget("treeViewIPT", treeViewIPT); + builder->get_widget("imgBG", imgBG); + builder->get_widget("overHead", overHead); } void MainWindow::localization(){ @@ -427,10 +432,15 @@ void MainWindow::add_CSS(){ Glib::RefPtr styleContext = Gtk::StyleContext::create(); Glib::RefPtr screen = Gdk::Screen::get_default();//get default screen styleContext->add_provider_for_screen(screen, cssProvider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);//add provider for screen in all application - Glib::RefPtr context_box = boxColor->get_style_context(); - Glib::RefPtr context_lbl_head = lblInfoHead->get_style_context(); - context_box->add_class("cssboxColor1"); - context_lbl_head->add_class("textHead"); + Glib::RefPtr lblInfoHead_css = lblInfoHead->get_style_context(); + Glib::RefPtr boxButton_css = boxButton->get_style_context(); + Glib::RefPtr boxSave_css = boxSave->get_style_context(); + imgBG->set(path_img_head_background); + if (socket_trd_id_I == 0 && socket_ext_id_I == 0){ + boxButton_css->add_class("bkim_no_plug"); + boxSave_css->add_class("bkim_no_plug"); + } + lblInfoHead_css->add_class("textHead"); } diff --git a/source/ubl-settings-bootloader.h b/source/ubl-settings-bootloader.h index 5dc222b..e2e8f66 100644 --- a/source/ubl-settings-bootloader.h +++ b/source/ubl-settings-bootloader.h @@ -21,6 +21,7 @@ extern string path_glade; extern string path_css; extern int socket_ext_id_I; extern int socket_trd_id_I; +extern const string path_img_head_background; void me_thread(string cmd); class CmdArgParser : public Glib::OptionGroup { @@ -89,6 +90,8 @@ class MainWindow : public Gtk::ApplicationWindow { Gtk::TreeView *treeViewKernel; Gtk::TreeView *treeViewIPT; Gtk::TreeView *treeViewOTT; + Gtk::Image *imgBG; + Gtk::Overlay *overHead; Glib::RefPtr list_store_kernel; Glib::RefPtr list_store_IPT; diff --git a/source/ubl-util-standard.c b/source/ubl-util-standard.c index f922043..3b753b1 100644 --- a/source/ubl-util-standard.c +++ b/source/ubl-util-standard.c @@ -44,6 +44,14 @@ inline void ubl_make_plugs(Gtk::Widget *LeftWidget, Gtk::Widget *RightWidget, in if (left_plug_id>0&&LeftWidget){ GtkWidget *plug=gtk_plug_new(left_plug_id); GtkWidget *toplug=GTK_WIDGET(LeftWidget->gobj()); + {GdkScreen *screen = gtk_widget_get_screen(plug); + gtk_widget_set_app_paintable(plug,TRUE); + GdkVisual *colormap = gdk_screen_get_rgba_visual(screen); + gtk_widget_set_visual(plug, colormap);} + {GdkScreen *screen = gtk_widget_get_screen(toplug); + gtk_widget_set_app_paintable(toplug,TRUE); + GdkVisual *colormap = gdk_screen_get_rgba_visual(screen); + gtk_widget_set_visual(toplug, colormap);} if (gtk_widget_get_parent(GTK_WIDGET(toplug))){ g_object_ref(G_OBJECT(toplug)); GtkWidget *parent=gtk_widget_get_parent(toplug); @@ -52,13 +60,21 @@ inline void ubl_make_plugs(Gtk::Widget *LeftWidget, Gtk::Widget *RightWidget, in } else gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug)); gtk_widget_show(GTK_WIDGET(plug)); - gtk_style_context_add_class(gtk_widget_get_style_context(plug),"bkimButtonPlug"); - gtk_style_context_add_class(gtk_widget_get_style_context(plug),"noborder"); + gtk_style_context_add_class(gtk_widget_get_style_context(plug),"bkim"); + gtk_style_context_add_class(gtk_widget_get_style_context(toplug),"bkim"); gtk_style_context_add_class(gtk_widget_get_style_context(plug),"primary-toolbar"); } if (right_plug_id>0&&RightWidget){ GtkWidget *plug=gtk_plug_new(right_plug_id); GtkWidget *toplug=GTK_WIDGET(RightWidget->gobj()); + {GdkScreen *screen = gtk_widget_get_screen(plug); + gtk_widget_set_app_paintable(plug,TRUE); + GdkVisual *colormap = gdk_screen_get_rgba_visual(screen); + gtk_widget_set_visual(plug, colormap);} + {GdkScreen *screen = gtk_widget_get_screen(toplug); + gtk_widget_set_app_paintable(toplug,TRUE); + GdkVisual *colormap = gdk_screen_get_rgba_visual(screen); + gtk_widget_set_visual(toplug, colormap);} if (gtk_widget_get_parent(GTK_WIDGET(toplug))){ g_object_ref(G_OBJECT(toplug)); GtkWidget *parent=gtk_widget_get_parent(toplug); @@ -67,10 +83,9 @@ inline void ubl_make_plugs(Gtk::Widget *LeftWidget, Gtk::Widget *RightWidget, in } else gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug)); gtk_widget_show(GTK_WIDGET(plug)); - gtk_style_context_add_class(gtk_widget_get_style_context(plug),"bkimButtonPlug"); - gtk_style_context_add_class(gtk_widget_get_style_context(plug),"noborder"); + gtk_style_context_add_class(gtk_widget_get_style_context(plug),"bkim"); + gtk_style_context_add_class(gtk_widget_get_style_context(toplug),"bkim"); gtk_style_context_add_class(gtk_widget_get_style_context(plug),"primary-toolbar"); - } } #endif \ No newline at end of file diff --git a/style.css b/style.css deleted file mode 100644 index 3fdf619..0000000 --- a/style.css +++ /dev/null @@ -1,89 +0,0 @@ -.boxInfoMessError{ - background-color: #ea9999; -} -.cssboxColor1{ - background: url("/usr/share/ubl-settings-datetime/images/bg_top.png") no-repeat; -} -.boxInfoMessOK{ - background-color: #f3f0ac; -} -.textHead{ - text-shadow: 1px 1px #ffffff; -} -.textHeaderBar{ - font-weight: bold; -} -.menuitemtop *{ - margin:2px 2px 0 2px; - padding: 5px 10px 3px 5px; -} -.menuitemmiddle *{ - margin:0 2px 0 2px; - padding: 3px 10px 3px 5px; -} -.menuitembottom *{ - margin:0 2px 2px 2px; - padding: 3px 10px 5px 5px; -} -.menuitemtop:hover { - border-radius:3px; - background:@theme_bg_color; -} -.menuitemmiddle:hover { - border-radius:3px; - background:@theme_bg_color; -} -.menuitembottom:hover { - border-radius:3px; - background:@theme_bg_color; - -} -.menuitemtop:hover* { - border-radius:3px; - margin:2px 2px 0 2px; - padding: 5px 10px 3px 5px; - background:@theme_selected_bg_color; - border-color:transparent; -} -.menuitemmiddle:hover* { - border-radius:3px; - margin:0 2px 0 2px; - padding: 3px 10px 3px 5px; - background:@theme_selected_bg_color; - border-color:transparent; -} -.menuitembottom:hover* { - border-radius:3px; - margin:0 2px 2px 2px; - padding: 3px 10px 5px 5px; - background:@theme_selected_bg_color; - border-color:transparent; -} -.menuitembottom{ - margin-top:0px; -} -.menuitemmiddle{ - margin-top:0px; - margin-bottom:0px; -} - -.menuitemtop{ - margin-bottom:0px; -} - -.bkimHeadBar{ - opacity:1.0; -} - -.bkimButton{ - background-color: transparent; - opacity:1.0; -} -.bkimButtonPlug{ - background-color: transparent; - color: rgb(0, 0, 0); - opacity:1.0; -} -.noborder{ - border:none; -} \ No newline at end of file diff --git a/ubl-settings-bootloader.css b/ubl-settings-bootloader.css new file mode 100644 index 0000000..b762407 --- /dev/null +++ b/ubl-settings-bootloader.css @@ -0,0 +1,143 @@ +.textHead{ + text-shadow: 2px 2px @theme_bg_color; + color: @theme_text_color; +} +.bannerbackground { + background-color: #404040; +} +.textHead{ + text-shadow: 1px 1px #ffffff; +} +.view_app { + background-color: @theme_bg_color; +} +.view_app.view.cell:selected { + background-color:@theme_selected_bg_color; + color:@theme_selected_text_color; + transition: 10ms ease-out; + border-radius: 3px; +} +#GnomeIcon{ + border-style:solid; + border-bottom-width: 1px; + border-image: linear-gradient(90deg, alpha(@theme_text_color,0.4) 55%, alpha(@theme_bg_color, 0) 100%); + border-image-slice: 1; +} + +#SepIcon{ + background-color: alpha(@theme_text_color, 0.6); +} + +#iconlabel { + font-size:14px; + font-weight: bold; + +} +.roundborder * { + border-width:0px; + border-radius:5px; +} +.noborder { + border: none; +} +.menu:hover { + border-color:alpha(@theme_text_color, 0.01); +} +.menu { + border-color:alpha(@theme_text_color, 0.01); +} +.menu:hover >* { + border-color:alpha(@theme_text_color, 0.01); +} +.menuitembottom{ + margin-top:0px; + margin-bottom:3px; +} +.menuitemmiddle{ + margin-top:0px; + margin-bottom:0px; +} + +.menuitemtop{ + margin-bottom:0px; +} +.menuitemtop *{ + margin:2px 2px 0 2px; + padding: 5px 10px 3px 5px; +} +.menuitemmiddle *{ + margin:0 2px 0 2px; + padding: 3px 10px 3px 5px; +} +.menuitembottom *{ + margin:0 2px 2px 2px; + padding: 3px 10px 5px 5px; +} +.menuitemtop:hover { + background:@theme_bg_color; + border-color:inherit; + border-left-width:inherit; + border-right-width:inherit; +} +.menuitemmiddle:hover { + background:@theme_bg_color; + border-color:inherit; + border-left-width:inherit; + border-right-width:inherit; +} +.menuitembottom:hover { + background:@theme_bg_color; + border-color:inherit; + border-left-width:inherit; + border-right-width:inherit; + +} +.menuitemtop:hover* { + margin:2px 2px 0 2px; + padding: 5px 10px 3px 5px; + background:@theme_selected_bg_color; + border-radius:2px; +} +.menuitemmiddle:hover* { + margin:0 2px 0 2px; + padding: 3px 10px 3px 5px; + background:@theme_selected_bg_color; + border-radius:2px; +} +.menuitembottom:hover* { + margin:0 2px 2px 2px; + padding: 3px 10px 5px 5px; + background:@theme_selected_bg_color; + border-radius:2px; +} + +.workingbg, #workingbg { + background-color:@theme_base_color; +} +.workingbg.view.cell:selected { + background-color:@theme_selected_bg_color; +} +.workingbg.view.cell:hover { + background-color:darker(@theme_selected_bg_color); + color:@theme_selected_text_color; + border-radius:3px; +} +.bkim { + transition: 200ms ease-out; + background-image: none; +} +.noborder{ +border:none; +} + +.bkim{ +opacity:0.99; +border:none; +} + +.bkim_no_plug{ +background-color: transparent; +opacity:0.99; +} + + diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index ad6223a..51737be 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -1,5 +1,5 @@ - + @@ -49,6 +49,54 @@ + + True + False + + + True + False + 5 + 5 + 5 + 5 + 6 + 6 + 69 + ublexec + + + False + True + 0 + + + + + True + False + start + 5 + 5 + 5 + 5 + 6 + 6 + Running applications as a user with a +specified priority + + + + + + + + True + True + 1 + + + True False @@ -201,51 +249,18 @@ - + True False - - True - False - 5 - 5 - 5 - 5 - 6 - 6 - 69 - ublexec - - - False - True - 0 - - - - + + 81 True False start - 5 - 5 - 5 - 5 - 6 - 6 - Running applications as a user with a -specified priority - - - - - - True - True - 1 + -1