diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index 735c9a4..95945b7 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -645,10 +645,10 @@ void on_resized (GtkWidget *window, GdkEventConfigure *event, dictionary *widget yon_switch_theme(&widgetsD,yon_dictionary_find(&widgetsD,"Main")); *main_config.currentThemeIconSize=24; - for (dictionary *dict=widgets->ICSys->first;dict!=NULL;dict=dict->next){ - IVGraphicals *IV=(IVGraphicals*)dict->data; - load_apps_with_clear(IV,widgets->applist,widgets->appssize); - } + // for (dictionary *dict=widgets->ICSys->first;dict!=NULL;dict=dict->next){ + // IVGraphicals *IV=(IVGraphicals*)dict->data; + // load_apps_with_clear(IV,widgets->applist,widgets->appssize); + // } gtk_window_resize(GTK_WINDOW(widgets->window),main_config.windowWidth,main_config.windowHeight); gtk_widget_hide(widgets->window); } @@ -740,8 +740,14 @@ int load_apps(IVGraphicals *section, apps *applist, int size){ }; 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,-1); + gtk_list_store_set(section->LV,&iter,0,pixbuf,1,applist[i].Name,2,0.0,3,0.5, 4, sz+8, -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); + yon_time_reg_for_average(times,sz++,clock()); } @@ -1031,6 +1037,10 @@ void yon_set_default_sections(dictionary **section){ *section=(*section)->first; } +void yon_check_for_space_near_eol(){ + +} + IVGraphicals *yon_create_single_section_IV(char *name,char *cats){ IVGraphicals *IVG=malloc(sizeof(IVGraphicals)); GtkWidget *box=gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); @@ -1050,18 +1060,22 @@ 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"); if (main_config.WindowTheme==1) { gtk_icon_view_set_columns(GTK_ICON_VIEW(iv),1); gtk_widget_set_name(iv,"GnomeIcon"); gtk_icon_view_set_activate_on_single_click(GTK_ICON_VIEW(iv),1); gtk_icon_view_set_item_orientation(GTK_ICON_VIEW(iv),GTK_ORIENTATION_HORIZONTAL); } else { - gtk_widget_set_name(iv,"Icon"); + gtk_icon_view_set_item_padding(GTK_ICON_VIEW(iv),3); + 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); GtkWidget *sep=gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); GtkListStore *lv=GTK_LIST_STORE(gtk_builder_get_object(builder,"liststoreTemplate")); + gtk_widget_set_name(sep,"SepIcon"); gtk_widget_set_halign(box,0); gtk_widget_set_valign(box,1); gtk_widget_set_margin_end(sep,6); @@ -1465,7 +1479,7 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them curWidgets->socket=GTK_WIDGET(create_socket(curWidgets)); 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 settings")); + 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); if (curWidgets->GnomePaned!=NULL){ @@ -1633,7 +1647,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)