version_application implementation, localisation for about window

pull/9/head
parent 2605be7163
commit 78e522b47b

3
.gitignore vendored

@ -13,4 +13,5 @@ css/
.config/ .config/
images/ images/
locale/ locale/
ui/ ui/
ubl-settings-manager_ru.pos

@ -13,7 +13,6 @@ CMAKE_BUILD_DIR = ./compile
DEPENDS = cmake DEPENDS = cmake
PKGNAME = $(MAKEFILE_DIR) PKGNAME = $(MAKEFILE_DIR)
#PKGNAME = ubl-settings-manager #PKGNAME = ubl-settings-manager
pkgdir =
default_target: all default_target: all
@ -23,8 +22,9 @@ init:
@echo "Initialize ..."; \ @echo "Initialize ..."; \
version="$$(cat VERSION.md)"; \ version="$$(cat VERSION.md)"; \
version=$${version:8}; \ version=$${version:8}; \
search="s/char *version_application.*$&"; \ search="s/string version_application.*$&"; \
replace="char *version_application = \"$${version}\";"; \ echo $$search; \
replace="string version_application = \"$${version}\";"; \
sed -i -e "$$search/$$replace/gi" source/ubl-settings-manager.h; \ sed -i -e "$$search/$$replace/gi" source/ubl-settings-manager.h; \
echo "-- Build path: ${CMAKE_BUILD_DIR}" echo "-- Build path: ${CMAKE_BUILD_DIR}"
@ -91,9 +91,7 @@ uninstall:
@$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}.glade" @$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}.glade"
@$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css" @$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css"
@$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}-banner.png" @$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}-banner.png"
@$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css" @$(RM) "/usr/share/${PKGNAME}/ui/ublinux-logo.svg"
@$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css"
@$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css"
@$(RM) -d "/usr/share/${PKGNAME}/css" @$(RM) -d "/usr/share/${PKGNAME}/css"
@$(RM) -d "/usr/share/${PKGNAME}/ui" @$(RM) -d "/usr/share/${PKGNAME}/ui"
@$(RM) -d "/usr/share/${PKGNAME}" @$(RM) -d "/usr/share/${PKGNAME}"

