diff --git a/ubl-settings-manager.c b/ubl-settings-manager.c index 0a0a634..7d01ca2 100644 --- a/ubl-settings-manager.c +++ b/ubl-settings-manager.c @@ -225,12 +225,13 @@ int on_settings_accept(GtkWidget *button, dictionary *widgetsD){ void on_paned_move(GtkPaned* self, GtkScrollType* scroll_type, actionWidgets *widgets){ /* TODO */ int position=gtk_paned_get_position(GTK_PANED(widgets->GnomePaned)); - printf("Paned moved to %d\n",position); - position-=70; if (position <115) position=115; + double pos=((double)position-(1/(double)position*4)*500)/1.8; + if (pos<110) pos=110; + printf("Paned moved to %f\n",pos); for (dictionary *dict=widgets->ICSys;dict!=NULL;dict=dict->next){ IVGraphicals *IV=(IVGraphicals*)dict->data; - gtk_icon_view_set_item_width(GTK_ICON_VIEW(IV->IV),position); + gtk_icon_view_set_item_width(GTK_ICON_VIEW(IV->IV),pos); } @@ -1014,6 +1015,7 @@ IVGraphicals *yon_create_single_section_IV(char *name,char *cats){ 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_item_orientation(GTK_ICON_VIEW(iv),GTK_ORIENTATION_HORIZONTAL); } @@ -1088,6 +1090,13 @@ dictionary *yon_section_new(dictionary *section, char *section_name, char *categ return section; } +void yon_icv_resize_item(dictionary *icdict, GtkWidget *paned){ + for (dictionary *dict=icdict->first;dict!=NULL;dict=dict->next){ + IVGraphicals *icv=(IVGraphicals*)dict->data; + gtk_icon_view_set_item_width(GTK_ICON_VIEW(icv->IV),gtk_paned_get_position(GTK_PANED(paned))); + } +} + char *yon_char_get_augumented(char *source, char *append){ int size=strlen(source)+strlen(append)+1; char *final=malloc(size); @@ -1322,9 +1331,9 @@ dictionary *yon_theme_new(dictionary *widgets, GtkBuilder *builder, char *theme_ sysinfo(&info); char lbl[2000]; memset(lbl,0,2000); - double mind=(double)(info.uptime/60/60)/60*100; + double mind=(double)info.uptime/60; // 13=x*60/100 int minutes=mind; - sprintf(lbl,"Система: %s\nЯдро: %s %s %s\nВремя работы: %d ч. %d мин. \n\nОперативная память: %d MiB/%d MiB",sysinfos.sysname,sysinfos.machine,sysinfos.sysname,sysinfos.release,info.uptime/60/60,minutes,info.totalram/1024/1024,info.freeram/1024/1024); + sprintf(lbl,"Система: UBLinux\nЯдро: %s %s %s\nВремя работы: %d ч. %d мин. \n\nОперативная память: %d MiB/%d MiB",sysinfos.machine,sysinfos.sysname,sysinfos.release,info.uptime/60/60,minutes,info.freeram/1024/1024,info.totalram/1024/1024); gtk_label_set_text(GTK_LABEL(curWidgets->GnomeInfoLabel),lbl); printf("\n\n%d\n\n",info.totalram/1024/1024); printf("\n\n%d\n\n",info.freeram/1024/1024); diff --git a/ui/ubl-settings-manager.glade b/ui/ubl-settings-manager.glade index b087e6d..be387c2 100644 --- a/ui/ubl-settings-manager.glade +++ b/ui/ubl-settings-manager.glade @@ -321,7 +321,7 @@ 64 True False - ../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg + ../../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg False @@ -988,7 +988,8 @@ True False - gtk-missing-image + 50 + ../../../../../../../usr/share/icons/ubmanager-cockpit.svg False @@ -998,12 +999,13 @@ + iconlabel True False fsdfhsdftj True - 0 - 0 + 0.15000000596046448 + 0.5 True @@ -1127,7 +1129,7 @@ True False - ../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg + ../../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg 5 @@ -1317,7 +1319,7 @@ True False - ../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg + ../../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg 5 @@ -1521,7 +1523,7 @@ True False - ../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg + ../../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg 5