From 3d7601c9887a258c59d10faa199a55ff683747e6 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 22 Mar 2023 14:24:35 +0600 Subject: [PATCH 1/5] Fixed icon --- ubl-settings-manager.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubl-settings-manager.desktop b/ubl-settings-manager.desktop index c16cec7..afec07e 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=com.ublinux.ubl-settings-manager +Icon=ru.ublinux.ubl-settings-manager Terminal=false X-XfcePluggable=false Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings; From a5c0a611ab7599c81cc54ecce2d7fffe92ef2253 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 22 Mar 2023 16:05:42 +0600 Subject: [PATCH 2/5] Test double click button fixes --- source/ubl-settings-manager.c | 30 +++++++++++++++++++++--------- ubl-settings-manager.conf | 2 ++ ubl-settings-manager.glade | 9 +++------ 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index d9d4fed..c75b56b 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -360,7 +360,7 @@ void on_section_settings_open(GtkButton* self,dictionary *cWidgets){ main_config.SettingsSections->first->key=name; yon_segments_hide(widgets); yon_segment_show(widgets, (SectionSettingSegment*)main_config.SettingsSections->data); - for (dictionary *dct=main_config.sections->first->next;dct!=NULL;dct=dct->next){ // ошибка если меньше двух + for (dictionary *dct=main_config.sections->first->next;dct!=NULL;dct=dct->next){ name=((IconSection*)dct->data)->section; categories=((IconSection*)dct->data)->categories; main_config.SettingsSections=yon_dictionary_create_with_data_connected(main_config.SettingsSections,name,yon_create_section_setting(name, categories)); @@ -656,6 +656,7 @@ void on_reveal_banner(GtkWidget *button, actionWidgets *widgets){ } void on_double_click_changed(GtkWidget *Switch, gboolean state, dictionary *widgetsD){ + printf("%s\n","SGRBHSDRFJHNSDRJHNSDRJHNDRDJR"); *main_config.currentDoubleClick=state; update_double_clicks(widgetsD); } @@ -724,14 +725,23 @@ int reload_list(IVGraphicals *section){ } void update_double_clicks(dictionary *widgetsD){ + printf("%s\n","1"); for (dictionary *dict=widgetsD->first;dict!=NULL;dict=dict->next){ + printf("%s\n","2"); actionWidgets *widgets=(actionWidgets*)dict->data; + printf("%s\n","3"); for (dictionary *ivdct=widgets->ICSys->first;ivdct!=NULL;ivdct=ivdct->next){ + printf("%s\n","4"); IVGraphicals *IV=(IVGraphicals*)ivdct->data; - if (strcmp(dict->key,"Gnome")==0) + printf("%s\n","5"); + if (strcmp(dict->key,"Gnome")==0){ + printf("%s\n","6"); gtk_icon_view_set_activate_on_single_click(GTK_ICON_VIEW(IV->IV),!main_config.GnomeDoubleClick); - else + printf("%s\n","7"); + } else{ gtk_icon_view_set_activate_on_single_click(GTK_ICON_VIEW(IV->IV),!main_config.MainDoubleClick); + printf("%s\n","8"); + } } } } @@ -988,13 +998,15 @@ void save_config(actionWidgets *widgets){ int sz=1,szm=1; if (main_config.Gnomeiconsize==64) sz=4; - if (main_config.Gnomeiconsize==48) sz=3; - if (main_config.Gnomeiconsize==32) sz=2; - if (main_config.Gnomeiconsize==24) sz=1; + else if (main_config.Gnomeiconsize==48) sz=3; + else if (main_config.Gnomeiconsize==32) sz=2; + else if (main_config.Gnomeiconsize==24) sz=1; + else sz=3; if (main_config.Mainiconsize==64) szm=4; - if (main_config.Mainiconsize==48) szm=3; - if (main_config.Mainiconsize==32) szm=2; - if (main_config.Mainiconsize==24) szm=1; + else if (main_config.Mainiconsize==48) szm=3; + else if (main_config.Mainiconsize==32) szm=2; + else if (main_config.Mainiconsize==24) szm=1; + else szm=3; char *fromint=malloc(5); memset(fromint,0,5); GError *err=NULL; diff --git a/ubl-settings-manager.conf b/ubl-settings-manager.conf index e8ceb76..652bc77 100644 --- a/ubl-settings-manager.conf +++ b/ubl-settings-manager.conf @@ -11,6 +11,8 @@ MainLabelSize=12 GnomeLabelSize=12 LabelDensity=0 User= +GnomeDoubleClick=false +MainDoubleClick=true [sections] Personal=X-UBL-SettingsManager;X-UBL-PersonalSettings; diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade index 20051d7..0e79079 100644 --- a/ubl-settings-manager.glade +++ b/ubl-settings-manager.glade @@ -364,10 +364,6 @@ - - True - True - 1 @@ -759,7 +755,7 @@ True False True - left + right @@ -1058,6 +1054,7 @@ False + True 800 600 @@ -1372,7 +1369,7 @@ False True True - left + right From 1e37e87854bbc4e1fc5bc417e1a8ad525c466e0e Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 22 Mar 2023 17:33:02 +0600 Subject: [PATCH 3/5] Fixed section management errors --- source/ubl-settings-manager.c | 39 +++++++++++++++++++---------------- source/ubl-settings-manager.h | 1 + ubl-settings-manager.conf | 1 + ubl-settings-manager.glade | 15 +++++++------- 4 files changed, 30 insertions(+), 26 deletions(-) diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index c75b56b..f2fe030 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -495,7 +495,7 @@ void on_sections_add(GtkWidget *button, actionWidgets *widgets){ SectionSettingSegment *segment=yon_create_section_setting(category_name,category_categories); dictionary *newsection = yon_dictionary_get_last(main_config.SettingsSections); newsection=yon_dictionary_create_with_data_connected(newsection,category_name,segment); - printf("%s\n",category_name); + // printf("%s\n",category_name); dictionary *newsec=yon_dictionary_create_empty(); newsec=yon_section_new(newsec,category_name,category_categories); main_config.sections=yon_dictionary_create_with_data_connected(main_config.sections,category_name,newsec->data); @@ -656,7 +656,7 @@ void on_reveal_banner(GtkWidget *button, actionWidgets *widgets){ } void on_double_click_changed(GtkWidget *Switch, gboolean state, dictionary *widgetsD){ - printf("%s\n","SGRBHSDRFJHNSDRJHNSDRJHNDRDJR"); + // printf("%s\n","SGRBHSDRFJHNSDRJHNSDRJHNDRDJR"); *main_config.currentDoubleClick=state; update_double_clicks(widgetsD); } @@ -1089,11 +1089,8 @@ char *yon_char_divide_search(char *source, char* dividepos, int delete_divider){ void yon_set_default_sections(dictionary *section){ yon_section_new(section,"Personal","X-UBL-SettingsManager;X-UBL-PersonalSettings;"); - section=yon_dictionary_create_conneced(section); yon_section_new(section,"Hardware","X-UBL-SettingsManager;X-UBL-HardwareSettings;"); - section=yon_dictionary_create_conneced(section); yon_section_new(section,"System","X-UBL-SettingsManager;X-UBL-SystemSettings;"); - section=yon_dictionary_create_conneced(section); yon_section_new(section,"Misc","X-UBL-SettingsManager;X-UBL-MiscSettings;"); } @@ -1187,21 +1184,18 @@ void yon_check_path(char *path){ } dictionary *yon_section_new(dictionary *section, char *section_name, char *categories){ - section->next=NULL; IconSection *sct=malloc(sizeof(IconSection)); - dictionary *dict=yon_dictionary_create_empty();//malloc(sizeof(dictionary)); - sct->section=section_name; - sct->categories=categories; - dict->data=sct; - if (!section->data){ - section->data=dict->data; + sct->section=section_name; + sct->categories=categories; + if (!section->data&&!section->prev){ + section->data=sct; section->first=section; section->key=section_name; } else { - dict->first=section->first; - section->next=dict; - dict->prev=section; - dict->key=section_name; + section=yon_dictionary_get_last(section); + section->next=yon_dictionary_create_conneced(section); + section->next->data=sct; + section->next->key=section_name; section=section->next; } @@ -1284,6 +1278,14 @@ dictionary *yon_dictionary_rip(dictionary *dict){ } } +dictionary *yon_dictionary_connect(dictionary *old, dictionary *toconnect){ + dictionary *dict=yon_dictionary_get_last(old); + dict->next=toconnect; + toconnect->prev=dict; + toconnect->first=dict->first; + return toconnect; +} + void yon_switch_theme(dictionary **dict, dictionary *newone){ dictionary *dct=*dict; actionWidgets *widgets=(actionWidgets*)dct->data; @@ -1610,8 +1612,9 @@ dictionary *yon_dictionary_switch_places(dictionary *dict,int aim){ } dictionary *yon_dictionary_get_last(dictionary *dict){ - for (dictionary *dct=dict;dct!=NULL;dct=dct->next){} - return dict; + dictionary *dct=NULL; + for (dct=dict->first;dct->next!=NULL;dct=dct->next){} + return dct; } void yon_main_quit(actionWidgets *widgets){ diff --git a/source/ubl-settings-manager.h b/source/ubl-settings-manager.h index bf11b95..193626d 100644 --- a/source/ubl-settings-manager.h +++ b/source/ubl-settings-manager.h @@ -229,6 +229,7 @@ dictionary *yon_dictionary_get_last(dictionary *dict); dictionary *yon_dictionary_switch_places(dictionary *dict,int aim); dictionary *yon_dictionary_create_with_data(char *key, void *data); dictionary *yon_dictionary_create_with_data_connected(dictionary *dict, char *key, void *data); +dictionary *yon_dictionary_connect(dictionary *old, dictionary *toconnect); SectionSettingSegment *yon_create_section_setting(char *name, char *categories); void yon_segments_show(actionWidgets *widgets); void yon_segments_hide(actionWidgets *widgets); diff --git a/ubl-settings-manager.conf b/ubl-settings-manager.conf index 652bc77..3e8a48b 100644 --- a/ubl-settings-manager.conf +++ b/ubl-settings-manager.conf @@ -13,6 +13,7 @@ LabelDensity=0 User= GnomeDoubleClick=false MainDoubleClick=true +BannerHidden=false [sections] Personal=X-UBL-SettingsManager;X-UBL-PersonalSettings; diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade index 0e79079..d378256 100644 --- a/ubl-settings-manager.glade +++ b/ubl-settings-manager.glade @@ -24,7 +24,7 @@ 20 20 20 - dialog-question-symbolic + dialog-information-symbolic 6 @@ -89,7 +89,7 @@ True False 32 - dialog-question-symbolic + dialog-information-symbolic 5 @@ -1054,7 +1054,6 @@ False - True 800 600 @@ -1250,8 +1249,8 @@ True False - - Close + + Save and apply True True True @@ -1266,12 +1265,12 @@ - - Save and apply + + Close True True True - 17 + 15 5 From 54b3be82eb4e389cd14d2f324aead85e116885d1 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 23 Mar 2023 09:49:05 +0600 Subject: [PATCH 4/5] wrong pictures name fixing; localisation information fixes --- Makefile | 10 +-- ...vg => com.ublinux.ubl-settings-manager.svg | 0 source/ubl-settings-manager.h | 2 +- ubl-settings-manager.desktop | 2 +- ubl-settings-manager.glade | 24 ++++-- ubl-settings-manager.pot | 73 +++++++++++-------- ubl-settings-manager_ru.po | 44 +++++++---- 7 files changed, 94 insertions(+), 61 deletions(-) rename ru.ublinux.ubl-settings-manager.svg => com.ublinux.ubl-settings-manager.svg (100%) diff --git a/Makefile b/Makefile index 240f2a5..e166a62 100644 --- a/Makefile +++ b/Makefile @@ -75,8 +75,8 @@ uninstall: $(RM) "$${PATH_FILE_MO}"; \ done @for SIZE in 16x16 32x32 48x48 scalable; do \ - $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/ru.ublinux.${PKGNAME}.svg"; \ - $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/ru.ublinux.${PKGNAME}.png"; \ + $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ + $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \ done @for FILE_SVG in $(wildcard *.svg); do \ for SIZE in 16x16 32x32 48x48 scalable; do \ @@ -86,7 +86,7 @@ uninstall: @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" @$(RM) "${DESTDIR}/etc/xdg/${PKGNAME}/${PKGNAME}.conf" @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" - @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ru.ublinux.${PKGNAME}.svg" + @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg" @$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ @@ -107,10 +107,10 @@ install: check uninstall done @for SIZE in 16 32 48; do \ install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ - rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "ru.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/ru.ublinux.${PKGNAME}.svg"; \ + rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ done @install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "ru.ublinux.${PKGNAME}.svg" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" @install -dm755 "${DESTDIR}/etc/xdg" @install -Dm744 -t "${DESTDIR}/etc/xdg/${PKGNAME}/" "${PKGNAME}.conf" diff --git a/ru.ublinux.ubl-settings-manager.svg b/com.ublinux.ubl-settings-manager.svg similarity index 100% rename from ru.ublinux.ubl-settings-manager.svg rename to com.ublinux.ubl-settings-manager.svg diff --git a/source/ubl-settings-manager.h b/source/ubl-settings-manager.h index 193626d..cb946fe 100644 --- a/source/ubl-settings-manager.h +++ b/source/ubl-settings-manager.h @@ -11,7 +11,7 @@ #define CssPath "/usr/share/ubl-settings-manager/css/ubl-settings-manager.css" #define GlobalConfigPath "/etc/xdg/ubl-settings-manager/ubl-settings-manager.conf" #define UserConfigPath "/.config/ubl-settings-manager/ubl-settings-manager.conf" -#define AppIconPath "ru.ublinux.ubl-settings-manager" +#define AppIconPath "com.ublinux.ubl-settings-manager" #define AppBannerPath "/usr/share/ubl-settings-manager/images/ubl-settings-manager-banner.png" #define DesktopPath "/usr/share/applications/" #define IconPicturesPath "/usr/share/icons/hicolor/scalable/apps/" diff --git a/ubl-settings-manager.desktop b/ubl-settings-manager.desktop index afec07e..c16cec7 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=ru.ublinux.ubl-settings-manager +Icon=com.ublinux.ubl-settings-manager 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 d378256..19fc833 100644 --- a/ubl-settings-manager.glade +++ b/ubl-settings-manager.glade @@ -5,6 +5,10 @@ False + start + False + dialog-information-symbolic + False True @@ -126,9 +130,12 @@ False + start + start + False 450 250 - dialog-question + dialog-question-symbolic True @@ -167,6 +174,7 @@ 10 5 Would you like to read documentation in the Web? + True 0 @@ -453,7 +461,7 @@ True False 32 - ru.ublinux.ubl-settings-manager + com.ublinux.ubl-settings-manager False @@ -679,7 +687,7 @@ True False 32 - ru.ublinux.ubl-settings-manager + com.ublinux.ubl-settings-manager 5 @@ -897,7 +905,7 @@ True False 32 - ru.ublinux.ubl-settings-manager + com.ublinux.ubl-settings-manager 5 @@ -1299,7 +1307,7 @@ True False 32 - ru.ublinux.ubl-settings-manager + com.ublinux.ubl-settings-manager 5 @@ -1573,7 +1581,7 @@ True False 32 - ru.ublinux.ubl-settings-manager + com.ublinux.ubl-settings-manager 5 @@ -2001,7 +2009,7 @@ True False 32 - ru.ublinux.ubl-settings-manager + com.ublinux.ubl-settings-manager 5 @@ -2076,7 +2084,7 @@ False True center - ubl-settings-manager + com.ublinux.ubl-settings-manager dialog True UBLinux Settings Manager diff --git a/ubl-settings-manager.pot b/ubl-settings-manager.pot index 4c5ebc1..8678dcd 100644 --- a/ubl-settings-manager.pot +++ b/ubl-settings-manager.pot @@ -1,70 +1,70 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Language translations for ubl-settings-manager package. +# Copyright (C) 2022, UBTech LLC +# This file is distributed under the same license as the ubl-settings-manager package. +# UBLinux Team , 2022 # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-22 11:23+0600\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"Project-Id-Version: ubl-settings-manager 1.0\n" +"Report-Msgid-Bugs-To: info@ublinux.com\n" +"POT-Creation-Date: 2023-01-01 00:00+0600\n" +"PO-Revision-Date: 2023-01-01 00:00+0600\n" +"Last-Translator: UBLinux Team \n" +"Language-Team: UBLinux Team \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: source/ubl-settings-manager.c:667 +#: source/ubl-settings-manager.c:632 msgid "Settings manager for UBLinux" msgstr "" -#: source/ubl-settings-manager.c:668 source/ubl-settings-manager.c:1655 -#: source/ubl-settings-manager.c:1669 source/ubl-settings-manager.c:1733 +#: source/ubl-settings-manager.c:633 source/ubl-settings-manager.c:1601 +#: source/ubl-settings-manager.c:1615 source/ubl-settings-manager.c:1674 msgid "UBLinux Settings Manager" msgstr "" -#: source/ubl-settings-manager.c:671 +#: source/ubl-settings-manager.c:636 msgid "Project Home Page" msgstr "" -#: source/ubl-settings-manager.c:1654 +#: source/ubl-settings-manager.c:1600 msgid "Back to all settings" msgstr "" -#: source/ubl-settings-manager.c:1734 +#: source/ubl-settings-manager.c:1675 msgid "Icon size" msgstr "" -#: source/ubl-settings-manager.c:1735 +#: source/ubl-settings-manager.c:1676 msgid "Window theme" msgstr "" -#: source/ubl-settings-manager.c:1736 +#: source/ubl-settings-manager.c:1677 msgid "Would you like to read documentation in the Web?" msgstr "" -#: source/ubl-settings-manager.c:1737 +#: source/ubl-settings-manager.c:1678 msgid "" "You will be redirected to documentation site, where user help pages are " "translated and supported by community." msgstr "" -#: source/ubl-settings-manager.c:1738 +#: source/ubl-settings-manager.c:1679 msgid "Read online" msgstr "" -#: source/ubl-settings-manager.c:1739 +#: source/ubl-settings-manager.c:1680 msgid "Cancel" msgstr "" -#: source/ubl-settings-manager.c:1740 +#: source/ubl-settings-manager.c:1681 msgid "Close" msgstr "" -#: source/ubl-settings-manager.c:1741 +#: source/ubl-settings-manager.c:1682 msgid "Save and apply" msgstr "" @@ -72,23 +72,23 @@ msgstr "" msgid "Apply" msgstr "" -#: source/ubl-settings-manager.c:1743 +#: source/ubl-settings-manager.c:1683 msgid "Always redirect" msgstr "" -#: source/ubl-settings-manager.c:1744 +#: source/ubl-settings-manager.c:1684 msgid "Settings" msgstr "" -#: source/ubl-settings-manager.c:1745 +#: source/ubl-settings-manager.c:1685 msgid "About..." msgstr "" -#: source/ubl-settings-manager.c:1746 +#: source/ubl-settings-manager.c:1686 msgid "Understood" msgstr "" -#: source/ubl-settings-manager.c:1747 +#: source/ubl-settings-manager.c:1687 msgid "Sections management" msgstr "" @@ -96,11 +96,11 @@ msgstr "" msgid "Double click selection" msgstr "" -#: source/ubl-settings-manager.c:1853 +#: source/ubl-settings-manager.c:1792 msgid "Standard theme" msgstr "" -#: source/ubl-settings-manager.c:1854 +#: source/ubl-settings-manager.c:1793 msgid "GNOME theme" msgstr "" @@ -122,3 +122,16 @@ msgid "" " -V, --version\t \t Show package version\n" " --lock-settings Lock menu settings\n" msgstr "" + +msgid "Personal" +msgstr "" + +msgid "Hardware" +msgstr "" + +msgid "System" +msgstr "" + +msgid "Misc" +msgstr "" + diff --git a/ubl-settings-manager_ru.po b/ubl-settings-manager_ru.po index 45497fa..c648825 100644 --- a/ubl-settings-manager_ru.po +++ b/ubl-settings-manager_ru.po @@ -1,18 +1,18 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Russian translations for ubl-settings-manager package. +# Copyright (C) 2022, UBTech LLC +# This file is distributed under the same license as the ubl-settings-manager package. +# UBLinux Team , 2022 # #, fuzzy msgid "translation_info\n" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-22 11:23+0600\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" +"Project-Id-Version: ubl-settings-manager 1.0\n" +"Report-Msgid-Bugs-To: info@ublinux.com\n" +"POT-Creation-Date: 2023-01-01 00:00+0600\n" +"PO-Revision-Date: 2023-01-01 00:00+0600\n" +"Last-Translator: UBLinux Team \n" +"Language-Team: Russian - UBLinux Team \n" +"Language: Russian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -50,8 +50,7 @@ msgstr "Вы хотите прочитать справку в Сети?" msgid "" "You will be redirected to documentation site, where user help pages are " "translated and supported by community." -msgstr "Вы будете перенаправлены на сайт с документацией, где страницы помощи" -"переводятся и поддерживаются сообществом." +msgstr "Вы будете перенаправлены на сайт с документацией где страницы помощи переводятся и поддерживаются сообществом." #: source/ubl-settings-manager.c:1738 msgid "Read online" @@ -124,9 +123,22 @@ msgid "" " --lock-settings Lock menu settings\n" msgstr "" "\n" -"GTK менеджер настроек для UBLinux\n" -"Использование: ubl-settings-manager [АРГУМЕНТЫ...]" +"GTK Менеджер настроек для UBLinux\n" +"Использование: ubl-settings-manager [АРГУМЕНТЫ...]\n" "Аргументы:\n" " -h, --help\t\t Показать помощь\n" " -V, --version\t \t Показать версию пакета\n" -" --lock-settings Заблокировать окно настроек\n" +" --lock-settings \t Заблокировать окно настроек\n" + + +msgid "Personal" +msgstr "Личные" + +msgid "Hardware" +msgstr "Оборудование" + +msgid "System" +msgstr "Система" + +msgid "Misc" +msgstr "Прочее" From a303d6b340675a7d93450b2c4a4070969b298837 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 23 Mar 2023 09:49:53 +0600 Subject: [PATCH 5/5] removed commented deprecated code fragment --- source/ubl-settings-manager.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index f2fe030..928f278 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -565,29 +565,7 @@ void on_resized (GtkWidget *window, GdkEventConfigure *event, dictionary *widget main_config.fullscreen=1; gtk_revealer_set_reveal_child(GTK_REVEALER(widgets->Revealer),!gtk_revealer_get_child_revealed(GTK_REVEALER(widgets->Revealer))); gtk_revealer_set_reveal_child(GTK_REVEALER(widgets->Revealer),gtk_revealer_get_child_revealed(GTK_REVEALER(widgets->Revealer))); - // if (main_config.WindowTheme==1){ - // if (main_config.windowWidth<1240){ - // if (stld==0){ - // stld=1; - // main_config.WindowTheme=0; - - // gtk_window_set_resizable(GTK_WINDOW(window),0); - // gtk_window_get_position(GTK_WINDOW(window),&main_config.windowPosX,&main_config.windowPosY); - // gtk_window_get_size(GTK_WINDOW(window),&main_config.windowWidth,&main_config.windowHeight); - // yon_switch_theme(&widgetsD,yon_dictionary_find(&widgetsD,"Main")); - // *main_config.currentThemeIconSize=24; - // gtk_window_resize(GTK_WINDOW(widgets->window),main_config.windowWidth,main_config.windowHeight); - // gtk_widget_hide(widgets->window); - // } - // }else { - // yon_segments_hide(widgets); - // yon_segments_show(widgets); - // if (stld==1){ - // stld=0; - // cmld=0; - // } - // } - // } + } void on_resized_done (GtkWidget *window, GdkEvent *event, dictionary *widgetsD){