Version in makefile, design changes

3 years ago · 362d53c90d
parent d1b9270630
commit 362d53c90d
6 changed files with 454 additions and 267 deletions
--- a/5
+++ b/5
@ -20,6 +20,11 @@ all: init build

 init:
 	@echo "Initialize ..."; \
+  	version="$$(cat VERSION.md)"; \
+  	version=$${version:8}; \
+  	search="s/string version_application.*$&"; \
+  	replace="string version_application = \"$${version}\";"; \
+  	sed -i -e "$$search/$$replace/gi" source/ubl-settings-datetime.h; \
  	echo "-- Build path: ${CMAKE_BUILD_DIR}"
        
 depend:
--- a/VERSION.md
+++ b/VERSION.md
@ -0,0 +1 @@
+string version_application = "1.1";
--- a/source/ubl-settings-manager.c
+++ b/source/ubl-settings-manager.c
@ -49,7 +49,7 @@ void on_plug_added(GtkSocket* self, actionWidgets *builder){
        
    // else
    //     gtk_widget_show(builder->appSettings);
-    if (builder->ButtonBackToMain!=NULL) gtk_widget_set_sensitive(builder->ButtonBackToMain,1);
+    if (builder->ButtonBackToMain!=NULL) gtk_widget_show(builder->ButtonBackToMain);
    gtk_widget_show(GTK_WIDGET(self));
    gtk_widget_show(builder->socketbuttonplace);
    gtk_widget_show(builder->ThirdSocketPlace);
@ -119,7 +119,7 @@ void on_gnome_Item_activated(GtkIconView* self, GtkTreePath* path, actionWidgets
        if (tempapp->Pluggable==1){
            
            if (tempapp->DualPluggable==1){
-                gtk_widget_hide(applist->appSettings);
+                //gtk_widget_hide(applist->appSettings);
                char *dualarg=malloc(strlen("--socket-id= --socket-ext-id= --socket-trd-id=")+30);
                sprintf(dualarg,"--socket-id=%d --socket-ext-id=%d --socket-trd-id=%d",gtk_socket_get_id(GTK_SOCKET(applist->socket)),gtk_socket_get_id(GTK_SOCKET(applist->socketbutton)),gtk_socket_get_id(GTK_SOCKET(applist->ThirdSocket)));
                launch_app_with_arguments(tempapp[0].Exec,dualarg);
@ -166,7 +166,7 @@ void on_backToSettingsButton_clicked(GtkWidget *button,actionWidgets *sctb){
    gtk_widget_destroy(sctb->socket);
    sctb->socket=GTK_WIDGET(create_socket(sctb));
    GtkWidget *backbutton=sctb->ButtonBackToMain;
-    gtk_widget_set_sensitive(backbutton,0);
+    gtk_widget_hide(backbutton);
 };

 void on_CancelHelpButton_activated(GtkWidget *button,GtkBuilder *builder){
@ -241,6 +241,7 @@ int on_settings_accept(GtkWidget *button, dictionary **widgetsDs){
        fclose(fp);
    }
    g_key_file_load_from_file(gfile,pth,G_KEY_FILE_NONE,&err);
+    if (gtk_window_is_maximized(GTK_WINDOW(widgets->window))==0){
        sprintf(fromint,"%d",main_config.windowPosX);
        g_key_file_set_string(gfile,"window","WindowPosX",fromint);
        sprintf(fromint,"%d",main_config.windowPosY);
@ -249,6 +250,7 @@ int on_settings_accept(GtkWidget *button, dictionary **widgetsDs){
        g_key_file_set_string(gfile,"window","WindowWidth",fromint);
        sprintf(fromint,"%d",main_config.windowHeight);
        g_key_file_set_string(gfile,"window","WindowHeight",fromint);
+    }
    sprintf(fromint,"%d",main_config.WindowTheme);
    g_key_file_set_string(gfile,"window","WindowTheme",fromint);
    sprintf(fromint,"%d",sz);
@ -282,7 +284,7 @@ void on_paned_move(GtkPaned* self, GtkScrollType* scroll_type, actionWidgets *wi
    if (position<250) {position=250;  gtk_paned_set_position(GTK_PANED(widgets->GnomePaned),250);}
    main_config.iconSegmentSize=position;
    if (position <115) {position=115;}
-    double pos=((double)position-(11/(double)position*4)*500)/1.3;
+    double pos=((double)position);
    if (pos<110) pos=110;
    for (dictionary *dict=widgets->ICSys;dict!=NULL;dict=dict->next){
        IVGraphicals *IV=(IVGraphicals*)dict->data;
@ -632,8 +634,12 @@ void on_section_delete(GtkWidget *button, actionWidgets *widgets){
 void on_resized (GtkWidget *window, GdkEventConfigure *event, dictionary *widgetsD){
    actionWidgets *widgets=(actionWidgets*)widgetsD->data;
    int x,y;
-    
+    if (gtk_window_is_maximized(GTK_WINDOW(widgets->window))==0)
+        main_config.fullscreen=0;
+    else
+        main_config.fullscreen=1;
    gtk_window_get_size(GTK_WINDOW(window),&main_config.windowWidth,&main_config.windowHeight);
+    if (main_config.WindowTheme==1){
        if (main_config.windowWidth<1240){
            if (stld==0){
                stld=1;
@ -660,7 +666,7 @@ void on_resized (GtkWidget *window, GdkEventConfigure *event, dictionary *widget
                cmld=0;
            }
        }
-
+    }
 }

 void on_resized_done (GtkWidget *window, GdkEvent *event, dictionary *widgetsD){
@ -685,6 +691,35 @@ void on_about_system(GtkWidget *button, actionWidgets *widgets){
    launch_app_with_arguments("ubl-settings-info",arg);
 }

+void on_theme_selection_changed(GtkWidget *self, actionWidgets *widgets){
+    int *icsize;
+    printf("changed\n");
+    int curthm=gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->settingsThemeChooser));
+    if (curthm==0)
+        *icsize=main_config.Mainiconsize;
+    else if (curthm==1)
+        *icsize=main_config.Gnomeiconsize;
+    if (*icsize<=24){
+        gtk_label_set_text(GTK_LABEL(widgets->settingsSizeInfoLabel),"24x24");
+        gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->settingsIcon),gdk_pixbuf_new_from_file_at_scale(AppIconPath,24,24,1,NULL));
+        gtk_scale_set_value_pos(GTK_SCALE(widgets->settingsSizeSlider),1.0);
+    } else if (*icsize<=32){
+        gtk_label_set_text(GTK_LABEL(widgets->settingsSizeInfoLabel),"32x32");
+        gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->settingsIcon),gdk_pixbuf_new_from_file_at_scale(AppIconPath,32,32,1,NULL));
+        gtk_scale_set_value_pos(GTK_SCALE(widgets->settingsSizeSlider),2.0);
+    } else if (*icsize<=48){
+        gtk_label_set_text(GTK_LABEL(widgets->settingsSizeInfoLabel),"48x48");
+        gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->settingsIcon),gdk_pixbuf_new_from_file_at_scale(AppIconPath,48,48,1,NULL));
+        gtk_scale_set_value_pos(GTK_SCALE(widgets->settingsSizeSlider),3.0);
+    } else{
+        gtk_label_set_text(GTK_LABEL(widgets->settingsSizeInfoLabel),"64x64");
+        gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->settingsIcon),gdk_pixbuf_new_from_file_at_scale(AppIconPath,64,64,1,NULL));
+        gtk_scale_set_value_pos(GTK_SCALE(widgets->settingsSizeSlider),4.0);
+    }
+}
+
+
+
 void launch(char *command){
    system(command);
 }
@ -732,18 +767,32 @@ int load_apps(IVGraphicals *section, apps *applist, int size){
            memset(path,0,strlen(IconPicturesPath)+strlen(applist[i].Icon)+7);
            memcpy(path,IconPicturesPath,strlen(IconPicturesPath));
            path=yon_char_get_augumented(path,applist[i].Icon);
-            path=yon_char_get_augumented(path,PictureFormatMain);
            GdkPixbuf *pixbuf;
-            pixbuf=gdk_pixbuf_new_from_file_at_size(path,*main_config.currentThemeIconSize,*main_config.currentThemeIconSize,NULL);
+            pixbuf=gdk_pixbuf_new_from_file_at_size(yon_char_get_augumented(path,PictureFormatMain),*main_config.currentThemeIconSize,*main_config.currentThemeIconSize,NULL);
+            if (!pixbuf) {
+                pixbuf=gdk_pixbuf_new_from_file_at_size(yon_char_get_augumented(path,PictureFormatExtra),*main_config.currentThemeIconSize,*main_config.currentThemeIconSize,NULL);
                if (!pixbuf){
+                    GtkWidget *imag=gtk_image_new_from_icon_name(applist[i].Icon,GTK_ICON_SIZE_DIALOG);
+                    void *a=GTK_ICON_SIZE_DIALOG;
+                    pixbuf=gtk_image_get_pixbuf(GTK_IMAGE(imag));
+                    printf("%s\n",applist[i].Icon);
+                    if (!pixbuf) 
                        pixbuf=gdk_pixbuf_new_from_file_at_size(ErrIconPicturePath,*main_config.currentThemeIconSize,*main_config.currentThemeIconSize,NULL);
+                    else {
+                        gdk_pixbuf_scale(pixbuf,pixbuf,0,0,*main_config.currentThemeIconSize,*main_config.currentThemeIconSize,0,0,*main_config.currentThemeIconSize,*main_config.currentThemeIconSize,GDK_INTERP_NEAREST);
+                        GValue a = G_VALUE_INIT;
+                        g_value_init (&a, G_TYPE_STRING);
+                        g_value_set_string (&a, applist[i].Icon);
+                        g_object_set_property(G_OBJECT(section->iconRender),"icon-name", &a);
+                    }
+                }
            };
            GtkTreeIter iter;
            gtk_list_store_append(section->LV,&iter);
            int sz= *main_config.currentThemeIconSize;
            if (sz<50) sz=50;
            GtkTreePath *pth = gtk_tree_model_get_path(GTK_TREE_MODEL(section->LV),&iter);
-            gtk_list_store_set(section->LV,&iter,0,pixbuf,1,applist[i].Name,2,0.0,3,0.5, 4, sz+8, -1);
+            gtk_list_store_set(section->LV,&iter,0, pixbuf, 1,applist[i].Name,2,0.0,3,0.5, 4, sz+8, 5, applist[i].Icon, -1);
            int cols = gtk_icon_view_get_columns(GTK_ICON_VIEW(section->IV));
            gtk_icon_view_set_columns(GTK_ICON_VIEW(section->IV), -1);
            gtk_icon_view_set_columns(GTK_ICON_VIEW(section->IV), cols);
@ -976,6 +1025,70 @@ int setup_config(){
    return 1;
 };

+void save_config(actionWidgets *widgets){
+    GKeyFile *gfile=g_key_file_new();
+    
+    int sz=1,szm=1;
+    if (main_config.Gnomeiconsize==64) sz=4;
+    if (main_config.Gnomeiconsize==48) sz=3;
+    if (main_config.Gnomeiconsize==32) sz=2;
+    if (main_config.Gnomeiconsize==24) sz=1;
+    if (main_config.Mainiconsize==64) szm=4;
+    if (main_config.Mainiconsize==48) szm=3;
+    if (main_config.Mainiconsize==32) szm=2;
+    if (main_config.Mainiconsize==24) szm=1;
+    char *fromint=malloc(5);
+    memset(fromint,0,5);
+    GError *err=NULL;
+    char *login=getlogin();
+    if (geteuid()==0){
+        login=main_config.lastUser;
+    } else {
+        main_config.lastUser=login;
+    }
+    char *pth=malloc(7+strlen(UserConfigPath)+strlen(getlogin()));
+    sprintf(pth,"%s%s%s","/home/",getlogin(),UserConfigPath);
+    g_key_file_load_from_file(gfile,pth,G_KEY_FILE_NONE,&err);
+    if (err){
+        struct stat st = {0};
+        char *ptdir=malloc(36+strlen(getlogin()));
+        sprintf(ptdir,"%s%s%s","/home/",getlogin(),"/.config/ubl-settings-manager");
+        if (stat(ptdir, &st) == -1) {
+            mkdir(ptdir, 0777);
+        }
+        FILE *fp;
+        fp=fopen(pth,"w");
+        fclose(fp);
+    }
+    g_key_file_load_from_file(gfile,pth,G_KEY_FILE_NONE,&err);
+    if (main_config.fullscreen==0){
+        sprintf(fromint,"%d",main_config.windowPosX);
+        g_key_file_set_string(gfile,"window","WindowPosX",fromint);
+        sprintf(fromint,"%d",main_config.windowPosY);
+        g_key_file_set_string(gfile,"window","WindowPosY",fromint);
+        sprintf(fromint,"%d",main_config.windowWidth);
+        g_key_file_set_string(gfile,"window","WindowWidth",fromint);
+        sprintf(fromint,"%d",main_config.windowHeight);
+        g_key_file_set_string(gfile,"window","WindowHeight",fromint);
+    }
+    sprintf(fromint,"%d",main_config.WindowTheme);
+    g_key_file_set_string(gfile,"window","WindowTheme",fromint);
+    sprintf(fromint,"%d",sz);
+    g_key_file_set_string(gfile,"window","GnomeIconSize",fromint);
+    sprintf(fromint,"%d",szm);
+    g_key_file_set_string(gfile,"window","MainIconSize",fromint);
+    sprintf(fromint,"%d",main_config.iconSegmentSize);
+    g_key_file_set_string(gfile,"window","IconSegmentSize",fromint);
+    sprintf(fromint,"%d",(int)((float)main_config.GnomelabelSize/1000));
+    g_key_file_set_string(gfile,"window","GnomeLabelSize",fromint);
+    sprintf(fromint,"%d",(int)((float)main_config.MainlabelSize/1000));
+    g_key_file_set_string(gfile,"window","MainLabelSize",fromint);
+    sprintf(fromint,"%d",(int)((float)main_config.labelDensity/1000));
+    g_key_file_set_string(gfile,"window","LabelDensity",fromint);
+    g_key_file_set_string(gfile,"window","User",login);
+    g_key_file_save_to_file(gfile,pth,NULL);
+}
+
 char *yon_cut(char *source, int size, int startpos){
    char *cut=NULL;
    cut=malloc(size+1);
@ -1047,6 +1160,7 @@ IVGraphicals *yon_create_single_section_IV(char *name,char *cats){
    GtkBuilder *builder = gtk_builder_new_from_file(GladePath);
    GtkWidget *iv = GTK_WIDGET(gtk_builder_get_object(builder,"iconTemplate"));
    GtkWidget *label = gtk_label_new(_(name));
+    GtkCellRendererPixbuf *iconRender = GTK_CELL_RENDERER_PIXBUF(gtk_builder_get_object(builder, "iconPic"));
    PangoAttrList *attrs = pango_attr_list_new();
    PangoFontDescription *descr = pango_font_description_new();
    pango_font_description_set_weight(descr,PANGO_WEIGHT_BOLD);
@ -1060,8 +1174,9 @@ IVGraphicals *yon_create_single_section_IV(char *name,char *cats){
    gtk_widget_set_margin_end(label,6);
    gtk_widget_set_margin_start(label,6);
    gtk_widget_set_margin_bottom(label,2);
-    gtk_widget_set_name(label,"workingbg");
-    gtk_widget_set_name(box,"workingbg");
+    // gtk_widget_set_name(label,"workingbg");
+    // gtk_widget_set_name(box,"workingbg");
+    gtk_icon_view_set_spacing(GTK_ICON_VIEW(iv),20);
    if (main_config.WindowTheme==1) {
        gtk_icon_view_set_columns(GTK_ICON_VIEW(iv),1);
        gtk_widget_set_name(iv,"GnomeIcon");
@ -1069,7 +1184,7 @@ IVGraphicals *yon_create_single_section_IV(char *name,char *cats){
        gtk_icon_view_set_item_orientation(GTK_ICON_VIEW(iv),GTK_ORIENTATION_HORIZONTAL);
    } else {
        gtk_icon_view_set_item_padding(GTK_ICON_VIEW(iv),3);
-        gtk_widget_set_name(iv,"workingbg");
+        //gtk_widget_set_name(iv,"workingbg");
        gtk_icon_view_set_item_orientation(GTK_ICON_VIEW(iv),GTK_ORIENTATION_HORIZONTAL);
    }
    gtk_icon_view_set_text_column(GTK_ICON_VIEW(iv),1);
@ -1092,6 +1207,7 @@ IVGraphicals *yon_create_single_section_IV(char *name,char *cats){
    IVG->IV = iv;
    IVG->label = label;
    IVG->sep = sep;
+    IVG->iconRender = iconRender;
    return IVG;
 }

@ -1157,7 +1273,7 @@ void yon_icv_resize_item(dictionary *icdict, GtkWidget *paned){
    for (dictionary *dict=icdict->first;dict!=NULL;dict=dict->next){
        IVGraphicals *icv=(IVGraphicals*)dict->data;
        int width=gtk_paned_get_position(GTK_PANED(paned));
-        int pos=(int)((double)width-(11/(double)width*4)*500)/1.3;
+        int pos=(int)((double)width);
        if (pos < 115) pos=115;
        
        gtk_icon_view_set_item_width(GTK_ICON_VIEW(icv->IV),pos);
@ -1215,6 +1331,8 @@ void yon_switch_theme(dictionary **dict, dictionary *newone){
    gtk_window_resize(GTK_WINDOW(widgets->window),main_config.windowWidth,main_config.windowHeight);
    gtk_window_move(GTK_WINDOW(widgets->window),main_config.windowPosX,main_config.windowPosY);
    if (strcmp(dct->key,"Gnome")==0){
+        main_config.currentThemeIconSize=&main_config.Gnomeiconsize;
+        main_config.currentThemeLabelSize=&main_config.GnomelabelSize;
        int x,y;
        GdkRectangle workarea;
        gdk_monitor_get_workarea(gdk_display_get_monitor(gdk_screen_get_display(gtk_window_get_screen(GTK_WINDOW(widgets->window))),0),&workarea);
@ -1246,6 +1364,8 @@ void yon_switch_theme(dictionary **dict, dictionary *newone){
        }
        
    } else {
+        main_config.currentThemeIconSize=&main_config.Mainiconsize;
+        main_config.currentThemeLabelSize=&main_config.MainlabelSize;
        gtk_widget_show(widgets->window);
        main_config.WindowTheme=0;
        main_config.curThemeName="Main";    
@ -1445,6 +1565,11 @@ void yon_time_reg_for_average(dictionary *listofregs, int size, time_t tm){
 void yon_small_window_theme_change(actionWidgets *widgets){
 }

+void yon_main_quit(actionWidgets *widgets){
+    save_config(widgets);
+    gtk_main_quit();
+}
+
 dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *theme_id, apps *applist, int appsize){
    
    dictionary *widgets=*widgetss;
@ -1480,23 +1605,22 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
    g_signal_connect(G_OBJECT(curWidgets->MenuItemAboutSystem), "activate", G_CALLBACK(on_about_system),curWidgets);
    if (curWidgets->ButtonBackToMain!=NULL)
        gtk_button_set_label(GTK_BUTTON(curWidgets->ButtonBackToMain),_("Back to all settings"));
-    gtk_window_set_title(GTK_WINDOW(curWidgets->window),"UBLinux Settings Manager");
-    g_signal_connect(G_OBJECT(curWidgets->window), "destroy", G_CALLBACK(gtk_main_quit), NULL);
+    gtk_window_set_title(GTK_WINDOW(curWidgets->window),_("UBLinux Settings Manager"));
    if (curWidgets->GnomePaned!=NULL){
        gtk_paned_set_position(GTK_PANED(curWidgets->GnomePaned),main_config.iconSegmentSize);
        g_signal_connect(G_OBJECT(curWidgets->GnomePaned), "notify::position", G_CALLBACK(on_paned_move), curWidgets);

    }
+    g_signal_connect(G_OBJECT(curWidgets->window), "configure-event", G_CALLBACK(on_resized), widgets);
    if (strcmp(theme_id,"Gnome")==0){
        on_about_system(NULL,curWidgets);
-    g_signal_connect(G_OBJECT(curWidgets->window), "configure-event", G_CALLBACK(on_resized), widgets);
    g_signal_connect(G_OBJECT(curWidgets->window), "event-after", G_CALLBACK(on_resized_done), widgets);
    
    }
    if (curWidgets->ButtonBackToMain!=NULL) 
    g_signal_connect(G_OBJECT(curWidgets->ButtonBackToMain), "clicked", G_CALLBACK(on_backToSettingsButton_clicked), curWidgets);
    curWidgets->LabelTitle=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"LabelTitle"));
-        gtk_window_set_title(GTK_WINDOW(curWidgets->window),"UBLinux Settings Manager GNOME");
+        gtk_window_set_title(GTK_WINDOW(curWidgets->window),_("UBLinux Settings Manager"));
    
    // Standard for all themes

@ -1537,10 +1661,9 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
    
    if (gnld==0){
        gnld=1;
-       
+        g_signal_connect(G_OBJECT(curWidgets->settingsThemeChooser), "changed", G_CALLBACK(on_theme_selection_changed), curWidgets);
        g_signal_connect(G_OBJECT(curWidgets->CancelHelpButton), "clicked", G_CALLBACK(on_CancelHelpButton_activated), curWidgets->builder);
        g_signal_connect(G_OBJECT(curWidgets->ReadHelpButton), "clicked", G_CALLBACK(on_ReadHelpButton_activated), curWidgets->builder);
-        
        g_signal_connect(G_OBJECT(curWidgets->settingsSizeSlider), "value-changed", G_CALLBACK(on_settings_icon_size_changed), curWidgets);
        g_signal_connect(G_OBJECT(curWidgets->settingsCancel), "clicked", G_CALLBACK(on_settings_cancel), curWidgets);
        g_signal_connect(G_OBJECT(curWidgets->settingsAccept), "clicked", G_CALLBACK(on_settings_accept), widgetss);
@ -1550,6 +1673,7 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
        g_signal_connect(G_OBJECT(curWidgets->SectionSettingsSaveButton), "clicked", G_CALLBACK(on_sections_save), curWidgets);
        g_signal_connect(G_OBJECT(curWidgets->CautionUnderstandButton), "clicked", G_CALLBACK(on_caution_understand), curWidgets);
    }
+    g_signal_connect(G_OBJECT(curWidgets->window), "destroy", G_CALLBACK(yon_main_quit), curWidgets);
    gtk_label_set_text(GTK_LABEL(curWidgets->LabelTitle),_("UBLinux Settings Manager"));
    gtk_label_set_text(GTK_LABEL(curWidgets->settingsSubmenuLabelSize),_("Icon size"));
    gtk_label_set_text(GTK_LABEL(curWidgets->settingsSubmenuLabelTheme),_("Window theme"));
@ -1647,7 +1771,7 @@ int main(int argc, char *argv[]){
    gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widg->settingsThemeChooser),NULL,_("Standard theme"));
    gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widg->settingsThemeChooser),NULL,_("GNOME theme"));
    widg=(actionWidgets*)widgets->data;
-    //gtk_window_maximize(GTK_WINDOW(widg->window));
+    gtk_window_maximize(GTK_WINDOW(widg->window));
    gtk_widget_show(widg->window);
    hide_if_unfound(widgets);
    if (main_config.WindowTheme==1)
--- a/source/ubl-settings-manager.h
+++ b/source/ubl-settings-manager.h
@ -50,6 +50,7 @@ typedef struct IVGrapgicals{
    GtkWidget *IV;
    GtkWidget *label;
    GtkWidget *sep;
+    GtkCellRendererPixbuf *iconRender;
 } IVGraphicals;

 typedef struct IconSection{
@ -75,6 +76,7 @@ typedef struct {
    int labelDensity;
    char *lastUser;
    int changed;
+    int fullscreen;
 } config;

 typedef struct {
--- a/ubl-settings-manager.css
+++ b/ubl-settings-manager.css
@ -28,13 +28,13 @@ background-color: #404040;
 	border: none;
 }
 .menu:hover {	
-  	border-color:alpha(@theme_text_color, 0.3);
+  	border-color:alpha(@theme_text_color, 0.01);
 }
 .menu {	
-  	border-color:alpha(@theme_text_color, 0.3);
+  	border-color:alpha(@theme_text_color, 0.01);
 }
 .menu:hover >* {
-	border-color:alpha(@theme_text_color, 0.3);
+	border-color:alpha(@theme_text_color, 0.01);
 }
 .menuitembottom{
  margin-top:0px;
@ -62,15 +62,12 @@ background-color: #404040;
 }
 .menuitemtop:hover {
  background:@theme_bg_color;
-  	border-color:transparent;
 }
 .menuitemmiddle:hover {
  background:@theme_bg_color;
-  border:none;
 }
 .menuitembottom:hover {
  background:@theme_bg_color;
-  border:none;
  
 }
 .menuitemtop:hover* {
@ -78,7 +75,6 @@ background-color: #404040;
  padding: 5px 10px 3px 5px;
  background:@theme_selected_bg_color;
  border-radius:2px;
-  border:none;
 }
 .menuitemmiddle:hover* {
  margin:0 2px 0 2px;
@ -99,8 +95,15 @@ background-color: #404040;
 .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 {
-background: rgba(122,122,122,0.3);
+	transition: 200ms ease-out;
+    	background-image: none;
 }


+
--- a/ubl-settings-manager.glade
+++ b/ubl-settings-manager.glade
@ -19,10 +19,12 @@
                <property name="visible">True</property>
                <property name="can-focus">False</property>
                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="margin-start">30</property>
-                <property name="margin-end">30</property>
-                <property name="stock">gtk-dialog-warning</property>
+                <property name="valign">start</property>
+                <property name="margin-start">20</property>
+                <property name="margin-end">20</property>
+                <property name="margin-top">20</property>
+                <property name="margin-bottom">20</property>
+                <property name="icon-name">dialog-question-symbolic</property>
                <property name="icon_size">6</property>
              </object>
              <packing>
@ -36,9 +38,11 @@
                <property name="visible">True</property>
                <property name="can-focus">False</property>
                <property name="halign">center</property>
-                <property name="valign">center</property>
+                <property name="valign">start</property>
                <property name="margin-start">5</property>
                <property name="margin-end">25</property>
+                <property name="margin-top">20</property>
+                <property name="margin-bottom">20</property>
                <property name="label">You are not allowed to change theme on such low resolution!</property>
                <property name="wrap">True</property>
                <property name="xalign">0.019999999552965164</property>
@ -84,7 +88,8 @@
          <object class="GtkImage">
            <property name="visible">True</property>
            <property name="can-focus">False</property>
-            <property name="stock">gtk-dialog-warning</property>
+            <property name="pixel-size">32</property>
+            <property name="icon-name">dialog-question-symbolic</property>
            <property name="icon_size">5</property>
          </object>
        </child>
@ -191,6 +196,7 @@
                  <object class="GtkScrolledWindow">
                    <property name="visible">True</property>
                    <property name="can-focus">True</property>
+                    <property name="hscrollbar-policy">external</property>
                    <property name="shadow-type">in</property>
                    <child>
                      <object class="GtkViewport">
@ -201,12 +207,14 @@
                          <object class="GtkBox" id="Gnomeicvpack">
                            <property name="visible">True</property>
                            <property name="can-focus">False</property>
-                            <property name="margin-start">3</property>
-                            <property name="margin-end">3</property>
                            <property name="orientation">vertical</property>
                            <child>
                              <placeholder/>
                            </child>
+                            <style>
+                              <class name="workingbg"/>
+                              <class name="noborder"/>
+                            </style>
                          </object>
                        </child>
                      </object>
@ -365,47 +373,27 @@
        <property name="visible">True</property>
        <property name="can-focus">False</property>
        <property name="show-close-button">True</property>
-        <child type="title">
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="hexpand">True</property>
        <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <object class="GtkLabel" id="GnomeLabelTitle">
+          <object class="GtkImage">
            <property name="visible">True</property>
            <property name="can-focus">False</property>
-                    <property name="label" translatable="yes">UBLinux Settings Manager</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
+            <property name="pixel-size">32</property>
+            <property name="icon-name">ubconfig-gui</property>
+            <property name="icon_size">5</property>
          </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
        </child>
        <child>
-              <object class="GtkBox" id="Gnomesocketbuttonplace">
+          <object class="GtkBox" id="GnomeThirdSocketPlace">
            <property name="visible">True</property>
            <property name="can-focus">False</property>
            <property name="halign">center</property>
            <property name="valign">center</property>
+            <property name="orientation">vertical</property>
            <child>
              <placeholder/>
            </child>
          </object>
          <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
            <property name="position">1</property>
          </packing>
        </child>
@ -419,6 +407,8 @@
                <property name="can-focus">True</property>
                <property name="focus-on-click">False</property>
                <property name="receives-default">True</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
                <property name="popup">GnomeMenu</property>
                <property name="direction">none</property>
                <child>
@ -436,38 +426,28 @@
            </child>
          </object>
          <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
            <property name="pack-type">end</property>
            <property name="position">2</property>
          </packing>
        </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkImage">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="pixel-size">32</property>
-            <property name="icon-name">ubconfig-gui</property>
-            <property name="icon_size">5</property>
-          </object>
-        </child>
        <child>
-          <object class="GtkBox" id="GnomeThirdSocketPlace">
+          <object class="GtkBox" id="Gnomesocketbuttonplace">
            <property name="visible">True</property>
            <property name="can-focus">False</property>
            <property name="halign">center</property>
            <property name="valign">center</property>
-            <property name="orientation">vertical</property>
            <child>
              <placeholder/>
            </child>
          </object>
          <packing>
-            <property name="position">1</property>
+            <property name="pack-type">end</property>
+            <property name="position">3</property>
          </packing>
        </child>
+        <style>
+          <class name="bkim"/>
+        </style>
      </object>
    </child>
  </object>
@ -492,7 +472,7 @@
                <property name="valign">start</property>
                <property name="xpad">20</property>
                <property name="ypad">20</property>
-                <property name="stock">gtk-dialog-question</property>
+                <property name="icon-name">dialog-question-symbolic</property>
                <property name="icon_size">6</property>
              </object>
              <packing>
@ -650,8 +630,7 @@
            <property name="visible">True</property>
            <property name="can-focus">False</property>
            <property name="pixel-size">32</property>
-            <property name="icon-name">gtk-dialog-question</property>
-            <property name="icon_size">5</property>
+            <property name="icon-name">dialog-question-symbolic</property>
          </object>
        </child>
      </object>
@ -976,6 +955,7 @@
    <property name="step-increment">1</property>
    <property name="page-increment">10</property>
  </object>
+  <object class="GtkAdjustment" id="adjustment3"/>
  <object class="GtkImage" id="image1">
    <property name="visible">True</property>
    <property name="can-focus">False</property>
@ -1061,8 +1041,6 @@
                            <property name="vscroll-policy">natural</property>
                            <child>
                              <object class="GtkBox" id="Mainicvpack">
-                                <property name="width-request">5</property>
-                                <property name="height-request">5</property>
                                <property name="visible">True</property>
                                <property name="can-focus">False</property>
                                <property name="orientation">vertical</property>
@ -1132,51 +1110,50 @@
        <property name="visible">True</property>
        <property name="can-focus">False</property>
        <property name="show-close-button">True</property>
-        <child type="title">
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="hexpand">True</property>
        <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <object class="GtkLabel" id="LabelTitle">
+          <object class="GtkImage">
            <property name="visible">True</property>
            <property name="can-focus">False</property>
-                    <property name="label" translatable="yes">UBLinux Settings Manager</property>
+            <property name="pixel-size">32</property>
+            <property name="icon-name">ubconfig-gui</property>
+            <property name="icon_size">5</property>
          </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
        </child>
+        <child>
+          <object class="GtkButton" id="MainbackToSettingsButton">
+            <property name="label" translatable="yes">Back to settings</property>
+            <property name="can-focus">True</property>
+            <property name="focus-on-click">False</property>
+            <property name="receives-default">False</property>
+            <property name="double-buffered">False</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+            <property name="margin-right">10</property>
+            <property name="margin-end">10</property>
+            <property name="image">image1</property>
+            <signal name="clicked" handler="on_backToSettingsButton_clicked" swapped="no"/>
          </object>
          <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+            <property name="position">1</property>
          </packing>
        </child>
        <child>
-              <object class="GtkBox" id="Mainsocketbuttonplace">
+          <object class="GtkBox" id="MainThirdSocketPlace">
            <property name="visible">True</property>
            <property name="can-focus">False</property>
            <property name="halign">center</property>
            <property name="valign">center</property>
+            <property name="orientation">vertical</property>
            <child>
              <placeholder/>
            </child>
            <style>
              <class name="roundborder"/>
+              <class name="bkim"/>
            </style>
          </object>
          <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+            <property name="position">2</property>
          </packing>
        </child>
        <child>
@ -1190,6 +1167,8 @@
                <property name="can-focus">True</property>
                <property name="focus-on-click">False</property>
                <property name="receives-default">True</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
                <property name="popup">MainMenu</property>
                <property name="direction">none</property>
                <property name="use-popover">False</property>
@ -1205,59 +1184,32 @@
            </child>
          </object>
          <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
            <property name="pack-type">end</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkImage">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="pixel-size">32</property>
-            <property name="icon-name">ubconfig-gui</property>
-            <property name="icon_size">5</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="MainbackToSettingsButton">
-            <property name="label" translatable="yes">Back to settings</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can-focus">True</property>
-            <property name="focus-on-click">False</property>
-            <property name="receives-default">False</property>
-            <property name="double-buffered">False</property>
-            <property name="margin-right">10</property>
-            <property name="margin-end">10</property>
-            <property name="image">image1</property>
-            <signal name="clicked" handler="on_backToSettingsButton_clicked" swapped="no"/>
-          </object>
-          <packing>
-            <property name="position">1</property>
+            <property name="position">3</property>
          </packing>
        </child>
        <child>
-          <object class="GtkBox" id="MainThirdSocketPlace">
+          <object class="GtkBox" id="Mainsocketbuttonplace">
            <property name="visible">True</property>
            <property name="can-focus">False</property>
            <property name="halign">center</property>
            <property name="valign">center</property>
-            <property name="orientation">vertical</property>
            <child>
              <placeholder/>
            </child>
            <style>
              <class name="roundborder"/>
+              <class name="bkim"/>
            </style>
          </object>
          <packing>
-            <property name="position">2</property>
+            <property name="pack-type">end</property>
+            <property name="position">4</property>
          </packing>
        </child>
+        <style>
+          <class name="bkim"/>
+        </style>
      </object>
    </child>
  </object>
@ -1315,7 +1267,7 @@
  <object class="GtkImage" id="image4">
    <property name="visible">True</property>
    <property name="can-focus">False</property>
-    <property name="stock">gtk-ok</property>
+    <property name="icon-name">object-select-symbolic</property>
  </object>
  <object class="GtkWindow" id="SectionSettingsWindow">
    <property name="can-focus">False</property>
@ -1597,24 +1549,29 @@
      <column type="gfloat"/>
      <!-- column-name gint1 -->
      <column type="gint"/>
+      <!-- column-name gchararray2 -->
+      <column type="gchararray"/>
    </columns>
  </object>
  <object class="GtkIconView" id="iconTemplate">
    <property name="visible">True</property>
    <property name="can-focus">True</property>
-    <property name="margin">0</property>
+    <property name="margin">4</property>
    <property name="item-orientation">horizontal</property>
    <property name="model">liststoreTemplate</property>
    <property name="item-width">135</property>
+    <property name="spacing">10</property>
    <property name="row-spacing">0</property>
    <property name="column-spacing">0</property>
    <property name="item-padding">0</property>
+    <property name="activate-on-single-click">True</property>
    <child>
      <object class="GtkCellRendererPixbuf" id="iconPic"/>
      <attributes>
        <attribute name="height">4</attribute>
        <attribute name="xalign">2</attribute>
        <attribute name="yalign">3</attribute>
+        <attribute name="icon-name">5</attribute>
        <attribute name="pixbuf">0</attribute>
      </attributes>
    </child>
@ -1964,4 +1921,99 @@
      </object>
    </child>
  </object>
+  <object class="GtkWindow" id="windowSettings-infoWarning">
+    <property name="can-focus">False</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="valign">start</property>
+                <property name="margin-start">20</property>
+                <property name="margin-end">20</property>
+                <property name="margin-top">20</property>
+                <property name="margin-bottom">20</property>
+                <property name="hexpand">True</property>
+                <property name="icon-name">dialog-question-symbolic</property>
+                <property name="icon_size">6</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="valign">start</property>
+                <property name="margin-start">10</property>
+                <property name="margin-end">10</property>
+                <property name="margin-top">20</property>
+                <property name="margin-bottom">20</property>
+                <property name="label" translatable="yes">Looks like you don't have ubl-settings-info installed on your PC</property>
+                <property name="wrap">True</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="buttonSettings-infoWarning">
+            <property name="label" translatable="yes">Ok</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="halign">end</property>
+            <property name="valign">end</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <property name="margin-top">5</property>
+            <property name="margin-bottom">5</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack-type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child type="titlebar">
+      <object class="GtkHeaderBar">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="title" translatable="yes">Warning</property>
+        <property name="has-subtitle">False</property>
+        <child>
+          <object class="GtkImage">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="pixel-size">32</property>
+            <property name="icon-name">dialog-question-symbolic</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
 </interface>