diff --git a/source/ubl-util-standard.c b/source/ubl-util-standard.c index 8cff122..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,10 +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),"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); @@ -64,6 +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),"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/source/ublexec.cc b/source/ublexec.cc index ded2387..0f1f89f 100644 --- a/source/ublexec.cc +++ b/source/ublexec.cc @@ -135,8 +135,12 @@ void MainWindow::add_CSS() { 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(); + Glib::RefPtr boxAbout_css = boxAbout->get_style_context(); context_box->add_class("cssboxColor1"); context_lbl_head->add_class("textHead"); + if (socket_ext_id_I == 0){ + boxAbout_css->add_class("bkim_no_plug"); + } } void MainWindow::localization() { @@ -289,8 +293,10 @@ bool MainWindow::focus_in_txt_cmd(GdkEventFocus* event) { if (user_cmd.length() != 0) { } else if (name_app.length() != 0) { + name_app = ""; } else if (path_file.length() != 0) { + path_file = ""; } else{ user_cmd = txtCmd->get_text(); diff --git a/source/ublexec.h b/source/ublexec.h index 76b8c0f..241033e 100755 --- a/source/ublexec.h +++ b/source/ublexec.h @@ -200,8 +200,8 @@ public: Glib::RefPtr list_System; Gtk::Widget *boxAbout; public: - string termunal_bin[3] = {"konsole","xfce4-terminal","xterm"}; - string termunal_cmd[3] = {"konsole -e ","xfce4-terminal -x ","xterm -e "}; + string termunal_bin[3] = {"konsole", "xfce4-terminal", "xterm"}; + string termunal_cmd[3] = {"konsole -e ", "xfce4-terminal -x ", "xterm -e "}; string version_application = "1.0"; string cmd_old = ""; string user_exec_app = ""; diff --git a/style.css b/style.css index 169a838..4c2255e 100644 --- a/style.css +++ b/style.css @@ -1,63 +1,77 @@ .cssboxColor1{ background: url("/usr/share/ublexec/images/bg_top.png") no-repeat; } +.boxInfoMessOK{ + background-color: #f3f0ac; +} .textHead{ - text-shadow: 1px 1px #ffffff; + text-shadow: 1px 1px #ffffff; +} +.textHeaderBar{ + font-weight: bold; +} +.menu:hover { +border-color:alpha(@theme_text_color, 0.01); +} + +.menu:hover >* { +border-color:alpha(@theme_text_color, 0.01); +} + +.menuitemtop{ +margin-bottom:0px; } .menuitemtop *{ - margin:2px 2px 0 2px; - padding: 5px 10px 3px 5px; +margin:2px 2px 0 2px; +padding: 5px 10px 3px 5px; } .menuitemmiddle *{ - margin:0 2px 0 2px; - padding: 3px 10px 3px 5px; +margin:0 2px 0 2px; +padding: 3px 10px 3px 5px; } .menuitembottom *{ - margin:0 2px 2px 2px; - padding: 3px 10px 5px 5px; +margin:0 2px 2px 2px; +padding: 3px 10px 5px 5px; } .menuitemtop:hover { - border-radius:3px; - background:@theme_bg_color; +background:@theme_bg_color; } .menuitemmiddle:hover { - border-radius:3px; - background:@theme_bg_color; +background:@theme_bg_color; } .menuitembottom:hover { - border-radius:3px; - background:@theme_bg_color; - +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; +margin:2px 2px 0 2px; +padding: 5px 10px 3px 5px; +background:@theme_selected_bg_color; +border-radius:2px; } .menuitemmiddle:hover* { - border-radius:3px; - margin:0 2px 0 2px; - padding: 3px 10px 3px 5px; - background:@theme_selected_bg_color; - border-color:transparent; +margin:0 2px 0 2px; +padding: 3px 10px 3px 5px; +background:@theme_selected_bg_color; +border-radius:2px; } .menuitembottom:hover* { - border-radius:3px; - margin:0 2px 2px 2px; - padding: 3px 10px 5px 5px; - background:@theme_selected_bg_color; - border-color:transparent; +margin:0 2px 2px 2px; +padding: 3px 10px 5px 5px; +background:@theme_selected_bg_color; +border-radius:2px; } -.menuitembottom{ - margin-top:0px; + +.noborder{ +border:none; } -.menuitemmiddle{ - margin-top:0px; - margin-bottom:0px; + +.bkim{ +opacity:0.99; +border:none; } -.menuitemtop{ - margin-bottom:0px; +.bkim_no_plug{ +background-color: transparent; +opacity:0.99; } \ No newline at end of file diff --git a/ublexec.glade b/ublexec.glade index 15d82f0..a43e408 100644 --- a/ublexec.glade +++ b/ublexec.glade @@ -63,7 +63,7 @@ 10 - 450 + 410 240 False ru.ublinux.ublexec @@ -920,6 +920,12 @@ True True True + 5 + 5 + 5 + 5 + 6 + 6 True @@ -933,6 +939,12 @@ True True True + 5 + 5 + 5 + 5 + 6 + 6 True