From 78e522b47b7ccac1bb7238c633c1dfbcd46d0d9a Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 13 Mar 2023 11:07:07 +0600 Subject: [PATCH 1/7] version_application implementation, localisation for about window --- .gitignore | 3 +- Makefile | 10 +++--- source/ubl-settings-manager.c | 19 +++++++---- source/ubl-settings-manager.h | 3 +- ubl-settings-manager.glade | 42 +++++++++++++++++++++++++ ubl-settings-manager_ru.po | 59 +++++++++++++++++++---------------- 6 files changed, 95 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index 42fe714..7eb13de 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ css/ .config/ images/ locale/ -ui/ \ No newline at end of file +ui/ +ubl-settings-manager_ru.pos \ No newline at end of file diff --git a/Makefile b/Makefile index 32ef201..cc5f38d 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,6 @@ CMAKE_BUILD_DIR = ./compile DEPENDS = cmake PKGNAME = $(MAKEFILE_DIR) #PKGNAME = ubl-settings-manager -pkgdir = default_target: all @@ -23,8 +22,9 @@ init: @echo "Initialize ..."; \ version="$$(cat VERSION.md)"; \ version=$${version:8}; \ - search="s/char *version_application.*$&"; \ - replace="char *version_application = \"$${version}\";"; \ + search="s/string version_application.*$&"; \ + echo $$search; \ + replace="string version_application = \"$${version}\";"; \ sed -i -e "$$search/$$replace/gi" source/ubl-settings-manager.h; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" @@ -91,9 +91,7 @@ uninstall: @$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}.glade" @$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css" @$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}-banner.png" - @$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css" - @$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css" - @$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css" + @$(RM) "/usr/share/${PKGNAME}/ui/ublinux-logo.svg" @$(RM) -d "/usr/share/${PKGNAME}/css" @$(RM) -d "/usr/share/${PKGNAME}/ui" @$(RM) -d "/usr/share/${PKGNAME}" diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index 37d7c97..4060fbd 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -723,7 +723,18 @@ void on_theme_selection_changed(GtkWidget *self, actionWidgets *widgets){ } } - +void on_about(GtkWidget *button){ + GtkBuilder *builder = gtk_builder_new_from_file(GladePath); + GtkWidget *AboutButtons = GTK_WIDGET(gtk_builder_get_object(builder,"AboutButtons")); + GtkWidget *About = GTK_WIDGET(gtk_builder_get_object(builder, "ublAbloutWindow")); + gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(About),_("Settings manager for UBLinux")); + gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(About),_("UBLinux Settings Manager")); + gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(About),version_application); + gtk_widget_show(About); + gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(About),_("Project Home Page")); + // gtk_label_set_text(GTK_LABEL(HeaderAboutTopic),_("About UBLinux Settings Manager")); + gtk_widget_set_visible(AboutButtons,0); +} int launch(thread_output *thread){ int a=0; @@ -1144,10 +1155,6 @@ void yon_set_default_sections(dictionary **section){ *section=(*section)->first; } -void yon_check_for_space_near_eol(){ - -} - IVGraphicals *yon_create_single_section_IV(char *name,char *cats){ IVGraphicals *IVG = malloc(sizeof(IVGraphicals)); GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); @@ -1658,7 +1665,7 @@ 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(GTK_WINDOW(curWidgets->window),gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(icthm, AppIconPath,yon_get_icon_size(32),1,GTK_ICON_LOOKUP_FORCE_SVG),NULL)); gtk_window_set_icon(GTK_WINDOW(curWidgets->SectionSettingsWindow),gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(icthm, AppIconPath,yon_get_icon_size(32),1,GTK_ICON_LOOKUP_FORCE_SVG),NULL)); - g_signal_connect(G_OBJECT(curWidgets->MenuItemDocumentation), "activate", G_CALLBACK(on_ButtonOpenHelp_activated), curWidgets->builder); + g_signal_connect(G_OBJECT(curWidgets->MenuItemDocumentation), "activate", G_CALLBACK(on_about), curWidgets->builder); //on_ButtonOpenHelp_activated g_signal_connect(G_OBJECT(curWidgets->MenuItemSettings), "activate", G_CALLBACK(on_settingsOpen), curWidgets); if (gnld==0){ diff --git a/source/ubl-settings-manager.h b/source/ubl-settings-manager.h index d10ecef..65ee9a7 100644 --- a/source/ubl-settings-manager.h +++ b/source/ubl-settings-manager.h @@ -18,7 +18,8 @@ #define LocaleName "ubl-settings-manager" #define ubl_settings_infoPath "ubl-settings-info" #define ubl_settings_infoPathLaunch "ubl-settings-info --socket-id=" -char *version_application = "1.3"; +typedef char* string; +string version_application = "1.1"; typedef struct apps{ char *Name; diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade index 43378f6..df36fbb 100644 --- a/ubl-settings-manager.glade +++ b/ubl-settings-manager.glade @@ -1281,6 +1281,7 @@ True False + 10 immediate natural @@ -1948,6 +1949,47 @@ + + False + About + False + True + center + ubl-settings-manager + dialog + True + UBLinux Settings Manager + 1.6 + Copyright © 2022 - 2023 - UBSoft Software LLC + Settings manager for UBLinux + https://ublinux.ru/ + Project Home Page + UBGroup + UBGroup + ubl-settings-manager + gpl-2-0 + + + False + vertical + 2 + + + False + end + + + False + False + 0 + + + + + + + + False diff --git a/ubl-settings-manager_ru.po b/ubl-settings-manager_ru.po index 6573cf3..f3c3921 100644 --- a/ubl-settings-manager_ru.po +++ b/ubl-settings-manager_ru.po @@ -6,88 +6,93 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: 1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-02-09 16:45+0600\n" +"POT-Creation-Date: 2023-03-13 10:24+0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ubl-settings-manager.c:1338 -msgid "Back to all settings" -msgstr "Назад ко всем настройкам" +#: source/ubl-settings-manager.c:730 +msgid "Settings manager for UBLinux" +msgstr "Менеджер настроек для UBLinux" -#: ubl-settings-manager.c:1418 +#: source/ubl-settings-manager.c:731 source/ubl-settings-manager.c:1615 +#: source/ubl-settings-manager.c:1630 source/ubl-settings-manager.c:1685 msgid "UBLinux Settings Manager" msgstr "Настройки UBLinux" -#: ubl-settings-manager.c:1419 +#: source/ubl-settings-manager.c:733 +msgid "Project Home Page" +msgstr "Домашняя станица проекта" + +#: source/ubl-settings-manager.c:1614 +msgid "Back to all settings" +msgstr "Назад ко всем настройкам" + +#: source/ubl-settings-manager.c:1686 msgid "Icon size" msgstr "Размер иконок" -#: ubl-settings-manager.c:1420 +#: source/ubl-settings-manager.c:1687 msgid "Window theme" msgstr "Выбор темы" -#: ubl-settings-manager.c:1421 +#: source/ubl-settings-manager.c:1688 msgid "Would you like to read documentation in the Web?" msgstr "Вы хотите прочитать руководство в сети?" -#: ubl-settings-manager.c:1422 +#: source/ubl-settings-manager.c:1689 msgid "" "You will be redirected to documentation site, where user help pages are " "translated and supported by community." msgstr "Вы будете перенаправлены на сайт с документацией, где страницы помощи переводятся и поддерживаются сообществом." -#: ubl-settings-manager.c:1423 +#: source/ubl-settings-manager.c:1690 msgid "Read online" msgstr "Прочитать онлайн" -#: ubl-settings-manager.c:1424 +#: source/ubl-settings-manager.c:1691 msgid "Cancel" msgstr "Отменить" -#: ubl-settings-manager.c:1425 +#: source/ubl-settings-manager.c:1692 msgid "Close" msgstr "Закрыть" -#: ubl-settings-manager.c:1426 +#: source/ubl-settings-manager.c:1693 msgid "Save and apply" msgstr "Сохранить и применить" -#: ubl-settings-manager.c:1427 +#: source/ubl-settings-manager.c:1694 msgid "Always redirect" msgstr "Всегда перенаправлять" -#: ubl-settings-manager.c:1428 +#: source/ubl-settings-manager.c:1695 msgid "Settings" msgstr "Настройки" -#: ubl-settings-manager.c:1429 +#: source/ubl-settings-manager.c:1696 msgid "About..." msgstr "О программе" -#: ubl-settings-manager.c:1430 +#: source/ubl-settings-manager.c:1697 msgid "About system" msgstr "О системе" -#: ubl-settings-manager.c:1431 +#: source/ubl-settings-manager.c:1698 msgid "Understood" msgstr "Понятно" -#: ubl-settings-manager.c:1432 -msgid "Section management" -msgstr "Точная настройка" - -#: ubl-settings-manager.c:1508 +#: source/ubl-settings-manager.c:1782 msgid "Standard theme" -msgstr "Основная тема" +msgstr "Стандартная тема" -#: ubl-settings-manager.c:1509 +#: source/ubl-settings-manager.c:1783 msgid "GNOME theme" msgstr "GNOME тема" From 5d5da291fc6b29f4c5483f459c3b83f07aa794ab Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 13 Mar 2023 11:35:31 +0600 Subject: [PATCH 2/7] .h fix --- source/ubl-settings-manager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-manager.h b/source/ubl-settings-manager.h index 65ee9a7..7c471db 100644 --- a/source/ubl-settings-manager.h +++ b/source/ubl-settings-manager.h @@ -19,7 +19,7 @@ #define ubl_settings_infoPath "ubl-settings-info" #define ubl_settings_infoPathLaunch "ubl-settings-info --socket-id=" typedef char* string; -string version_application = "1.1"; +string version_application = ; typedef struct apps{ char *Name; From b9a073e4d7ed183ca2c9568e08d86e6fc7bf5b35 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 13 Mar 2023 11:58:35 +0600 Subject: [PATCH 3/7] Removal of version variable value after building --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cc5f38d..e77531a 100644 --- a/Makefile +++ b/Makefile @@ -138,7 +138,13 @@ clean: echo "Clean: error, compile directory exist ${CMAKE_BUILD_DIR}"; \ else \ echo "Clean: OK"; \ - fi + fi; \ + version="$$(cat VERSION.md)"; \ + version=$${version:8}; \ + search="s/string version_application.*"; \ + echo $$search; \ + replace="string version_application = ;"; \ + sed -i -e "$$search/$$replace/gi" source/ubl-settings-manager.h; \ help: @echo "The following are some of the valid targets for this Makefile:" From 6f4598984b137084f5720584f35ba49f5e2bbb97 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 13 Mar 2023 16:41:42 +0600 Subject: [PATCH 4/7] Fixed fullscreen being activated when app wasn't closed at fullscreen; fixed crash while trying to load Manager with 3 or more categories --- source/ubl-settings-manager.c | 11 ++++++++--- ubl-settings-manager.css | 1 + ubl-settings-manager.glade | 10 +++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index 4060fbd..70eb714 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -948,7 +948,8 @@ int check_categories(apps app, char *catstocheck){ if (!found) return 0; n_found++; while (cat){ - char *fcat=strstr(app.Categories,";"); + left_cats=cat+1; + char *fcat=app.Categories;//strstr(app.Categories,";"); cat=strstr(cat+1,";"); if (!cat) break; find_it=yon_cut(left_cats,(strlen(left_cats)-strlen(cat)),0); @@ -957,7 +958,7 @@ int check_categories(apps app, char *catstocheck){ if (!found) break; n_found++; left_cats=cat+1; - if (strlen(left_cats)==0 ||strcmp(left_cats,'\0')==0) break; + if (strlen(left_cats)==0 ||strcmp(left_cats,"")==0) break; } if (to_find==n_found) return 1; else return 0; } @@ -998,6 +999,7 @@ int setup_config(){ main_config.GnomelabelSize=g_key_file_get_integer(configfile,"window","GnomeLabelSize",NULL); main_config.labelDensity=g_key_file_get_integer(configfile,"window","LabelDensity",NULL); main_config.lastUser=g_key_file_get_string(configfile,"window","User",NULL); + main_config.fullscreen=g_key_file_get_boolean(configfile,"window","fullscreen",NULL); if (main_config.MainlabelSize==0) main_config.MainlabelSize=12; if (main_config.labelDensity==0) main_config.labelDensity=0; main_config.MainlabelSize=main_config.MainlabelSize*1000; @@ -1076,6 +1078,7 @@ void save_config(actionWidgets *widgets){ sprintf(fromint,"%d",main_config.windowHeight); g_key_file_set_string(gfile,"window","WindowHeight",fromint); } + g_key_file_set_boolean(gfile,"window","fullscreen",main_config.fullscreen); sprintf(fromint,"%d",main_config.WindowTheme); g_key_file_set_string(gfile,"window","WindowTheme",fromint); sprintf(fromint,"%d",sz); @@ -1187,6 +1190,7 @@ IVGraphicals *yon_create_single_section_IV(char *name,char *cats){ gtk_icon_view_set_item_padding(GTK_ICON_VIEW(iv),3); //gtk_widget_set_name(iv,"workingbg"); gtk_icon_view_set_item_orientation(GTK_ICON_VIEW(iv),GTK_ORIENTATION_HORIZONTAL); + gtk_icon_view_set_row_spacing(GTK_ICON_VIEW(iv),2); } gtk_icon_view_set_text_column(GTK_ICON_VIEW(iv),0); GtkWidget *sep=gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); @@ -1783,7 +1787,8 @@ 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)); + if (main_config.fullscreen==1) + gtk_window_maximize(GTK_WINDOW(widg->window)); gtk_widget_show(widg->window); hide_if_unfound(widgets); if (main_config.WindowTheme==1) diff --git a/ubl-settings-manager.css b/ubl-settings-manager.css index 79a5aa8..640ab40 100644 --- a/ubl-settings-manager.css +++ b/ubl-settings-manager.css @@ -4,6 +4,7 @@ background-color: #404040; #GnomeIcon{ + border-radius: 0px; border-style:solid; border-bottom-width: 1px; border-image: linear-gradient(90deg, alpha(@theme_text_color,0.4) 55%, alpha(@theme_bg_color, 0) 100%); diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade index df36fbb..a657914 100644 --- a/ubl-settings-manager.glade +++ b/ubl-settings-manager.glade @@ -905,7 +905,8 @@ True False - gtk-undelete + 16 + software-remove-symbolic True @@ -956,6 +957,7 @@ True False + 16 object-select-symbolic @@ -1469,10 +1471,8 @@ True False False - False center center - 10 10 image5 @@ -1587,7 +1587,7 @@ horizontal liststoreTemplate 135 - 2 + 0 2 5 True @@ -2026,7 +2026,7 @@ False start 10 - 10 + 15 20 20 Looks like you don't have ubl-settings-info installed on your PC From 2459a1f5f3bd6aacaec7dca83391f46ab5e050f4 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 14 Mar 2023 11:49:11 +0600 Subject: [PATCH 5/7] Returnal of sections management button, removal of 'About System' menu button --- source/ubl-settings-manager.c | 38 +++++++++++++---------------- source/ubl-settings-manager.h | 5 ++-- ubl-settings-manager.glade | 45 +++++++++++++++-------------------- ubl-settings-manager_ru.po | 8 +++++++ 4 files changed, 47 insertions(+), 49 deletions(-) diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index 70eb714..221c220 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -122,7 +122,6 @@ void on_gnome_Item_activated(GtkIconView* self, GtkTreePath* path, actionWidgets } } else { - on_about_system(NULL,applist); launch_app(tempapp[0].Exec); gtk_widget_destroy(applist->socketbutton); } @@ -275,8 +274,8 @@ void on_paned_move(GtkPaned* self, GtkScrollType* scroll_type, actionWidgets *wi int position=gtk_paned_get_position(GTK_PANED(widgets->GnomePaned)); if (position<200) {position=200; gtk_paned_set_position(GTK_PANED(widgets->GnomePaned),200);} main_config.iconSegmentSize=position; - if (position <70) {position=70;} - double pos=((double)position); + // if (position <70) {position=70;} + double pos=((double)position-35); if (pos<70) pos=70; for (dictionary *dict=widgets->ICSys;dict!=NULL;dict=dict->next){ IVGraphicals *IV=(IVGraphicals*)dict->data; @@ -304,7 +303,7 @@ int on_settingsOpen(GtkWidget *button, actionWidgets *widgets){ gtk_label_set_text(GTK_LABEL(widgets->settingsSizeInfoLabel),tmp); gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->settingsIcon),gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(icthm, AppIconPath,yon_get_icon_size(*main_config.currentThemeIconSize),1,GTK_ICON_LOOKUP_FORCE_SVG),NULL)); - gtk_window_present(GTK_WINDOW(widgets->SettingsWindow)); + gtk_window_present(GTK_WINDOW(widgets->SettingsWindow)); }; int on_settings_icon_size_changed(GtkWidget* self, actionWidgets *widgets){ @@ -368,7 +367,7 @@ void on_section_settings_open(GtkButton* self,dictionary *cWidgets){ dict=dict->prev; dict->next=NULL; } - gtk_widget_show(widgets->SectionSettingsWindow); + gtk_window_present(GTK_WINDOW(widgets->SectionSettingsWindow)); } void on_sections_edit(GtkWidget *button, actionWidgets *widgets){ @@ -672,18 +671,7 @@ void on_resized_done (GtkWidget *window, GdkEvent *event, dictionary *widgetsD){ } } -void on_about_system(GtkWidget *button, actionWidgets *widgets){ - char arg[100]; - memset(arg,0,100); - gtk_widget_show(widgets->socketbuttonplace); - if (button){ - gtk_widget_hide(widgets->appSettings); - sprintf(arg,"--socket-id=%d --socket-ext-id=%d",gtk_socket_get_id(GTK_SOCKET(widgets->socket)),gtk_socket_get_id(GTK_SOCKET(widgets->socketbutton))); - }else{ - sprintf(arg,"--socket-id=%d",gtk_socket_get_id(GTK_SOCKET(widgets->socket))); - } - launch_app_with_arguments("ubl-settings-info",arg); -} + void on_theme_selection_changed(GtkWidget *self, actionWidgets *widgets){ int *icsize; @@ -1614,7 +1602,7 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them gtk_style_context_add_class(gtk_widget_get_style_context(curWidgets->icvpack),"iconview"); curWidgets->socket=GTK_WIDGET(create_socket(curWidgets)); - g_signal_connect(G_OBJECT(curWidgets->MenuItemAboutSystem), "activate", G_CALLBACK(on_about_system),curWidgets); + // g_signal_connect(G_OBJECT(curWidgets->MenuItemAboutSystem), "activate", G_CALLBACK(on_about_system),curWidgets); if (curWidgets->ButtonBackToMain!=NULL) gtk_button_set_label(GTK_BUTTON(curWidgets->ButtonBackToMain),_("Back to all settings")); gtk_window_set_title(GTK_WINDOW(curWidgets->window),_("UBLinux Settings Manager")); @@ -1625,7 +1613,7 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them } g_signal_connect(G_OBJECT(curWidgets->window), "configure-event", G_CALLBACK(on_resized), widgets); if (strcmp(theme_id,"Gnome")==0){ - on_about_system(NULL,curWidgets); + // on_about_system(NULL,curWidgets); g_signal_connect(G_OBJECT(curWidgets->window), "event-after", G_CALLBACK(on_resized_done), widgets); } @@ -1653,6 +1641,7 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them curWidgets->settingsCancel=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsCancel")); curWidgets->settingsSubmenuLabelSize=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsSubmenuLabelSize")); curWidgets->settingsSubmenuLabelTheme=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsSubmenuLabelTheme")); + curWidgets->settingsSectionsSettingsButton=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsSectionsSettingsButton")); curWidgets->SectionSettingAddButton=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"SectionSettingsAddButton")); curWidgets->SectionSettingAddNameEntry=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"SectionSettingsAddNameEntry")); curWidgets->SectionSettingAddCategoriesEntry=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"SectionSettingsAddCategoriesEntry")); @@ -1662,6 +1651,8 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them curWidgets->CautionWindow=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"CautionWindow")); curWidgets->CautionUnderstandButton=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"CautionUnderstandButton")); curWidgets->infoWarningWindow=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"windowSettings-infoWarning")); + curWidgets->infoWarningButton=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"buttonSettings-infoWarning")); + curWidgets->infoWarningLabel=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"labelSettings-infoWarning")); curWidgets->applist=applist; curWidgets->appssize=appsize; GtkIconTheme *icthm=gtk_icon_theme_get_default(); @@ -1685,9 +1676,12 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them g_signal_connect(G_OBJECT(curWidgets->SectionSettingsCloseButton), "clicked", G_CALLBACK(on_sections_close), curWidgets); g_signal_connect(G_OBJECT(curWidgets->SectionSettingsSaveButton), "clicked", G_CALLBACK(on_sections_save), curWidgets); g_signal_connect(G_OBJECT(curWidgets->CautionUnderstandButton), "clicked", G_CALLBACK(on_caution_understand), curWidgets); + // g_signal_connect(G_OBJECT(curWidgets->infoWarningButton), "clicked", G_CALLBACK(on_info_warning_closed), curWidgets); + g_signal_connect(G_OBJECT(curWidgets->settingsSectionsSettingsButton), "clicked", G_CALLBACK(on_section_settings_open), widgets); } g_signal_connect(G_OBJECT(curWidgets->window), "destroy", G_CALLBACK(yon_main_quit), curWidgets); gtk_label_set_text(GTK_LABEL(curWidgets->LabelTitle),_("UBLinux Settings Manager")); + // gtk_label_set_text(GTK_LABEL(curWidgets->infoWarningLabel),_("Looks like you don't have ubl-settings-info installed on your PC.")); gtk_label_set_text(GTK_LABEL(curWidgets->settingsSubmenuLabelSize),_("Icon size")); gtk_label_set_text(GTK_LABEL(curWidgets->settingsSubmenuLabelTheme),_("Window theme")); gtk_label_set_text(GTK_LABEL(curWidgets->helpHeader),_("Would you like to read documentation in the Web?")); @@ -1699,8 +1693,9 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them 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_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemAboutSystem),_("About system")); gtk_button_set_label(GTK_BUTTON(curWidgets->CautionUnderstandButton),_("Understood")); + gtk_button_set_label(GTK_BUTTON(curWidgets->settingsSectionsSettingsButton),_("Sections management")); return widgets; } @@ -1712,7 +1707,8 @@ int main(int argc, char *argv[]){ } local=setlocale(LC_ALL, ""); textdomain (LocaleName); - actionWidgets *widget=malloc(sizeof(actionWidgets)); + actionWidgets *widget=NULL; + widget=malloc(sizeof(actionWidgets)); dictionary *widgets=yon_dictionary_create_empty(); widgets->data=widget; int *size=malloc(sizeof(int)); diff --git a/source/ubl-settings-manager.h b/source/ubl-settings-manager.h index 7c471db..df806b5 100644 --- a/source/ubl-settings-manager.h +++ b/source/ubl-settings-manager.h @@ -136,7 +136,7 @@ typedef struct { GtkWidget *GnomePaned; GtkWidget *GnomeInfoLabel; GtkWidget *workingwindow; - // GtkWidget *settingsSectionsSettingsButton; + GtkWidget *settingsSectionsSettingsButton; GtkWidget *SectionSettingsWindow; GtkWidget *SectionSettingsPack; dictionary *SettingsSections; @@ -158,6 +158,8 @@ typedef struct { apps *applist; GtkWidget *icvpack; GtkWidget *infoWarningWindow; + GtkWidget *infoWarningButton; + GtkWidget *infoWarningLabel; } actionWidgets; @@ -215,7 +217,6 @@ void yon_dictionary_make_first(dictionary *dict); dictionary *yon_create_icon_section_list(dictionary *sections); int yon_show_icon_views(dictionary *IVS,actionWidgets *widgets); void yon_icon_size_convert(int mode); -void on_about_system(GtkWidget *button, actionWidgets *widgets); char *yon_char_new(char *chr); int launch(thread_output *thread); float yon_time_average(dictionary *times); diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade index a657914..16761af 100644 --- a/ubl-settings-manager.glade +++ b/ubl-settings-manager.glade @@ -123,17 +123,6 @@ - - - True - False - About system - True - - - @@ -353,17 +342,6 @@ - - - True - False - About system - True - - - @@ -563,6 +541,23 @@ 1 + + + button + True + True + True + 5 + 5 + 5 + 5 + + + False + True + 2 + + True @@ -674,7 +669,6 @@ True False center - ubl-settings-manager-banner 3