Merge pull request 'develop' (#5) from develop into master

Reviewed-on: #5
pull/6/head
Dmitry Razumov 3 years ago
commit 61e6b42b7e

4
.gitignore vendored

@ -3,4 +3,6 @@ ubl-settings-info
/css/
/ui/
.vscode/
/ubl-standard-ui.c
/ubl-standard-ui.c
ubl-settings-info.glade~

@ -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:"

@ -0,0 +1 @@
VERSION 1.2

@ -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 <EMAIL@ADDRESS>, 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 ""

@ -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})
install(TARGETS ubl-settings-info DESTINATION bin)

@ -1,6 +0,0 @@
.backset{
background: url("/usr/share/ubl-settings-info/images/bg_top.png") no-repeat;
}
.textHead{
text-shadow: 1px 1px #ffffff;
}

@ -1,13 +1,20 @@
#include <gtk/gtk.h>
#include <gtk/gtkx.h>
#include <getopt.h>
#include <libintl.h>
#include <locale.h>
#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;i<argc;i++){
socket_find=getopt_long(argc,argv,"s::",long_options,&option_index);
socket_find=getopt_long(argc,argv,"s:t:",long_options,&option_index);
if (socket_find==0) if (optarg!=NULL) socket_id=atoi(optarg); else socket_id=-1;
else if (socket_find=='s') if (optarg!=NULL) socket_id=atoi(optarg); else socket_id=-1;
else if (socket_find==2) if (optarg!=NULL) socket_ext_id=atoi(optarg); else socket_ext_id=-1;
@ -120,18 +149,16 @@ int main(int argc, char *argv[]){
printf("%d\n\n%d\n\n",socket_id,socket_ext_id);
if (socket_id<1){
printf("Solo mod\n");
GtkWidget *mainui = NULL;
returnstruct *ret = ubl_get_standard_ui(HeaderImagePath, "Информация о системе",1,NULL,0);
mainui=ret->uiwindow;
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);

@ -1,55 +0,0 @@
#ifndef UBL_GET_STANDARD_UI
#define UBL_GET_STANDARD_UI
#include <gtk/gtk.h>
#include <gtk/gtkx.h>
#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

@ -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

@ -0,0 +1,20 @@
#ifndef __cplusplus
#include <gtk/gtk.h>
#include <gtk/gtkx.h>
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 <gtkmm.h>
#include <gtkmm/stock.h>
#include <gtkmm/window.h>
#include <gtkmm/plug.h>
static void ubl_make_plugs(Gtk::Widget *LeftWidget, Gtk::Widget *RightWidget, int left_plug_id, int right_plug_id);
#endif

@ -1,60 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 -->
<interface>
<requires lib="gtk+" version="3.24"/>
<object class="GtkBox" id="plugBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkImage" id="InfoIcon">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="InfoLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">label</property>
<property name="xalign">0.019999999552965164</property>
<property name="yalign">0.5</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</interface>

@ -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;
}

@ -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;

