Merge pull request 'master' (#6) from YanTheKaller/ubl-settings-info:master into develop

Reviewed-on: #6

source/ubl-settings-info.c

@@ -132,19 +132,21 @@ int main(int argc, char *argv[]){
 
     int socket_id=0;
     int socket_ext_id=0;
+    int socket_trd_id=0;
     int option_index=0;
     int textsize=0;
     int pointer=0;
     static struct option long_options[] = {
-            {"socket-id", 1, 0, 0},
-            {"socket-ext-id", 1, 0, 2},
+            {"socket-id", 1, 0, 's'},
+            {"socket-ext-id", 1, 0, 'e'},
+            {"socket-trd-id", 1, 0, 't'},
             };
     int socket_find;
     for (int i=0;i<argc;i++){
-        socket_find=getopt_long(argc,argv,"s:t:",long_options,&option_index);
-        if (socket_find==0) if (optarg!=NULL) socket_id=atoi(optarg); else socket_id=-1;
-        else if (socket_find=='s') if (optarg!=NULL) socket_id=atoi(optarg); else socket_id=-1;
-        else if (socket_find==2) if (optarg!=NULL) socket_ext_id=atoi(optarg); else socket_ext_id=-1;
+        socket_find=getopt_long(argc,argv,"s:t:e",long_options,&option_index);
+        if (socket_find=='s') if (optarg!=NULL) socket_id=atoi(optarg); else socket_id=-1;
+        else if (socket_find=='e') if (optarg!=NULL) socket_ext_id=atoi(optarg); else socket_ext_id=-1;
+        else if (socket_find=='t') if (optarg!=NULL) socket_trd_id=atoi(optarg); else socket_trd_id=-1;
     }
     printf("%d\n\n%d\n\n",socket_id,socket_ext_id);
     if (socket_id<1){

source/ubl-util-standard.c

@@ -9,6 +9,8 @@ inline returnstruct *ubl_make_plugs(GtkWidget *LeftWidget, GtkWidget *RightWidge
     if (left_plug_id>0&&LeftWidget){
         GtkWidget *plug=gtk_plug_new(left_plug_id);
         GtkWidget *toplug=LeftWidget;
+        gtk_widget_set_visual(plug,gdk_screen_get_rgba_visual(gtk_widget_get_screen(plug)));
+        gtk_widget_set_app_paintable(plug,1);
         if (gtk_widget_get_parent(GTK_WIDGET(toplug))){
             g_object_ref(G_OBJECT(toplug));
             GtkWidget *parent=gtk_widget_get_parent(toplug);
@@ -18,14 +20,16 @@ inline returnstruct *ubl_make_plugs(GtkWidget *LeftWidget, GtkWidget *RightWidge
             gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
         gtk_widget_show(GTK_WIDGET(plug));
         ret->plugLeft=plug;
-
-        GtkStyleContext *context = gtk_widget_get_style_context(plug);
-        gtk_style_context_add_class(context,"primary-toolbar");
+        gtk_style_context_add_class(gtk_widget_get_style_context(plug),"primary-toolbar");
         gtk_style_context_add_class(gtk_widget_get_style_context(toplug),"button");
+        gtk_style_context_add_class(gtk_widget_get_style_context(toplug),"opacited");
+        gtk_style_context_add_class(gtk_widget_get_style_context(toplug),"color");
     }
     if (right_plug_id>0&&RightWidget){
         GtkWidget *plug=gtk_plug_new(right_plug_id);
         GtkWidget *toplug=RightWidget;
+        gtk_widget_set_visual(plug,gdk_screen_get_rgba_visual(gtk_widget_get_screen(plug)));
+        gtk_widget_set_app_paintable(plug,1);
         if (gtk_widget_get_parent(GTK_WIDGET(toplug))){
             g_object_ref(G_OBJECT(toplug));
             GtkWidget *parent=gtk_widget_get_parent(toplug);
@@ -37,8 +41,9 @@ inline returnstruct *ubl_make_plugs(GtkWidget *LeftWidget, GtkWidget *RightWidge
         ret->plugRight=plug;
 
         GtkStyleContext *context = gtk_widget_get_style_context(plug);
-        gtk_style_context_add_class(context,"primary-toolbar");
-        gtk_style_context_add_class(gtk_widget_get_style_context(toplug),"button");
+        gtk_style_context_add_class(gtk_widget_get_style_context(plug),"primary-toolbar");
+        gtk_style_context_add_class(gtk_widget_get_style_context(toplug),"opacited");
+        gtk_style_context_add_class(gtk_widget_get_style_context(toplug),"color");
     }
     return ret;
 }

ubl-settings-info.css

@@ -13,10 +13,18 @@
                                     color-stop(0.85, @entry_background_c),
                                     to(@entry_background_d));
 }
+.opacited {
+	opacity:0.98;
+	border:none;
+	border-radius:0px;
+}
+.color {
+	background-color: inherit;
+}
 .menuitemsolo {
 	border-color:alpha(@theme_text_color, 0.4);
 	border-style:solid;
-	border-width:1px;
+	border-width:inherit;
 }
 .menuitemsolo *{
 	margin:0 2px 2px 2px;
@@ -24,6 +32,7 @@
 }
 .menuitemsolo:hover {
 	background:@theme_bg_color;
+	border:inherit;
 	
 }
 .menuitemsolo:hover* {

ubl-settings-info.desktop

@@ -11,5 +11,5 @@ Exec=ubl-settings-info
 Icon=com.ublinux.ubl-settings-info
 Terminal=false
 X-XfcePluggable=true
-X-UBlPluggable=true
+X-UBLPluggable=true
 Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;X-UBL-SettingsManager;X-UBL-SystemSettings;

ubl-settings-info.glade

@@ -300,6 +300,7 @@
         <child>
           <object class="GtkMenuButton" id="buttonSettings">
             <property name="visible">True</property>
+            <property name="app-paintable">True</property>
             <property name="can-focus">True</property>
             <property name="focus-on-click">False</property>
             <property name="receives-default">True</property>