diff --git a/.gitignore b/.gitignore index d83f252..030e9ea 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,6 @@ ubl-settings-info /css/ /ui/ .vscode/ -/ubl-standard-ui.c \ No newline at end of file +/ubl-standard-ui.c +ubl-settings-info.glade~ + diff --git a/Makefile b/Makefile index 6d34ce8..27656a1 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,12 @@ all: init build init: @echo "Initialize ..."; \ + version="$$(cat VERSION.md)"; \ + version=$${version:8}; \ + search="s/string version_application.*$&"; \ + echo $$search; \ + replace="string version_application = \"$${version}\";"; \ + sed -i -e "$$search/$$replace/gi" source/ubl-settings-info.c; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" depend: @@ -105,10 +111,10 @@ install: check uninstall @install -dm755 /usr/share/icons/hicolor/scalable/status @install -Dm755 -t /usr/bin/ ${CMAKE_BUILD_DIR}/${PKGNAME} @install -Dm655 -t /usr/share/applications/ ${PKGNAME}.desktop - @install -Dm644 -t /usr/share/ubl-util-standard/ ubl-util-standard.glade @install -Dm644 -t /usr/share/ubl-settings-info/ ubl-settings-info.glade @install -Dm644 -t /usr/share/ubl-settings-info/ ubl-settings-info.css @install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ${PKGNAME}.svg + @install -Dm644 -t /usr/share/${PKGNAME}/images/ ublinux-logo.svg @install -Dm644 -t /usr/share/${PKGNAME}/images/ bg_top.png @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null @update-desktop-database --quiet 2>/dev/null @@ -123,6 +129,12 @@ clean: else \ echo "Clean: OK"; \ 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-info.c; \ help: @echo "The following are some of the valid targets for this Makefile:" diff --git a/VERSION.md b/VERSION.md new file mode 100644 index 0000000..f3d572a --- /dev/null +++ b/VERSION.md @@ -0,0 +1 @@ +VERSION 1.2 \ No newline at end of file diff --git a/base.pot b/base.pot new file mode 100644 index 0000000..469fbc9 --- /dev/null +++ b/base.pot @@ -0,0 +1,42 @@ +# 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. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-03-03 14:25+0600\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: source/ubl-settings-info.c:37 +msgid "Sum up system information" +msgstr "" + +#: source/ubl-settings-info.c:38 source/ubl-settings-info.c:67 +msgid "UBLinux System Info" +msgstr "" + +#: source/ubl-settings-info.c:40 +msgid "Project Home Page" +msgstr "" + +#: source/ubl-settings-info.c:41 +msgid "About UBLinux System Info" +msgstr "" + +#: source/ubl-settings-info.c:68 +msgid "System Info" +msgstr "" + +#: source/ubl-settings-info.c:70 +msgid "About program" +msgstr "" diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 7f9a323..bf05211 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -21,7 +21,4 @@ set(LIBRARIES add_executable(ubl-settings-info ${SOURCE_FILES}) target_link_libraries(ubl-settings-info ${LIBRARIES}) -install(TARGETS ubl-settings-info DESTINATION bin) -file(COPY ui/ubl-settings-info.glade DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -file(COPY css/ubl-settings-info.css DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -file(COPY ubl-standard-ui.c DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) \ No newline at end of file +install(TARGETS ubl-settings-info DESTINATION bin) \ No newline at end of file diff --git a/source/css/ubl-settings-info.css b/source/css/ubl-settings-info.css deleted file mode 100644 index ef43993..0000000 --- a/source/css/ubl-settings-info.css +++ /dev/null @@ -1,6 +0,0 @@ -.backset{ - background: url("/usr/share/ubl-settings-info/images/bg_top.png") no-repeat; -} -.textHead{ - text-shadow: 1px 1px #ffffff; -} diff --git a/source/ubl-settings-info.c b/source/ubl-settings-info.c index d737b2d..04d8485 100644 --- a/source/ubl-settings-info.c +++ b/source/ubl-settings-info.c @@ -1,13 +1,20 @@ #include #include #include +#include #include -#include "ubl-standard-ui.c" +#include "ubl-util-standard.c" #define cssPath "/usr/share/ubl-settings-info/ubl-settings-info.css" #define gladePath "/usr/share/ubl-settings-info/ubl-settings-info.glade" #define HeaderImagePath "/usr/share/icons/hicolor/scalable/apps/ubl-settings-info.svg" -#define LogoImagePath "/usr/share/icons/hicolor/scalable/apps/ubl-settings-manager.svg" +#define LogoImagePath "/usr/share/ubl-settings-info/images/ublinux-logo.svg" +#define LocaleName "ubl-settings-info" +#define LocalePath "/usr/share/locale" +typedef char* string; +string version_application = ; + +#define _(String) gettext(String) char *yon_char_get_augumented(char *source, char *append){ @@ -25,24 +32,47 @@ char *yon_cut(char *source, int size, int startpos){ memcpy(cut,source+startpos,size); return cut; } +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, "About")); + GtkWidget *HeaderAboutTopic = GTK_WIDGET(gtk_builder_get_object(builder, "headerAboutTopic")); + gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(About),version_application); + gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(About),_("Sum up system information")); + gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(About),_("UBLinux System Info")); + gtk_widget_show(GTK_WIDGET(gtk_builder_get_object(builder,"About"))); + gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(About),_("Project Home Page")); + gtk_label_set_text(GTK_LABEL(HeaderAboutTopic),_("About UBLinux System Info")); + gtk_widget_set_visible(AboutButtons,0); +} + +void yon_on_window_close_dont_destroy(){ -void on_resized(GtkWidget *window, GdkEventConfigure *event){ - int x,y; - gtk_window_get_size(GTK_WINDOW(window),&x,&y); - printf("x - %d\ny - %d\n"); } + int main(int argc, char *argv[]){ int argsc=0; char *arv=""; char **argsv=&arv; GError *err=NULL; gtk_init(&argsc, &argsv); + setlocale(LC_ALL, ""); + bindtextdomain (LocaleName, LocalePath); + textdomain (LocaleName); GtkBuilder *builder = gtk_builder_new_from_file(gladePath); GtkWidget *plugBox = GTK_WIDGET(gtk_builder_get_object(builder, "plugBox")); - GtkWidget *button = GTK_WIDGET(gtk_builder_get_object(builder, "ButtonToHeader")); GtkWidget *labelInfo = GTK_WIDGET(gtk_builder_get_object(builder, "InfoLabel")); GtkWidget *iconInfo = GTK_WIDGET(gtk_builder_get_object(builder, "InfoIcon")); + GtkWidget *headLabel = GTK_WIDGET(gtk_builder_get_object(builder, "headLabel")); + GtkWidget *HeaderTopic = GTK_WIDGET(gtk_builder_get_object(builder, "headerTopic")); + GtkWidget *AboutButton = GTK_WIDGET(gtk_builder_get_object(builder,"MenuItemAbout")); + GtkWidget *buttonSettings = GTK_WIDGET(gtk_builder_get_object(builder,"buttonSettings")); + gtk_label_set_text(GTK_LABEL(HeaderTopic),_("UBLinux System Info")); + gtk_label_set_text(GTK_LABEL(headLabel),_("System Info")); + g_signal_connect(G_OBJECT(AboutButton), "activate", G_CALLBACK(on_about),NULL); + gtk_menu_item_set_label(GTK_MENU_ITEM(AboutButton),_("About program")); + gtk_image_set_from_pixbuf(GTK_IMAGE(iconInfo),gdk_pixbuf_new_from_file_at_size(LogoImagePath,256,256,&err)); if (err){ printf("%s\n",err->message); @@ -56,7 +86,7 @@ int main(int argc, char *argv[]){ } gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), GTK_STYLE_PROVIDER(css), - 0); + -1); FILE *fp; char path[1035]; char *loc=setlocale(LC_ALL,NULL); @@ -106,13 +136,12 @@ int main(int argc, char *argv[]){ int textsize=0; int pointer=0; static struct option long_options[] = { - {"socket-id", 2, 0, 0}, - {"socket-ext-id", 2, 0, 2}, - {"size",2,0,1} + {"socket-id", 1, 0, 0}, + {"socket-ext-id", 1, 0, 2}, }; int socket_find; for (int i=0;iuiwindow; - gtk_box_pack_start(GTK_BOX(mainui),plugBox,1,1,0); - gtk_widget_show_all(plugBox); + GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder,"window")); + g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(gtk_main_quit),NULL); + gtk_widget_show_all(window); + } else { - GtkWidget *mainui = NULL; - returnstruct *ret = ubl_get_standard_ui(HeaderImagePath, "Информация о системе",0,NULL, 0); - mainui=ret->uiwindow; - gtk_box_pack_start(GTK_BOX(mainui),plugBox,1,1,0); printf("Plug mod\n"); + ubl_make_plugs(NULL,buttonSettings,0,socket_ext_id); + // GtkStyleContext *context = gtk_widget_get_style_context(gtk_widget_get_parent(buttonSettings)); + // gtk_style_context_add_class(context,"primary-toolbar"); GtkWidget *plug=GTK_WIDGET(gtk_plug_new(socket_id)); g_signal_connect(G_OBJECT(plug), "destroy", G_CALLBACK(gtk_main_quit),NULL); GtkWidget *parentWindow = gtk_widget_get_parent(plugBox); diff --git a/source/ubl-standard-ui.c b/source/ubl-standard-ui.c deleted file mode 100644 index f00df59..0000000 --- a/source/ubl-standard-ui.c +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef UBL_GET_STANDARD_UI -#define UBL_GET_STANDARD_UI - -#include -#include -#define STANDARD_PATH "/usr/share/ubl-util-standard/ubl-util-standard.glade" - -typedef struct { - GtkWidget *socket; - GtkWidget *uiwindow; - - -} returnstruct; - -returnstruct *ubl_get_standard_ui(char *icon_path, char *util_name, int show_item, GtkWidget *button, int sec_plug_id){ - returnstruct *ret=malloc(sizeof(returnstruct)); - GtkBuilder *builder=gtk_builder_new(); - GError *err=NULL; - gtk_builder_add_from_file(builder, STANDARD_PATH,&err); - if(err) - printf("%s\n\n\n",err->message); - if (!builder){ - printf("Error occured: no UI file found.\n"); - return NULL; - } - GtkWidget *ButtonPlace=NULL; - if (button){ - ButtonPlace=GTK_WIDGET(gtk_builder_get_object(builder,"ButtonPlace")); - if (sec_plug_id>0){ - ret->socket=gtk_plug_new(sec_plug_id); - //gtk_box_pack_start(GTK_BOX(ButtonPlace), ret->socket,1,1,0); - gtk_container_add(GTK_CONTAINER(ret->socket),button); - gtk_widget_show_all(ret->socket); - } else { - gtk_box_pack_start(GTK_BOX(ButtonPlace), button,1,1,0); - } - - } - GtkWidget *icon=GTK_WIDGET(gtk_builder_get_object(builder,"HeaderImage")); - GtkWidget *window=GTK_WIDGET(gtk_builder_get_object(builder,"window")); - g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(gtk_main_quit),NULL); - GtkWidget *uiplace=GTK_WIDGET(gtk_builder_get_object(builder,"CustomUI")); - GtkWidget *name=GTK_WIDGET(gtk_builder_get_object(builder,"HeaderName")); - GdkPixbuf *ic=gdk_pixbuf_new_from_file_at_size(icon_path,64,64,NULL); - gtk_window_set_icon(GTK_WINDOW(window),ic); - gtk_image_set_from_pixbuf(GTK_IMAGE(icon),ic); - gtk_label_set_text(GTK_LABEL(name),util_name); - gtk_window_set_title(GTK_WINDOW(window),util_name); - if (show_item==1) - gtk_widget_show_all(window); - ret->uiwindow=uiplace; - return ret; -} - -#endif \ No newline at end of file diff --git a/source/ubl-util-standard.c b/source/ubl-util-standard.c new file mode 100644 index 0000000..74e9108 --- /dev/null +++ b/source/ubl-util-standard.c @@ -0,0 +1,77 @@ +#include "ubl-util-standard.h" +#ifndef __cplusplus +#ifndef UBL_GET_STANDARD_UI +#define UBL_GET_STANDARD_UI + + +inline returnstruct *ubl_make_plugs(GtkWidget *LeftWidget, GtkWidget *RightWidget, int left_plug_id, int right_plug_id){ + returnstruct *ret=(returnstruct*)malloc(sizeof(returnstruct*)); + if (left_plug_id>0&&LeftWidget){ + GtkWidget *plug=gtk_plug_new(left_plug_id); + GtkWidget *toplug=LeftWidget; + if (gtk_widget_get_parent(GTK_WIDGET(toplug))){ + g_object_ref(G_OBJECT(toplug)); + GtkWidget *parent=gtk_widget_get_parent(toplug); + gtk_container_remove(GTK_CONTAINER(parent),toplug); + gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug)); + } else + gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug)); + gtk_widget_show(GTK_WIDGET(plug)); + ret->plugLeft=plug; + + GtkStyleContext *context = gtk_widget_get_style_context(plug); + gtk_style_context_add_class(context,"primary-toolbar"); + gtk_style_context_add_class(gtk_widget_get_style_context(toplug),"button"); + } + if (right_plug_id>0&&RightWidget){ + GtkWidget *plug=gtk_plug_new(right_plug_id); + GtkWidget *toplug=RightWidget; + if (gtk_widget_get_parent(GTK_WIDGET(toplug))){ + g_object_ref(G_OBJECT(toplug)); + GtkWidget *parent=gtk_widget_get_parent(toplug); + gtk_container_remove(GTK_CONTAINER(parent),toplug); + gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug)); + } else + gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug)); + gtk_widget_show(GTK_WIDGET(plug)); + ret->plugRight=plug; + + GtkStyleContext *context = gtk_widget_get_style_context(plug); + gtk_style_context_add_class(context,"primary-toolbar"); + gtk_style_context_add_class(gtk_widget_get_style_context(toplug),"button"); + } + return ret; +} + +#endif + +#else + + +inline void ubl_make_plugs(Gtk::Widget *LeftWidget, Gtk::Widget *RightWidget, int left_plug_id, int right_plug_id){ + if (left_plug_id>0&&LeftWidget){ + GtkWidget *plug=gtk_plug_new(left_plug_id); + GtkWidget *toplug=GTK_WIDGET(LeftWidget->gobj()); + if (gtk_widget_get_parent(GTK_WIDGET(toplug))){ + g_object_ref(G_OBJECT(toplug)); + GtkWidget *parent=gtk_widget_get_parent(toplug); + gtk_container_remove(GTK_CONTAINER(parent),toplug); + gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug)); + } else + gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug)); + gtk_widget_show(GTK_WIDGET(plug)); + } + if (right_plug_id>0&&RightWidget){ + GtkWidget *plug=gtk_plug_new(right_plug_id); + GtkWidget *toplug=GTK_WIDGET(RightWidget->gobj()); + if (gtk_widget_get_parent(GTK_WIDGET(toplug))){ + g_object_ref(G_OBJECT(toplug)); + GtkWidget *parent=gtk_widget_get_parent(toplug); + gtk_container_remove(GTK_CONTAINER(parent),toplug); + gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug)); + } else + gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug)); + gtk_widget_show(GTK_WIDGET(plug)); + } +} +#endif \ No newline at end of file diff --git a/source/ubl-util-standard.h b/source/ubl-util-standard.h new file mode 100644 index 0000000..3209625 --- /dev/null +++ b/source/ubl-util-standard.h @@ -0,0 +1,20 @@ +#ifndef __cplusplus +#include +#include + +typedef struct { + GtkWidget *plugLeft; + GtkWidget *plugRight; + + +} returnstruct; +static returnstruct *ubl_make_plugs(GtkWidget *LeftWidget, GtkWidget *RightWidget, int left_plug_id, int right_plug_id); +#else +#include +#include +#include +#include + + +static void ubl_make_plugs(Gtk::Widget *LeftWidget, Gtk::Widget *RightWidget, int left_plug_id, int right_plug_id); +#endif \ No newline at end of file diff --git a/source/ui/ubl-settings-info.glade b/source/ui/ubl-settings-info.glade deleted file mode 100644 index b772951..0000000 --- a/source/ui/ubl-settings-info.glade +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - True - False - vertical - - - True - False - vertical - - - True - False - - - True - False - 0.5 - 0.5 - - - False - True - 0 - - - - - True - False - label - 0.019999999552965164 - 0.5 - - - True - True - 1 - - - - - True - True - 1 - - - - - True - True - 0 - - - - diff --git a/ubl-settings-info.css b/ubl-settings-info.css index ef43993..c332ad9 100644 --- a/ubl-settings-info.css +++ b/ubl-settings-info.css @@ -4,3 +4,32 @@ .textHead{ text-shadow: 1px 1px #ffffff; } + +.button { + background-image: -gtk-gradient(linear, + left top, left bottom, + from(@entry_background_a), + color-stop(0.20, @entry_background_b), + color-stop(0.85, @entry_background_c), + to(@entry_background_d)); +} +.menuitemsolo { + border-color:alpha(@theme_text_color, 0.4); + border-style:solid; + border-width:1px; +} +.menuitemsolo *{ + margin:0 2px 2px 2px; + padding: 3px 10px 5px 5px; +} +.menuitemsolo:hover { + background:@theme_bg_color; + +} +.menuitemsolo:hover* { + margin:0 2px 2px 2px; + padding: 3px 10px 5px 5px; + background:@theme_selected_bg_color; + border-color:transparent; + border-radius: 2px; +} diff --git a/ubl-settings-info.desktop b/ubl-settings-info.desktop index 90207b5..451b852 100644 --- a/ubl-settings-info.desktop +++ b/ubl-settings-info.desktop @@ -8,7 +8,8 @@ Comment=ubl-settings-manager Comment[ru]=Показать характеристики системы Type=Application Exec=ubl-settings-info -Icon=ublinux-ubconfig +Icon=ubl-settings-info Terminal=false X-XfcePluggable=true -Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;UBL-Dual-Args; +X-UBlPluggable=true +Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;X-UBL-SettingsManager;X-UBL-SystemSettings; diff --git a/ubl-settings-info.glade b/ubl-settings-info.glade index f9ee034..2621da2 100644 --- a/ubl-settings-info.glade +++ b/ubl-settings-info.glade @@ -2,46 +2,88 @@ - - True + + False - - + False + True + center + ubl-settings-info + dialog + True + UBLinux Info + 1.1 + Copyright © 2022 - 2023 - UBSoft Software LLC + Sum up system information + https://ublinux.ru/ + Project Home Page + UBGroup + UBGroup + ubl-settings-info + gpl-2-0 + + True False - Save to local configuration - True + vertical + 2 + + + False + end + + + False + False + 1 + + - - + + True False - Save to global configuration - True + True + + + True + False + 5 + 5 + 5 + 5 + 2 + UBLinux System Info + + + + + - + True - True - False - True - menu1 + False + False + False - + True False - Save... + About + True + - - True + False - vertical - + True False vertical @@ -49,31 +91,167 @@ True False + vertical - + True False - 0.5 - 0.5 + vertical + + + True + False + + + 90 + True + False + 5 + 5 + 5 + 5 + 6 + 6 + 69 + ubl-settings-info + + + False + True + 0 + + + + + True + False + + + True + False + + + True + False + vertical + + + 255 + True + False + System Info + + + + + + + + + + True + True + 0 + + + + + False + True + 0 + + + + + True + True + 0 + + + + + True + True + 1 + + + + + + False + True + 0 + + False True - 0 + 1 - + True False - label - 0.019999999552965164 - 0.5 + True + True + vertical + + + True + False + True + True + True + + + True + False + center + 1 + gtk-missing-image + 255 + + + True + True + 0 + + + + + True + False + center + 10 + 10 + label + 0.019999999552965164 + 0.5 + + + True + True + 1 + + + + + False + True + 0 + + - True + False True - 1 + 2 @@ -84,11 +262,66 @@ - - True - True - 0 - + + + + True + False + True + + + True + False + 5 + 5 + 5 + 5 + 2 + UBLinux System Info + + + + + + + + True + False + 5 + 5 + 5 + 5 + 6 + 6 + 32 + ubl-settings-info + + + + + True + True + False + True + True + menu2 + none + + + + + + + end + 1 + + + + diff --git a/ubl-settings-info_ru.po b/ubl-settings-info_ru.po new file mode 100644 index 0000000..56e43ee --- /dev/null +++ b/ubl-settings-info_ru.po @@ -0,0 +1,42 @@ +# 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. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-03-03 14:25+0600\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: source/ubl-settings-info.c:37 +msgid "Sum up system information" +msgstr "Сводки с информацией о системе" + +#: source/ubl-settings-info.c:38 source/ubl-settings-info.c:67 +msgid "UBLinux System Info" +msgstr "Информация о системе UBLinux" + +#: source/ubl-settings-info.c:40 +msgid "Project Home Page" +msgstr "Домашняя страница проекта" + +#: source/ubl-settings-info.c:41 +msgid "About UBLinux System Info" +msgstr "Информация о UBLinux System Info" + +#: source/ubl-settings-info.c:68 +msgid "System Info" +msgstr "Информация о системе" + +#: source/ubl-settings-info.c:70 +msgid "About program" +msgstr "О программе" diff --git a/ubl-settings-manager.desktop b/ubl-settings-manager.desktop index f558b53..b075730 100644 --- a/ubl-settings-manager.desktop +++ b/ubl-settings-manager.desktop @@ -11,4 +11,5 @@ Exec=ubl-settings-info Icon=ublinux-ubconfig Terminal=false X-XfcePluggable=false +X-UBlPluggable=false Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings; diff --git a/ubl-util-standard.glade b/ubl-util-standard.glade deleted file mode 100644 index fc78164..0000000 --- a/ubl-util-standard.glade +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - False - - - True - False - vertical - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 6 - 6 - 80 - - - False - True - 0 - - - - - 255 - True - False - start - 0.009999999776482582 - - - - - - - - - True - True - 1 - - - - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 0 - in - - - True - False - 12 - 12 - 12 - 12 - - - True - False - vertical - - - - - - - - - - - - - True - True - 1 - - - - - - - True - False - True - - - True - False - vertical - - - - - - - - - diff --git a/ubl-settings-manager-logo.svg b/ublinux-logo.svg similarity index 100% rename from ubl-settings-manager-logo.svg rename to ublinux-logo.svg