@ -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 launch(thread_output *thread){
int a=0; int a=0;
@ -1144,10 +1155,6 @@ void yon_set_default_sections(dictionary **section){
*section=(*section)->first; *section=(*section)->first;
} }
void yon_check_for_space_near_eol(){
}
IVGraphicals *yon_create_single_section_IV(char *name,char *cats){ IVGraphicals *yon_create_single_section_IV(char *name,char *cats){
IVGraphicals *IVG = malloc(sizeof(IVGraphicals)); IVGraphicals *IVG = malloc(sizeof(IVGraphicals));
GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); 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_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->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)); 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); g_signal_connect(G_OBJECT(curWidgets->MenuItemSettings), "activate", G_CALLBACK(on_settingsOpen), curWidgets);
if (gnld==0){ if (gnld==0){

@ -18,7 +18,8 @@
#define LocaleName "ubl-settings-manager" #define LocaleName "ubl-settings-manager"
#define ubl_settings_infoPath "ubl-settings-info" #define ubl_settings_infoPath "ubl-settings-info"
#define ubl_settings_infoPathLaunch "ubl-settings-info --socket-id=" #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{ typedef struct apps{
char *Name; char *Name;

@ -1281,6 +1281,7 @@
<object class="GtkViewport"> <object class="GtkViewport">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-end">10</property>
<property name="resize-mode">immediate</property> <property name="resize-mode">immediate</property>
<property name="hscroll-policy">natural</property> <property name="hscroll-policy">natural</property>
<child> <child>
@ -1948,6 +1949,47 @@
</object> </object>
</child> </child>
</object> </object>
<object class="GtkAboutDialog" id="ublAbloutWindow">
<property name="can-focus">False</property>
<property name="title" translatable="yes">About</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window-position">center</property>
<property name="icon-name">ubl-settings-manager</property>
<property name="type-hint">dialog</property>
<property name="urgency-hint">True</property>
<property name="program-name">UBLinux Settings Manager</property>
<property name="version">1.6</property>
<property name="copyright" translatable="yes">Copyright © 2022 - 2023 - UBSoft Software LLC</property>
<property name="comments" translatable="yes">Settings manager for UBLinux</property>
<property name="website">https://ublinux.ru/</property>
<property name="website-label" translatable="yes">Project Home Page</property>
<property name="authors">UBGroup</property>
<property name="artists">UBGroup</property>
<property name="logo-icon-name">ubl-settings-manager</property>
<property name="license-type">gpl-2-0</property>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="AboutButtons">
<property name="can-focus">False</property>
<property name="layout-style">end</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
<object class="GtkWindow" id="windowSettings-infoWarning"> <object class="GtkWindow" id="windowSettings-infoWarning">
<property name="can-focus">False</property> <property name="can-focus">False</property>
<child> <child>

@ -6,88 +6,93 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: 1.2\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n" "Language: ru\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: ubl-settings-manager.c:1338 #: source/ubl-settings-manager.c:730
msgid "Back to all settings" msgid "Settings manager for UBLinux"
msgstr "Назад ко всем настройкам" 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" msgid "UBLinux Settings Manager"
msgstr "Настройки UBLinux" 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" msgid "Icon size"
msgstr "Размер иконок" msgstr "Размер иконок"
#: ubl-settings-manager.c:1420 #: source/ubl-settings-manager.c:1687
msgid "Window theme" msgid "Window theme"
msgstr "Выбор темы" msgstr "Выбор темы"
#: ubl-settings-manager.c:1421 #: source/ubl-settings-manager.c:1688
msgid "Would you like to read documentation in the Web?" msgid "Would you like to read documentation in the Web?"
msgstr "Вы хотите прочитать руководство в сети?" msgstr "Вы хотите прочитать руководство в сети?"
#: ubl-settings-manager.c:1422 #: source/ubl-settings-manager.c:1689
msgid "" msgid ""
"You will be redirected to documentation site, where user help pages are " "You will be redirected to documentation site, where user help pages are "
"translated and supported by community." "translated and supported by community."
msgstr "Вы будете перенаправлены на сайт с документацией, где страницы помощи переводятся и поддерживаются сообществом." msgstr "Вы будете перенаправлены на сайт с документацией, где страницы помощи переводятся и поддерживаются сообществом."
#: ubl-settings-manager.c:1423 #: source/ubl-settings-manager.c:1690
msgid "Read online" msgid "Read online"
msgstr "Прочитать онлайн" msgstr "Прочитать онлайн"
#: ubl-settings-manager.c:1424 #: source/ubl-settings-manager.c:1691
msgid "Cancel" msgid "Cancel"
msgstr "Отменить" msgstr "Отменить"
#: ubl-settings-manager.c:1425 #: source/ubl-settings-manager.c:1692
msgid "Close" msgid "Close"
msgstr "Закрыть" msgstr "Закрыть"
#: ubl-settings-manager.c:1426 #: source/ubl-settings-manager.c:1693
msgid "Save and apply" msgid "Save and apply"
msgstr "Сохранить и применить" msgstr "Сохранить и применить"
#: ubl-settings-manager.c:1427 #: source/ubl-settings-manager.c:1694
msgid "Always redirect" msgid "Always redirect"
msgstr "Всегда перенаправлять" msgstr "Всегда перенаправлять"
#: ubl-settings-manager.c:1428 #: source/ubl-settings-manager.c:1695
msgid "Settings" msgid "Settings"
msgstr "Настройки" msgstr "Настройки"
#: ubl-settings-manager.c:1429 #: source/ubl-settings-manager.c:1696
msgid "About..." msgid "About..."
msgstr "О программе" msgstr "О программе"
#: ubl-settings-manager.c:1430 #: source/ubl-settings-manager.c:1697
msgid "About system" msgid "About system"
msgstr "О системе" msgstr "О системе"
#: ubl-settings-manager.c:1431 #: source/ubl-settings-manager.c:1698
msgid "Understood" msgid "Understood"
msgstr "Понятно" msgstr "Понятно"
#: ubl-settings-manager.c:1432 #: source/ubl-settings-manager.c:1782
msgid "Section management"
msgstr "Точная настройка"
#: ubl-settings-manager.c:1508
msgid "Standard theme" msgid "Standard theme"
msgstr "Основная тема" msgstr "Стандартная тема"
#: ubl-settings-manager.c:1509 #: source/ubl-settings-manager.c:1783
msgid "GNOME theme" msgid "GNOME theme"
msgstr "GNOME тема" msgstr "GNOME тема"

Loading…
Cancel
Save