From cc35ec732b7760d144ab56603a27ed54dafd88c3 Mon Sep 17 00:00:00 2001 From: YanTheKaller Date: Mon, 30 Jan 2023 05:20:14 +0000 Subject: [PATCH 1/2] Implemented Gnome theme lock on low resolutions --- ubl-settings-manager.c | 193 ++++++++++++++++++++--------------------- 1 file changed, 93 insertions(+), 100 deletions(-) diff --git a/ubl-settings-manager.c b/ubl-settings-manager.c index 119978d..6deece3 100644 --- a/ubl-settings-manager.c +++ b/ubl-settings-manager.c @@ -171,28 +171,12 @@ int on_settings_accept(GtkWidget *button, dictionary **widgetsDs){ gtk_widget_show(loaderWindow); gtk_window_present(GTK_WINDOW(widgets->SettingsWindow)); - gtk_widget_hide(widgets->window); - if (yon_dictionary_find(&widgetsD,main_config.curThemeName)==NULL){ - dictionary *DCT=yon_dictionary_create_empty(); - widgetsD->next=yon_theme_new(&DCT,widgets->builder,main_config.curThemeName,widgets->applist,widgets->appssize); - widgetsD->next->prev=widgetsD; - - yon_switch_theme(widgetsDs,yon_dictionary_find(&widgetsD,main_config.curThemeName)); - widgets=(actionWidgets*)widgetsD->data; - widgets->ICSys=yon_create_icon_section_list(main_config.sections); - for (dictionary *cur=widgets->ICSys->first; cur!=NULL;cur=cur->next){ - load_apps((IVGraphicals*)cur->data,widgets->applist,widgets->appssize); - } - yon_show_icon_views(widgets->ICSys,widgets); - - } + // gtk_widget_hide(widgets->window); yon_switch_theme(widgetsDs,yon_dictionary_find(&widgetsD,main_config.curThemeName)); if (widgets!=(actionWidgets*)widgetsD->data) widgets=(actionWidgets*)widgetsD->data; - gtk_window_resize(GTK_WINDOW(widgets->window),main_config.windowWidth,main_config.windowHeight); - gtk_window_move(GTK_WINDOW(widgets->window),main_config.windowPosX,main_config.windowPosY); - gtk_widget_show(widgets->window); + // gtk_widget_show(widgets->window); gtk_widget_hide(loaderWindow); - main_config.WindowTheme=theme; + // main_config.WindowTheme=theme; } GKeyFile *gfile=g_key_file_new(); int sz; @@ -563,68 +547,8 @@ void on_section_delete(GtkWidget *button, actionWidgets *widgets){ } void on_resized (GtkWidget *window, GdkEventConfigure *event, dictionary *widgetsD){ actionWidgets *widgets=(actionWidgets*)widgetsD->data; - gtk_window_get_position(GTK_WINDOW(widgets->window),&main_config.windowPosX,&main_config.windowPosY); - gtk_window_get_size(GTK_WINDOW(widgets->window),&main_config.windowWidth,&main_config.windowHeight); - dictionary *dct; - if (yon_dictionary_find(&widgetsD,"Main")==NULL){ - dct=yon_dictionary_create_empty(); - dictionary *newd=yon_theme_new(&dct,widgets->builder,"Main", widgets->applist,widgets->appssize); - widgetsD->next=newd; - newd->prev=widgetsD; - newd->first=widgetsD; - actionWidgets *widgetss=(actionWidgets*)widgetsD->data; - widgetss->ICSys=yon_create_icon_section_list(main_config.sections); - for (dictionary *cur=widgetss->ICSys->first; cur!=NULL;cur=cur->next){ - load_apps((IVGraphicals*)cur->data,widgetss->applist,widgetss->appssize); - } - yon_show_icon_views(widgetss->ICSys,widgetss); - } - dictionary *newdd; - if (yon_dictionary_find(&widgetsD,"Gnome")==NULL){ - newdd=yon_theme_new(&dct,widgets->builder,"Gnome", widgets->applist,widgets->appssize); - widgetsD->next=newdd; - newdd->prev=widgetsD; - newdd->first=widgetsD; - actionWidgets *widgetss=(actionWidgets*)widgetsD->data; - widgetss->ICSys=yon_create_icon_section_list(main_config.sections); - for (dictionary *cur=widgetss->ICSys->first; cur!=NULL;cur=cur->next){ - load_apps((IVGraphicals*)cur->data,widgetss->applist,widgetss->appssize); - } - yon_show_icon_views(widgetss->ICSys,widgetss); - } - if (main_config.WindowTheme==1){ - printf("\nAaAaAaAa\n"); - actionWidgets *widgetss=(actionWidgets*)widgetsD->data; - GtkWidget *loaderWindow=GTK_WIDGET(gtk_builder_get_object(widgets->builder,"LoaderWindow")); - // gtk_window_resize(GTK_WINDOW(widgetss->window),main_config.windowWidth,main_config.windowHeight); - widgetsD=yon_dictionary_find(&widgetsD,"Gnome"); - if (gtk_widget_get_visible(widgetss->window)==1){ - widgetsD=yon_dictionary_find(&widgetsD,"Gnome"); - gtk_window_resize(GTK_WINDOW(widgetss->window),1025,721); - if (main_config.windowWidth<1024&&main_config.windowHeight<720){ - gtk_widget_hide(widgetss->window); - gtk_combo_box_set_active(GTK_COMBO_BOX(widgetss->settingsThemeChooser),0); - widgetsD=yon_dictionary_find(&widgetsD,"Main"); - actionWidgets *widgetss=(actionWidgets*)widgetsD->data; - // gtk_window_resize(GTK_WINDOW(widgetss->window),1023,719); - gtk_widget_show(widgetss->window); - } - } else { - widgetsD=yon_dictionary_find(&widgetsD,"Main"); - gtk_window_resize(GTK_WINDOW(widgetss->window),1024,720); - if (main_config.windowWidth>1024&&main_config.windowHeight>720){ - gtk_widget_hide(widgetss->window); - gtk_combo_box_set_active(GTK_COMBO_BOX(widgetss->settingsThemeChooser),1); - widgetsD=yon_dictionary_find(&widgetsD,"Gnome"); - actionWidgets *widgetss=(actionWidgets*)widgetsD->data; - // gtk_window_resize(GTK_WINDOW(widgetss->window),1025,721); - gtk_widget_show(widgetss->window); - - } - } - }else { - - } + + gtk_window_get_size() gtk_window_get_size(GTK_WINDOW(widgets->window),&main_config.windowWidth,&main_config.windowHeight); } void launch_app_with_arguments(char *name, char *args){ @@ -734,7 +658,6 @@ void sort_apps(apps *applist,int size){ }; apps *find_apps(int *sizef){ - int size=0; struct apps *applist; { @@ -754,7 +677,6 @@ apps *find_apps(int *sizef){ if (strcmp(extension,".desktop")==0) { apps tempapp; - GKeyFile *gfile=g_key_file_new(); g_key_file_load_from_file(gfile,path,G_KEY_FILE_KEEP_TRANSLATIONS,NULL); char *Type=g_key_file_get_string(gfile,"Desktop Entry", "Type",NULL); @@ -845,7 +767,6 @@ int check_categories(apps app, char *catstocheck){ n_found++; left_cats=cat+1; if (strlen(left_cats)==0 ||strcmp(left_cats,'\0')==0) break; - } if (to_find==n_found) return 1; else return 0; } @@ -1201,7 +1122,40 @@ dictionary *yon_dictionary_find(dictionary **dict, char *key){ return NULL; } void yon_switch_theme(dictionary **dict, dictionary *newone){ + dictionary *dct=*dict; + actionWidgets *widgets=(actionWidgets*)dct->data; + gtk_widget_hide(widgets->window); + gtk_window_get_position(GTK_WINDOW(widgets->window),&main_config.windowPosX,&main_config.windowPosY); + gtk_window_get_size(GTK_WINDOW(widgets->window),&main_config.windowWidth,&main_config.windowHeight); *dict=newone; + dct=*dict; + widgets=(actionWidgets*)dct->data; + gtk_window_resize(GTK_WINDOW(widgets->window),main_config.windowWidth,main_config.windowHeight); + gtk_window_move(GTK_WINDOW(widgets->window),main_config.windowPosX,main_config.windowPosY); + gtk_window_maximize(GTK_WINDOW(widgets->window)); + gtk_widget_show(widgets->window); + if (strcmp(dct->key,"Gnome")==0){ + int x,y; + GdkRectangle workarea; + gdk_monitor_get_workarea(gdk_display_get_monitor(gdk_screen_get_display(gtk_window_get_screen(GTK_WINDOW(widgets->window))),0),&workarea); + gtk_window_get_size(GTK_WINDOW(widgets->window),&x, &y); + if (workarea.width<1024&&workarea.height<720||x<1024&&y<720){ + dictionary *founddict=yon_dictionary_find(dict,"Main"); + dct=yon_dictionary_find(dict,"Gnome"); + yon_switch_theme(&dct,founddict); + main_config.WindowTheme=0; + main_config.curThemeName="Main"; + gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->settingsThemeChooser),0); + } else{ + main_config.WindowTheme=1; + main_config.curThemeName="Gnome"; + } + } else { + main_config.WindowTheme=0; + main_config.curThemeName="Main"; + } + + } SectionSettingSegment *yon_create_section_setting(char *name, char *categories){ @@ -1373,6 +1327,8 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them curWidgets->SettingsSections=NULL; gtk_style_context_add_class(gtk_widget_get_style_context(curWidgets->icvpack),"iconview"); + + gtk_window_maximize(GTK_WINDOW(curWidgets->window)); if (curWidgets->GnomeInfoLabel!=NULL&&curWidgets->GnomeInfoDetailsLabel!=NULL){ FILE *fp; char path[1035]; @@ -1504,34 +1460,71 @@ int main(int argc, char *argv[]){ bindtextdomain (LocaleName, LocalePath); textdomain (LocaleName); actionWidgets *widget=malloc(sizeof(actionWidgets)); - dictionary *widgets=malloc(sizeof(dictionary)); + dictionary *widgets=yon_dictionary_create_empty(); widgets->data=widget; - widgets->first=widgets; - widgets->next=NULL; - widgets->prev=NULL; int *size=malloc(sizeof(int)); apps *applist=find_apps(size); sort_apps(applist,*size); GtkBuilder *builder=gtk_builder_new_from_file(GladePath); actionWidgets *widg=(actionWidgets*)widgets->first->data; char *theme; - if (main_config.WindowTheme==0) theme="Main"; - else if (main_config.WindowTheme==1) theme="Gnome"; - else theme="Main"; - yon_theme_new(&widgets->first, builder,theme,applist,*size); - widg->applist=applist; - widg->appssize=*size; - widg->ICSys=yon_create_icon_section_list(main_config.sections); - for (dictionary *cur=widg->ICSys->first; cur!=NULL;cur=cur->next){ - load_apps((IVGraphicals*)cur->data,widg->applist,widg->appssize); + if (main_config.WindowTheme==1){ theme="Gnome"; + yon_theme_new(&widgets->first, builder,theme,applist,*size); + widg->applist=applist; + widg->appssize=*size; + widg->ICSys=yon_create_icon_section_list(main_config.sections); + for (dictionary *cur=widg->ICSys->first; cur!=NULL;cur=cur->next){ + load_apps((IVGraphicals*)cur->data,widg->applist,widg->appssize); + } + yon_show_icon_views(widg->ICSys,widg); + theme="Main"; + main_config.WindowTheme=0; + widgets->next=yon_dictionary_create_empty(); + widgets->next->first=widgets; + widgets->next->prev=widgets; + yon_theme_new(&widgets->next, builder,theme,applist,*size); + widg=(actionWidgets*)widgets->next->data; + widg->applist=applist; + widg->appssize=*size; + widg->ICSys=yon_create_icon_section_list(main_config.sections); + for (dictionary *cur=widg->ICSys->first; cur!=NULL;cur=cur->next){ + load_apps((IVGraphicals*)cur->data,widg->applist,widg->appssize); + } + yon_show_icon_views(widg->ICSys,widg); + main_config.WindowTheme=1; + + } + else {theme="Main"; + yon_theme_new(&widgets->first, builder,theme,applist,*size); + widg->applist=applist; + widg->appssize=*size; + widg->ICSys=yon_create_icon_section_list(main_config.sections); + for (dictionary *cur=widg->ICSys->first; cur!=NULL;cur=cur->next){ + load_apps((IVGraphicals*)cur->data,widg->applist,widg->appssize); + } + yon_show_icon_views(widg->ICSys,widg); + theme="Gnome"; + main_config.WindowTheme=1; + widgets->next=yon_dictionary_create_empty(); + widgets->next->first=widgets; + widgets->next->prev=widgets; + yon_theme_new(&widgets->next, builder,theme,applist,*size); + widg=(actionWidgets*)widgets->next->data; + widg->applist=applist; + widg->appssize=*size; + widg->ICSys=yon_create_icon_section_list(main_config.sections); + for (dictionary *cur=widg->ICSys->first; cur!=NULL;cur=cur->next){ + load_apps((IVGraphicals*)cur->data,widg->applist,widg->appssize); + } + yon_show_icon_views(widg->ICSys,widg); + main_config.WindowTheme=0; } - yon_show_icon_views(widg->ICSys,widg); + 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_widget_show_all(widg->window); - // hide_if_unfound(GTK_TREE_MODEL(widgets->ModelPersonal),&Personal); GtkCssProvider *css=gtk_css_provider_new(); gtk_css_provider_load_from_path(css,CssPath,NULL); From 8bfdf69a9f202be710f8f58b36219f54c50b29fa Mon Sep 17 00:00:00 2001 From: YanTheKaller Date: Mon, 30 Jan 2023 11:44:33 +0000 Subject: [PATCH 2/2] Implemented system info resizing on small resolutions --- ubl-settings-manager.c | 85 ++++++++++++++++++++----- ubl-settings-manager.h | 1 + ui/ubl-settings-manager.glade | 114 ++++++++++++++++++++++++++++++++-- 3 files changed, 179 insertions(+), 21 deletions(-) diff --git a/ubl-settings-manager.c b/ubl-settings-manager.c index 6deece3..162aa6e 100644 --- a/ubl-settings-manager.c +++ b/ubl-settings-manager.c @@ -151,13 +151,18 @@ void on_ReadHelpButton_activated(GtkWidget *button, GtkBuilder *builder){ }; int on_settings_accept(GtkWidget *button, dictionary **widgetsDs){ - dictionary *widgetsD=*widgetsDs; + if (main_config.WindowTheme==0) + main_config.curThemeName="Main"; + else if (main_config.WindowTheme==1) + main_config.curThemeName="Gnome"; + dictionary *widgetsD=yon_dictionary_find(widgetsDs,main_config.curThemeName); printf("Saving config...\n"); actionWidgets *widgets=(actionWidgets*)widgetsD->data; int theme=gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->settingsThemeChooser)); - + gtk_window_get_position(GTK_WINDOW(widgets->window),&main_config.windowPosX,&main_config.windowPosY); + gtk_window_get_size(GTK_WINDOW(widgets->window),&main_config.windowWidth,&main_config.windowHeight); if (theme==0) main_config.curThemeName="Main"; else if (theme==1) @@ -170,13 +175,13 @@ int on_settings_accept(GtkWidget *button, dictionary **widgetsDs){ gtk_window_move(GTK_WINDOW(loaderWindow),main_config.windowPosX,main_config.windowPosY); gtk_widget_show(loaderWindow); - gtk_window_present(GTK_WINDOW(widgets->SettingsWindow)); // gtk_widget_hide(widgets->window); yon_switch_theme(widgetsDs,yon_dictionary_find(&widgetsD,main_config.curThemeName)); if (widgets!=(actionWidgets*)widgetsD->data) widgets=(actionWidgets*)widgetsD->data; // gtk_widget_show(widgets->window); gtk_widget_hide(loaderWindow); // main_config.WindowTheme=theme; + gtk_window_present(GTK_WINDOW(widgets->SettingsWindow)); } GKeyFile *gfile=g_key_file_new(); int sz; @@ -212,6 +217,7 @@ int on_settings_accept(GtkWidget *button, dictionary **widgetsDs){ void on_paned_move(GtkPaned* self, GtkScrollType* scroll_type, actionWidgets *widgets){ /* TODO */ 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; if (pos<110) pos=110; @@ -547,10 +553,51 @@ void on_section_delete(GtkWidget *button, actionWidgets *widgets){ } void on_resized (GtkWidget *window, GdkEventConfigure *event, dictionary *widgetsD){ actionWidgets *widgets=(actionWidgets*)widgetsD->data; - - gtk_window_get_size() - gtk_window_get_size(GTK_WINDOW(widgets->window),&main_config.windowWidth,&main_config.windowHeight); + int x,y; + gtk_window_get_size(GTK_WINDOW(window),&main_config.windowWidth,&main_config.windowHeight); + if (main_config.windowWidth<1024){ + if (stld==0){ + stld=1; + char *details=gtk_label_get_label(GTK_LABEL(widgets->GnomeInfoDetailsLabel)); + //gtk_window_set_resizable(GTK_WINDOW(window),0); + // yon_switch_theme(&widgetsD,yon_dictionary_find(&widgetsD,"Main")); + details[12]='0'; + details[13]='9'; + printf("SSSSS\n"); + gtk_label_set_markup(GTK_LABEL(widgets->GnomeInfoDetailsLabel),details); + GtkWidget *logo = gtk_builder_get_object(widgets->builder,"GnomeInfoLogo"); + gtk_image_set_from_pixbuf(GTK_IMAGE(logo),gdk_pixbuf_new_from_file_at_scale(LogoPath,256,256,1,NULL)); + // gtk_window_resize(GTK_WINDOW(widgets->window),main_config.windowWidth,main_config.windowHeight); + // gtk_widget_hide(widgets->window); + } + }else { + if (stld==1){ + stld=0; + char *details=gtk_label_get_label(GTK_LABEL(widgets->GnomeInfoDetailsLabel)); + details[12]='1'; + details[13]='2'; + printf("SSSSS\n"); + gtk_label_set_markup(GTK_LABEL(widgets->GnomeInfoDetailsLabel),details); + GtkWidget *logo = gtk_builder_get_object(widgets->builder,"GnomeInfoLogo"); + gtk_image_set_from_pixbuf(GTK_IMAGE(logo),gdk_pixbuf_new_from_file_at_scale(LogoPath,512,512,1,NULL)); + } + } + +} + +void on_resized_done (GtkWidget *window, GdkEvent *event, dictionary *widgetsD){ + actionWidgets *widgets=(actionWidgets*)widgetsD->data; + if (event->type==GDK_CONFIGURE){ + int x,y; + gtk_window_get_size(GTK_WINDOW(window),&x,&y); + if (x<1024&&y<720){ + gtk_window_set_resizable(GTK_WINDOW(window),1); + printf("AAAAA\n"); + // gtk_widget_hide(widgets->window); + } + } } + void launch_app_with_arguments(char *name, char *args){ char *path=malloc(strlen(name)+strlen(args)+4); memset(path,0,strlen(name)+strlen(args)+4); @@ -1124,16 +1171,13 @@ dictionary *yon_dictionary_find(dictionary **dict, char *key){ void yon_switch_theme(dictionary **dict, dictionary *newone){ dictionary *dct=*dict; actionWidgets *widgets=(actionWidgets*)dct->data; + gtk_widget_hide(widgets->window); - gtk_window_get_position(GTK_WINDOW(widgets->window),&main_config.windowPosX,&main_config.windowPosY); - gtk_window_get_size(GTK_WINDOW(widgets->window),&main_config.windowWidth,&main_config.windowHeight); *dict=newone; dct=*dict; widgets=(actionWidgets*)dct->data; gtk_window_resize(GTK_WINDOW(widgets->window),main_config.windowWidth,main_config.windowHeight); gtk_window_move(GTK_WINDOW(widgets->window),main_config.windowPosX,main_config.windowPosY); - gtk_window_maximize(GTK_WINDOW(widgets->window)); - gtk_widget_show(widgets->window); if (strcmp(dct->key,"Gnome")==0){ int x,y; GdkRectangle workarea; @@ -1143,14 +1187,18 @@ void yon_switch_theme(dictionary **dict, dictionary *newone){ dictionary *founddict=yon_dictionary_find(dict,"Main"); dct=yon_dictionary_find(dict,"Gnome"); yon_switch_theme(&dct,founddict); + gtk_window_resize(GTK_WINDOW(widgets->window),main_config.windowWidth,main_config.windowHeight); + gtk_window_move(GTK_WINDOW(widgets->window),main_config.windowPosX,main_config.windowPosY); main_config.WindowTheme=0; main_config.curThemeName="Main"; gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->settingsThemeChooser),0); } else{ main_config.WindowTheme=1; main_config.curThemeName="Gnome"; + gtk_widget_show(widgets->window); } } else { + gtk_widget_show(widgets->window); main_config.WindowTheme=0; main_config.curThemeName="Main"; } @@ -1328,7 +1376,6 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them gtk_style_context_add_class(gtk_widget_get_style_context(curWidgets->icvpack),"iconview"); - gtk_window_maximize(GTK_WINDOW(curWidgets->window)); if (curWidgets->GnomeInfoLabel!=NULL&&curWidgets->GnomeInfoDetailsLabel!=NULL){ FILE *fp; char path[1035]; @@ -1360,7 +1407,7 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them line=yon_char_get_augumented(pth,line); } else { line=path; - pth="\n"; + pth="\n"; line=yon_char_get_augumented(pth,line); } prevline=yon_char_get_augumented(prevline,line); @@ -1377,15 +1424,20 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them gtk_button_set_label(GTK_BUTTON(curWidgets->ButtonBackToMain),_("Back to 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){ + g_signal_connect(G_OBJECT(curWidgets->GnomePaned), "notify::position", G_CALLBACK(on_paned_move), curWidgets); + + } + if (strcmp(theme_id,"Gnome")==0){ g_signal_connect(G_OBJECT(curWidgets->window), "configure-event", G_CALLBACK(on_resized), widgets); + // g_signal_connect(G_OBJECT(curWidgets->window), "event-after", G_CALLBACK(on_resized_done), widgets); + + } if (curWidgets->ButtonBackToMain!=NULL) 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){ - 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")); @@ -1524,6 +1576,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_widget_show_all(widg->window); GtkCssProvider *css=gtk_css_provider_new(); diff --git a/ubl-settings-manager.h b/ubl-settings-manager.h index ce98718..db726a0 100644 --- a/ubl-settings-manager.h +++ b/ubl-settings-manager.h @@ -14,6 +14,7 @@ #define PictureFormatExtra ".svg" #define LocalePath "locale/" #define LocaleName "base" +#define LogoPath "images/ublinux-dark-glow-sc.svg" typedef struct apps{ diff --git a/ui/ubl-settings-manager.glade b/ui/ubl-settings-manager.glade index 8ca4371..0f0e842 100644 --- a/ui/ubl-settings-manager.glade +++ b/ui/ubl-settings-manager.glade @@ -249,6 +249,110 @@ + + 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 + + + True + False + + + + + + True + False + label + + + False + True + 1 + + + + + 1 5 @@ -930,7 +1034,7 @@ True True - 152 + 52 True True @@ -963,7 +1067,7 @@ - True + False True @@ -981,7 +1085,6 @@ True False - 3 3 3 3 @@ -1001,7 +1104,7 @@ center center - + - False + True True @@ -1113,6 +1216,7 @@ True True + end 1