From 43d3f48715c3631fd669fa96fbb43e67e6b7148f Mon Sep 17 00:00:00 2001 From: YanTheKaller Date: Tue, 24 Jan 2023 10:54:25 +0000 Subject: [PATCH] New functionality --- .config/ubconfig-main/ubconfig-main.conf | 15 + .gitignore | 9 + css/gtk-widgets.css | 22 +- ubl-settings-manager.c | 93 +- ui/forTest.glade~ | 39 + ui/ubl-settings-manager backup 1.glade~ | 1589 ++++++++++++++++++++++ ui/ubl-settings-manager backup.glade~ | 1468 ++++++++++++++++++++ ui/ubl-settings-manager.glade | 73 +- 8 files changed, 3246 insertions(+), 62 deletions(-) create mode 100644 .config/ubconfig-main/ubconfig-main.conf create mode 100644 .gitignore create mode 100644 ui/forTest.glade~ create mode 100644 ui/ubl-settings-manager backup 1.glade~ create mode 100644 ui/ubl-settings-manager backup.glade~ diff --git a/.config/ubconfig-main/ubconfig-main.conf b/.config/ubconfig-main/ubconfig-main.conf new file mode 100644 index 0000000..c9c03db --- /dev/null +++ b/.config/ubconfig-main/ubconfig-main.conf @@ -0,0 +1,15 @@ +[window] +WindowPosX=0 +WindowPosY=0 +WindowWidth=1920 +WindowHeight=1004 +WindowTheme=1 +IconSize=2 +IconSegmentSize=152 + +[sections] +Personal=XFCE; +Hardware=X-UBL-SettingsManager;X-UBL-HardwareSettings; +System=X-UBL-SettingsManager;X-UBL-SystemSettings; +Misc=X-UBL-SettingsManager;X-UBL-PersonalSettings; +Xfce Настройки=X-XFCE-SettingsDialog; diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2d7cb9c --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +.vscode/ +config.conf +ubconfig-main-back.conf +gtk-dark.css +msgformat.py +calendarApp.glade +calendarApp.glade~ +ubl-settings-manager.glade~ +ubl-settings-manager-bin \ No newline at end of file diff --git a/css/gtk-widgets.css b/css/gtk-widgets.css index cdb8a65..db09f48 100644 --- a/css/gtk-widgets.css +++ b/css/gtk-widgets.css @@ -30,10 +30,28 @@ background-color: #404040; } -iconview:disabled { - background-color: rgba(0,0,0,0); +#Icon { + background-color: transparent; + color: transparent; +} + +iconview#GnomeIcon{ + border-style:solid; + border-bottom-width: 1px; + border-image: linear-gradient(90deg, #aaaaaa 0%, #dcddde 100%); + border-image-slice: 1; + + background-color: transparent; } #noborders{ border-style:solid; border: 0px; } + +label#iconlabel { + font-size:14px; + font-weight: bold; +} +#combo{ + text-align:center; +} diff --git a/ubl-settings-manager.c b/ubl-settings-manager.c index b93938a..a367bb5 100644 --- a/ubl-settings-manager.c +++ b/ubl-settings-manager.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "ubl-settings-manager.h" @@ -1007,11 +1008,14 @@ IVGraphicals *yon_create_single_section_IV(char *name,char *cats){ IVGraphicals *IVG=malloc(sizeof(IVGraphicals)); GtkWidget *box=gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); GtkWidget *iv=gtk_icon_view_new(); + GtkWidget *label=gtk_label_new(_(name)); + gtk_widget_set_name(label,"iconlabel"); 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); } - GtkWidget *label=gtk_label_new(_(name)); + GtkWidget *sep=gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); GtkListStore *lv=gtk_list_store_new(2, GDK_TYPE_PIXBUF,G_TYPE_STRING); gtk_widget_set_halign(box,0); @@ -1149,6 +1153,9 @@ SectionSettingSegment *yon_create_section_setting(char *name, char *categories){ segment->DeleditBox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0); segment->ButtonDelete=gtk_button_new_from_icon_name("edit-delete",GTK_ICON_SIZE_BUTTON); + gtk_widget_set_name(segment->NameLabel,"SegName"); + gtk_widget_set_name(segment->CategoriesLabel,"SegCat"); + gtk_container_add(GTK_CONTAINER(segment->MainFrame),segment->MainBox); gtk_box_pack_start(GTK_BOX(segment->MainBox),segment->DragButtonBox,FALSE,FALSE,0); @@ -1158,9 +1165,9 @@ SectionSettingSegment *yon_create_section_setting(char *name, char *categories){ gtk_box_pack_start(GTK_BOX(segment->DragButtonBox),segment->DragDownButton,FALSE,FALSE,0); gtk_box_pack_start(GTK_BOX(segment->ElemBox),segment->NameBox,FALSE,FALSE,0); - gtk_box_pack_start(GTK_BOX(segment->ElemBox),segment->CategoriesBox,FALSE,FALSE,0); + gtk_box_pack_end(GTK_BOX(segment->ElemBox),segment->CategoriesBox,FALSE,FALSE,0); - gtk_box_pack_start(GTK_BOX(segment->ElemBox),segment->OptionBox,FALSE,FALSE,0); + gtk_box_pack_start(GTK_BOX(segment->MainBox),segment->OptionBox,FALSE,FALSE,0); gtk_box_pack_start(GTK_BOX(segment->NameBox),segment->NameEntry,FALSE,FALSE,5); gtk_box_pack_start(GTK_BOX(segment->NameBox),segment->NameLabel,FALSE,FALSE,5); @@ -1186,29 +1193,33 @@ SectionSettingSegment *yon_create_section_setting(char *name, char *categories){ gtk_widget_set_margin_top(segment->DragButtonBox,3); gtk_widget_set_margin_end(segment->DragUpButton,3); - gtk_widget_set_halign(segment->ElemBox,GTK_ALIGN_FILL); - gtk_widget_set_halign(segment->NameBox,GTK_ALIGN_START); - gtk_widget_set_halign(segment->CategoriesBox,GTK_ALIGN_START); + // gtk_widget_set_halign(segment->ElemBox,GTK_ALIGN_FILL); + // gtk_widget_set_halign(segment->NameBox,GTK_ALIGN_START); + // gtk_widget_set_halign(segment->CategoriesBox,GTK_ALIGN_START); gtk_widget_set_halign(segment->NameEntry,GTK_ALIGN_START); - gtk_widget_set_halign(segment->NameLabel,GTK_ALIGN_START); - gtk_widget_set_halign(segment->CategoriesEntry,GTK_ALIGN_START); - gtk_widget_set_halign(segment->CategoriesLabel,GTK_ALIGN_START); - gtk_widget_set_halign(segment->EditButtonAccept,GTK_ALIGN_END); - gtk_widget_set_halign(segment->EditButtonBox,GTK_ALIGN_END); - gtk_widget_set_halign(segment->EditButtonCancel,GTK_ALIGN_END); - gtk_widget_set_halign(segment->ButtonEdit,GTK_ALIGN_END); + gtk_widget_set_halign(segment->NameLabel,GTK_ALIGN_END); + // gtk_widget_set_halign(segment->CategoriesEntry,GTK_ALIGN_START); + // gtk_widget_set_halign(segment->CategoriesLabel,GTK_ALIGN_START); + // gtk_widget_set_halign(segment->EditButtonAccept,GTK_ALIGN_END); + // gtk_widget_set_halign(segment->EditButtonBox,GTK_ALIGN_END); + // gtk_widget_set_halign(segment->EditButtonCancel,GTK_ALIGN_END); + // gtk_widget_set_halign(segment->ButtonEdit,GTK_ALIGN_END); - gtk_widget_set_valign(segment->ElemBox,GTK_ALIGN_CENTER); - gtk_widget_set_valign(segment->NameBox,GTK_ALIGN_CENTER); - gtk_widget_set_valign(segment->CategoriesBox,GTK_ALIGN_CENTER); - gtk_widget_set_valign(segment->NameEntry,GTK_ALIGN_CENTER); - gtk_widget_set_valign(segment->NameLabel,GTK_ALIGN_CENTER); - gtk_widget_set_valign(segment->CategoriesEntry,GTK_ALIGN_CENTER); - gtk_widget_set_valign(segment->CategoriesLabel,GTK_ALIGN_CENTER); - - gtk_widget_set_hexpand(segment->ElemBox,1); - gtk_widget_set_hexpand(segment->CategoriesEntry,1); - gtk_widget_set_hexpand(segment->CategoriesLabel,1); + // gtk_widget_set_valign(segment->ElemBox,GTK_ALIGN_CENTER); + // gtk_widget_set_valign(segment->NameBox,GTK_ALIGN_CENTER); + // gtk_widget_set_valign(segment->CategoriesBox,GTK_ALIGN_CENTER); + // gtk_widget_set_valign(segment->NameEntry,GTK_ALIGN_START); + // gtk_widget_set_valign(segment->NameLabel,GTK_ALIGN_START); + // gtk_widget_set_valign(segment->CategoriesEntry,GTK_ALIGN_CENTER); + // gtk_widget_set_valign(segment->CategoriesLabel,GTK_ALIGN_CENTER); + gtk_widget_set_valign(segment->OptionBox,GTK_ALIGN_CENTER); + gtk_label_set_xalign(GTK_LABEL(segment->NameLabel),0); + gtk_label_set_xalign(GTK_LABEL(segment->CategoriesLabel),0); + // gtk_widget_set_hexpand(segment->ElemBox,1); + // gtk_widget_set_hexpand(segment->NameEntry,1); + // gtk_widget_set_hexpand(segment->NameLabel,1); + // gtk_widget_set_hexpand(segment->CategoriesEntry,1); + // gtk_widget_set_hexpand(segment->CategoriesLabel,1); gtk_widget_set_vexpand(segment->ElemBox,0); @@ -1294,19 +1305,27 @@ dictionary *yon_theme_new(dictionary *widgets, GtkBuilder *builder, char *theme_ curWidgets->workingwindow=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"workingwindow"))); curWidgets->icvpack=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"icvpack"))); curWidgets->GnomePaned=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"Paned"))); - curWidgets->GnomeInfoLabel=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"Paned"))); + curWidgets->GnomeInfoLabel=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"InfoLabel"))); curWidgets->SettingsSections=NULL; + gtk_style_context_add_class(gtk_widget_get_style_context(curWidgets->icvpack),"iconview"); if (curWidgets->GnomeInfoLabel!=NULL){ - struct utsname sysinfo; - uname(&sysinfo); - struct seq_file *fl; - show_cpuinfo(fl); - printf("System Name = %s\n", sysinfo.sysname); - printf("Node Name = %s\n", sysinfo.nodename); - printf("Version = %s\n", sysinfo.version); - printf("Release = %s\n", sysinfo.release); - printf("Machine = %s\n", sysinfo.machine); + struct utsname sysinfos; + uname(&sysinfos); + printf("System Name = %s\n", sysinfos.sysname); + printf("Node Name = %s\n", sysinfos.nodename); + printf("Version = %s\n", sysinfos.version); + printf("Release = %s\n", sysinfos.release); + printf("Machine = %s\n", sysinfos.machine); + struct sysinfo info; + sysinfo(&info); + char lbl[2000]; + memset(lbl,0,2000); + sprintf(lbl,"Система: %s\nЯдро: %s %s %s\nВремя работы: %\n\nОперативная память: %f/%f",sysinfos.sysname,sysinfos.machine,sysinfos.sysname,sysinfos.release,info.uptime/60/60,info.totalram/1024/1024,info.freeram/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); + } if (curWidgets->ButtonBackToMain!=NULL) gtk_button_set_label(GTK_BUTTON(curWidgets->ButtonBackToMain),_("Back to settings")); @@ -1316,8 +1335,10 @@ dictionary *yon_theme_new(dictionary *widgets, GtkBuilder *builder, char *theme_ 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"); - if (curWidgets->GnomePaned!=NULL) + if (curWidgets->GnomePaned!=NULL){ g_signal_connect(G_OBJECT(curWidgets->GnomePaned), "notify::position", G_CALLBACK(on_paned_move), curWidgets); + + } // Standard for all themes curWidgets->settingsThemeChooser=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsThemeChooser")); @@ -1424,7 +1445,7 @@ int main(int argc, char *argv[]){ gtk_css_provider_load_from_path(css,CssPath,NULL); gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), GTK_STYLE_PROVIDER(css), - GTK_STYLE_PROVIDER_PRIORITY_USER); + 0); gtk_main(); } diff --git a/ui/forTest.glade~ b/ui/forTest.glade~ new file mode 100644 index 0000000..18e3af5 --- /dev/null +++ b/ui/forTest.glade~ @@ -0,0 +1,39 @@ + + + + + + False + + + True + False + vertical + + + + + + True + False + + + True + False + label + + + + + True + True + 1 + + + + + + + + + diff --git a/ui/ubl-settings-manager backup 1.glade~ b/ui/ubl-settings-manager backup 1.glade~ new file mode 100644 index 0000000..d77501d --- /dev/null +++ b/ui/ubl-settings-manager backup 1.glade~ @@ -0,0 +1,1589 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + 450 + 250 + dialog-question + + + True + False + vertical + + + True + False + + + True + False + start + 20 + 20 + gtk-dialog-question + 6 + + + False + True + 0 + + + + + True + False + vertical + + + True + False + start + 10 + 5 + Вы хотите прочитать руководство в сети? + + + + + + + False + True + 0 + + + + + True + False + start + start + 15 + Вы будете перенаправлены на сайт с документацией, где страницы помощи переводятся и +поддерживаются сообществом. + + + + True + True + 1 + + + + + Всегда перенаправлять на онлайн-документацию + True + True + False + end + 5 + 10 + True + + + + False + True + 2 + + + + + + True + True + 1 + + + + + + True + True + 0 + + + + + True + False + + + Отменить + True + True + True + + + + + True + True + 0 + + + + + Прочитать онлайн + True + True + True + + + + + True + True + 1 + + + + + False + True + 1 + + + + + + + False + 800 + 600 + + + True + False + vertical + + + True + False + + + True + False + vertical + + + True + False + center + ../images/side_img_ubc_v_dark_grad_down.png + 3 + + + + False + True + 0 + + + + + + False + True + 0 + + + + + True + False + vertical + + + True + False + 2 + 2 + 2 + 2 + 2 + 2 + + + True + True + in + + + True + False + natural + + + + + + + + + + True + True + 0 + + + + + + True + True + 0 + + + + + True + False + vertical + + + + + + + False + True + 1 + + + + + True + True + 1 + + + + + + True + True + 0 + + + + + + + True + False + + + True + False + True + + + True + False + UBLinux Settings Manager + + + True + True + 0 + + + + + True + True + False + True + menu1 + none + False + + + + + + False + True + 1 + + + + + + + True + False + ../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg + 5 + + + + + + + + True + False + emblem-danger + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 5 + 2 + 1 + 1 + + + False + 440 + 250 + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 2 + 0 + in + + + True + False + 12 + + + True + False + + + True + False + vertical + + + True + False + 5 + 32x32 + + + False + True + 0 + + + + + True + True + 10 + 10 + 10 + 10 + adjustment1 + 5 + 0 + 0 + False + + + True + True + 1 + + + + + True + True + 0 + + + + + 64 + 64 + True + False + ../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg + + + False + True + 1 + + + + + + + + + True + False + Рамер иконок + + + + + True + True + 1 + + + + + True + False + 5 + 5 + 2 + 5 + 0 + in + + + True + False + 12 + + + True + False + vertical + + + True + False + 0 + + Стандартная тема + GNOME тема + + + + False + True + 0 + + + + + + + + + True + False + Выбор темы + + + + + True + True + 2 + + + + + True + False + + + True + False + 5 + 5 + + + Закрыть без сохранения + 200 + True + True + True + 2 + + + False + True + 0 + + + + + Сохранить и перезагрузить + 200 + True + True + True + 2 + + + False + True + end + 1 + + + + + True + True + 0 + + + + + False + True + 4 + + + + + + + 1 + 1 + 10 + + + True + False + gtk-go-back + + + True + False + ../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg + 6 + + + True + False + + + True + False + Element 1 + + + + + True + False + Element 2 + + + True + False + + + True + False + Element 3 + + + + + + + + + Element 4 + True + False + image3 + False + + + + + + + + + + + Стандартная тема + + + GNOME тема + + + + + True + False + + + True + False + Параметры UBL Settings Manager + Параметры + True + + + + + True + False + О программе... + True + + + + + False + 800 + 600 + + + True + False + vertical + + + True + False + + + True + False + True + vertical + + + True + False + center + ../images/side_img_ubc_v_dark_grad_down.png + 3 + + + + False + True + 0 + + + + + + False + True + 0 + + + + + True + True + in + 150 + True + + + True + False + + + True + False + 3 + 3 + 3 + 3 + vertical + + + True + False + start + Личные + + + False + True + 0 + + + + + True + False + + + False + True + 1 + + + + + True + True + 0 + horizontal + GnomeModelPersonal + 1 + 6 + 0 + 0 + True + + + + False + False + 2 + + + + + True + False + start + Оборудование + + + False + True + 3 + + + + + True + False + + + False + True + 4 + + + + + True + True + 0 + horizontal + GnomeModelHardware + 1 + 6 + 0 + 0 + True + + + + False + False + 5 + + + + + True + False + start + Система + + + False + True + 6 + + + + + True + False + + + False + True + 7 + + + + + True + True + 0 + horizontal + GnomeModelSystem + 1 + 6 + 0 + 0 + True + + + + False + False + 8 + + + + + True + False + start + Прочее + + + False + True + 9 + + + + + True + False + + + False + True + 10 + + + + + True + True + 0 + horizontal + GnomeModelMisc + 1 + 6 + 0 + 0 + True + + + + False + False + 11 + + + + + + + + + False + True + 1 + + + + + True + False + vertical + + + True + False + vertical + + + True + False + 3 + 3 + 3 + 3 + 0 + in + + + True + False + 12 + + + True + False + gtk-missing-image + 6 + + + + + + + + + + True + True + 0 + + + + + True + True + 0 + + + + + True + False + vertical + + + True + False + vertical + + + + + + False + True + 0 + + + + + False + True + 1 + + + + + True + True + 3 + + + + + True + True + 0 + + + + + + + True + False + True + + + True + False + True + + + True + False + UBLinux Settings Manager + + + True + True + 0 + + + + + True + True + False + True + menu1 + none + False + + + + + + False + True + 1 + + + + + + + True + False + ../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg + 5 + + + + + + + False + 800 + 600 + + + True + False + vertical + + + True + False + + + True + False + vertical + + + True + False + center + ../images/side_img_ubc_v_dark_grad_down.png + 3 + + + + False + True + 0 + + + + + + False + True + 0 + + + + + True + False + vertical + + + True + False + 2 + 2 + 2 + 2 + 2 + 2 + + + True + True + in + + + True + False + natural + + + True + False + vertical + + + True + False + start + 1 + 1 + Личные + + + + + + + False + True + 0 + + + + + True + False + 5 + 5 + + + + False + True + 1 + + + + + True + False + vertical + + + + + + False + True + 2 + + + + + True + False + start + 1 + 1 + Оборудование + + + + + + + False + True + 3 + + + + + True + False + 5 + 5 + + + + False + True + 4 + + + + + True + False + vertical + + + + + + False + True + 5 + + + + + True + False + start + 1 + 1 + Система + + + + + + + False + True + 6 + + + + + True + False + 5 + 5 + + + + False + True + 7 + + + + + True + False + vertical + + + + + + False + True + 8 + + + + + True + False + start + 1 + 1 + Прочее + + + + + + + False + True + 9 + + + + + True + False + 5 + 5 + + + + False + True + 10 + + + + + True + False + vertical + + + + + + False + True + 11 + + + + + + + + + + + + True + True + 0 + + + + + + True + True + 0 + + + + + True + False + vertical + + + + + + + False + True + 1 + + + + + True + True + 1 + + + + + + True + True + 0 + + + + + + + True + False + True + + + True + False + True + + + True + False + UBLinux Settings Manager + + + True + True + 0 + + + + + True + True + False + True + menu1 + none + False + + + + + + False + True + 1 + + + + + + + True + False + ../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg + 5 + + + + + Все настройки + True + False + True + False + False + False + 10 + 10 + image1 + + + + + 1 + + + + + + + diff --git a/ui/ubl-settings-manager backup.glade~ b/ui/ubl-settings-manager backup.glade~ new file mode 100644 index 0000000..25cb799 --- /dev/null +++ b/ui/ubl-settings-manager backup.glade~ @@ -0,0 +1,1468 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + 450 + 250 + dialog-question + + + True + False + vertical + + + True + False + + + True + False + start + 20 + 20 + gtk-dialog-question + 6 + + + False + True + 0 + + + + + True + False + vertical + + + True + False + start + 10 + 5 + Вы хотите прочитать руководство в сети? + + + + + + + False + True + 0 + + + + + True + False + start + start + 15 + Вы будете перенаправлены на сайт с документацией, где страницы помощи переводятся и +поддерживаются сообществом. + + + + True + True + 1 + + + + + Всегда перенаправлять на онлайн-документацию + True + True + False + end + 5 + 10 + True + + + + False + True + 2 + + + + + + True + True + 1 + + + + + + True + True + 0 + + + + + True + False + + + Отменить + True + True + True + + + + + True + True + 0 + + + + + Прочитать онлайн + True + True + True + + + + + True + True + 1 + + + + + False + True + 1 + + + + + + + True + False + emblem-danger + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 5 + 2 + 1 + 1 + + + False + 440 + 250 + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 2 + 0 + in + + + True + False + 12 + + + True + False + + + True + False + vertical + + + True + False + 5 + 32x32 + + + False + True + 0 + + + + + True + True + 10 + 10 + 10 + 10 + adjustment1 + 5 + 0 + 0 + False + + + True + True + 1 + + + + + True + True + 0 + + + + + 64 + 64 + True + False + ../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg + + + False + True + 1 + + + + + + + + + True + False + Рамер иконок + + + + + True + True + 1 + + + + + True + False + 5 + 5 + 2 + 5 + 0 + in + + + True + False + 12 + + + True + False + vertical + + + True + False + 0 + + Стандартная тема + GNOME тема + + + + False + True + 0 + + + + + + + + + True + False + Выбор темы + + + + + True + True + 2 + + + + + True + False + + + True + False + 5 + 5 + + + Закрыть без сохранения + 200 + True + True + True + 2 + + + False + True + 0 + + + + + Сохранить и перезагрузить + 200 + True + True + True + 2 + + + False + True + end + 1 + + + + + True + True + 0 + + + + + False + True + 4 + + + + + + + 1 + 1 + 10 + + + True + False + gtk-go-back + + + True + False + ../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg + 6 + + + True + False + + + True + False + Element 1 + + + + + True + False + Element 2 + + + True + False + + + True + False + Element 3 + + + + + + + + + Element 4 + True + False + image3 + False + + + + + + + + + + + Стандартная тема + + + GNOME тема + + + + + True + False + + + True + False + Параметры UBL Settings Manager + Параметры + True + + + + + True + False + О программе... + True + + + + + False + 800 + 600 + + + True + False + vertical + + + True + False + + + True + False + True + vertical + + + True + False + center + ../images/side_img_ubc_v_dark_grad_down.png + 3 + + + + False + True + 0 + + + + + + False + True + 0 + + + + + True + True + in + 150 + True + + + True + False + + + True + False + 3 + 3 + 3 + 3 + vertical + + + True + False + start + Личные + + + False + True + 0 + + + + + True + False + + + False + True + 1 + + + + + True + True + 0 + horizontal + GnomeModelPersonal + 1 + 6 + 0 + 0 + True + + + + False + False + 2 + + + + + True + False + start + Оборудование + + + False + True + 3 + + + + + True + False + + + False + True + 4 + + + + + True + True + 0 + horizontal + GnomeModelHardware + 1 + 6 + 0 + 0 + True + + + + False + False + 5 + + + + + True + False + start + Система + + + False + True + 6 + + + + + True + False + + + False + True + 7 + + + + + True + True + 0 + horizontal + GnomeModelSystem + 1 + 6 + 0 + 0 + True + + + + False + False + 8 + + + + + True + False + start + Прочее + + + False + True + 9 + + + + + True + False + + + False + True + 10 + + + + + True + True + 0 + horizontal + GnomeModelMisc + 1 + 6 + 0 + 0 + True + + + + False + False + 11 + + + + + + + + + False + True + 1 + + + + + True + False + vertical + + + True + False + vertical + + + True + False + 3 + 3 + 3 + 3 + 0 + in + + + True + False + 12 + + + True + False + gtk-missing-image + 6 + + + + + + + + + + True + True + 0 + + + + + True + True + 0 + + + + + True + False + vertical + + + True + False + vertical + + + + + + False + True + 0 + + + + + False + True + 1 + + + + + True + True + 3 + + + + + True + True + 0 + + + + + + + True + False + True + + + True + False + True + + + True + False + UBLinux Settings Manager + + + True + True + 0 + + + + + True + True + False + True + menu1 + none + False + + + + + + False + True + 1 + + + + + + + True + False + ../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg + 5 + + + + + + + False + 800 + 600 + + + True + False + vertical + + + True + False + + + True + False + vertical + + + True + False + center + ../images/side_img_ubc_v_dark_grad_down.png + 3 + + + + False + True + 0 + + + + + + False + True + 0 + + + + + True + False + vertical + + + True + False + 2 + 2 + 2 + 2 + 2 + 2 + + + True + True + in + + + True + False + natural + + + True + False + vertical + + + True + False + start + 1 + 1 + Личные + + + + + + + False + True + 0 + + + + + True + False + 5 + 5 + + + + False + True + 1 + + + + + True + False + vertical + + + True + True + 6 + queue + natural + ModelPersonal + 75 + 10 + 20 + True + + + + + False + True + 0 + + + + + False + True + 2 + + + + + True + False + start + 1 + 1 + Оборудование + + + + + + + False + True + 3 + + + + + True + False + 5 + 5 + + + + False + True + 4 + + + + + True + False + vertical + + + True + True + 6 + queue + natural + ModelHardware + 75 + 0 + 20 + True + + + + + False + True + 0 + + + + + False + True + 5 + + + + + True + False + start + 1 + 1 + Система + + + + + + + False + True + 6 + + + + + True + False + 5 + 5 + + + + False + True + 7 + + + + + True + False + vertical + + + True + True + 6 + queue + natural + ModelSystem + 75 + 0 + 0 + True + + + + + False + True + 0 + + + + + False + True + 8 + + + + + True + False + start + 1 + 1 + Прочее + + + + + + + False + True + 9 + + + + + True + False + 5 + 5 + + + + False + True + 10 + + + + + True + False + vertical + + + True + True + 10 + 6 + queue + natural + ModelMisc + 75 + 0 + 0 + True + + + + + False + True + 0 + + + + + False + True + 11 + + + + + + + + + + + + True + True + 0 + + + + + + True + True + 0 + + + + + True + False + vertical + + + + + + + False + True + 1 + + + + + True + True + 1 + + + + + + True + True + 0 + + + + + + + True + False + True + + + True + False + True + + + True + False + UBLinux Settings Manager + + + True + True + 0 + + + + + True + True + False + True + menu1 + none + False + + + + + + False + True + 1 + + + + + + + True + False + ../../../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg + 5 + + + + + Все настройки + True + False + True + False + False + False + 10 + 10 + image1 + + + + + 1 + + + + + + + diff --git a/ui/ubl-settings-manager.glade b/ui/ubl-settings-manager.glade index bcea24b..b087e6d 100644 --- a/ui/ubl-settings-manager.glade +++ b/ui/ubl-settings-manager.glade @@ -361,7 +361,6 @@ True False - 12 True @@ -369,13 +368,18 @@ vertical + combo True False + center + 10 10 + 5 + True 0 - False + True True 0 @@ -399,31 +403,49 @@ - + True False - True - True - - - + 5 + 5 + 0 + in - - Настройка разделов + True - True - True - center - 5 + False + + + True + False + True + True + + + Настройка разделов + True + True + True + 10 + 10 + 5 + + + True + True + 1 + + + + - - False - True - 1 - - - + + + True + False + Тонкая настройка + @@ -639,7 +661,7 @@ True True center - 5 + 3 image2 @@ -652,7 +674,6 @@ True True - 5 True False Название группы @@ -678,6 +699,7 @@ True True True + 5 image4 @@ -699,7 +721,7 @@ 5 5 5 - 5 + 10 False Идетификатор @@ -978,7 +1000,10 @@ True False + fsdfhsdftj True + 0 + 0 True