From 9108dc21fed5463246ce7c6ac0b70d8d12aab8a2 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 28 Feb 2023 10:08:11 +0600 Subject: [PATCH] minor changes and fixes --- Makefile | 6 +- source/ubl-settings-manager.c | 93 +- source/ubl-settings-manager.h | 3 +- ubconfig-gui.svg | 4957 +++++++++++++++++++++++++++++++++ ubconfig-main.conf | 2 +- ubl-settings-manager.css | 13 +- ubl-settings-manager.desktop | 2 +- ubl-settings-manager.glade | 980 ++++--- 8 files changed, 5598 insertions(+), 458 deletions(-) create mode 100644 ubconfig-gui.svg diff --git a/Makefile b/Makefile index 4c1f9b8..d73c976 100644 --- a/Makefile +++ b/Makefile @@ -79,6 +79,7 @@ uninstall: @$(RM) "/usr/share/applications/${PKGNAME}.desktop" @$(RM) "/usr/share/icons/hicolor/scalable/apps/${PKGNAME}.png" @$(RM) "/usr/share/icons/hicolor/scalable/apps/${PKGNAME}.svg" + @$(RM) "/usr/share/icons/hicolor/scalable/apps/ubconfig-gui.svg" @$(RM) "/etc/ubconfig-main.conf" @$(RM) "~/ubconfig-main.conf" @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null @@ -102,19 +103,18 @@ install: check uninstall done @install -dm755 /usr/share/icons/hicolor/scalable/apps @install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ${PKGNAME}.svg - @install -dm755 /usr/share/icons/hicolor/scalable/status + @install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ubconfig-gui.svg @install -Dm755 -t /usr/bin/ ${CMAKE_BUILD_DIR}/${PKGNAME} @install -Dm644 -t /usr/share/applications/ ${PKGNAME}.desktop @install -Dm644 -t /usr/share/${PKGNAME}/ui/ ${PKGNAME}.glade @install -Dm644 -t /usr/share/${PKGNAME}/css/ ${PKGNAME}.css @install -Dm644 -t /etc/ ubconfig-main.conf chmod 766 /etc/ubconfig-main.conf - @install -Dm655 -t ~/.config/ ubconfig-main.conf @install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ${PKGNAME}.png @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null @update-desktop-database --quiet 2>/dev/null @touch /usr/share/applications - @echo "Install: OK ${USER}" + @echo "Install: OK" clean: @echo "Clean ..." diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index e0c53cd..24aeb38 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -267,7 +267,7 @@ void on_paned_move(GtkPaned* self, GtkScrollType* scroll_type, actionWidgets *wi int position=gtk_paned_get_position(GTK_PANED(widgets->GnomePaned)); main_config.iconSegmentSize=position; if (position <115) position=115; - double pos=((double)position-(1/(double)position*4)*500)/1.8; + double pos=((double)position-(11/(double)position*4)*500)/1.3; if (pos<110) pos=110; //printf("Paned moved to %f\n",pos); for (dictionary *dict=widgets->ICSys;dict!=NULL;dict=dict->next){ @@ -293,7 +293,7 @@ int on_settingsOpen(GtkWidget *button, actionWidgets *widgets){ char *tmp=malloc(6); sprintf(tmp,"%dx%d\0",main_config.iconsize,main_config.iconsize); gtk_label_set_text(GTK_LABEL(widgets->settingsSizeInfoLabel),tmp); - gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->settingsIcon),gdk_pixbuf_new_from_file_at_scale("/usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg",main_config.iconsize,main_config.iconsize,1,NULL)); + gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->settingsIcon),gdk_pixbuf_new_from_file_at_scale(AppIconPath,main_config.iconsize,main_config.iconsize,1,NULL)); gtk_window_present(GTK_WINDOW(widgets->SettingsWindow)); }; @@ -301,22 +301,22 @@ int on_settingsOpen(GtkWidget *button, actionWidgets *widgets){ int on_settings_icon_size_changed(GtkWidget* self, actionWidgets *widgets){ int val=(int)gtk_range_get_value(GTK_RANGE(self)); if ((int)val==1||(int)val==0){ - gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->settingsIcon),gdk_pixbuf_new_from_file_at_scale("/usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg",24,24,1,NULL)); + gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->settingsIcon),gdk_pixbuf_new_from_file_at_scale(AppIconPath,24,24,1,NULL)); gtk_label_set_text(GTK_LABEL(widgets->settingsSizeInfoLabel),"24x24"); main_config.iconsize=24; } if ((int)val==2){ - gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->settingsIcon),gdk_pixbuf_new_from_file_at_scale("/usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg",32,32,1,NULL)); + gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->settingsIcon),gdk_pixbuf_new_from_file_at_scale(AppIconPath,32,32,1,NULL)); gtk_label_set_text(GTK_LABEL(widgets->settingsSizeInfoLabel),"32x32"); main_config.iconsize=32; } if ((int)val==3){ - gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->settingsIcon),gdk_pixbuf_new_from_file_at_scale("/usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg",48,48,1,NULL)); + gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->settingsIcon),gdk_pixbuf_new_from_file_at_scale(AppIconPath,48,48,1,NULL)); gtk_label_set_text(GTK_LABEL(widgets->settingsSizeInfoLabel),"48x48"); main_config.iconsize=48; } if ((int)val==4){ - gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->settingsIcon),gdk_pixbuf_new_from_file_at_scale("/usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg",64,64,1,NULL)); + gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->settingsIcon),gdk_pixbuf_new_from_file_at_scale(AppIconPath,64,64,1,NULL)); gtk_label_set_text(GTK_LABEL(widgets->settingsSizeInfoLabel),"64x64"); main_config.iconsize=64; } @@ -613,6 +613,8 @@ 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; + + printf("1\n"); gtk_window_get_size(GTK_WINDOW(window),&main_config.windowWidth,&main_config.windowHeight); if (main_config.windowWidth<1240){ if (stld==0){ @@ -633,6 +635,8 @@ void on_resized (GtkWidget *window, GdkEventConfigure *event, dictionary *widget gtk_widget_hide(widgets->window); } }else { + yon_segments_hide(widgets); + yon_segments_show(widgets); if (stld==1){ stld=0; cmld=0; @@ -693,15 +697,17 @@ apps *get_app_by_name(apps *applist,char *name, int size){ int reload_list(IVGraphicals *section){ gtk_icon_view_set_model(GTK_ICON_VIEW(section->IV),GTK_TREE_MODEL(section->LV)); - gtk_icon_view_set_pixbuf_column(GTK_ICON_VIEW(section->IV),0); - gtk_icon_view_set_text_column(GTK_ICON_VIEW(section->IV),1); + //gtk_icon_view_set_pixbuf_column(GTK_ICON_VIEW(section->IV),0); + //gtk_icon_view_set_text_column(GTK_ICON_VIEW(section->IV),1); } int load_apps(IVGraphicals *section, apps *applist, int size){ int catstofind=sizeof(section->categories)/sizeof(char*); int i=0; for (int i=0;icategories)==1){ + //printf("Проверка прошла.\n"); GError *err=NULL; char *path=malloc(strlen(IconPicturesPath)+strlen(applist[i].Icon)+7); memset(path,0,strlen(IconPicturesPath)+strlen(applist[i].Icon)+7); @@ -715,14 +721,15 @@ int load_apps(IVGraphicals *section, apps *applist, int size){ }; GtkTreeIter iter; gtk_list_store_append(section->LV,&iter); - char *ChosenName; - ChosenName=applist[i].Name; - gtk_list_store_set(section->LV,&iter,0,pixbuf,1,ChosenName,-1); + 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); } + //printf("Конец\n"); } + gtk_icon_view_set_model(GTK_ICON_VIEW(section->IV),GTK_TREE_MODEL(section->LV)); - gtk_icon_view_set_pixbuf_column(GTK_ICON_VIEW(section->IV),0); - gtk_icon_view_set_text_column(GTK_ICON_VIEW(section->IV),1); + //gtk_icon_view_set_pixbuf_column(GTK_ICON_VIEW(section->IV),0); + //gtk_icon_view_set_text_column(GTK_ICON_VIEW(section->IV),1); }; int load_apps_with_clear(IVGraphicals *section, apps *applist, int size){ @@ -1005,12 +1012,23 @@ void yon_set_default_sections(dictionary **section){ 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(); + GtkBuilder *builder=gtk_builder_new_from_file(GladePath); + GtkWidget *iv=GTK_WIDGET(gtk_builder_get_object(builder,"iconTemplate")); GtkWidget *label=gtk_label_new(_(name)); PangoAttrList *attrs=pango_attr_list_new(); + PangoFontDescription *descr=pango_font_description_new(); + pango_font_description_set_weight(descr,PANGO_WEIGHT_BOLD); + int stretch = main_config.labelDensity; + if (stretch>8) + stretch = 4; + pango_font_description_set_stretch(descr,main_config.labelDensity); pango_attr_list_insert(attrs,pango_attr_size_new(main_config.labelSize)); + pango_attr_list_insert(attrs, pango_attr_font_desc_new(descr)); gtk_label_set_attributes(GTK_LABEL(label),attrs); - gtk_widget_set_name(label,"iconlabel"); + 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,"SepIcon"); if (main_config.WindowTheme==1) { gtk_icon_view_set_columns(GTK_ICON_VIEW(iv),1); gtk_widget_set_name(iv,"GnomeIcon"); @@ -1018,17 +1036,23 @@ 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_widget_set_name(iv,"Icon"); + gtk_icon_view_set_item_orientation(GTK_ICON_VIEW(iv),GTK_ORIENTATION_HORIZONTAL); } GtkWidget *sep=gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); - gtk_widget_set_name(sep,"thinborder"); - GtkListStore *lv=gtk_list_store_new(2, GDK_TYPE_PIXBUF,G_TYPE_STRING); + //gtk_widget_set_name(sep,"SepIcon"); + GtkListStore *lv=GTK_LIST_STORE(gtk_builder_get_object(builder,"liststoreTemplate")); gtk_widget_set_halign(box,0); gtk_widget_set_valign(box,1); - gtk_icon_view_set_pixbuf_column(GTK_ICON_VIEW(iv),0); - gtk_icon_view_set_text_column(GTK_ICON_VIEW(iv),1); - gtk_icon_view_set_item_width(GTK_ICON_VIEW(iv),75); + gtk_widget_set_margin_end(sep,6); + gtk_widget_set_margin_start(sep,6); + + //gtk_icon_view_set_pixbuf_column(GTK_ICON_VIEW(iv),0); + //gtk_icon_view_set_text_column(GTK_ICON_VIEW(iv),1); + //gtk_icon_view_set_item_width(GTK_ICON_VIEW(iv),150); gtk_icon_view_set_model(GTK_ICON_VIEW(iv),GTK_TREE_MODEL(lv)); + gtk_icon_view_set_item_padding(GTK_ICON_VIEW(iv),0); + gtk_icon_view_set_row_spacing(GTK_ICON_VIEW(iv),10); gtk_label_set_xalign(GTK_LABEL(label),0); gtk_box_pack_start(GTK_BOX(box),label,FALSE,FALSE,0); gtk_box_pack_start(GTK_BOX(box),sep,FALSE,FALSE,0); @@ -1106,8 +1130,10 @@ 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)); - if (width < 115) width=115; - gtk_icon_view_set_item_width(GTK_ICON_VIEW(icv->IV),width); + int pos=(int)((double)width-(11/(double)width*4)*500)/1.3; + if (pos < 115) pos=115; + + gtk_icon_view_set_item_width(GTK_ICON_VIEW(icv->IV),pos); } } @@ -1331,6 +1357,7 @@ void yon_segment_show(actionWidgets *widgets, SectionSettingSegment *sgm){ } void yon_segments_show(actionWidgets *widgets){ + if(widgets->SettingsSections) for (dictionary *dict=widgets->SettingsSections->first;dict!=NULL;dict=dict->next){ SectionSettingSegment *sgm=(SectionSettingSegment*)dict->data; if (sgm!=NULL) @@ -1341,6 +1368,7 @@ void yon_segments_show(actionWidgets *widgets){ }; void yon_segments_hide(actionWidgets *widgets){ + if(widgets->SettingsSections) for (dictionary *dict=widgets->SettingsSections->first;dict!=NULL;dict=dict->next){ SectionSettingSegment *sgm=(SectionSettingSegment*)dict->data; if (sgm!=NULL){ @@ -1384,12 +1412,15 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them curWidgets->socketbuttonplace=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"socketbuttonplace"))); curWidgets->Overlay=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"Overlay"))); curWidgets->ThirdSocketPlace=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"ThirdSocketPlace"))); + curWidgets->MenuItemSettings=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"MenuItemSettings"))); + curWidgets->MenuItemDocumentation=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"MenuItemDocumentation"))); + curWidgets->MenuItemAboutSystem=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"MenuItemAboutSystem"))); curWidgets->SettingsSections=NULL; gtk_style_context_add_class(gtk_widget_get_style_context(curWidgets->icvpack),"iconview"); curWidgets->socket=GTK_WIDGET(create_socket(curWidgets)); curWidgets->MenuItemAboutSystem=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"MenuItemAboutSystem")); - g_signal_connect(G_OBJECT(curWidgets->MenuItemAboutSystem), "activate", G_CALLBACK(on_about_system),curWidgets); + g_signal_connect(G_OBJECT(curWidgets->MenuItemAboutSystem), "clicked", G_CALLBACK(on_about_system),curWidgets); if (curWidgets->ButtonBackToMain!=NULL) gtk_button_set_label(GTK_BUTTON(curWidgets->ButtonBackToMain),_("Back to settings")); gtk_window_set_title(GTK_WINDOW(curWidgets->window),"UBLinux Settings Manager"); @@ -1414,9 +1445,6 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them curWidgets->settingsThemeChooser=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsThemeChooser")); curWidgets->SettingsWindow=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"SettingsWindow")); - curWidgets->MenuItemSettings=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"MenuItemSettings")); - curWidgets->MenuItemDocumentation=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"MenuItemDocumentation")); - curWidgets->MenuItemAboutSystem=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"MenuItemAboutSystem")); curWidgets->DialogOpenDocumentation=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"HelpSureWindow")); curWidgets->CancelHelpButton=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"CancelHelpButton")); curWidgets->ReadHelpButton=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"ReadHelpButton")); @@ -1448,14 +1476,15 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them gtk_window_resize(GTK_WINDOW(curWidgets->window),main_config.windowWidth,main_config.windowHeight); gtk_window_set_icon_from_file(GTK_WINDOW(curWidgets->window),AppIconPath,NULL); gtk_window_set_icon_from_file(GTK_WINDOW(curWidgets->SectionSettingsWindow),AppIconPath,NULL); - + g_signal_connect(G_OBJECT(curWidgets->MenuItemDocumentation), "clicked", G_CALLBACK(on_ButtonOpenHelp_activated), curWidgets->builder); + g_signal_connect(G_OBJECT(curWidgets->MenuItemSettings), "clicked", G_CALLBACK(on_settingsOpen), curWidgets); if (gnld==0){ gnld=1; - g_signal_connect(G_OBJECT(curWidgets->MenuItemDocumentation), "activate", G_CALLBACK(on_ButtonOpenHelp_activated), curWidgets->builder); + 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->MenuItemSettings), "activate", G_CALLBACK(on_settingsOpen), curWidgets); + 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); @@ -1476,9 +1505,9 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them gtk_button_set_label(GTK_BUTTON(curWidgets->settingsCancel),_("Close")); gtk_button_set_label(GTK_BUTTON(curWidgets->settingsAccept),_("Save and apply")); gtk_button_set_label(GTK_BUTTON(curWidgets->AlwaysOpenDocumentation),_("Always redirect")); - gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemSettings),_("Settings")); - gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemDocumentation),_("About...")); - gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemAboutSystem),_("About system")); + gtk_button_set_label(GTK_BUTTON(curWidgets->MenuItemSettings),_("Settings")); + gtk_button_set_label(GTK_BUTTON(curWidgets->MenuItemDocumentation),_("About...")); + gtk_button_set_label(GTK_BUTTON(curWidgets->MenuItemAboutSystem),_("About system")); gtk_button_set_label(GTK_BUTTON(curWidgets->CautionUnderstandButton),_("Understood")); gtk_button_set_label(GTK_BUTTON(curWidgets->settingsSectionsSettingsButton),_("Section management")); return widgets; diff --git a/source/ubl-settings-manager.h b/source/ubl-settings-manager.h index 92f3100..84b32cb 100644 --- a/source/ubl-settings-manager.h +++ b/source/ubl-settings-manager.h @@ -3,11 +3,12 @@ #include + #define GladePath "/usr/share/ubl-settings-manager/ui/ubl-settings-manager.glade" #define CssPath "/usr/share/ubl-settings-manager/css/ubl-settings-manager.css" #define GlobalConfigPath "/etc/ubconfig-main.conf" #define UserConfigPath "/.config/ubl-settings-manager/ubconfig-main.conf" -#define AppIconPath "/usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg" +#define AppIconPath "/usr/share/icons/hicolor/scalable/apps/ubconfig-gui.svg" #define AppBannerPath "/usr/share/icons/hicolor/scalable/apps/ubl-settings-manager.png" #define DesktopPath "/usr/share/applications/" #define IconPicturesPath "/usr/share/icons/hicolor/scalable/apps/" diff --git a/ubconfig-gui.svg b/ubconfig-gui.svg new file mode 100644 index 0000000..f636c26 --- /dev/null +++ b/ubconfig-gui.svg @@ -0,0 +1,4957 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ubconfig-main.conf b/ubconfig-main.conf index 4d5b3a4..34e755e 100644 --- a/ubconfig-main.conf +++ b/ubconfig-main.conf @@ -4,7 +4,7 @@ WindowPosY=0 WindowWidth=800 WindowHeight=600 WindowTheme=0 -IconSize=2 +IconSize=3 IconSegmentSize=250 LabelSize=12 LabelDensity=0 diff --git a/ubl-settings-manager.css b/ubl-settings-manager.css index 437117d..2d44bf7 100644 --- a/ubl-settings-manager.css +++ b/ubl-settings-manager.css @@ -6,9 +6,17 @@ background-color: #404040; #GnomeIcon{ border-style:solid; border-bottom-width: 1px; - border-image: linear-gradient(90deg, #aaaaaa 0%, #dcddde 100%); + border-image: linear-gradient(90deg, #aaaaaa 0%, rgba(170,170,170,0) 80%); border-image-slice: 1; } + +#SepIcon{ + border-style:solid; + border-bottom-width: 2px; + border-image: linear-gradient(90deg, #aaaaaa 0%, rgba(170,170,170,0) 100%); + border-image-slice: 1; +} + #iconlabel { font-size:14px; font-weight: bold; @@ -19,3 +27,6 @@ background-color: #404040; border-width:1px; border-radius:5px; } +.noborder { + border: none; +} diff --git a/ubl-settings-manager.desktop b/ubl-settings-manager.desktop index 0e55e44..e2e7a3f 100644 --- a/ubl-settings-manager.desktop +++ b/ubl-settings-manager.desktop @@ -8,7 +8,7 @@ Comment=ubl-settings-manager Comment[ru]=Приложение для управления настройками UBLinux Type=Application Exec=ubl-settings-manager -Icon=ublinux-ubconfig +Icon=ubconfig-gui Terminal=false X-XfcePluggable=false Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings; diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade index 5deadd5..5e8a228 100644 --- a/ubl-settings-manager.glade +++ b/ubl-settings-manager.glade @@ -82,41 +82,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True True + immediate in 150 True @@ -126,6 +95,8 @@ False + 5 + 5 True False 3 @@ -305,6 +276,22 @@ + + + True + False + UBLinux Settings + + + True + False + 32 + gtk-dialog-question + 5 + + + + True @@ -321,8 +308,13 @@ vertical + 5 + 5 True True + immediate + never + always in @@ -331,6 +323,8 @@ natural + 5 + 5 True False vertical @@ -382,55 +376,28 @@ False emblem-danger - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + True False + menu - + + True + False + + + + True False - - - - - - True - False - + + True + False + True + @@ -519,7 +486,7 @@ 64 True False - ublinux-ubconfig + ubconfig-gui False @@ -711,7 +678,7 @@ - + True False UBLinux Settings @@ -736,7 +703,7 @@ True False - ../../../../usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg + ubconfig-gui 6 @@ -1022,7 +989,7 @@ - + True False UBLinux Settings @@ -1043,39 +1010,134 @@ - + + + + + + + + + + + + + True - False + True + 6 + horizontal + liststoreTemplate + 3 - - True - False - Settings of UBL Settings Manager - Settings - True - + + + 2 + 3 + 0 + - - True - False - Documentation - True - + + + 2 + 3 + 1 + + + + True + False + + + + + + + + + False - + True False - About system... - True + 0 + none + + + True + False + 5 + 5 + 5 + 5 + + + True + False + 4 + 4 + 4 + 4 + vertical + + + True + True + True + Settings + + + False + True + 3 + + + + + True + True + True + Documentation + + + False + True + 4 + + + + + True + True + True + About system + + + False + True + 5 + + + + + + + + + + - + False 800 600 + ubconfig-gui True @@ -1089,10 +1151,9 @@ True False - True vertical - + True False center @@ -1119,163 +1180,85 @@ - + True - True - 52 - True - True + False + vertical - + + Icon True False + 2 + 2 + 2 + 2 + 2 + 2 - + True True - 6 + in + + + True + False + natural + + + + + + - -1 + True + True + 0 + - False - True + True + True + 0 - + True False vertical - - True - False - vertical - - - True - False - 3 - 3 - 3 - 3 - 3 - 0 - in - - - True - False - 12 - - - True - False - center - center - - - - False - True - 0 - - - - - True - False - - - desklabel - True - False - center - right - 1 - - - False - True - 0 - - - - - False - True - 1 - - - - - - - - - - - - True - True - 0 - - - - - True - True - 0 - - - - - True - False - vertical - - - False - vertical - - - - - - False - True - 0 - - - - - False - True - 1 - + + - True - True + False + True + 1 True True - end 1 + True @@ -1289,28 +1272,16 @@ True False - True True False True - + True False - - - True - False - UBLinux Settings Manager - - - True - True - 0 - - + UBLinux Settings Manager True @@ -1319,9 +1290,14 @@ - + True - False + True + False + True + menu1 + none + settingsPopover @@ -1332,67 +1308,29 @@ 1 - - - True - False - - - True - True - False - True - menu1 - none - False - - - - - - False - True - 0 - - - - - False - True - end - 2 - - True False - ublinux-ubconfig + 32 + ubconfig-gui 5 - - - True - False - vertical - - - - - - 1 - - + - + False 800 600 + ubconfig-gui True @@ -1408,7 +1346,7 @@ False vertical - + True False center @@ -1435,73 +1373,39 @@ - + True False - vertical - - Icon + True - False - 2 - 2 - 2 - 2 - 2 - 2 + True + 6 + horizontal + 50 - - True - True - in - - - True - False - natural - - - - - - - - - True - True - 0 - + + + 2 + 3 + 1 + 0 + - - - - True - True - 0 - - - - - True - False - vertical - + + + 2 + 3 + 1 + + + + - - False - True - 1 + -1 @@ -1511,9 +1415,6 @@ 1 - True @@ -1527,16 +1428,28 @@ True False + True True False True - + True False - UBLinux Settings Manager + + + True + False + UBLinux Settings Manager + + + True + True + 0 + + True @@ -1545,17 +1458,17 @@ - + True - True - False - True - menu1 - none - False + False + center + center + False @@ -1563,27 +1476,154 @@ 1 + + + True + False + vertical + + + True + True + False + True + none + settingsPopover + + + + + + False + True + 0 + + + + + False + True + end + 2 + + + + + + + True + False + 32 + ubconfig-gui + 5 + + + + + Back to settings + True + False + True + False + False + False + 10 + 10 + image1 + + + + + 1 + + + + + True + False + center + center + vertical + + + + + + + 2 + + + + + + + False + + + True + False + 4 + 4 + 4 + 4 + 4 + 4 + vertical + + + True + True + True + Settings + + False + True + 3 + - + True - False - ublinux-ubconfig - 5 + True + True + Documentation + + False + True + 4 + + + + + True + True + True + About system + + + False + True + 5 + + - - + False 800 600 + ubconfig-gui True @@ -1597,9 +1637,10 @@ True False + True vertical - + True False center @@ -1626,23 +1667,163 @@ - + True - False + True + 52 + True + True - + True - True - 6 + False + + + True + True + 6 + + + -1 + + - -1 + False + True + + + + + True + False + vertical + + + True + False + vertical + + + True + False + 3 + 3 + 3 + 3 + 3 + 0 + in + + + True + False + 12 + + + True + False + center + center + + + + False + True + 0 + + + + + True + False + + + desklabel + True + False + center + right + 1 + + + False + True + 0 + + + + + False + True + 1 + + + + + + + + + + + + + True + True + 0 + + + + + True + True + 0 + + + + + True + False + vertical + + + False + vertical + + + + + + False + True + 0 + + + + + False + True + 1 + + + + + True + True True True + end 1 @@ -1670,7 +1851,7 @@ True False - + True False UBLinux Settings Manager @@ -1689,17 +1870,12 @@ - + True False - center - center - False @@ -1711,16 +1887,14 @@ True False - vertical - + True True False True - menu1 none - False + settingsPopover1 @@ -1745,57 +1919,25 @@ True False - ublinux-ubconfig + 32 + ubconfig-gui 5 - - Back to settings - True - False - True - False - False - False - 10 - 10 - image1 - - - - - 1 - - - - + True False - center - center vertical - - 2 + 1 - - - - - -