diff --git a/gresource.xml b/gresource.xml index a374f64..d804f02 100644 --- a/gresource.xml +++ b/gresource.xml @@ -6,6 +6,7 @@ ubl-settings-manager-theme-gnome.glade ubl-settings-manager-theme-gnome-section.glade ubl-settings-manager-theme-main.glade + ubl-settings-manager-theme-main-section.glade ubl-settings-manager-settings-sections.glade ubl-settings-manager-section-element.glade diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index bc716e9..1198fd8 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -35,6 +35,7 @@ set(DEPENDFILES ../ubl-settings-manager-theme-gnome-section.glade ../ubl-settings-manager-theme-main.glade ../ubl-settings-manager-settings-sections.glade + ../ubl-settings-manager-theme-main-section.glade ../ubl-settings-manager-section-element.glade ../gresource.xml ../manager-banner.png @@ -74,6 +75,7 @@ set(SOURCE_FILES ubl-settings-manager-settings.c ubl-settings-manager-theme.c ubl-settings-manager-theme-gnome.c + ubl-settings-manager-theme-main.c ubl-settings-manager-app-sections.c ubl-settings-manager-settings-sections.c ubl-settings-manager.h diff --git a/source/ubl-settings-manager-settings-sections.c b/source/ubl-settings-manager-settings-sections.c index 359e70d..04c965b 100644 --- a/source/ubl-settings-manager-settings-sections.c +++ b/source/ubl-settings-manager-settings-sections.c @@ -3,6 +3,7 @@ typedef struct { GtkWidget *Window; GtkWidget *StatusBox; + GtkWidget *DefaultSwitch; GtkWidget *SectionsBox; GtkWidget *NameEntry; GtkWidget *CategoriesEntry; @@ -50,7 +51,12 @@ section_struct *yon_section_new(){ void on_section_add(GtkWidget *,settings_section_window *window){ const char *cat_name = gtk_entry_get_text(GTK_ENTRY(window->NameEntry)); - const char *cat_categories = gtk_entry_get_text(GTK_ENTRY(window->CategoriesEntry)); + char *cat_categories = yon_char_new(gtk_entry_get_text(GTK_ENTRY(window->CategoriesEntry))); + if (cat_categories[strlen(cat_categories)-1]!=';') { + char *temp = yon_char_append_c(cat_categories,';'); + free(cat_categories); + cat_categories = temp; + } if (yon_char_is_empty(cat_name)){ yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),_EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_highlight_incorrect(window->NameEntry); @@ -64,6 +70,7 @@ void on_section_add(GtkWidget *,settings_section_window *window){ gtk_entry_set_text(GTK_ENTRY(window->NameEntry),""); gtk_entry_set_text(GTK_ENTRY(window->CategoriesEntry),""); + free(cat_categories); } void on_section_clear(GtkWidget *,settings_section_window *window){ @@ -78,25 +85,51 @@ void on_sections_save(GtkWidget *,settings_section_window *window){ for (gsize i=0;iSectionsBox)); - GList *iter; - for (iter=list;iter;iter=iter->next){ - section_struct *section = g_object_get_data(G_OBJECT(iter->data),"section"); - char *name = (char*)gtk_entry_get_text(GTK_ENTRY(section->NameEntry)); - char *categories = (char*)gtk_entry_get_text(GTK_ENTRY(section->CategoriesEntry)); - yon_window_config_add_instant_parameter(name,sections_section,categories,YON_TYPE_STRING); + if (!gtk_switch_get_active(GTK_SWITCH(window->DefaultSwitch))){ + GList *list = gtk_container_get_children(GTK_CONTAINER(window->SectionsBox)); + GList *iter; + for (iter=list;iter;iter=iter->next){ + section_struct *section = g_object_get_data(G_OBJECT(iter->data),"section"); + char *name = (char*)gtk_entry_get_text(GTK_ENTRY(section->NameEntry)); + char *categories = (char*)gtk_entry_get_text(GTK_ENTRY(section->CategoriesEntry)); + yon_window_config_add_instant_parameter(name,sections_section,categories,YON_TYPE_STRING); + } } on_subwindow_close(window->Window); yon_interface_update(widgets); } +void yon_section_window_add_default(settings_section_window *window){ + + section_struct *cur_section = yon_section_new(); + gtk_box_pack_start(GTK_BOX(window->SectionsBox),cur_section->SectionBox,0,0,0); + gtk_entry_set_text(GTK_ENTRY(cur_section->NameEntry),"Personal"); + gtk_entry_set_text(GTK_ENTRY(cur_section->CategoriesEntry),"X-UBL-SettingsManager;X-UBL-PersonalSettings;"); + + cur_section = yon_section_new(); + gtk_box_pack_start(GTK_BOX(window->SectionsBox),cur_section->SectionBox,0,0,0); + gtk_entry_set_text(GTK_ENTRY(cur_section->NameEntry),"Hardware"); + gtk_entry_set_text(GTK_ENTRY(cur_section->CategoriesEntry),"X-UBL-SettingsManager;X-UBL-HardwareSettings;"); + + cur_section = yon_section_new(); + gtk_box_pack_start(GTK_BOX(window->SectionsBox),cur_section->SectionBox,0,0,0); + gtk_entry_set_text(GTK_ENTRY(cur_section->NameEntry),"System"); + gtk_entry_set_text(GTK_ENTRY(cur_section->CategoriesEntry),"X-UBL-SettingsManager;X-UBL-SystemSettings;"); + + cur_section = yon_section_new(); + gtk_box_pack_start(GTK_BOX(window->SectionsBox),cur_section->SectionBox,0,0,0); + gtk_entry_set_text(GTK_ENTRY(cur_section->NameEntry),"Misc"); + gtk_entry_set_text(GTK_ENTRY(cur_section->CategoriesEntry),""); +} + settings_section_window *yon_section_window_new(){ settings_section_window *window = malloc(sizeof(settings_section_window)); GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_settings_section); window->Window = yon_gtk_builder_get_widget(builder,"Window"); window->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox"); + window->DefaultSwitch = yon_gtk_builder_get_widget(builder,"DefaultSwitch"); window->SectionsBox = yon_gtk_builder_get_widget(builder,"SectionsBox"); window->NameEntry = yon_gtk_builder_get_widget(builder,"NameEntry"); window->CategoriesEntry = yon_gtk_builder_get_widget(builder,"CategoriesEntry"); @@ -109,6 +142,29 @@ settings_section_window *yon_section_window_new(){ g_signal_connect(G_OBJECT(window->SaveButton),"clicked",G_CALLBACK(on_sections_save),window); g_signal_connect(G_OBJECT(window->AddButton),"clicked",G_CALLBACK(on_section_add),window); g_signal_connect(G_OBJECT(window->ClearButton),"clicked",G_CALLBACK(on_section_clear),window); + g_signal_connect(G_OBJECT(window->DefaultSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),window->SectionsBox); + g_signal_connect(G_OBJECT(window->DefaultSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),window->NameEntry); + g_signal_connect(G_OBJECT(window->DefaultSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),window->CategoriesEntry); + g_signal_connect(G_OBJECT(window->DefaultSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),window->AddButton); + g_signal_connect(G_OBJECT(window->DefaultSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),window->ClearButton); + + gsize parameters_size; + config_str parameters = NULL; + parameters = yon_window_config_get_section(sections_section,¶meters_size); + if (parameters_size){ + for (gsize i=0;iSectionsBox),cur_section->SectionBox,0,0,0); + gtk_entry_set_text(GTK_ENTRY(cur_section->NameEntry),parameters[i]); + gtk_entry_set_text(GTK_ENTRY(cur_section->CategoriesEntry),param); + + } + } else { + gtk_switch_set_active(GTK_SWITCH(window->DefaultSwitch),1); + yon_section_window_add_default(window); + } return window; } diff --git a/source/ubl-settings-manager-theme-gnome.c b/source/ubl-settings-manager-theme-gnome.c index 16eee5a..2b194ee 100644 --- a/source/ubl-settings-manager-theme-gnome.c +++ b/source/ubl-settings-manager-theme-gnome.c @@ -63,6 +63,9 @@ gnome_section *yon_gnome_section_new(){ GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_gnome_section); cur_section->expander = yon_gtk_builder_get_widget(builder,"MainExpander"); cur_section->AppsList = yon_gtk_builder_get_widget(builder,"AppsList"); + int doubleclick=0; + yon_window_config_get_parameter(settings_section,double_click_parameter,&doubleclick,YON_TYPE_BOOLEAN); + gtk_list_box_set_activate_on_single_click(GTK_LIST_BOX(cur_section->AppsList),!doubleclick); return cur_section; } @@ -85,6 +88,8 @@ void yon_gnome_section_setup_apps(gnome_section *cur_section, const char *target gtk_box_pack_start(GTK_BOX(Box),Image,0,0,0); gtk_box_pack_start(GTK_BOX(Box),Label,0,0,0); gtk_label_set_xalign(GTK_LABEL(Label),0); + gtk_label_set_line_wrap(GTK_LABEL(Label),1); + gtk_label_set_line_wrap_mode(GTK_LABEL(Label),PANGO_WRAP_WORD); gtk_list_box_insert(GTK_LIST_BOX(cur_section->AppsList),Row,-1); g_object_set_data(G_OBJECT(Row),"gnome_section",cur_section); @@ -118,7 +123,6 @@ int yon_gnome_update(gnome_theme_struct *theme){ free(cur_section); } - int size; dictionary *cur; for_dictionaries(cur,main_config.sections){ app_section *section_data = yon_dictionary_get_data(cur,app_section*); diff --git a/source/ubl-settings-manager-theme-main.c b/source/ubl-settings-manager-theme-main.c new file mode 100644 index 0000000..5b42271 --- /dev/null +++ b/source/ubl-settings-manager-theme-main.c @@ -0,0 +1,200 @@ +#include "ubl-settings-manager.h" + +typedef struct { + GtkWidget *expander; + GtkWidget *MainLabel; + GtkWidget *AppsList; + app_section *section; +} main_section; + + +void on_main_plug_connected(GtkWidget *,main_theme_struct *theme){ + gtk_widget_show(theme->SocketBox); + gtk_widget_hide(theme->HideBox); +} + +void on_main_plug_disconnected(GtkWidget *,main_theme_struct *theme){ + gtk_widget_show(theme->HideBox); + gtk_widget_hide(theme->SocketBox); + on_plug_disconnected(GTK_SOCKET(theme->Socket),main_config.widgets); +} + +void on_main_selected(GtkWidget* self, main_theme_struct *theme); +void on_main_selected(GtkWidget* self, main_theme_struct *theme){ + GList *list = gtk_container_get_children(GTK_CONTAINER(theme->AppsTree)); + GList *iter; + for (iter=list;iter;iter=iter->next){ + main_section *cur_section = g_object_get_data(G_OBJECT(iter->data),"main_section"); + if (cur_section->AppsList != self){ + g_signal_handlers_block_by_func(G_OBJECT(cur_section->AppsList),G_CALLBACK(on_main_selected),theme); + GList *flowlist = gtk_flow_box_get_selected_children(GTK_FLOW_BOX(cur_section->AppsList)); + if (flowlist){ + gtk_flow_box_unselect_child(GTK_FLOW_BOX(cur_section->AppsList),GTK_FLOW_BOX_CHILD(flowlist->data)); + g_list_free(flowlist); + } + g_signal_handlers_unblock_by_func(G_OBJECT(cur_section->AppsList),G_CALLBACK(on_main_selected),theme); + } + } +} + +void on_main_activate(GtkFlowBox* self, GtkFlowBoxChild* child, main_theme_struct *theme){ + theme->Socket = GTK_WIDGET(yon_sockets_init(GTK_BOX(theme->SocketBox))); + g_signal_connect(G_OBJECT(theme->Socket),"plug_added",G_CALLBACK(on_main_plug_connected),theme); + g_signal_connect(G_OBJECT(theme->Socket),"destroy",G_CALLBACK(on_main_plug_disconnected),theme); + apps *cur_app = g_object_get_data(G_OBJECT(child),"apps"); + char *command = cur_app->Exec;//launch_command(cur_app->Desktop_path); + char *command_args = NULL; + if (cur_app->DualPluggable==1){ + char *save_socket = yon_get_save_socket(); + char *load_socket = yon_get_load_socket(); + char *main_socket_id = yon_char_from_long((long)gtk_socket_get_id(GTK_SOCKET(theme->Socket))); + command_args = launch_args_command(main_socket_id,load_socket,save_socket); + } else if (cur_app->Pluggable){ + char *main_socket_id = yon_char_from_long((long)gtk_socket_get_id(GTK_SOCKET(theme->Socket))); + command_args = yon_char_unite("--socket-id=",main_socket_id,NULL); + + } + yon_launch_app_with_arguments(command,command_args); +} + +void on_main_socket_add(){ + +} + +void yon_main_section_setup_apps(main_section *cur_section, const char *target){ + if (yon_char_is_empty(target)) return; + apps *cur_app = yon_apps_get((char*)target); + GtkIconInfo *info = gtk_icon_theme_lookup_icon_for_scale(gtk_icon_theme_get_default(), !yon_char_is_empty(cur_app->Icon)?cur_app->Icon:icon_path, main_config.apps_icon_size,1,GTK_ICON_LOOKUP_FORCE_SIZE); + GtkWidget *Image = NULL; + if (info){ + Image = gtk_image_new_from_pixbuf(gtk_icon_info_load_icon(info,NULL)); + } else { + info = gtk_icon_theme_lookup_icon_for_scale(gtk_icon_theme_get_default(), icon_path, main_config.apps_icon_size,1,GTK_ICON_LOOKUP_FORCE_SIZE); + Image = gtk_image_new_from_pixbuf(gtk_icon_info_load_icon(info,NULL)); + + } + + char *name = yon_char_wrap_to_length_str(cur_app->Name,20); + + GtkWidget *Row = gtk_flow_box_child_new(); + GtkWidget *Box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,5); + GtkWidget *Label = gtk_label_new(name); + GtkWidget *Icon = Image; + + gtk_box_pack_start(GTK_BOX(Box),Icon,0,0,0); + gtk_box_pack_start(GTK_BOX(Box),Label,0,0,0); + gtk_container_add(GTK_CONTAINER(Row),Box); + gtk_flow_box_insert(GTK_FLOW_BOX(cur_section->AppsList),Row,-1); + + gtk_widget_set_size_request(Row,50,50); + + gtk_widget_set_halign(Box,GTK_ALIGN_START); + gtk_widget_set_valign(Box,GTK_ALIGN_CENTER); + + gtk_label_set_line_wrap_mode(GTK_LABEL(Label),PANGO_WRAP_WORD); + gtk_label_set_line_wrap(GTK_LABEL(Label),1); + gtk_label_set_xalign(GTK_LABEL(Label),0); + + g_object_set_data(G_OBJECT(Row),"main_section",cur_section); + g_object_set_data(G_OBJECT(Row),"apps",cur_app); + g_object_set_data(G_OBJECT(Row),"Label",Label); + + gtk_widget_show_all(Row); +} + +main_section *yon_main_section_new(){ + main_section *cur_section = malloc(sizeof(main_section)); + memset(cur_section,0,sizeof(cur_section)); + GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_main_section); + cur_section->expander = yon_gtk_builder_get_widget(builder,"MainExpander"); + cur_section->MainLabel = yon_gtk_builder_get_widget(builder,"MainLabel"); + cur_section->AppsList = yon_gtk_builder_get_widget(builder,"AppsFlow"); + g_object_set_data(G_OBJECT(cur_section->expander),"main_section",cur_section); + int doubleclick=0; + yon_window_config_get_parameter(settings_section,double_click_parameter,&doubleclick,YON_TYPE_BOOLEAN); + gtk_flow_box_set_activate_on_single_click(GTK_FLOW_BOX(cur_section->AppsList),!doubleclick); + return cur_section; +} + +void yon_main_section_setup(main_theme_struct *theme, app_section *section){ + main_section *cur_section = yon_main_section_new(); + cur_section->section = section; + gtk_label_set_text(GTK_LABEL(cur_section->MainLabel),section->name); + int app_size; + config_str app_list = yon_apps_get_by_categories(section->categories,section->categories_size,&app_size); + for(int i=0;iAppsTree),cur_section->expander,0,0,0); + g_object_set_data(G_OBJECT(cur_section->expander),"main_section",cur_section); + g_signal_connect(G_OBJECT(cur_section->AppsList),"child-activated",G_CALLBACK(on_main_activate),theme); + g_signal_connect(G_OBJECT(cur_section->AppsList),"selected-children-changed",G_CALLBACK(on_main_selected),theme); + +} + +void yon_main_section_get_max_size(main_section *section, int *ret_width, int *ret_height){ + GList *list = gtk_container_get_children(GTK_CONTAINER(section->AppsList)); + GList *iter; + for (iter = list; iter;iter=iter->next){ + gtk_widget_realize(GTK_WIDGET(iter->data)); + int width; + int height; + GtkWidget *Label = g_object_get_data(G_OBJECT(iter->data),"Label"); + + gtk_widget_get_preferred_width(Label,NULL,&width); + gtk_widget_get_preferred_height(Label,NULL,&height); + if ((*ret_width)AppsTree)); + GList *iter; + int max_width=0; + int max_height=0; + for (iter=list;iter;iter=iter->next){ + main_section *section = g_object_get_data(G_OBJECT(iter->data),"main_section"); + yon_main_section_get_max_size(section,&max_width,&max_height); + } + for (iter=list;iter;iter=iter->next){ + main_section *section = g_object_get_data(G_OBJECT(iter->data),"main_section"); + GList *child_list = gtk_container_get_children(GTK_CONTAINER(section->AppsList)); + if (child_list){ + GtkWidget *Label = g_object_get_data(G_OBJECT(child_list->data),"Label"); + gtk_widget_set_size_request(Label,max_width,max_height); + } + } +} + +void yon_main_update(main_theme_struct *theme){ + GList *list = gtk_container_get_children(GTK_CONTAINER(theme->AppsTree)); + GList *iter; + for (iter=list;iter;iter->next){ + gtk_widget_destroy(GTK_WIDGET(iter->data)); + } + + dictionary *cur; + for_dictionaries(cur,main_config.sections){ + app_section *section_data = yon_dictionary_get_data(cur,app_section*); + yon_main_section_setup(theme,section_data); + } + + yon_main_theme_resize(theme); +} + +main_theme_struct *yon_main_theme_new(){ + main_theme_struct *theme = malloc(sizeof(main_theme_struct)); + + GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_main_theme); + theme->MainBox = yon_gtk_builder_get_widget(builder,"MainBox"); + theme->AppsTree = yon_gtk_builder_get_widget(builder,"AppsTree"); + theme->SocketBox = yon_gtk_builder_get_widget(builder,"SocketBox"); + theme->HideBox = yon_gtk_builder_get_widget(builder,"HideBox"); + theme->theme_name = yon_char_new(MAIN_THEME_LABEL); + theme->Socket = NULL; + theme->list_update_func = (int(*)(struct main_theme_struct*))yon_main_update; + + g_signal_connect(G_OBJECT(theme->SocketBox),"add",G_CALLBACK(on_main_socket_add),theme); + return theme; +} diff --git a/source/ubl-settings-manager-theme.c b/source/ubl-settings-manager-theme.c index b4365a6..501d6df 100644 --- a/source/ubl-settings-manager-theme.c +++ b/source/ubl-settings-manager-theme.c @@ -29,33 +29,4 @@ void yon_theme_init(){ // theme_struct *main_struct = (theme_struct*)yon_main_theme_new(); g_hash_table_insert(main_config.themes,yon_char_new(GNOME_THEME_LABEL),yon_gnome_theme_new); g_hash_table_insert(main_config.themes,yon_char_new(MAIN_THEME_LABEL),yon_main_theme_new); -} - -void yon_main_update(main_theme_struct *theme){ - -} - -void on_main_activate(){ - -} - -void on_main_socket_add(){ - -} - -main_theme_struct *yon_main_theme_new(){ - main_theme_struct *theme = malloc(sizeof(main_theme_struct)); - - GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_main_theme); - theme->MainBox = yon_gtk_builder_get_widget(builder,"MainBox"); - theme->AppsIconView = yon_gtk_builder_get_widget(builder,"AppsIconView"); - theme->SocketBox = yon_gtk_builder_get_widget(builder,"SocketBox"); - theme->AppsList = GTK_LIST_STORE(gtk_builder_get_object(builder,"AppsList")); - theme->theme_name = yon_char_new(MAIN_THEME_LABEL); - theme->Socket = NULL; - theme->list_update_func = (int(*)(struct main_theme_struct*))yon_main_update; - - g_signal_connect(G_OBJECT(theme->AppsIconView),"item-activated",G_CALLBACK(on_main_activate),theme); - g_signal_connect(G_OBJECT(theme->SocketBox),"add",G_CALLBACK(on_main_socket_add),theme); - return theme; -} +} \ No newline at end of file diff --git a/source/ubl-settings-manager.h b/source/ubl-settings-manager.h index a721735..5b7b4c2 100644 --- a/source/ubl-settings-manager.h +++ b/source/ubl-settings-manager.h @@ -36,6 +36,7 @@ #define glade_path "/com/ublinux/ui/ubl-settings-manager.glade" #define glade_path_gnome_theme "/com/ublinux/ui/ubl-settings-manager-theme-gnome.glade" #define glade_path_gnome_section "/com/ublinux/ui/ubl-settings-manager-theme-gnome-section.glade" +#define glade_path_main_section "/com/ublinux/ui/ubl-settings-manager-theme-main-section.glade" #define glade_path_main_theme "/com/ublinux/ui/ubl-settings-manager-theme-main.glade" #define glade_path_settings "/com/ublinux/ui/ubl-settings-manager-settings.glade" #define glade_path_settings_section "/com/ublinux/ui/ubl-settings-manager-settings-sections.glade" @@ -141,7 +142,7 @@ typedef struct main_theme_struct { GtkWidget *SocketBox; GtkWidget *HideBox; int (*list_update_func)(struct main_theme_struct*); - GtkWidget *AppsIconView; + GtkWidget *AppsTree; GtkWidget *Socket; GtkListStore *AppsList; } main_theme_struct; diff --git a/ubl-settings-manager-section-element.glade b/ubl-settings-manager-section-element.glade index 6493942..8cd8823 100644 --- a/ubl-settings-manager-section-element.glade +++ b/ubl-settings-manager-section-element.glade @@ -2,6 +2,12 @@ + + True + False + 16 + com.ublinux.libublsettingsui-gtk3.trash-symbolic + True False @@ -16,7 +22,7 @@ name - True + False True 0 @@ -25,7 +31,7 @@ True False - 25 + 0 False @@ -52,10 +58,4 @@ - - True - False - 16 - com.ublinux.libublsettingsui-gtk3.trash-symbolic - diff --git a/ubl-settings-manager-settings-sections.glade b/ubl-settings-manager-settings-sections.glade index 406f7ce..91314f9 100644 --- a/ubl-settings-manager-settings-sections.glade +++ b/ubl-settings-manager-settings-sections.glade @@ -62,6 +62,43 @@ 5 vertical 5 + + + True + False + 5 + 5 + 5 + + + True + True + + + False + True + 0 + + + + + True + False + Default + + + False + True + 1 + + + + + False + True + 0 + + True @@ -71,14 +108,14 @@ True False + 5 + 5 + 5 + 5 True False - 5 - 5 - 5 - 5 vertical 5 @@ -92,7 +129,7 @@ True True - 0 + 1 @@ -125,7 +162,7 @@ name - True + False True 0 @@ -134,7 +171,7 @@ True True - 25 + 0 False Identifier @@ -189,7 +226,7 @@ False True - 1 + 2 diff --git a/ubl-settings-manager-theme-gnome.glade b/ubl-settings-manager-theme-gnome.glade index f2d2ac0..28dc32f 100644 --- a/ubl-settings-manager-theme-gnome.glade +++ b/ubl-settings-manager-theme-gnome.glade @@ -25,57 +25,71 @@ True True - + True - True + False + 5 + 5 + 5 + 5 + vertical + 5 - + True - False - 5 - 5 - 5 - 5 - none + True + 0 + edit-find-symbolic + False + False + + + False + True + 0 + + + + + True + True - + True False - vertical - 5 + none - - True - True - edit-find-symbolic - False - False - - - False - True - 0 - - - - + True False vertical 5 - + + True + False + vertical + 5 + + + + + + True + True + 1 + - - True - True - 1 - + + True + True + 1 + @@ -168,6 +182,9 @@ True + True diff --git a/ubl-settings-manager-theme-main-section.glade b/ubl-settings-manager-theme-main-section.glade new file mode 100644 index 0000000..36f79fa --- /dev/null +++ b/ubl-settings-manager-theme-main-section.glade @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + True + False + vertical + + + True + False + label + 0 + + + + + + + False + True + 0 + + + + + True + False + start + True + 5 + 5 + 15 + browse + False + + + False + True + 1 + + + + diff --git a/ubl-settings-manager-theme-main.glade b/ubl-settings-manager-theme-main.glade index 306a248..72717ed 100644 --- a/ubl-settings-manager-theme-main.glade +++ b/ubl-settings-manager-theme-main.glade @@ -3,7 +3,6 @@ - True False @@ -15,20 +14,27 @@ vertical - 5 - 5 True True - immediate - never - always in - + True - True - 6 - AppsList + False + 5 + 5 + 5 + 5 + + + True + False + vertical + + + + + @@ -57,7 +63,7 @@ - False + True True 1 diff --git a/ubl-settings-manager.css b/ubl-settings-manager.css index a042536..8cc8f3b 100644 --- a/ubl-settings-manager.css +++ b/ubl-settings-manager.css @@ -10,6 +10,11 @@ border-style: solid; } + +.titlelabel { + color: @theme_bg_color; +} + .nobackground { background:transparent; } diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade index 3ed6809..b907e4b 100644 --- a/ubl-settings-manager.glade +++ b/ubl-settings-manager.glade @@ -3,111 +3,6 @@ - - False - False - dialog-information-symbolic - False - - - True - False - vertical - - - True - False - - - True - False - center - start - 20 - 20 - 20 - 20 - dialog-information-symbolic - 6 - - - False - True - 0 - - - - - True - False - center - start - 10 - 25 - 20 - 20 - Changing the theme is not available due to the small screen resolution! - True - 0 - - - True - True - 1 - - - - - True - True - 0 - - - - - Understood - True - True - True - 5 - 5 - 5 - 5 - - - False - True - 2 - - - - - - - True - False - - - True - False - UBLinux Settings Manager - - - - - - - - True - False - 32 - dialog-information-symbolic - 5 - - - - - True False @@ -164,7 +59,6 @@ True False - 5 True @@ -249,9 +143,7 @@ True False - 5 vertical - 5 True @@ -269,17 +161,11 @@ - Icon True False - 5 - True @@ -346,7 +232,10 @@ True False - com.ublinux.libublsettingsui-gtk3.pan-left + com.ublinux.libublsettingsui-gtk3.pan-left-symbolic + False