diff --git a/ubl-settings-manager.c b/ubl-settings-manager.c index ce043ed..61c8590 100644 --- a/ubl-settings-manager.c +++ b/ubl-settings-manager.c @@ -622,8 +622,8 @@ void launch_app_with_arguments(char *name, char *args){ }; void launch_app(char *name){ - strcat(name," &"); - system(name); + char *path=yon_char_get_augumented(name," &"); + system(path); }; void py_launch_app(char *name,char *args){ @@ -1564,7 +1564,16 @@ int main(int argc, char *argv[]){ hide_if_unfound(widgets); if (main_config.WindowTheme==1) gtk_widget_hide(widg->MenuItemAboutSystem); - + GtkWidget *banner = GTK_WIDGET(gtk_builder_get_object(widg->builder,"MainBanner")); + gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gdk_pixbuf_new_from_file(AppBannerPath,NULL)); + banner = GTK_WIDGET(gtk_builder_get_object(widg->builder,"GnomeBanner")); + gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gdk_pixbuf_new_from_file(AppBannerPath,NULL)); + banner = GTK_WIDGET(gtk_builder_get_object(widg->builder,"loaderBanner")); + gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gdk_pixbuf_new_from_file(AppBannerPath,NULL)); + banner = GTK_WIDGET(gtk_builder_get_object(widg->builder,"GnomeInfoLogo")); + gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gdk_pixbuf_new_from_file_at_scale(LogoPath,512,512,1,NULL)); + banner = GTK_WIDGET(gtk_builder_get_object(widg->builder,"settingsIcon")); + gtk_image_set_from_pixbuf(GTK_IMAGE(banner),gdk_pixbuf_new_from_file_at_scale(AppIconPath,main_config.iconsize,main_config.iconsize,1,NULL)); GtkCssProvider *css=gtk_css_provider_new(); gtk_css_provider_load_from_path(css,CssPath,NULL); gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), diff --git a/ubl-settings-manager.css b/ubl-settings-manager.css new file mode 100644 index 0000000..f5a3b0c --- /dev/null +++ b/ubl-settings-manager.css @@ -0,0 +1,52 @@ +.label { + font-size: 13px; +} +.noborder{ + border:none; + border-width:0px; + border-radius:0px; + box-shadow: none; +} +.darkborder{ + border-width:1px; + border-radius:1px; +} +.bannerbackground { +background-color: #404040; +} +.elseps { + border-style:solid; + border-bottom-width: 1px; + border-image: linear-gradient(90deg, #aaaaaa 0%, #dcddde 100%); + border-image-slice: 1; + +} +#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; +} + +#iconlabel { + font-size:14px; + font-weight: bold; +} + + #desclabel { + font-size:100%; + } + .bold { + color:#1a5fb4; + } diff --git a/ubl-settings-manager.desktop b/ubl-settings-manager.desktop new file mode 100644 index 0000000..4a5af39 --- /dev/null +++ b/ubl-settings-manager.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=ubl-settings-manager +Name[ru]=Настройки UBLinux +GenericName=ubl-settings-manager +GenericName[ru]=Настройки UBLinux +Comment=ubl-settings-manager +Comment[ru]=Приложение для управления настройками UBLinux +Type=Application +Exec=ubl-settings-manager +Icon=ublinux-ubconfig +Terminal=false +Pluggable=false +Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings; diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade new file mode 100644 index 0000000..c62c031 --- /dev/null +++ b/ubl-settings-manager.glade @@ -0,0 +1,1674 @@ + + + + + + False + + + True + False + vertical + + + True + False + + + True + False + 30 + 30 + gtk-dialog-warning + 6 + + + False + True + 0 + + + + + True + False + 5 + 5 + You are not allowed to change theme on such low resolution! + True + 0.019999999552965164 + + + True + True + 1 + + + + + True + True + 0 + + + + + Understood + True + True + True + + + False + True + 2 + + + + + + + True + False + UBLinux Settings Manager + + + True + False + gtk-dialog-warning + 5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + Would yo like to read documentation in the Web? + + + + + + + False + True + 0 + + + + + True + False + start + start + 15 + 10 + You will be redirected to documentation website where documentation is translated and supported by community. + True + + + + True + True + 1 + + + + + Always redirect to online documentation + True + True + False + end + 5 + 10 + True + + + + False + True + 2 + + + + + + True + True + 1 + + + + + + True + True + 0 + + + + + True + False + + + Cancel + True + True + True + + + + + True + True + 0 + + + + + Read Online + True + True + True + + + + + True + True + 1 + + + + + False + True + 1 + + + + + + + True + False + emblem-danger + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + + + True + False + + + + + + + + 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 + + + False + True + 1 + + + + + + + + + True + False + Icons size + + + + + True + True + 0 + + + + + True + False + 5 + 5 + 2 + 5 + 0 + in + + + True + False + + + True + False + vertical + + + combo + True + False + center + 10 + 10 + 5 + True + 0 + + + True + True + 0 + + + + + + + + + True + False + Choose theme + + + + + True + True + 1 + + + + + True + False + 5 + 5 + 0 + in + + + True + False + + + True + False + True + True + + + Sections management + True + True + True + 10 + 10 + 5 + + + True + True + 1 + + + + + + + + + True + False + Тонкая настройка + + + + + False + True + 2 + + + + + True + False + + + True + False + 5 + 5 + + + Close + 200 + True + True + True + 2 + + + False + True + 0 + + + + + Save and apply + 200 + True + True + True + 2 + + + False + True + end + 1 + + + + + True + True + 0 + + + + + False + True + 4 + + + + + + + True + False + UBLinux Settings + + + + + 1 + 1 + 10 + + + True + False + gtk-go-back + + + True + False + gtk-undelete + + + 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 + + + + + True + False + gtk-ok + + + False + 800 + 600 + + + True + False + vertical + + + True + True + 5 + 5 + 5 + 5 + in + + + True + False + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + vertical + + + + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 0 + in + + + True + False + 3 + 3 + 5 + 5 + + + True + False + + + True + True + True + center + 3 + image2 + + + False + True + 0 + + + + + True + True + True + False + Section name + name + + + True + True + 1 + + + + + True + False + + + True + False + center + + + True + True + True + 5 + image4 + + + False + True + end + 2 + + + + + True + False + 2 + + + True + True + 5 + 5 + 5 + 10 + False + Identifier + + + True + True + 0 + + + + + True + True + 2 + + + + + True + True + 1 + + + + + True + True + 2 + + + + + + + + + + + + False + True + 1 + + + + + + + + + True + True + 0 + + + + + True + False + + + Close + True + True + True + 5 + 5 + + + False + True + end + 0 + + + + + Save and apply + True + True + True + 17 + 5 + + + False + True + end + 1 + + + + + False + True + 1 + + + + + + + True + False + UBLinux Settings + + + + + + + + + + + Стандартная тема + + + GNOME тема + + + + + True + False + + + True + False + Settings of UBL Settings Manager + Settings + True + + + + + True + False + Documentation + True + + + + + True + False + About system... + True + + + + + False + 800 + 600 + + + True + False + vertical + + + True + False + + + True + False + True + vertical + + + True + False + center + 3 + + + + False + True + 0 + + + + + + False + True + 0 + + + + + True + True + 52 + True + True + + + True + True + in + 150 + True + + + True + False + + + True + False + 3 + 3 + 3 + 3 + 3 + vertical + + + + + + + + + + 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 + + + + + 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 + 3 + + + + False + True + 0 + + + + + + False + True + 0 + + + + + True + False + vertical + + + Icon + 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 + + + + + + + + False + 800 + 600 + + + True + False + vertical + + + True + False + + + True + False + vertical + + + True + False + center + 3 + + + + False + True + 0 + + + + + + False + True + 0 + + + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 5 + vertical + + + True + True + in + + + True + False + natural + + + True + False + vertical + 2 + + + + + + + + + + + + + True + True + 0 + + + + + + True + True + 0 + + + + + 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 + + + + + Back to settings + True + False + True + False + False + False + 10 + 10 + image1 + + + + + 1 + + + + + + + + + + + + + diff --git a/ubl-settings-manager.h b/ubl-settings-manager.h index 45f4133..ab90a08 100644 --- a/ubl-settings-manager.h +++ b/ubl-settings-manager.h @@ -7,16 +7,17 @@ #define CssPath "./css/ubl-settings-manager.css" #define ConfigPath ".config/ubconfig-main/ubconfig-main.conf" #define AppIconPath "/usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg" +#define AppBannerPath "/usr/share/icons/hicolor/scalable/apps/ubl-settings-manager.png" #define DesktopPath "/usr/share/applications/" -#define IconPicturesPath "/usr/share/icons/hicolor/32x32/apps/" +#define IconPicturesPath "/usr/share/icons/hicolor/scalable/apps/" #define ErrIconPicturePath "/usr/share/icons/Faenza/emblems/32/emblem-important.png" #define PictureFormatMain ".svg" #define PictureFormatExtra ".png" -#define LocalePath "locale/" +#define LocalePath "/usr/share/locale/" #define LocaleName "base" -#define LogoPath "images/ubl-settings-manager-logo.svg" -#define ubl_settings_infoPath "../ubl-info/ubl-settings-info" -#define ubl_settings_infoPathLaunch "../ubl-info/ubl-settings-info --socket-id=" +#define LogoPath "/usr/share/icons/hicolor/scalable/apps/ubl-settings-manager.svg" +#define ubl_settings_infoPath "/home/superadmin/Документы/ubl-settings-manager/ub-settings-manager/ubl-info/ubl-settings-info" +#define ubl_settings_infoPathLaunch "/home/superadmin/Документы/ubl-settings-manager/ub-settings-manager/ubl-info/ubl-settings-info --socket-id=" typedef struct apps{ diff --git a/ubl-settings-manager.png b/ubl-settings-manager.png new file mode 100644 index 0000000..b7f6b74 Binary files /dev/null and b/ubl-settings-manager.png differ diff --git a/ubl-settings-manager.svg b/ubl-settings-manager.svg new file mode 100644 index 0000000..d44113c --- /dev/null +++ b/ubl-settings-manager.svg @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui/ubl-settings-manager.glade b/ui/ubl-settings-manager.glade index 355c5bc..c62c031 100644 --- a/ui/ubl-settings-manager.glade +++ b/ui/ubl-settings-manager.glade @@ -413,7 +413,6 @@ 64 True False - usr/share/icons/hicolor/32x32/apps/ublinux-ubconfig.svg False @@ -985,11 +984,10 @@ True vertical - + True False center - ../images/ubl-settings-manager-banner.png 3