@ -2,46 +2,88 @@
<!-- Generated with glade 3.38.2 -->
<interface>
<requires lib="gtk+" version="3.24"/>
<object class="GtkMenu" id="menu1">
<property name="visible">True</property>
<!-- interface-css-provider-path ubl-settings-info.css -->
<object class="GtkAboutDialog" id="About">
<property name="can-focus">False</property>
<child>
<object class="GtkMenuItem" id="SaveToLocal">
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window-position">center</property>
<property name="icon-name">ubl-settings-info</property>
<property name="type-hint">dialog</property>
<property name="urgency-hint">True</property>
<property name="program-name">UBLinux Info</property>
<property name="version">1.1</property>
<property name="copyright" translatable="yes">Copyright © 2022 - 2023 - UBSoft Software LLC</property>
<property name="comments" translatable="yes">Sum up system information</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-info</property>
<property name="license-type">gpl-2-0</property>
<child internal-child="vbox">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Save to local configuration</property>
<property name="use-underline">True</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">1</property>
</packing>
</child>
</object>
</child>
<child>
<object class="GtkMenuItem" id="SaveToGlobal">
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Save to global configuration</property>
<property name="use-underline">True</property>
<property name="show-close-button">True</property>
<child type="title">
<object class="GtkLabel" id="headerAboutTopic">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-bottom">2</property>
<property name="label" translatable="yes">UBLinux System Info</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
</child>
</object>
<object class="GtkMenuButton" id="ButtonToHeader">
<object class="GtkMenu" id="menu2">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="focus-on-click">False</property>
<property name="receives-default">True</property>
<property name="popup">menu1</property>
<property name="can-focus">False</property>
<property name="take-focus">False</property>
<property name="reserve-toggle-size">False</property>
<child>
<object class="GtkLabel">
<object class="GtkMenuItem" id="MenuItemAbout">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Save...</property>
<property name="label" translatable="yes">About</property>
<property name="use-underline">True</property>
<style>
<class name="menuitemsolo"/>
</style>
</object>
</child>
</object>
<object class="GtkBox" id="plugBox">
<property name="visible">True</property>
<object class="GtkWindow" id="window">
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
<object class="GtkBox" id="plugBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
@ -49,31 +91,167 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkImage" id="InfoIcon">
<object class="GtkBox" id="standartHead">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="boxColor">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkImage">
<property name="width-request">90</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="pixel-size">69</property>
<property name="icon-name">ubl-settings-info</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="headLabel">
<property name="width-request">255</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">System Info</property>
<attributes>
<attribute name="font-desc" value="URW Gothic Semi-Bold 10"/>
<attribute name="weight" value="bold"/>
<attribute name="foreground" value="#000023233232"/>
<attribute name="size" value="15360"/>
</attributes>
<style>
<class name="textHead"/>
</style>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<style>
<class name="backset"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="InfoLabel">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">label</property>
<property name="xalign">0.019999999552965164</property>
<property name="yalign">0.5</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkImage" id="InfoIcon">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">center</property>
<property name="xalign">1</property>
<property name="stock">gtk-missing-image</property>
<property name="pixel-size">255</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="InfoLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="valign">center</property>
<property name="margin-start">10</property>
<property name="margin-end">10</property>
<property name="label" translatable="yes">label</property>
<property name="xalign">0.019999999552965164</property>
<property name="yalign">0.5</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
</object>
@ -84,11 +262,66 @@
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child type="titlebar">
<object class="GtkHeaderBar" id="headerBar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="show-close-button">True</property>
<child type="title">
<object class="GtkLabel" id="headerTopic">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-bottom">2</property>
<property name="label" translatable="yes">UBLinux System Info</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="pixel-size">32</property>
<property name="icon-name">ubl-settings-info</property>
</object>
</child>
<child>
<object class="GtkMenuButton" id="buttonSettings">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="focus-on-click">False</property>
<property name="receives-default">True</property>
<property name="draw-indicator">True</property>
<property name="popup">menu2</property>
<property name="direction">none</property>
<child>
<placeholder/>
</child>
<style>
<class name="noborder"/>
</style>
</object>
<packing>
<property name="pack-type">end</property>
<property name="position">1</property>
</packing>
</child>
<style>
<class name="toolbar"/>
</style>
</object>
</child>
</object>
</interface>

@ -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 <EMAIL@ADDRESS>, 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 "О программе"

@ -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;

@ -1,125 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 -->
<interface>
<requires lib="gtk+" version="3.24"/>
<object class="GtkWindow" id="window">
<property name="can-focus">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="boxColor">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkImage" id="HeaderImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="pixel-size">80</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="HeaderName">
<property name="width-request">255</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="xalign">0.009999999776482582</property>
<attributes>
<attribute name="font-desc" value="URW Gothic Semi-Bold 10"/>
<attribute name="weight" value="bold"/>
<attribute name="foreground" value="#000023233232"/>
<attribute name="size" value="15360"/>
</attributes>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<style>
<class name="backset"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-bottom">5</property>
<property name="label-xalign">0</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="top-padding">12</property>
<property name="bottom-padding">12</property>
<property name="left-padding">12</property>
<property name="right-padding">12</property>
<child>
<object class="GtkBox" id="CustomUI">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="show-close-button">True</property>
<child>
<object class="GtkBox" id="ButtonPlace">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
</child>
</object>
</interface>

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Loading…
Cancel
Save